iobroker.device-watcher 2.8.5 → 2.9.1

package/lib/arrApart.js

@@ -183,6 +183,7 @@ const arrApart = {
 		battery: 'none',
 		reach: '.unreach',
 		isLowBat: '.lowBat',
+		upgrade: '.info.updateState',
 	},
 	hmrpc: {
 		Selektor: 'hm-rpc.*.RSSI_PEER',
@@ -212,6 +213,18 @@ const arrApart = {
 		id: '.name',
 		upgrade: 'none',
 	},
+	homekitController: {
+		Selektor: 'homekit-controller.*.connected',
+		timeSelector: '.lastDiscovered',
+		adapterID: 'homekitController',
+		adapter: 'Homekit Controller',
+		rssiState: 'none',
+		battery: 'none',
+		reach: '.connected',
+		isLowBat: 'none',
+		id: 'none',
+		upgrade: 'none',
+	},
 	hs100: {
 		Selektor: 'hs100.*.last_update',
 		timeSelector: '.last_update',
@@ -525,6 +538,18 @@ const arrApart = {
 		id: 'none',
 		upgrade: '.upgradable',
 	},
+	viessmann: {
+		Selektor: 'viessmann.*.info.connection',
+		timeSelector: '.lastPoll',
+		adapterID: 'viessmann',
+		adapter: 'Viessmann',
+		rssiState: 'none',
+		battery: 'none',
+		reach: '.connection',
+		isLowBat: 'none',
+		id: 'none',
+		upgrade: 'none',
+	},
 	wled: {
 		Selektor: 'wled.*._online',
 		timeSelector: '._online',

package/main.js

@@ -1,7 +1,3 @@
-/* jshint -W097 */
-/* jshint strict: false */
-/* jslint node: true */
-
 'use strict';
 
 const utils = require('@iobroker/adapter-core');
@@ -10,9 +6,6 @@ const schedule = require('node-schedule');
 const arrApart = require('./lib/arrApart.js'); // list of supported adapters
 const cronParser = require('cron-parser');
 
-// Sentry error reporting, disable when testing code!
-const enableSendSentry = true;
-
 // indicator if the adapter is running or not (for intervall/shedule)
 let isUnloaded = false;
 
@@ -122,6 +115,7 @@ class DeviceWatcher extends utils.Adapter {
 			hmiP: this.config.hmiPDevices,
 			hmrpc: this.config.hmrpcDevices,
 			homeconnect: this.config.homeconnectDevices,
+			homekitController: this.config.homekitControllerDevices,
 			hs100: this.config.hs100Devices,
 			hue: this.config.hueDevices,
 			hueExt: this.config.hueExtDevices,
@@ -153,6 +147,7 @@ class DeviceWatcher extends utils.Adapter {
 			tapo: this.config.tapoDevices,
 			tradfri: this.config.tradfriDevices,
 			unifi: this.config.unifiDevices,
+			viessmann: this.config.viessmannDevices,
 			wled: this.config.wledDevices,
 			yeelight: this.config.yeelightDevices,
 			zigbee: this.config.zigbeeDevices,
@@ -178,6 +173,7 @@ class DeviceWatcher extends utils.Adapter {
 			hmiP: this.config.hmiPMaxMinutes,
 			hmrpc: this.config.hmrpcMaxMinutes,
 			homeconnect: this.config.homeconnectMaxMinutes,
+			homekitController: this.config.homekitControllerMaxMinutes,
 			hs100: this.config.hs100MaxMinutes,
 			hue: this.config.hueMaxMinutes,
 			hueExt: this.config.hueextMaxMinutes,
@@ -209,6 +205,7 @@ class DeviceWatcher extends utils.Adapter {
 			tapo: this.config.tapoMaxMinutes,
 			tradfri: this.config.tradfriMaxMinutes,
 			unifi: this.config.unifiMaxMinutes,
+			viessmann: this.config.viessmannMaxMinutes,
 			wled: this.config.wledMaxMinutes,
 			yeelight: this.config.yeelightMaxMinutes,
 			zigbee: this.config.zigbeeMaxMinutes,
@@ -260,7 +257,7 @@ class DeviceWatcher extends utils.Adapter {
 						}
 					}
 				} catch (error) {
-					this.errorReporting('[onReady - create and fill datapoints for each adapter]', error);
+					this.log.error(`[onReady - create and fill datapoints for each adapter] - ${error}`);
 				}
 			}
 
@@ -310,7 +307,7 @@ class DeviceWatcher extends utils.Adapter {
 			// send overview of instances with error
 			if (this.config.checkSendInstanceFailedDaily) this.sendScheduleNotifications('errorInstance');
 		} catch (error) {
-			this.errorReporting('[onReady]', error);
+			this.log.error(`[onReady] - ${error}`);
 			this.terminate ? this.terminate(15) : process.exit(15);
 		}
 	} // <-- onReady end
@@ -447,8 +444,8 @@ class DeviceWatcher extends utils.Adapter {
 						// device updates
 						case deviceData.UpdateDP:
 							if (state.val !== deviceData.Upgradable) {
-								deviceData.Upgradable = state.val;
-								if (state.val === true || state.val === 1) {
+								deviceData.Upgradable = await this.checkDeviceUpdate(deviceData.adapterID, state.val);
+								if (deviceData.Upgradable === true) {
 									if (this.config.checkSendDeviceUpgrade && !this.blacklistNotify.includes(deviceData.Path)) {
 										await this.sendStateNotifications('updateDevice', device);
 									}
@@ -597,7 +594,7 @@ class DeviceWatcher extends utils.Adapter {
 						});
 						this.sendTo(obj.from, obj.command, sortDevices, obj.callback);
 					} catch (error) {
-						this.errorReporting('[onMessage - deviceList for blacklisttable]', error);
+						this.log.error(`[onMessage - deviceList for blacklisttable] - ${error}`);
 					}
 				}
 				break;
@@ -622,7 +619,7 @@ class DeviceWatcher extends utils.Adapter {
 						});
 						this.sendTo(obj.from, obj.command, sortInstances, obj.callback);
 					} catch (error) {
-						this.errorReporting('[onMessage - instanceList]', error);
+						this.log.error(`[onMessage - instanceList] - ${error}`);
 					}
 				}
 				break;
@@ -646,7 +643,7 @@ class DeviceWatcher extends utils.Adapter {
 						});
 						this.sendTo(obj.from, obj.command, sortInstances, obj.callback);
 					} catch (error) {
-						this.errorReporting('[onMessage - instanceList]', error);
+						this.log.error(`[onMessage - instanceList] - ${error}`);
 					}
 				}
 				break;
