iobroker.device-watcher 2.0.2 → 2.0.3

package/main.js

@@ -79,6 +79,7 @@ class DeviceWatcher extends utils.Adapter {
 				enocean: this.config.enoceanDevices,
 				esphome: this.config.esphomeDevices,
 				fritzdect: this.config.fritzdectDevices,
+				fullybrowser: this.config.fullybrowserDevices,
 				ham: this.config.hamDevices,
 				harmony: this.config.harmonyDevices,
 				hmiP: this.config.hmiPDevices,
@@ -101,8 +102,10 @@ class DeviceWatcher extends utils.Adapter {
 				shelly: this.config.shellyDevices,
 				sonoff: this.config.sonoffDevices,
 				sonos: this.config.sonosDevices,
+				sureflap: this.config.sureflapDevices,
 				switchbotBle: this.config.switchbotBleDevices,
 				tado: this.config.tadoDevices,
+				tapo: this.config.tapoDevices,
 				tradfri: this.config.tradfriDevices,
 				unifi: this.config.unifiDevices,
 				wled: this.config.wledDevices,
@@ -119,6 +122,7 @@ class DeviceWatcher extends utils.Adapter {
 				enocean: this.config.enoceanMaxMinutes,
 				esphome: this.config.esphomeMaxMinutes,
 				fritzdect: this.config.fritzdectMaxMinutes,
+				fullybrowser: this.config.fullybrowserMaxMinutes,
 				ham: this.config.hamMaxMinutes,
 				harmony: this.config.harmonyMaxMinutes,
 				hmiP: this.config.hmiPMaxMinutes,
@@ -141,8 +145,10 @@ class DeviceWatcher extends utils.Adapter {
 				shelly: this.config.shellyMaxMinutes,
 				sonoff: this.config.sonoffMaxMinutes,
 				sonos: this.config.sonosMaxMinutes,
+				sureflap: this.config.sureflapMaxMinutes,
 				switchbotBle: this.config.switchbotMaxMinutes,
 				tado: this.config.tadoMaxMinutes,
+				tapo: this.config.tapoMaxMinutes,
 				tradfri: this.config.tradfriMaxMinutes,
 				unifi: this.config.unifiMaxMinutes,
 				wled: this.config.wledMaxMinutes,
@@ -426,6 +432,7 @@ class DeviceWatcher extends utils.Adapter {
 				// Get ID for Switchbot and ESPHome Devices
 				case 'switchbotBle':
 				case 'esphome':
+				case 'fullybrowser':
 					deviceName = await this.getInitValue(currDeviceString + this.arrDev[i].id);
 					break;
 
@@ -457,6 +464,19 @@ class DeviceWatcher extends utils.Adapter {
 					deviceName = currDeviceString.slice(currDeviceString.lastIndexOf('.') + 1);
 					break;
 
+				// Format Device name
+				case 'sureflap':
+					if (deviceObject && typeof deviceObject === 'object') {
+						deviceName = deviceObject.common.name
+							// @ts-ignore FIXME: fix syntax error
+							.replace(/'/g, '')
+							.replace(/\(\d+\)/g, '')
+							.trim()
+							.replace('Hub', 'Hub -')
+							.replace('Device', 'Device -');
+					}
+					break;
+
 				//Get ID of foldername
 				case 'yeelight':
 					deviceName = shortCurrDeviceString.slice(shortCurrDeviceString.lastIndexOf('.') + 1);
@@ -702,9 +722,16 @@ class DeviceWatcher extends utils.Adapter {
 				let isBatteryDevice;
 
 				// Get battery states
-				const deviceBatteryState = await this.getInitValue(currDeviceString + this.arrDev[i].battery);
-				const shortDeviceBatteryState = await this.getInitValue(shortCurrDeviceString + this.arrDev[i].battery);
-				const shortDeviceBatteryState2 = await this.getInitValue(shortCurrDeviceString + this.arrDev[i].battery2);
+				let deviceBatteryState = await this.getInitValue(currDeviceString + this.arrDev[i].battery);
+				if (deviceBatteryState === undefined) {
+					deviceBatteryState = await this.getInitValue(currDeviceString + this.arrDev[i].battery2);
+				}
+
+				// Get battery states with short path
+				let shortDeviceBatteryState = await this.getInitValue(shortCurrDeviceString + this.arrDev[i].battery);
+				if (shortDeviceBatteryState === undefined) {
+					shortDeviceBatteryState = await this.getInitValue(shortCurrDeviceString + this.arrDev[i].battery2);
+				}
 
 				// Get low bat states
 				let deviceLowBatState = await this.getInitValue(currDeviceString + this.arrDev[i].isLowBat);
@@ -712,7 +739,7 @@ class DeviceWatcher extends utils.Adapter {
 					deviceLowBatState = await this.getInitValue(currDeviceString + this.arrDev[i].isLowBat2);
 				}
 
-				if (!deviceBatteryState && !shortDeviceBatteryState && !shortDeviceBatteryState2) {
+				if (!deviceBatteryState && !shortDeviceBatteryState) {
 					if (deviceLowBatState !== undefined) {
 						switch (this.arrDev[i].isLowBat || this.arrDev[i].isLowBat2) {
 							case 'none':
@@ -734,7 +761,7 @@ class DeviceWatcher extends utils.Adapter {
 				} else {
 					switch (adapterID) {
 						case 'hmrpc':
-							if (deviceBatteryState === 0) {
+							if (deviceBatteryState === 0 || (deviceBatteryState && deviceBatteryState >= 6)) {
 								batteryHealth = ' - ';
 							} else {
 								batteryHealth = deviceBatteryState + 'V';
@@ -743,20 +770,13 @@ class DeviceWatcher extends utils.Adapter {
 							break;
 
 						case 'hueExt':
-							if (shortDeviceBatteryState) {
-								batteryHealth = shortDeviceBatteryState + '%';
-								isBatteryDevice = true;
-							}
-							break;
 						case 'mihomeVacuum':
 							if (shortDeviceBatteryState) {
 								batteryHealth = shortDeviceBatteryState + '%';
 								isBatteryDevice = true;
-							} else if (shortDeviceBatteryState2) {
-								batteryHealth = shortDeviceBatteryState2 + '%';
-								isBatteryDevice = true;
 							}
 							break;
+
 						default:
 							batteryHealth = deviceBatteryState + '%';
 							isBatteryDevice = true;
@@ -1208,8 +1228,7 @@ class DeviceWatcher extends utils.Adapter {
 							deviceList = `${deviceList}\n${id['Device']} (${id['Battery']})`;
 						}
 					}
-
-					if (this.lowBatteryPoweredCountRaw > 0 && deviceList.length > 0) {
+					if (deviceList.length > 0) {
 						this.log.info(`Niedrige Batteriezustände: ${deviceList}`);
 						this.setStateAsync('lastNotification', `Niedrige Batteriezustände: ${deviceList}`, true);
 
@@ -1447,7 +1466,9 @@ class DeviceWatcher extends utils.Adapter {
 	 */
 	async creatLinkQualityListHTML(devices, deviceCount) {
 		devices = devices.sort((a, b) => {
-			return a.Device.localeCompare(b.Device);
+			a = a.Device || '';
+			b = b.Device || '';
+			return a.localeCompare(b);
 		});
 		let html = `<center>
 		<b>Link Quality Devices:<font> ${deviceCount}</b><small></small></font>
@@ -1481,7 +1502,9 @@ class DeviceWatcher extends utils.Adapter {
 	 */
 	async createOfflineListHTML(devices, deviceCount) {
 		devices = devices.sort((a, b) => {
-			return a.Device.localeCompare(b.Device);
+			a = a.Device || '';
+			b = b.Device || '';
+			return a.localeCompare(b);
 		});
 		let html = `<center>
 		<b>Offline Devices: <font color=${deviceCount == 0 ? '#3bcf0e' : 'orange'}>${deviceCount}</b><small></small></font>
@@ -1516,7 +1539,9 @@ class DeviceWatcher extends utils.Adapter {
 	 */
 	async createBatteryListHTML(devices, deviceCount, isLowBatteryList) {
 		devices = devices.sort((a, b) => {
-			return a.Device.localeCompare(b.Device);
+			a = a.Device || '';
+			b = b.Device || '';
+			return a.localeCompare(b);
 		});
 		let html = `<center>
 		<b>${isLowBatteryList == true ? 'Schwache ' : ''}Batterie Devices: <font color=${isLowBatteryList == true ? (deviceCount > 0 ? 'orange' : '#3bcf0e') : ''}>${deviceCount}</b></font>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.device-watcher",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "Watchdog for devices",
   "author": {
     "name": "Christian Behrends",