iobroker.device-watcher 2.0.2 → 2.1.0

package/main.js

@@ -33,6 +33,7 @@ class DeviceWatcher extends utils.Adapter {
 		this.blacklistNotify = [];
 		this.arrDev = [];
 		this.adapterSelected = [];
+		this.upgradableList = [];
 
 		// raw arrays
 		this.listAllDevicesRaw = [];
@@ -43,6 +44,7 @@ class DeviceWatcher extends utils.Adapter {
 		this.offlineDevicesCountRaw = 0;
 		this.offlineDevicesCountRawOld = 0;
 		this.lowBatteryPoweredCountRaw = 0;
+		this.upgradableDevicesCountRawOld = 0;
 
 		// counts
 		this.offlineDevicesCount = 0;
@@ -74,11 +76,13 @@ class DeviceWatcher extends utils.Adapter {
 
 			this.supAdapter = {
 				alexa2: this.config.alexa2Devices,
+				apcups: this.config.apcupsDevices,
 				ble: this.config.bleDevices,
 				deconz: this.config.deconzDevices,
 				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,
@@ -93,6 +97,8 @@ class DeviceWatcher extends utils.Adapter {
 				mihome: this.config.mihomeDevices,
 				mihomeGW: this.config.mihomeDevices,
 				mihomeVacuum: this.config.mihomeVacuumDevices,
+				mqttClientZigbee2Mqtt: this.config.mqttClientZigbee2MqttDevices,
+				mqttNuki: this.config.mqttNukiDevices,
 				netatmo: this.config.netatmoDevices,
 				nukiExt: this.config.nukiExtDevices,
 				nut: this.config.nutDevices,
@@ -101,8 +107,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,
@@ -114,11 +122,13 @@ class DeviceWatcher extends utils.Adapter {
 
 			this.maxMinutes = {
 				alexa2: this.config.alexa2MaxMinutes,
+				apcups: this.config.apcupsMaxMinutes,
 				ble: this.config.bleMaxMinutes,
 				deconz: this.config.deconzMaxMinutes,
 				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,
@@ -133,6 +143,8 @@ class DeviceWatcher extends utils.Adapter {
 				mihome: this.config.mihomeMaxMinutes,
 				mihomeGW: this.config.mihomeMaxMinutes,
 				mihomeVacuum: this.config.mihomeVacuumMaxMinutes,
+				mqttClientZigbee2Mqtt: this.config.mqttClientZigbee2MqttMaxMinutes,
+				mqttNuki: this.config.mqttNukiMaxMinutes,
 				netatmo: this.config.netatmoMaxMinutes,
 				nukiExt: this.config.nukiextendMaxMinutes,
 				nut: this.config.nutMaxMinutes,
@@ -141,8 +153,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,
@@ -206,6 +220,12 @@ class DeviceWatcher extends utils.Adapter {
 			// update data in interval
 			await this.refreshData();
 
+			// trigger update notification on state change
+			/*
+			if (this.config.checkSendAdapterUpdateNotify) {
+				this.subscribeForeignStatesAsync(`admin.*.info.updatesJson`);
+			}*/
+
 			// send overview for low battery devices
 			if (this.config.checkSendBatteryMsg) await this.sendBatteryNotifyShedule();
 
@@ -223,12 +243,10 @@ class DeviceWatcher extends utils.Adapter {
 	 * @param {ioBroker.State | null | undefined} state
 	 */
 	onStateChange(id, state) {
-		if (state) {
-			// The state was changed
-			this.log.warn(`state ${id} changed: ${state.val} (ack = ${state.ack})`);
-		} else {
-			// The state was deleted
-			this.log.warn(`state ${id} deleted`);
+		// Admin JSON for Adapter updates
+		if (id && state) {
+			this.log.debug(`State changed: ${id} changed ${state.val}`);
+			//this.sendAdapterUpdatesNotification(id, state);
 		}
 	}
 
@@ -426,6 +444,8 @@ class DeviceWatcher extends utils.Adapter {
 				// Get ID for Switchbot and ESPHome Devices
 				case 'switchbotBle':
 				case 'esphome':
+				case 'fullybrowser':
+				case 'apcups':
 					deviceName = await this.getInitValue(currDeviceString + this.arrDev[i].id);
 					break;
 
@@ -457,6 +477,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);
@@ -504,6 +537,7 @@ class DeviceWatcher extends utils.Adapter {
 		this.offlineDevices = [];
 		this.batteryLowPoweredRaw = [];
 		this.offlineDevicesRaw = [];
+		this.upgradableList = [];
 
 		for (const device of this.listAllDevicesRaw) {
 			/*----------  fill raw lists  ----------*/
@@ -570,6 +604,14 @@ class DeviceWatcher extends utils.Adapter {
 						'Last contact': device['Last contact'],
 					});
 				}
+
+				// Device update List
+				if (device['Upgradable']) {
+					this.upgradableList.push({
+						Device: device['Device'],
+						Adapter: device['Adapter'],
+					});
+				}
 			}
 		}
 	}
@@ -630,6 +672,7 @@ class DeviceWatcher extends utils.Adapter {
 				=============================================*/
 				let deviceQualityState;
 				let linkQuality;
+				let mqttNukiValue;
 
 				switch (adapterID) {
 					case 'mihomeVacuum':
@@ -687,6 +730,15 @@ class DeviceWatcher extends utils.Adapter {
 								case 'nukiExt':
 									linkQuality = ' - ';
 									break;
+								case 'mqttNuki':
+									linkQuality = deviceQualityState.val;
+									mqttNukiValue = parseInt(linkQuality);
+									if (this.config.trueState) {
+										linkQuality = deviceQualityState.val;
+									} else if (mqttNukiValue < 0) {
+										linkQuality = Math.min(Math.max(2 * (mqttNukiValue + 100), 0), 100) + '%';
+										// If Quality State is an value between 0-255 (zigbee) calculate in percent:
+									}
 							}
 							break;
 					}
@@ -702,9 +754,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 +771,7 @@ class DeviceWatcher extends utils.Adapter {
 					deviceLowBatState = await this.getInitValue(currDeviceString + this.arrDev[i].isLowBat2);
 				}
 
-				if (!deviceBatteryState && !shortDeviceBatteryState && !shortDeviceBatteryState2) {
+				if (deviceBatteryState === undefined && shortDeviceBatteryState === undefined) {
 					if (deviceLowBatState !== undefined) {
 						switch (this.arrDev[i].isLowBat || this.arrDev[i].isLowBat2) {
 							case 'none':
@@ -734,7 +793,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 +802,14 @@ class DeviceWatcher extends utils.Adapter {
 							break;
 
 						case 'hueExt':
-							if (shortDeviceBatteryState) {
-								batteryHealth = shortDeviceBatteryState + '%';
-								isBatteryDevice = true;
-							}
-							break;
 						case 'mihomeVacuum':
+						case 'mqttNuki':
 							if (shortDeviceBatteryState) {
 								batteryHealth = shortDeviceBatteryState + '%';
 								isBatteryDevice = true;
-							} else if (shortDeviceBatteryState2) {
-								batteryHealth = shortDeviceBatteryState2 + '%';
-								isBatteryDevice = true;
 							}
 							break;
+
 						default:
 							batteryHealth = deviceBatteryState + '%';
 							isBatteryDevice = true;
@@ -810,7 +863,6 @@ class DeviceWatcher extends utils.Adapter {
 						const deviceUnreachState = await this.getInitValue(currDeviceString + this.arrDev[i].reach);
 						const lastDeviceUnreachStateChange = deviceUnreachSelector != undefined ? await this.getTimestamp(deviceUnreachSelector.lc) : await this.getTimestamp(deviceMainSelector.ts);
 						const shortDeviceUnreachState = await this.getForeignStateAsync(shortCurrDeviceString + this.arrDev[i].reach);
-
 						//  If there is no contact since user sets minutes add device in offline list
 						// calculate to days after 48 hours
 						switch (this.arrDev[i].reach) {
@@ -864,37 +916,33 @@ class DeviceWatcher extends utils.Adapter {
 										linkQuality = '0%'; // set linkQuality to nothing
 									}
 									break;
+								case 'apcups':
+								case 'hue':
+								case 'hueExt':
 								case 'ping':
 								case 'deconz':
-									if (this.maxMinutes[adapterID] <= 0) {
-										if (!deviceUnreachState) {
-											deviceState = 'Offline'; //set online state to offline
-											linkQuality = '0%'; // set linkQuality to nothing
-										}
-									} else if (lastDeviceUnreachStateChange > this.maxMinutes[adapterID] && !deviceUnreachState) {
-										deviceState = 'Offline'; //set online state to offline
-										linkQuality = '0%'; // set linkQuality to nothing
-									}
-									break;
+								case 'shelly':
+								case 'sonoff':
 								case 'unifi':
+								case 'zigbee':
+								case 'zigbee2MQTT':
 									if (this.maxMinutes[adapterID] <= 0) {
-										if (deviceUnreachState === 0) {
+										if (!deviceUnreachState) {
 											deviceState = 'Offline'; //set online state to offline
 											linkQuality = '0%'; // set linkQuality to nothing
 										}
-									} else if (this.maxMinutes !== undefined && lastContact > this.maxMinutes[adapterID]) {
+									} else if (!deviceUnreachState && lastDeviceUnreachStateChange > this.maxMinutes[adapterID]) {
 										deviceState = 'Offline'; //set online state to offline
 										linkQuality = '0%'; // set linkQuality to nothing
 									}
 									break;
-								case 'shelly':
-								case 'sonoff':
+								case 'mqttClientZigbee2Mqtt':
 									if (this.maxMinutes[adapterID] <= 0) {
-										if (!deviceUnreachState) {
+										if (deviceUnreachState !== 'online') {
 											deviceState = 'Offline'; //set online state to offline
 											linkQuality = '0%'; // set linkQuality to nothing
 										}
-									} else if (!deviceUnreachState && lastDeviceUnreachStateChange > this.maxMinutes[adapterID]) {
+									} else if (deviceUnreachState !== 'online' && lastDeviceUnreachStateChange > this.maxMinutes[adapterID]) {
 										deviceState = 'Offline'; //set online state to offline
 										linkQuality = '0%'; // set linkQuality to nothing
 									}
@@ -950,6 +998,20 @@ class DeviceWatcher extends utils.Adapter {
 						this.errorReporting('[getLastContact]', error);
 					}
 				}
+				/*=============================================
+				=            Get update data	              =
+				=============================================*/
+				let deviceUpdateSelector;
+				let isUpgradable;
+
+				if (this.config.checkSendDeviceUpgrade) {
+					deviceUpdateSelector = await this.getInitValue(currDeviceString + this.arrDev[i].upgrade);
+					if (deviceUpdateSelector) {
+						isUpgradable = true;
+					} else {
+						isUpgradable = false;
+					}
+				}
 
 				/*=============================================
 				=          		  Fill Raw Lists          	  =
@@ -968,6 +1030,7 @@ class DeviceWatcher extends utils.Adapter {
 							'Signal strength': linkQuality,
 							'Last contact': lastContactString,
 							Status: deviceState,
+							Upgradable: isUpgradable,
 						});
 					}
 				} else {
@@ -982,6 +1045,7 @@ class DeviceWatcher extends utils.Adapter {
 						'Signal strength': linkQuality,
 						'Last contact': lastContactString,
 						Status: deviceState,
+						Upgradable: isUpgradable,
 					});
 				}
 			} else {
@@ -1038,6 +1102,9 @@ class DeviceWatcher extends utils.Adapter {
 			// send message if new devices are offline
 			if (this.config.checkSendOfflineMsg) await this.sendOfflineNotifications();
 
+			// send overview of upgradable devices
+			if (this.config.checkSendDeviceUpgrade) await this.sendDeviceUpdatesNotification();
+
 			await this.writeDatapoints(); // fill the datapoints
 		} catch (error) {
 			this.errorReporting('[createDataOfAllAdapter]', error);
@@ -1170,6 +1237,26 @@ class DeviceWatcher extends utils.Adapter {
 		} catch (error) {
 			this.errorReporting('[sendNotification Lovelace]', error);
 		}
+
+		// Synochat Notification
+		try {
+			if (this.config.instanceSynochat) {
+				//first check if instance is living
+				const synochatAliveState = await this.getInitValue('system.adapter.' + this.config.instanceSynochat + '.alive');
+
+				if (!synochatAliveState) {
+					this.log.warn('Synochat instance is not running. Message could not be sent. Please check your instance configuration.');
+				} else {
+					if (this.config.channelSynochat !== undefined) {
+						await this.setForeignStateAsync(`${this.config.instanceSynochat}.${this.config.channelSynochat}.message`, text);
+					} else {
+						this.log.warn('Synochat channel is not set. Message could not be sent. Please check your instance configuration.');
+					}
+				}
+			}
+		} catch (error) {
+			this.errorReporting('[sendNotification Synochat]', error);
+		}
 	} // <-- End of sendNotification function
 
 	/**
@@ -1205,15 +1292,19 @@ class DeviceWatcher extends utils.Adapter {
 
 					for (const id of this.batteryLowPoweredRaw) {
 						if (!this.blacklistNotify.includes(id['Path'])) {
-							deviceList = `${deviceList}\n${id['Device']} (${id['Battery']})`;
+							if (!this.config.showAdapterNameinMsg) {
+								deviceList = `${deviceList}\n${id['Device']} (${id['Battery']})`;
+							} else {
+								// Add adaptername if checkbox is checked true in options by user
+								deviceList = `${deviceList}\n${id['Adapter']}: ${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);
 
-						this.sendNotification(`Niedriege Batteriezustände: ${deviceList}`);
+						this.sendNotification(`Niedrige Batteriezustände: ${deviceList}`);
 					}
 				} catch (error) {
 					this.errorReporting('[sendBatteryNotifyShedule]', error);
@@ -1234,13 +1325,17 @@ class DeviceWatcher extends utils.Adapter {
 
 			for (const id of this.offlineDevicesRaw) {
 				if (!this.blacklistNotify.includes(id['Path'])) {
-					deviceList = `${deviceList}\n${id['Device']} (${id['Last contact']})`;
+					if (!this.config.showAdapterNameinMsg) {
+						deviceList = `${deviceList}\n${id['Device']} (${id['Last contact']})`;
+					} else {
+						deviceList = `${deviceList}\n${id['Adapter']}: ${id['Device']} (${id['Last contact']})`;
+					}
 				}
 			}
 			if (deviceList.length !== this.offlineDevicesCountRawOld) {
-				if (deviceList.length == 0) {
+				if (deviceList.length === 0) {
 					msg = 'Alle Geräte sind Online.';
-				} else if (deviceList.length == 1) {
+				} else if (deviceList.length === 1) {
 					// make singular if it is only one device
 					msg = 'Folgendes Gerät ist seit einiger Zeit nicht erreichbar: \n';
 				} else if (deviceList.length >= 2) {
@@ -1292,7 +1387,11 @@ class DeviceWatcher extends utils.Adapter {
 
 					for (const id of this.offlineDevicesRaw) {
 						if (!this.blacklistNotify.includes(id['Path'])) {
-							deviceList = `${deviceList}\n${id['Device']} (${id['Last contact']})`;
+							if (!this.config.showAdapterNameinMsg) {
+								deviceList = `${deviceList}\n${id['Device']} (${id['Last contact']})`;
+							} else {
+								deviceList = `${deviceList}\n${id['Adapter']}: ${id['Device']} (${id['Last contact']})`;
+							}
 						}
 					}
 
@@ -1309,6 +1408,75 @@ class DeviceWatcher extends utils.Adapter {
 		}
 	} //<--End of daily offline notification
 
+	/**
+	 * check if adapter updates are available and send notification
+	 * @param {string} id
+	 * @param {ioBroker.State | null | undefined} state
+	 */
+	/*
+	async sendAdapterUpdatesNotification(id, state) {
+		this.log.debug(`Start the function: ${this.sendAdapterUpdatesNotification.name}`);
+
+		try {
+			if (state && state !== undefined) {
+				const list = await this.parseData(state.val);
+				let msg = '';
+				let adapterList = '';
+
+				for (const [id] of Object.entries(list)) {
+					adapterList = `${adapterList}\n${this.capitalize(id)} - Version: ${list[id].availableVersion}`;
+				}
+				if (adapterList.length !== 0) {
+					msg = `Neue Adapter Updates vorhanden: \n`;
+
+					this.log.info(msg + adapterList);
+					await this.setStateAsync('lastNotification', msg + adapterList, true);
+					await this.sendNotification(msg + adapterList);
+				}
+			}
+		} catch (error) {
+			this.errorReporting('[sendAdapterUpdatesNotification]', error);
+		}
+		this.log.debug(`Finished the function: ${this.sendAdapterUpdatesNotification.name}`);
+	}*/
+
+	/**
+	 * check if device updates are available and send notification
+	 **/
+	async sendDeviceUpdatesNotification() {
+		this.log.debug(`Start the function: ${this.sendDeviceUpdatesNotification.name}`);
+
+		try {
+			let msg = '';
+			let deviceList = '';
+
+			for (const id of this.upgradableList) {
+				if (!this.blacklistNotify.includes(id['Path'])) {
+					if (!this.config.showAdapterNameinMsg) {
+						deviceList = `${deviceList}\n${id['Device']}`;
+					} else {
+						deviceList = `${deviceList}\n${id['Adapter']}: ${id['Device']}`;
+					}
+				}
+			}
+			if (deviceList.length !== this.upgradableDevicesCountRawOld) {
+				if (deviceList.length >= 1) {
+					msg = `Neue Geräte Updates vorhanden: \n`;
+
+					this.log.info(msg + deviceList);
+					this.upgradableDevicesCountRawOld = deviceList.length;
+					await this.setStateAsync('lastNotification', msg + deviceList, true);
+					await this.sendNotification(msg + deviceList);
+				} else {
+					this.upgradableDevicesCountRawOld = deviceList.length;
+				}
+			}
+		} catch (error) {
+			this.errorReporting('[sendDeviceUpdatesNotification]', error);
+		}
+		this.log.debug(`Finished the function: ${this.sendDeviceUpdatesNotification.name}`);
+	}
+
 	/**
 	 * reset arrays and counts
 	 */
@@ -1362,13 +1530,13 @@ class DeviceWatcher extends utils.Adapter {
 			await this.setStateAsync(`${dpSubFolder}batteryCount`, { val: this.batteryPoweredCount, ack: true });
 			await this.setStateAsync(`${dpSubFolder}lowBatteryCount`, { val: this.lowBatteryPoweredCount, ack: true });
 
-			if (this.deviceCounter == 0) {
+			if (this.deviceCounter === 0) {
 				// if no device is count, write the JSON List with default value
 				this.listAllDevices = [{ Device: '--none--', Adapter: '', Battery: '', 'Last contact': '', 'Signal strength': '' }];
 			}
 			await this.setStateAsync(`${dpSubFolder}listAll`, { val: JSON.stringify(this.listAllDevices), ack: true });
 
-			if (this.linkQualityCount == 0) {
+			if (this.linkQualityCount === 0) {
 				// if no device is count, write the JSON List with default value
 				this.linkQualityDevices = [{ Device: '--none--', Adapter: '', 'Signal strength': '' }];
 			}
@@ -1384,7 +1552,7 @@ class DeviceWatcher extends utils.Adapter {
 					ack: true,
 				});
 
-			if (this.offlineDevicesCount == 0) {
+			if (this.offlineDevicesCount === 0) {
 				// if no device is count, write the JSON List with default value
 				this.offlineDevices = [{ Device: '--none--', Adapter: '', 'Last contact': '' }];
 			}
@@ -1400,7 +1568,7 @@ class DeviceWatcher extends utils.Adapter {
 					ack: true,
 				});
 
-			if (this.batteryPoweredCount == 0) {
+			if (this.batteryPoweredCount === 0) {
 				// if no device is count, write the JSON List with default value
 				this.batteryPowered = [{ Device: '--none--', Adapter: '', Battery: '' }];
 			}
@@ -1416,7 +1584,7 @@ class DeviceWatcher extends utils.Adapter {
 					ack: true,
 				});
 
-			if (this.lowBatteryPoweredCount == 0) {
+			if (this.lowBatteryPoweredCount === 0) {
 				// if no device is count, write the JSON List with default value
 				this.batteryLowPowered = [{ Device: '--none--', Adapter: '', Battery: '' }];
 			}
@@ -1447,7 +1615,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,10 +1651,12 @@ 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>
+		<b>Offline Devices: <font color=${deviceCount === 0 ? '#3bcf0e' : 'orange'}>${deviceCount}</b><small></small></font>
 		<p></p>
 		</center>   
 		<table width=100%>
@@ -1516,10 +1688,12 @@ 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>
+		<b>${isLowBatteryList === true ? 'Schwache ' : ''}Batterie Devices: <font color=${isLowBatteryList === true ? (deviceCount > 0 ? 'orange' : '#3bcf0e') : ''}>${deviceCount}</b></font>
 		<p></p>
 		</center>   
 		<table width=100%>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.device-watcher",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "description": "Watchdog for devices",
   "author": {
     "name": "Christian Behrends",
@@ -30,30 +30,29 @@
     "@alcalzone/release-script-plugin-license": "^3.5.9",
     "@iobroker/adapter-dev": "^1.2.0",
     "@iobroker/testing": "^4.1.0",
-    "@types/chai": "^4.3.3",
+    "@types/chai": "^4.3.4",
     "@types/chai-as-promised": "^7.1.5",
-    "@types/mocha": "^10.0.0",
-    "@types/node": "^18.11.8",
+    "@types/mocha": "^10.0.1",
+    "@types/node": "^18.11.10",
     "@types/node-schedule": "^2.1.0",
     "@types/proxyquire": "^1.3.28",
     "@types/sinon": "^10.0.13",
-    "@types/sinon-chai": "^3.2.8",
-    "chai": "^4.3.6",
+    "@types/sinon-chai": "^3.2.9",
+    "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^8.26.0",
+    "eslint": "^8.28.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.2.1",
     "mocha": "^10.1.0",
     "node-schedule": "^2.1.0",
-    "prettier": "^2.7.1",
+    "prettier": "^2.8.0",
     "proxyquire": "^2.1.3",
-    "sinon": "^14.0.1",
+    "sinon": "^15.0.0",
     "sinon-chai": "^3.7.0",
-    "typescript": "~4.8.4"
+    "typescript": "~4.9.3"
   },
   "main": "main.js",
   "files": [
-    "admin{,/!(src)/**}/!(tsconfig|tsconfig.*).json",
     "admin{,/!(src)/**}/*.{html,css,png,svg,jpg,js}",
     "lib/",
     "www/",