@@ -668,7 +665,7 @@ class DeviceWatcher extends utils.Adapter {
 			await this.writeDatapoints(); // fill the datapoints
 			this.log.debug(`Created and filled data for all adapters`);
 		} catch (error) {
-			this.errorReporting('[main - create data of all adapter]', error);
+			this.log.error(`[main - create data of all adapter] - ${error}`);
 		}
 
 		// fill datapoints for each adapter if selected
@@ -686,7 +683,7 @@ class DeviceWatcher extends utils.Adapter {
 					}
 				}
 			} catch (error) {
-				this.errorReporting('[main - create and fill datapoints for each adapter]', error);
+				this.log.error(`[main - create and fill datapoints for each adapter] - ${error}`);
 			}
 		}
 
@@ -759,7 +756,7 @@ class DeviceWatcher extends utils.Adapter {
 						this.blacklistNotify.push(blacklistParse.path);
 					}
 				} catch (error) {
-					this.errorReporting('[createBlacklist]', error);
+					this.log.error(`[createBlacklist] - ${error}`);
 				}
 				if (this.blacklistLists.length >= 1) this.log.info(`Found devices/services on blacklist for lists: ${this.blacklistLists}`);
 				if (this.blacklistAdapterLists.length >= 1) this.log.info(`Found devices/services on blacklist for lists: ${this.blacklistAdapterLists}`);
@@ -782,7 +779,7 @@ class DeviceWatcher extends utils.Adapter {
 						this.blacklistInstancesNotify.push(blacklistParse.instanceID);
 					}
 				} catch (error) {
-					this.errorReporting('[createBlacklist]', error);
+					this.log.error(`[createBlacklist] - ${error}`);
 				}
 			}
 			if (this.blacklistInstancesLists.length >= 1) this.log.info(`Found instances items on blacklist for lists: ${this.blacklistInstancesLists}`);
@@ -807,7 +804,7 @@ class DeviceWatcher extends utils.Adapter {
 						errorTime: userTimeListInstances[i].errorTime,
 					});
 				} catch (error) {
-					this.errorReporting('[createTimeListInstances]', error);
+					this.log.error(`[createTimeListInstances] - ${error}`);
 				}
 			}
 			if (this.userTimeInstancesList.size >= 1) this.log.info(`Found instances items on lists for timesettings: ${Array.from(this.userTimeInstancesList.keys())}`);
@@ -1001,18 +998,24 @@ class DeviceWatcher extends utils.Adapter {
 				/*=============================================
 			=            Get update data	              =
 			=============================================*/
-				const deviceUpdateDP = currDeviceString + this.selAdapter[i].upgrade;
 				let isUpgradable;
+				let deviceUpdateDP;
 
 				if (this.config.checkSendDeviceUpgrade) {
-					const deviceUpdateSelector = await this.getInitValue(deviceUpdateDP);
+					deviceUpdateDP = currDeviceString + this.selAdapter[i].upgrade;
+					let deviceUpdateSelector = await this.getInitValue(deviceUpdateDP);
+					if (deviceUpdateSelector === undefined) {
+						deviceUpdateDP = shortCurrDeviceString + this.selAdapter[i].upgrade;
+						deviceUpdateSelector = await this.getInitValue(deviceUpdateDP);
+						if (deviceUpdateSelector === undefined) {
+							const shortShortCurrDeviceString = shortCurrDeviceString.slice(0, shortCurrDeviceString.lastIndexOf('.') + 1 - 1);
+							deviceUpdateDP = shortShortCurrDeviceString + this.selAdapter[i].upgrade;
+							deviceUpdateSelector = await this.getInitValue(deviceUpdateDP);
+						}
+					}
 
 					if (deviceUpdateSelector !== undefined) {
-						if (deviceUpdateSelector) {
-							isUpgradable = true;
-						} else if (!deviceUpdateSelector) {
-							isUpgradable = false;
-						}
+						isUpgradable = await this.checkDeviceUpdate(adapterID, deviceUpdateSelector);
 					} else {
 						isUpgradable = ' - ';
 					}
@@ -1067,7 +1070,7 @@ class DeviceWatcher extends utils.Adapter {
 				}
 			} // <-- end of loop
 		} catch (error) {
-			this.errorReporting('[createData - create data of devices]', error);
+			this.log.error(`[createData - create data of devices] - ${error}`);
 		}
 	} // <-- end of createData
 
@@ -1107,6 +1110,8 @@ class DeviceWatcher extends utils.Adapter {
 				case 'wled':
 				case 'mqttNuki':
 				case 'loqedSmartLock':
+				case 'viessmann':
+				case 'homekitController':
 					if (shortDeviceObject && typeof shortDeviceObject === 'object') {
 						deviceName = shortDeviceObject.common.name;
 					}
@@ -1162,7 +1167,7 @@ class DeviceWatcher extends utils.Adapter {
 			}
 			return deviceName;
 		} catch (error) {
-			this.errorReporting('[getDeviceName]', error);
+			this.log.error(`[getDeviceName] - ${error}`);
 		}
 	}
 
@@ -1441,21 +1446,21 @@ class DeviceWatcher extends utils.Adapter {
 						if (this.configMaxMinutes[adapterID] <= 0) {
 							if (deviceUnreachState === 1) {
 								deviceState = 'Offline'; //set online state to offline
-								linkQuality = '0%'; // set linkQuality to nothing
+								if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
 							}
 						} else if (lastDeviceUnreachStateChange > this.configMaxMinutes[adapterID] && deviceUnreachState === 1) {
 							deviceState = 'Offline'; //set online state to offline
-							linkQuality = '0%'; // set linkQuality to nothing
+							if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
 						}
 						break;
 					case 'proxmox':
 						if (this.configMaxMinutes[adapterID] <= 0) {
 							if (deviceUnreachState !== 'running' && deviceUnreachState !== 'online') {
-								deviceState = 'Offline'; //set online state to offline
+								if (linkQuality !== ' - ') deviceState = 'Offline'; //set online state to offline
 							}
 						} else if (lastDeviceUnreachStateChange > this.configMaxMinutes[adapterID] && deviceUnreachState !== 'running' && deviceUnreachState !== 'online') {
 							deviceState = 'Offline'; //set online state to offline
-							linkQuality = '0%'; // set linkQuality to nothing
+							if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
 						}
 						break;
 					case 'hmiP':
@@ -1463,11 +1468,11 @@ class DeviceWatcher extends utils.Adapter {
 						if (this.configMaxMinutes[adapterID] <= 0) {
 							if (deviceUnreachState) {
 								deviceState = 'Offline'; //set online state to offline
-								linkQuality = '0%'; // set linkQuality to nothing
+								if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
 							}
 						} else if (lastDeviceUnreachStateChange > this.configMaxMinutes[adapterID] && deviceUnreachState) {
 							deviceState = 'Offline'; //set online state to offline
-							linkQuality = '0%'; // set linkQuality to nothing
+							if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
 						}
 						break;
 					case 'apcups':
@@ -1483,22 +1488,22 @@ class DeviceWatcher extends utils.Adapter {
 						if (this.configMaxMinutes[adapterID] <= 0) {
 							if (!deviceUnreachState) {
 								deviceState = 'Offline'; //set online state to offline
-								linkQuality = '0%'; // set linkQuality to nothing
+								if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
 							}
 						} else if (!deviceUnreachState && lastDeviceUnreachStateChange > this.configMaxMinutes[adapterID]) {
 							deviceState = 'Offline'; //set online state to offline
-							linkQuality = '0%'; // set linkQuality to nothing
+							if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
 						}
 						break;
 					case 'mqttClientZigbee2Mqtt':
 						if (this.configMaxMinutes[adapterID] <= 0) {
 							if (deviceUnreachState !== 'online') {
 								deviceState = 'Offline'; //set online state to offline
-								linkQuality = '0%'; // set linkQuality to nothing
+								if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
 							}
 						} else if (deviceUnreachState !== 'online' && lastDeviceUnreachStateChange > this.configMaxMinutes[adapterID]) {
 							deviceState = 'Offline'; //set online state to offline
-							linkQuality = '0%'; // set linkQuality to nothing
+							if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
 						}
 						break;
 					case 'mihome':
@@ -1506,21 +1511,21 @@ class DeviceWatcher extends utils.Adapter {
 							if (this.configMaxMinutes[adapterID] <= 0) {
 								if (!deviceUnreachState) {
 									deviceState = 'Offline'; //set online state to offline
-									linkQuality = '0%'; // set linkQuality to nothing
+									if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
 								}
 							} else if (lastContact && lastContact > this.configMaxMinutes[adapterID]) {
 								deviceState = 'Offline'; //set online state to offline
-								linkQuality = '0%'; // set linkQuality to nothing
+								if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
 							}
 						} else {
 							if (this.config.mihomeMaxMinutes <= 0) {
 								if (this.configMaxMinutes[adapterID] <= 0) {
 									deviceState = 'Offline'; //set online state to offline
-									linkQuality = '0%'; // set linkQuality to nothing
+									if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
 								}
 							} else if (lastContact && lastContact > this.configMaxMinutes[adapterID]) {
 								deviceState = 'Offline'; //set online state to offline
-								linkQuality = '0%'; // set linkQuality to nothing
+								if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
 							}
 						}
 						break;
@@ -1528,29 +1533,29 @@ class DeviceWatcher extends utils.Adapter {
 						if (this.configMaxMinutes[adapterID] <= 0) {
 							if (deviceUnreachState === 'OFFLINE') {
 								deviceState = 'Offline'; //set online state to offline
-								linkQuality = '0%'; // set linkQuality to nothing
+								if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
 							}
 						} else if (deviceUnreachState === 'OFFLINE' && lastDeviceUnreachStateChange > this.configMaxMinutes[adapterID]) {
 							deviceState = 'Offline'; //set online state to offline
-							linkQuality = '0%'; // set linkQuality to nothing
+							if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
 						}
 						break;
 					default:
 						if (this.configMaxMinutes[adapterID] <= 0) {
 							if (!deviceUnreachState) {
 								deviceState = 'Offline'; //set online state to offline
-								linkQuality = '0%'; // set linkQuality to nothing
+								if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
 							}
 						} else if (lastContact && lastContact > this.configMaxMinutes[adapterID]) {
 							deviceState = 'Offline'; //set online state to offline
-							linkQuality = '0%'; // set linkQuality to nothing
+							if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
 						}
 						break;
 				}
 			}
 			return [lastContactString, deviceState, linkQuality];
 		} catch (error) {
-			this.errorReporting('[getLastContact]', error);
+			this.log.error(`[getLastContact] - ${error}`);
 		}
 	}
 
@@ -1583,8 +1588,35 @@ class DeviceWatcher extends utils.Adapter {
 		}
 	}
 
+	/**
+	 * @param {any} adapterID
+	 * @param {string | number | boolean | null} deviceUpdateSelector
+	 */
+	async checkDeviceUpdate(adapterID, deviceUpdateSelector) {
+		let isUpgradable;
+
+		switch (adapterID) {
+			case 'hmiP':
+				if (deviceUpdateSelector === 'UPDATE_AVAILABLE') {
+					isUpgradable = true;
+				} else {
+					isUpgradable = false;
+				}
+				break;
+			default:
+				if (deviceUpdateSelector) {
+					isUpgradable = true;
+				} else if (!deviceUpdateSelector) {
+					isUpgradable = false;
+				}
+		}
+
+		return isUpgradable;
+	}
+
 	/**
 	 * Create Lists
+	 * @param {string | undefined} [adptName]
 	 */
 	async createLists(adptName) {
 		this.linkQualityDevices = [];
@@ -1961,7 +1993,7 @@ class DeviceWatcher extends utils.Adapter {
 			const lastCheck = this.formatDate(new Date(), 'DD.MM.YYYY') + ' - ' + this.formatDate(new Date(), 'hh:mm:ss');
 			await this.setStateChangedAsync('lastCheck', lastCheck, true);
 		} catch (error) {
-			this.errorReporting('[writeDatapoints]', error);
+			this.log.error(`[writeDatapoints] - ${error}`);
 		}
 		this.log.debug(`Function finished: ${this.writeDatapoints.name}`);
 	} //<--End  of writing Datapoints
@@ -1974,7 +2006,7 @@ class DeviceWatcher extends utils.Adapter {
 			const allInstances = `system.adapter.*`;
 			await this.getInstanceData(allInstances);
 		} catch (error) {
-			this.errorReporting('[getInstance]', error);
+			this.log.error(`[getInstance] - ${error}`);
 		}
 	}
 
@@ -2074,7 +2106,7 @@ class DeviceWatcher extends utils.Adapter {
 			await this.createInstanceList();
 			await this.writeInstanceDPs();
 		} catch (error) {
-			this.errorReporting('[getInstanceData]', error);
+			this.log.error(`[getInstanceData] - ${error}`);
 		}
 	}
 
@@ -2765,7 +2797,7 @@ class DeviceWatcher extends utils.Adapter {
 					});
 				}
 			} catch (error) {
-				this.errorReporting('[sendNotification Pushover]', error);
+				this.log.error(`[sendNotification Pushover] - ${error}`);
 			}
 		}
 
@@ -2785,7 +2817,7 @@ class DeviceWatcher extends utils.Adapter {
 					});
 				}
 			} catch (error) {
-				this.errorReporting('[sendNotification Telegram]', error);
+				this.log.error(`[sendNotification Telegram] - ${error}`);
 			}
 		}
 
@@ -2804,7 +2836,7 @@ class DeviceWatcher extends utils.Adapter {
 					});
 				}
 			} catch (error) {
-				this.errorReporting('[sendNotification Whatsapp]', error);
+				this.log.error(`[sendNotification Whatsapp] - ${error}`);
 			}
 		}
 
@@ -2823,7 +2855,7 @@ class DeviceWatcher extends utils.Adapter {
 					});
 				}
 			} catch (error) {
-				this.errorReporting('[sendNotification Matrix]', error);
+				this.log.error(`[sendNotification Matrix] - ${error}`);
 			}
 		}
 
@@ -2842,7 +2874,7 @@ class DeviceWatcher extends utils.Adapter {
 					});
 				}
 			} catch (error) {
-				this.errorReporting('[sendNotification Signal]', error);
+				this.log.error(`[sendNotification Signal] - ${error}`);
 			}
 		}
 
@@ -2862,7 +2894,7 @@ class DeviceWatcher extends utils.Adapter {
 					});
 				}
 			} catch (error) {
-				this.errorReporting('[sendNotification eMail]', error);
+				this.log.error(`[sendNotification eMail] - ${error}`);
 			}
 		}
 
@@ -2882,7 +2914,7 @@ class DeviceWatcher extends utils.Adapter {
 					);
 				}
 			} catch (error) {
-				this.errorReporting('[sendNotification Jarvis]', error);
+				this.log.error(`[sendNotification Jarvis] - ${error}`);
 			}
 		}
 
@@ -2902,7 +2934,7 @@ class DeviceWatcher extends utils.Adapter {
 					);
 				}
 			} catch (error) {
-				this.errorReporting('[sendNotification Lovelace]', error);
+				this.log.error(`[sendNotification Lovelace] - ${error}`);
 			}
 		}
 
@@ -2922,7 +2954,7 @@ class DeviceWatcher extends utils.Adapter {
 					}
 				}
 			} catch (error) {
-				this.errorReporting('[sendNotification Synochat]', error);
+				this.log.error(`[sendNotification Synochat] - ${error}`);
 			}
 		}
 	} // <-- End of sendNotification function
@@ -3057,10 +3089,22 @@ class DeviceWatcher extends utils.Adapter {
 						}
 					}
 					if (list.length === 0) return;
-					message = `Tägliche Meldung über Geräte mit niedrigen Batteriezuständen: ${list}`;
+
+					switch (checkDays.length) {
+						case 1:
+							message = `Wöchentliche Übersicht über Geräte mit niedrigen Batteriezuständen: ${list}`;
+							break;
+						case 7:
+							message = `Tägliche Übersicht über Geräte mit niedrigen Batteriezuständen: ${list}`;
+							break;
+						default:
+							message = `Übersicht über Geräte mit niedrigen Batteriezuständen: ${list}`;
+							break;
+					}
 					setMessage(message);
 				});
 				break;
+
 			case 'offlineDevices':
 				// push the selected days in list
 				if (this.config.checkOfflineMonday) checkDays.push(1);
@@ -3093,10 +3137,22 @@ class DeviceWatcher extends utils.Adapter {
 					}
 
 					if (list.length === 0) return;
-					message = `Tägliche Meldung über offline Geräte: ${list}`;
+
+					switch (checkDays.length) {
+						case 1:
+							message = `Wöchentliche Übersicht über offline Geräte: ${list}`;
+							break;
+						case 7:
+							message = `Tägliche Übersicht über offline Geräte: ${list}`;
+							break;
+						default:
+							message = `Übersicht über offline Geräte: ${list}`;
+							break;
+					}
 					setMessage(message);
 				});
 				break;
+
 			case 'updateDevices':
 				// push the selected days in list
 				if (this.config.checkUpgradeMonday) checkDays.push(1);
@@ -3128,10 +3184,22 @@ class DeviceWatcher extends utils.Adapter {
 						}
 					}
 					if (list.length === 0) return;
-					message = `Tägliche Meldung über verfügbare Geräte Updates: ${list}`;
+
+					switch (checkDays.length) {
+						case 1:
+							message = `Wöchentliche Übersicht über verfügbare Geräte Updates: ${list}`;
+							break;
+						case 7:
+							message = `Tägliche Übersicht über verfügbare Geräte Updates: ${list}`;
+							break;
+						default:
+							message = `Übersicht über verfügbare Geräte Updates: ${list}`;
+							break;
+					}
 					setMessage(message);
 				});
 				break;
+
 			case 'updateAdapter':
 				// push the selected days in list
 				if (this.config.checkAdapterUpdateMonday) checkDays.push(1);
@@ -3158,10 +3226,22 @@ class DeviceWatcher extends utils.Adapter {
 						list = `${list}\n${id.Adapter}: v${id['Available Version']}`;
 					}
 					if (list.length === 0) return;
-					message = `Tägliche Meldung über verfügbare Adapter Updates: ${list}`;
+
+					switch (checkDays.length) {
+						case 1:
+							message = `Wöchentliche Übersicht über verfügbare Adapter Updates: ${list}`;
+							break;
+						case 7:
+							message = `Tägliche Übersicht über verfügbare Adapter Updates: ${list}`;
+							break;
+						default:
+							message = `Übersicht über verfügbare Adapter Updates: ${list}`;
+							break;
+					}
 					setMessage(message);
 				});
 				break;
+
 			case 'errorInstance':
 				// push the selected days in list
 				if (this.config.checkFailedInstancesMonday) checkDays.push(1);
@@ -3212,13 +3292,24 @@ class DeviceWatcher extends utils.Adapter {
 				cron = '5 ' + time[1] + ' ' + time[0] + ' * * ' + checkDays;
 				schedule.scheduleJob(cron, () => {
 					list = '';
-
 					for (const id of this.listDeactivatedInstances) {
-						if (this.blacklistInstancesNotify.includes(id)) continue;
-						list = `${list}\n${id}`;
+						if (this.blacklistInstancesNotify.includes(id.Instance)) continue;
+						list = `${list}\n${id.Instance}`;
 					}
+
 					if (list.length === 0) return;
-					message = `Tägliche Meldung über deaktivierte Instanzen: ${list}`;
+
+					switch (checkDays.length) {
+						case 1:
+							message = `Wöchentliche Übersicht über deaktivierte Instanzen: ${list}`;
+							break;
+						case 7:
+							message = `Tägliche Übersicht über deaktivierte Instanzen: ${list}`;
+							break;
+						default:
+							message = `Übersicht über deaktivierte Instanzen: ${list}`;
+							break;
+					}
 					setMessage(message);
 				});
 				break;
@@ -4256,30 +4347,10 @@ class DeviceWatcher extends utils.Adapter {
 			const previous = interval.prev();
 			return Math.floor(Date.now() - previous.getTime()); // in ms
 		} catch (error) {
-			this.log.warn(error);
-			return;
+			this.log.error(`[getPreviousCronRun] - ${error}`);
 		}
 	}
 
-	/**
-	 * @param {string} codePart - Message Prefix
-	 * @param {object} error - Sentry message
-	 */
-	errorReporting(codePart, error) {
-		const msg = `[${codePart}] error: ${error.message}`;
-		if (enableSendSentry) {
-			if (this.supportsFeature && this.supportsFeature('PLUGINS')) {
-				const sentryInstance = this.getPluginInstance('sentry');
-				if (sentryInstance) {
-					this.log.warn(`Error catched and sent to Sentry, error: ${msg}`);
-					sentryInstance.getSentryObject().captureException(msg);
-				}
-			}
-		} else {
-			this.log.error(`Sentry disabled, error catched : ${msg}`);
-		}
-	} // <-- end of errorReporting
-
 	/**
 	 * @param {() => void} callback
 	 */

package/package.json

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