iobroker.device-watcher 2.13.1 → 2.15.0-alpha.1

package/main.js

@@ -3,7 +3,8 @@
 const utils = require('@iobroker/adapter-core');
 const adapterName = require('./package.json').name.split('.').pop();
 const schedule = require('node-schedule');
-const arrApart = require('./lib/arrApart.js'); // list of supported adapters
+const cronParserLib = require('cron-parser');
+const adapterArray = require('./lib/adapterArray.js'); // list of supported adapters
 const translations = require('./lib/translations.js');
 const tools = require('./lib/tools.js');
 const crud = require('./lib/crud.js');
@@ -90,9 +91,6 @@ class DeviceWatcher extends utils.Adapter {
 		this.on('objectChange', this.onObjectChange.bind(this));
 		this.on('message', this.onMessage.bind(this));
 		this.on('unload', this.onUnload.bind(this));
-
-
-
 	}
 
 	/**
@@ -116,146 +114,23 @@ class DeviceWatcher extends utils.Adapter {
 		this.configCreateOwnFolder = this.config.createOwnFolder;
 		this.configCreateHtmlList = this.config.createHtmlList;
 
-		this.configSetAdapter = {
-			alexa2: this.config.alexa2Devices,
-			apcups: this.config.apcupsDevices,
-			ble: this.config.bleDevices,
-			deconz: this.config.deconzDevices,
-			ecovacsdeebot: this.config.ecovacsdeebotDevices,
-			enocean: this.config.enoceanDevices,
-			esphome: this.config.esphomeDevices,
-			eusec: this.config.eusecDevices,
-			fhemTFAsensors: this.config.fhemTFAsensorsDevices,
-			fritzdect: this.config.fritzdectDevices,
-			fullybrowser: this.config.fullybrowserDevices,
-			fullybrowserV3: this.config.fullybrowserV3Devices,
-			fullyMQTT: this.config.fullyMQTTDevices,
-			ham: this.config.hamDevices,
-			harmony: this.config.harmonyDevices,
-			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,
-			innogy: this.config.innogyDevices,
-			jeelink: this.config.jeelinkDevices,
-			loqedSmartLock: this.config.loqedSmartLockDevices,
-			lupusec: this.config.lupusecDevices,
-			maxcube: this.config.maxcubeDevices,
-			meross: this.config.merossDevices,
-			mihome: this.config.mihomeDevices,
-			mihomeGW: this.config.mihomeDevices,
-			mihomeVacuum: this.config.mihomeVacuumDevices,
-			mqttClientZigbee2Mqtt: this.config.mqttClientZigbee2MqttDevices,
-			mqttNuki: this.config.mqttNukiDevices,
-			musiccast: this.config.musiccastDevices,
-			netatmo: this.config.netatmoDevices,
-			nukiExt: this.config.nukiExtDevices,
-			nut: this.config.nutDevices,
-			ping: this.config.pingDevices,
-			proxmox: this.config.proxmoxDevices,
-			ring: this.config.ringDevices,
-			roomba: this.config.roombaDevices,
-			shelly: this.config.shellyDevices,
-			smartgarden: this.config.smartgardenDevices,
-			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,
-			tuya: this.config.tuyaDevices,
-			unifi: this.config.unifiDevices,
-			viessmann: this.config.viessmannDevices,
-			wifilight: this.config.wifilightDevices,
-			wled: this.config.wledDevices,
-			xsense: this.config.xsenseDevices,
-			yeelight: this.config.yeelightDevices,
-			zigbee: this.config.zigbeeDevices,
-			zigbee2MQTT: this.config.zigbee2mqttDevices,
-			zwave2: this.config.zwaveDevices,
-		};
-
-		this.configMaxMinutes = {
-			alexa2: this.config.alexa2MaxMinutes,
-			apcups: this.config.apcupsMaxMinutes,
-			ble: this.config.bleMaxMinutes,
-			deconz: this.config.deconzMaxMinutes,
-			ecovacsdeebot: this.config.ecovacsdeebotMaxMinutes,
-			enocean: this.config.enoceanMaxMinutes,
-			esphome: this.config.esphomeMaxMinutes,
-			eusec: this.config.eusecMaxMinutes,
-			fhemTFAsensors: this.config.fhemTFAsensorsMaxMinutes,
-			fritzdect: this.config.fritzdectMaxMinutes,
-			fullybrowser: this.config.fullybrowserMaxMinutes,
-			fullybrowserV3: this.config.fullybrowserV3MaxMinutes,
-			fullyMQTT: this.config.fullyMQTTMaxMinutes,
-			ham: this.config.hamMaxMinutes,
-			harmony: this.config.harmonyMaxMinutes,
-			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,
-			innogy: this.config.innogyMaxMinutes,
-			jeelink: this.config.jeelinkMaxMinutes,
-			loqedSmartLock: this.config.loqedSmartLockMaxMinutes,
-			lupusec: this.config.lupusecMaxMinutes,
-			maxcube: this.config.maxcubeMaxMinutes,
-			meross: this.config.merossMaxMinutes,
-			mihome: this.config.mihomeMaxMinutes,
-			mihomeGW: this.config.mihomeMaxMinutes,
-			mihomeVacuum: this.config.mihomeVacuumMaxMinutes,
-			mqttClientZigbee2Mqtt: this.config.mqttClientZigbee2MqttMaxMinutes,
-			mqttNuki: this.config.mqttNukiMaxMinutes,
-			musiccast: this.config.musiccastMaxMinutes,
-			netatmo: this.config.netatmoMaxMinutes,
-			nukiExt: this.config.nukiextendMaxMinutes,
-			nut: this.config.nutMaxMinutes,
-			ping: this.config.pingMaxMinutes,
-			proxmox: this.config.proxmoxMaxMinutes,
-			ring: this.config.ringMaxMinutes,
-			roomba: this.config.roombaMaxMinutes,
-			shelly: this.config.shellyMaxMinutes,
-			smartgarden: this.config.smartgardenMaxMinutes,
-			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,
-			tuya: this.config.tuyaMaxMinutes,
-			unifi: this.config.unifiMaxMinutes,
-			viessmann: this.config.viessmannMaxMinutes,
-			wifilight: this.config.wifilightMaxMinutes,
-			wled: this.config.wledMaxMinutes,
-			xsense: this.config.xsenseMaxMinutes,
-			yeelight: this.config.yeelightMaxMinutes,
-			zigbee: this.config.zigbeeMaxMinutes,
-			zigbee2MQTT: this.config.zigbee2mqttMaxMinutes,
-			zwave2: this.config.zwaveMaxMinutes,
-		};
-
 		try {
-			// create list with selected adapters for monitor devices
-			for (const [id] of Object.entries(arrApart)) {
-				if (this.configSetAdapter[id]) {
-					this.selAdapter.push(arrApart[id]);
-					this.adapterSelected.push(tools.capitalize(id));
+			// create list with enabled adapters for monitor devices
+			for (const device of Object.values(this.config.tableDevices)) {
+				if (device.enabled) {
+					for (const [adapterName, adapter] of Object.entries(adapterArray)) {
+						if (String(adapter.adapterKey).toLowerCase() === String(device.adapterKey).toLowerCase()) {
+							this.selAdapter.push(adapter);
+							this.adapterSelected.push(adapter.adapterKey);
+							break;
+						}
+					}
 				}
 			}
 
 			// Check if an adapter to monitor devices is selected.
 			if (this.adapterSelected.length >= 1) {
-				// show list in debug log
 				this.log.debug(JSON.stringify(this.selAdapter));
-
 				this.log.info(`Number of selected adapters to monitor devices: ${this.adapterSelected.length}. Loading data from: ${this.adapterSelected.join(', ')} ...`);
 			} else {
 				this.log.info(`No adapters selected to monitor devices.`);
@@ -268,13 +143,15 @@ class DeviceWatcher extends utils.Adapter {
 			await crud.createTimeListInstances(this);
 
 			//create datapoints for each adapter if selected
-			for (const [id] of Object.entries(arrApart)) {
+			for (const [id] of Object.entries(adapterArray)) {
 				try {
 					if (!this.configCreateOwnFolder) {
 						await crud.deleteDPsForEachAdapter(this, id);
 						await crud.deleteHtmlListDatapoints(this, id);
 					} else {
-						if (this.configSetAdapter && this.configSetAdapter[id]) {
+						const adapter = adapterArray[id];
+
+						if (this.adapterSelected.includes(adapter.adapterKey)) {
 							await crud.createDPsForEachAdapter(this, id);
 							// create HTML list datapoints
 							if (!this.configCreateHtmlList) {
@@ -296,10 +173,13 @@ class DeviceWatcher extends utils.Adapter {
 				await crud.deleteHtmlListDatapointsInstances(this);
 			} else {
 				await crud.createHtmlListDatapoints(this);
-				if (this.config.checkAdapterInstances) await crud.createHtmlListDatapointsInstances(this);
+				if (this.config.checkAdapterInstances) {
+					await crud.createHtmlListDatapointsInstances(this);
+				}
+			}
+			if (!this.config.checkAdapterInstances) {
+				await crud.deleteHtmlListDatapointsInstances(this);
 			}
-			if (!this.config.checkAdapterInstances) await crud.deleteHtmlListDatapointsInstances(this);
-
 
 			// instances and adapters
 			if (this.configCreateInstanceList) {
@@ -318,24 +198,35 @@ class DeviceWatcher extends utils.Adapter {
 			await this.refreshData();
 
 			// send overview for low battery devices
-			if (this.config.checkSendBatteryMsgDaily) await this.sendScheduleNotifications('lowBatteryDevices');
+			if (this.config.checkSendBatteryMsgDaily) {
+				await this.sendScheduleNotifications('lowBatteryDevices');
+			}
 
 			// send overview of offline devices
-			if (this.config.checkSendOfflineMsgDaily) await this.sendScheduleNotifications('offlineDevices');
+			if (this.config.checkSendOfflineMsgDaily) {
+				await this.sendScheduleNotifications('offlineDevices');
+			}
 
 			// send overview of upgradeable devices
-			if (this.config.checkSendUpgradeMsgDaily) await this.sendScheduleNotifications('updateDevices');
+			if (this.config.checkSendUpgradeMsgDaily) {
+				await this.sendScheduleNotifications('updateDevices');
+			}
 
 			// send overview of updatable adapters
-			if (this.config.checkSendAdapterUpdateMsgDaily) await this.sendScheduleNotifications('updateAdapter');
+			if (this.config.checkSendAdapterUpdateMsgDaily) {
+				await this.sendScheduleNotifications('updateAdapter');
+			}
 
 			// send overview of deactivated instances
-			if (this.config.checkSendInstanceDeactivatedDaily) await this.sendScheduleNotifications('deactivatedInstance');
+			if (this.config.checkSendInstanceDeactivatedDaily) {
+				await this.sendScheduleNotifications('deactivatedInstance');
+			}
 
 			// send overview of instances with error
-			if (this.config.checkSendInstanceFailedDaily) await this.sendScheduleNotifications('errorInstance');
-
-        } catch (error) {
+			if (this.config.checkSendInstanceFailedDaily) {
+				await this.sendScheduleNotifications('errorInstance');
+			}
+		} catch (error) {
 			this.log.error(`[onReady] - ${error}`);
 			this.terminate ? this.terminate(15) : process.exit(15);
 		}
@@ -349,7 +240,9 @@ class DeviceWatcher extends utils.Adapter {
 		this.mainRunning = true;
 
 		// cancel run if no adapter is selected
-		if (this.adapterSelected.length === 0) return;
+		if (this.adapterSelected.length === 0) {
+			return;
+		}
 
 		// fill counts and lists of all selected adapter
 		try {
@@ -366,11 +259,15 @@ class DeviceWatcher extends utils.Adapter {
 		// fill datapoints for each adapter if selected
 		if (this.configCreateOwnFolder) {
 			try {
-				for (const [id] of Object.entries(arrApart)) {
-					if (this.configSetAdapter && this.configSetAdapter[id]) {
+				for (const [id] of Object.entries(adapterArray)) {
+					const adapter = adapterArray[id];
+
+					if (this.adapterSelected.includes(adapter.adapterKey)) {
 						for (const deviceData of this.listAllDevicesRaw.values()) {
 							// list device only if selected adapter matched with device
-							if (!deviceData.adapterID.includes(id)) continue;
+							if (!deviceData.adapterID.includes(id)) {
+								continue;
+							}
 							await crud.createLists(this, id);
 						}
 						await crud.writeDatapoints(this, id); // fill the datapoints
@@ -388,11 +285,7 @@ class DeviceWatcher extends utils.Adapter {
 	// If you need to react to object changes, uncomment the following block and the corresponding line in the constructor.
 	// You also need to subscribe to the objects with `this.subscribeObjects`, similar to `this.subscribeStates`.
 	//
-	/**
-	 * Is called if a subscribed object changes
-	 * @param {string} id
-	 * @param {ioBroker.Object | null | undefined} obj
-	 */
+
 	async onObjectChange(id, obj) {
 		if (obj) {
 			try {
@@ -440,11 +333,6 @@ class DeviceWatcher extends utils.Adapter {
 		}
 	}
 
-	/**
-	 * Is called if a subscribed state changes
-	 * @param {string} id
-	 * @param {ioBroker.State | null | undefined} state
-	 */
 	async onStateChange(id, state) {
 		if (state) {
 			// this.log.debug(`State changed: ${id} changed ${state.val}`);
@@ -470,7 +358,7 @@ class DeviceWatcher extends utils.Adapter {
 					await this.renewDeviceData(id, state);
 				}
 			} catch (error) {
-				this.log.error(`Issue at state change: ${error}`);
+				this.log.error(`Issue at state change: ${id}`);
 			}
 		} else {
 			// The state was deleted
@@ -478,9 +366,6 @@ class DeviceWatcher extends utils.Adapter {
 		}
 	}
 
-	/**
-	 * @param {ioBroker.Message} obj
-	 */
 	onMessage(obj) {
 		const devices = [];
 		const instances = [];
@@ -571,7 +456,9 @@ class DeviceWatcher extends utils.Adapter {
 	 * is neccessary to refresh lastContact data, especially of devices without state changes
 	 */
 	async refreshData() {
-		if (isUnloaded) return; // cancel run if unloaded was called.
+		if (isUnloaded) {
+			return;
+		} // cancel run if unloaded was called.
 		const nextTimeout = this.config.updateinterval * 1000;
 
 		// devices data
@@ -581,8 +468,10 @@ class DeviceWatcher extends utils.Adapter {
 
 		// devices data in own adapter folder
 		if (this.configCreateOwnFolder) {
-			for (const [id] of Object.entries(arrApart)) {
-				if (this.configSetAdapter && this.configSetAdapter[id]) {
+			for (const [id] of Object.entries(adapterArray)) {
+				const adapter = adapterArray[id];
+
+				if (this.adapterSelected.includes(adapter.adapterKey)) {
 					await crud.createLists(this, id);
 					await crud.writeDatapoints(this, id);
 					this.log.debug(`Created and filled data for ${tools.capitalize(id)}`);
@@ -634,7 +523,7 @@ class DeviceWatcher extends utils.Adapter {
 
 			switch (this.selAdapter[i].adapterID) {
 				case 'fullybrowser':
-					deviceName = (await tools.getInitValue(this,currDeviceString + this.selAdapter[i].id)) + ' ' + (await tools.getInitValue(this,currDeviceString + this.selAdapter[i].id2));
+					deviceName = `${await tools.getInitValue(this, currDeviceString + this.selAdapter[i].id)} ${await tools.getInitValue(this, currDeviceString + this.selAdapter[i].id2)}`;
 					break;
 
 				// Get ID with short currDeviceString from objectjson
@@ -663,7 +552,7 @@ class DeviceWatcher extends utils.Adapter {
 				case 'mihomeVacuum':
 				case 'roomba':
 					folderName = shortCurrDeviceString.slice(shortCurrDeviceString.lastIndexOf('.') + 1);
-					deviceID = await tools.getInitValue(this,shortCurrDeviceString + this.selAdapter[i].id);
+					deviceID = await tools.getInitValue(this, shortCurrDeviceString + this.selAdapter[i].id);
 					deviceName = `I${folderName} ${deviceID}`;
 					break;
 
@@ -671,7 +560,7 @@ class DeviceWatcher extends utils.Adapter {
 				case 'tado':
 				case 'wifilight':
 				case 'fullybrowserV3':
-        		case 'sonoff':
+				case 'sonoff':
 					deviceName = currDeviceString.slice(currDeviceString.lastIndexOf('.') + 1);
 					break;
 
@@ -679,7 +568,6 @@ class DeviceWatcher extends utils.Adapter {
 				case 'sureflap':
 					if (deviceObject && typeof deviceObject === 'object' && deviceObject.common) {
 						deviceName = deviceObject.common.name
-							// @ts-ignore FIXME: fix syntax error
 							.replace(/'/g, '')
 							.replace(/\(\d+\)/g, '')
 							.trim()
@@ -695,7 +583,9 @@ class DeviceWatcher extends utils.Adapter {
 
 				// Get ID with main selektor from objectjson
 				default:
-					if (this.selAdapter[i].id !== 'none' || this.selAdapter[i].id !== undefined) deviceName = await tools.getInitValue(this,currDeviceString + this.selAdapter[i].id);
+					if (this.selAdapter[i].id !== 'none' || this.selAdapter[i].id !== undefined) {
+						deviceName = await tools.getInitValue(this, currDeviceString + this.selAdapter[i].id);
+					}
 					if (deviceName === null || deviceName === undefined) {
 						if (deviceObject && typeof deviceObject === 'object' && deviceObject.common) {
 							deviceName = deviceObject.common.name;
@@ -711,6 +601,7 @@ class DeviceWatcher extends utils.Adapter {
 
 	/**
 	 * calculate Signalstrength
+	 *
 	 * @param {object} deviceQualityState - State value
 	 * @param {object} adapterID - adapter name
 	 */
@@ -778,6 +669,7 @@ class DeviceWatcher extends utils.Adapter {
 
 	/**
 	 * get battery data
+	 *
 	 * @param {object} deviceBatteryState - State value
 	 * @param {object} deviceLowBatState - State value
 	 * @param {object} faultReportingState - State value
@@ -790,6 +682,17 @@ class DeviceWatcher extends utils.Adapter {
 		let batteryHealthUnitRaw;
 
 		switch (adapterID) {
+			case 'lupusec':
+				if (deviceBatteryState === undefined) {
+					if (deviceLowBatState === 1) {
+						batteryHealth = 'ok';
+						isBatteryDevice = true;
+					} else {
+						batteryHealth = 'low';
+						isBatteryDevice = true;
+					}
+				}
+				break;
 			case 'hmrpc':
 				if (deviceBatteryState === undefined) {
 					if (faultReportingState !== undefined && faultReportingState !== 6) {
@@ -829,7 +732,7 @@ class DeviceWatcher extends utils.Adapter {
 							break;
 						default:
 							batteryHealth = 'error';
-						}
+					}
 				}
 				break;
 			default:
@@ -845,12 +748,10 @@ class DeviceWatcher extends utils.Adapter {
 					}
 				} else {
 					if (typeof deviceBatteryState === 'string') {
-						if (deviceBatteryState === 'high' || deviceBatteryState === 'medium')
-						{
+						if (deviceBatteryState === 'high' || deviceBatteryState === 'medium') {
 							batteryHealth = 'ok';
 							isBatteryDevice = true;
-						}
-						else if (deviceBatteryState === 'low') {
+						} else if (deviceBatteryState === 'low') {
 							batteryHealth = 'low';
 							isBatteryDevice = true;
 						}
@@ -869,6 +770,7 @@ class DeviceWatcher extends utils.Adapter {
 
 	/**
 	 * set low bat indicator
+	 *
 	 * @param {object} deviceBatteryState
 	 * @param {object} deviceLowBatState
 	 * @param {object} faultReportState
@@ -896,7 +798,7 @@ class DeviceWatcher extends utils.Adapter {
 			}
 		} else if (typeof deviceBatteryState === 'number' && deviceBatteryState < this.config.minWarnBatterie) {
 			lowBatIndicator = true;
-		} else if  (typeof deviceBatteryState === 'string' && deviceBatteryState === 'low') {
+		} else if (typeof deviceBatteryState === 'string' && deviceBatteryState === 'low') {
 			lowBatIndicator = true;
 		}
 
@@ -905,209 +807,217 @@ class DeviceWatcher extends utils.Adapter {
 
 	/**
 	 * get Last Contact
+	 *
 	 * @param {object} selector - Selector
 	 */
 	async getLastContact(selector) {
-		const lastContact = tools.getTimestamp(selector);
-		let lastContactString;
+		const lastContact = tools.getTimestamp(selector); // z. B. Differenz in Sekunden?
 
-		lastContactString = `${this.formatDate(new Date(selector), 'hh:mm')}`;
-		if (Math.round(lastContact) > 100) {
-			lastContactString = `${Math.round(lastContact / 60)} ${translations.hours[this.config.userSelectedLanguage]}`;
+		let lastContactString = `${this.formatDate(new Date(selector), 'hh:mm:ss')}`;
+
+		// Falls du die vergangene Zeit in Sekunden anzeigen willst:
+		if (Math.round(lastContact) >= 0) {
+			lastContactString = `${Math.round(lastContact)} ${translations.secs[this.config.userSelectedLanguage]}`;
 		}
-		if (Math.round(lastContact / 60) > 48) {
-			lastContactString = `${Math.round(lastContact / 60 / 24)} ${translations.days[this.config.userSelectedLanguage]}`;
+
+		// Optional: Wenn du ab einem bestimmten Wert lieber Minuten oder Stunden willst
+		if (lastContact >= 3600) {
+			lastContactString = `${(lastContact / 3600).toFixed(1)} ${translations.hours[this.config.userSelectedLanguage]}`;
+		} else {
+			lastContactString = `${Math.round(lastContact / 60)} ${translations.minits[this.config.userSelectedLanguage]}`;
 		}
+
 		return lastContactString;
 	}
 
-	/**
-	 * get online state and time
-	 * @param {object} timeSelector - device Timeselector
-	 * @param {string} adapterID - ID of Adapter
-	 * @param {string} unreachDP - Datapoint of Unreach
-	 * @param {object} linkQuality - Linkquality Value
-	 * @param {object} deviceUnreachState - State of deviceUnreach datapoint
-	 * @param {string} deviceStateSelectorHMRPC - Selector of device state (like .state)
-	 * @param {string} rssiPeerSelectorHMRPC - HM RSSI Peer Datapoint
-	 */
-	async getOnlineState(timeSelector, adapterID, unreachDP, linkQuality, deviceUnreachState, deviceStateSelectorHMRPC, rssiPeerSelectorHMRPC) {
+	async getOnlineState(timeSelector, adapterID, treeDP, linkQuality, deviceUnreachState, deviceStateSelectorHMRPC, rssiPeerSelectorHMRPC) {
 		let lastContactString;
+		let lastContact;
 		let deviceState = 'Online';
+		let linkQualitySet = linkQuality ?? '0%';
 
 		try {
 			const deviceTimeSelector = await this.getForeignStateAsync(timeSelector);
-			const deviceUnreachSelector = await this.getForeignStateAsync(unreachDP);
-			const deviceStateSelector = await this.getForeignStateAsync(deviceStateSelectorHMRPC); // for hmrpc devices
-			const rssiPeerSelector = await this.getForeignStateAsync(rssiPeerSelectorHMRPC);
+			const deviceUnreachSelector = await this.getForeignStateAsync(treeDP);
+
 			const lastDeviceUnreachStateChange = deviceUnreachSelector != undefined ? tools.getTimestamp(deviceUnreachSelector.lc) : tools.getTimestamp(timeSelector.ts);
 
 			// ignore disabled device from zigbee2MQTT
 			if (adapterID === 'zigbee2MQTT') {
-				const is_device_disabled = await tools.isDisabledDevice(this, unreachDP.substring(0, unreachDP.lastIndexOf('.')));
+				const is_device_disabled = await tools.isDisabledDevice(this, treeDP.substring(0, treeDP.lastIndexOf('.')));
 
 				if (is_device_disabled) {
-					return [null, 'disabled', '0%'];
+					return [null, 'disabled', ' - '];
 				}
 			}
 
-			//  If there is no contact since user sets minutes add device in offline list
-			// calculate to days after 48 hours
-			switch (unreachDP) {
-				case 'none':
-					if (deviceTimeSelector) lastContactString = await this.getLastContact(deviceTimeSelector.ts);
-					break;
+			if (adapterID === 'hmrpc') {
+				const deviceState = await this.getForeignStateAsync(deviceStateSelectorHMRPC);
+				const rssiPeer = await this.getForeignStateAsync(rssiPeerSelectorHMRPC);
+
+				if (linkQuality !== ' - ' && deviceTimeSelector) {
+					const ts = deviceUnreachState === 1 ? deviceTimeSelector.lc : deviceTimeSelector.ts;
+					lastContactString = await this.getLastContact(ts);
+				} else if (deviceState) {
+					lastContactString = await this.getLastContact(deviceState.ts);
+				} else if (rssiPeer) {
+					lastContactString = await this.getLastContact(rssiPeer.ts);
+				}
+			} else if (deviceTimeSelector) {
+				const ts = !deviceUnreachState ? deviceTimeSelector.lc : deviceTimeSelector.ts;
+				lastContactString = await this.getLastContact(ts);
+			}
 
-				default:
-					//State changed
-					if (adapterID === 'hmrpc') {
-						if (linkQuality !== ' - ' && deviceTimeSelector) {
-							if (deviceUnreachState === 1) {
-								lastContactString = await this.getLastContact(deviceTimeSelector.lc);
-							} else {
-								lastContactString = await this.getLastContact(deviceTimeSelector.ts);
-							}
-						} else {
-							if (deviceStateSelector) {
-								// because old hm devices don't send rssi states
-								lastContactString = await this.getLastContact(deviceStateSelector.ts);
-							} else if (rssiPeerSelector) {
-								// because old hm sensors don't send rssi/state values
-								lastContactString = await this.getLastContact(rssiPeerSelector.ts);
-							}
-						}
-					} else {
-						if ((!deviceUnreachState || deviceUnreachState === 0) && deviceTimeSelector) {
-							lastContactString = await this.getLastContact(deviceTimeSelector.lc);
-						} else {
-							if (deviceTimeSelector) lastContactString = await this.getLastContact(deviceTimeSelector.ts);
-						}
-						break;
-					}
+			if (deviceTimeSelector) {
+				lastContact = tools.getTimestamp(deviceTimeSelector.ts);
 			}
 
-			/*=============================================
-					=            Set Online Status             =
-					=============================================*/
-			let lastContact;
-			if (deviceTimeSelector) lastContact = tools.getTimestamp(deviceTimeSelector.ts);
+			const gefundenerAdapter = Object.values(adapterArray).find((adapter) => adapter.adapterID === adapterID);
+			const device = Object.values(this.config.tableDevices).find((adapter) => adapter.adapterKey === gefundenerAdapter.adapterKey);
+			const maxSecondDevicesOffline = device.maxSecondDevicesOffline;
 
-			if (this.configMaxMinutes !== undefined) {
-				switch (adapterID) {
-					case 'hmrpc':
-						if (this.configMaxMinutes[adapterID] <= 0) {
-							if (deviceUnreachState === 1) {
-								deviceState = 'Offline'; //set online state to offline
-								if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
-							}
-						} else if (lastDeviceUnreachStateChange > this.configMaxMinutes[adapterID] && deviceUnreachState === 1) {
+			switch (adapterID) {
+				case 'hmrpc': {
+					if (maxSecondDevicesOffline <= 0) {
+						if (deviceUnreachState === 1) {
 							deviceState = 'Offline'; //set online state to offline
-							if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
+							if (linkQuality !== ' - ') {
+								linkQualitySet = '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 !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
-							}
-						} else if (lastDeviceUnreachStateChange > this.configMaxMinutes[adapterID] && deviceUnreachState !== 'running' && deviceUnreachState !== 'online') {
+					} else if (lastDeviceUnreachStateChange > maxSecondDevicesOffline && deviceUnreachState === 1) {
+						deviceState = 'Offline'; //set online state to offline
+						if (linkQuality !== ' - ') {
+							linkQualitySet = '0%';
+						} // set linkQuality to nothing
+					}
+					break;
+				}
+				case 'proxmox': {
+					if (maxSecondDevicesOffline <= 0) {
+						if (deviceUnreachState !== 'running' && deviceUnreachState !== 'online') {
 							deviceState = 'Offline'; //set online state to offline
-							if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
+							if (linkQuality !== ' - ') {
+								linkQualitySet = '0%';
+							} // set linkQuality to nothing
 						}
-						break;
-					case 'hmiP':
-					case 'maxcube':
-						if (this.configMaxMinutes[adapterID] <= 0) {
-							if (deviceUnreachState) {
-								deviceState = 'Offline'; //set online state to offline
-								if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
-							}
-						} else if (lastDeviceUnreachStateChange > this.configMaxMinutes[adapterID] && deviceUnreachState) {
+					} else if (lastDeviceUnreachStateChange > maxSecondDevicesOffline && deviceUnreachState !== 'running' && deviceUnreachState !== 'online') {
+						deviceState = 'Offline'; //set online state to offline
+						if (linkQuality !== ' - ') {
+							linkQualitySet = '0%';
+						} // set linkQuality to nothing
+					}
+					break;
+				}
+				case 'hmiP':
+				case 'maxcube': {
+					if (maxSecondDevicesOffline <= 0) {
+						if (deviceUnreachState) {
 							deviceState = 'Offline'; //set online state to offline
-							if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
+							if (linkQuality !== ' - ') {
+								linkQualitySet = '0%';
+							} // set linkQuality to nothing
 						}
-						break;
-					case 'apcups':
-					case 'hue':
-					case 'hueExt':
-					case 'ping':
-					case 'deconz':
-					case 'shelly':
-					case 'sonoff':
-					case 'tradfri':
-					case 'unifi':
-					case 'zigbee':
-					case 'zigbee2MQTT':
-						if (this.configMaxMinutes[adapterID] <= 0) {
-							if (!deviceUnreachState) {
-								deviceState = 'Offline'; //set online state to offline
-								if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
-							}
-						} else if (!deviceUnreachState && lastDeviceUnreachStateChange > this.configMaxMinutes[adapterID]) {
+					} else if (lastDeviceUnreachStateChange > maxSecondDevicesOffline && deviceUnreachState) {
+						deviceState = 'Offline'; //set online state to offline
+						if (linkQuality !== ' - ') {
+							linkQualitySet = '0%';
+						} // set linkQuality to nothing
+					}
+					break;
+				}
+				case 'apcups':
+				case 'hue':
+				case 'hueExt':
+				case 'ping':
+				case 'deconz':
+				case 'shelly':
+				case 'sonoff':
+				case 'tradfri':
+				case 'unifi':
+				case 'zigbee':
+				case 'zigbee2MQTT': {
+					if (maxSecondDevicesOffline <= 0) {
+						if (!deviceUnreachState) {
 							deviceState = 'Offline'; //set online state to offline
-							if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
+							if (linkQuality !== ' - ') {
+								linkQualitySet = '0%';
+							} // set linkQuality to nothing
 						}
-						break;
-					case 'mqttClientZigbee2Mqtt':
-						if (this.configMaxMinutes[adapterID] <= 0) {
-							if (deviceUnreachState !== 'online') {
-								deviceState = 'Offline'; //set online state to offline
-								if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
-							}
-						} else if (deviceUnreachState !== 'online' && lastDeviceUnreachStateChange > this.configMaxMinutes[adapterID]) {
+					} else if (!deviceUnreachState && lastDeviceUnreachStateChange > maxSecondDevicesOffline) {
+						deviceState = 'Offline'; //set online state to offline
+						if (linkQuality !== ' - ') {
+							linkQualitySet = '0%';
+						} // set linkQuality to nothing
+					}
+					break;
+				}
+				case 'mqttClientZigbee2Mqtt': {
+					if (maxSecondDevicesOffline <= 0) {
+						if (deviceUnreachState !== 'online') {
 							deviceState = 'Offline'; //set online state to offline
-							if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
+							if (linkQuality !== ' - ') {
+								linkQualitySet = '0%';
+							} // set linkQuality to nothing
 						}
-						break;
-					case 'mihome':
-						if (deviceUnreachState !== undefined) {
-							if (this.configMaxMinutes[adapterID] <= 0) {
-								if (!deviceUnreachState) {
-									deviceState = 'Offline'; //set online state to offline
-									if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
-								}
-							} else if (lastContact && lastContact > this.configMaxMinutes[adapterID]) {
-								deviceState = 'Offline'; //set online state to offline
-								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
-									if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
-								}
-							} else if (lastContact && lastContact > this.configMaxMinutes[adapterID]) {
-								deviceState = 'Offline'; //set online state to offline
-								if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
-							}
+					} else if (deviceUnreachState !== 'online' && lastDeviceUnreachStateChange > maxSecondDevicesOffline) {
+						deviceState = 'Offline'; //set online state to offline
+						if (linkQuality !== ' - ') {
+							linkQualitySet = '0%';
 						}
-						break;
-					case 'smartgarden':
-						if (this.configMaxMinutes[adapterID] <= 0) {
-							if (deviceUnreachState === 'OFFLINE') {
-								deviceState = 'Offline'; //set online state to offline
-								if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
-							}
-						} else if (deviceUnreachState === 'OFFLINE' && lastDeviceUnreachStateChange > this.configMaxMinutes[adapterID]) {
-							deviceState = 'Offline'; //set online state to offline
-							if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
+					}
+					break;
+				}
+				case 'mihome': {
+					const offlineByTime = maxSecondDevicesOffline <= 0 || (lastContact && lastContact > maxSecondDevicesOffline);
+					const offlineByState = deviceUnreachState !== undefined ? !deviceUnreachState && offlineByTime : offlineByTime;
+
+					if (offlineByState) {
+						deviceState = 'Offline';
+						if (linkQuality !== ' - ') {
+							linkQualitySet = '0%';
 						}
-						break;
-					default:
-						if (this.configMaxMinutes[adapterID] <= 0) {
-							if (!deviceUnreachState) {
-								deviceState = 'Offline'; //set online state to offline
-								if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
-							}
-						} else if (lastContact && lastContact > this.configMaxMinutes[adapterID]) {
+					}
+					break;
+				}
+				case 'smartgarden': {
+					if (maxSecondDevicesOffline <= 0) {
+						if (deviceUnreachState === 'OFFLINE') {
 							deviceState = 'Offline'; //set online state to offline
-							if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
+							if (linkQuality !== ' - ') {
+								linkQualitySet = '0%';
+							} // set linkQuality to nothing
 						}
-						break;
+					} else if (deviceUnreachState === 'OFFLINE' && lastDeviceUnreachStateChange > maxSecondDevicesOffline) {
+						deviceState = 'Offline'; //set online state to offline
+						if (linkQuality !== ' - ') {
+							linkQualitySet = '0%';
+						} // set linkQuality to nothing
+					}
+					break;
+				}
+				default: {
+					// Gerät gilt als offline, wenn es unerreichbar ist und keine Wartezeit definiert ist, oder wenn der letzte Kontakt zu lange her ist als Wartezeit
+					let shouldBeOffline = false;
+
+					if (maxSecondDevicesOffline <= 0) {
+						if (!deviceUnreachState) {
+							shouldBeOffline = true;
+						}
+					} else if (lastContact && lastContact > maxSecondDevicesOffline) {
+						shouldBeOffline = true;
+					}
+
+					if (shouldBeOffline) {
+						deviceState = 'Offline'; // Gerät auf offline setzen
+						if (linkQuality !== ' - ') {
+							linkQualitySet = '0%';
+						}
+					}
 				}
 			}
-			return [lastContactString, deviceState, linkQuality];
+
+			return [lastContactString, deviceState, linkQualitySet];
 		} catch (error) {
 			this.log.error(`[getLastContact] - ${error}`);
 		}
@@ -1118,31 +1028,22 @@ class DeviceWatcher extends utils.Adapter {
 	 * @param {string | number | boolean | null} deviceUpdateSelector
 	 */
 	async checkDeviceUpdate(adapterID, deviceUpdateSelector) {
-		let isUpgradable;
+		let isUpgradable = false;
 
 		switch (adapterID) {
 			case 'hmiP':
-				if (deviceUpdateSelector === 'UPDATE_AVAILABLE') {
-					isUpgradable = true;
-				} else {
-					isUpgradable = false;
-				}
+				isUpgradable = deviceUpdateSelector === 'UPDATE_AVAILABLE';
 				break;
+
 			case 'ring':
-				if (deviceUpdateSelector !== 'Up to Date') {
-					isUpgradable = true;
-				} else {
-					isUpgradable = false;
-				}
+				isUpgradable = deviceUpdateSelector !== 'Up to Date';
 				break;
+
 			default:
-				if (deviceUpdateSelector !== null && typeof deviceUpdateSelector === 'boolean') {
-					if (deviceUpdateSelector) {
-						isUpgradable = true;
-					} else if (!deviceUpdateSelector) {
-						isUpgradable = false;
-					}
+				if (typeof deviceUpdateSelector === 'boolean') {
+					isUpgradable = deviceUpdateSelector;
 				}
+				break;
 		}
 
 		return isUpgradable;
@@ -1150,17 +1051,17 @@ class DeviceWatcher extends utils.Adapter {
 
 	/**
 	 * fill the lists for user
+	 *
 	 * @param {object} device
 	 */
 	async theLists(device) {
 		// Raw List with all devices for user
 		if (device.Status !== 'disabled') {
-
 			this.listAllDevicesUserRaw.push({
 				Device: device.Device,
 				Adapter: device.Adapter,
 				Instance: device.instance,
-				'Instance connected': device.instancedeviceConnected,
+				'Instance connected': device.instanceDeviceConnected,
 				isBatteryDevice: device.isBatteryDevice,
 				Battery: device.Battery,
 				BatteryRaw: device.BatteryRaw,
@@ -1230,12 +1131,12 @@ class DeviceWatcher extends utils.Adapter {
 		}
 	}
 
-
 	/**
 	 * @param {string | string[]} id
 	 * @param {ioBroker.State} state
 	 */
 	async renewDeviceData(id, state) {
+		const regex = /^([^.]+\.\d+\.[^.]+)/;
 		let batteryData;
 		let signalData;
 		let oldLowBatState;
@@ -1243,16 +1144,21 @@ class DeviceWatcher extends utils.Adapter {
 		let oldStatus;
 		let isLowBatValue;
 
-		const deviceID = id.slice(0, id.lastIndexOf('.') + 1 - 1);
+		const deviceID = id.match(regex)[1];
 		const deviceData = this.listAllDevicesRaw.get(deviceID);
 
+		this.log.debug(`[renewDeviceData] - ${id}`);
+
 		if (deviceData) {
+			const gefundenerAdapter = Object.values(adapterArray).find((adapter) => adapter.adapterID === deviceData.adapterID);
+			const silentEnabled = Object.values(this.config.tableDevices).find((adapter) => adapter.adapterKey === gefundenerAdapter.adapterKey);
+
 			// On statechange update available datapoint
 			switch (id) {
 				// device connection
 				case deviceData.instanceDeviceConnectionDP:
-					if (state.val !== deviceData.instancedeviceConnected) {
-						deviceData.instancedeviceConnected = state.val;
+					if (state.val !== deviceData.instanceDeviceConnected) {
+						deviceData.instanceDeviceConnected = state.val;
 					}
 					break;
 
@@ -1262,7 +1168,7 @@ class DeviceWatcher extends utils.Adapter {
 						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('Devices', 'updateDevice', deviceID);
+								await this.sendStateNotifications('Devices', 'updateDevice', deviceID, silentEnabled.telegramSilent);
 							}
 						}
 					}
@@ -1279,14 +1185,16 @@ class DeviceWatcher extends utils.Adapter {
 				case deviceData.batteryDP:
 					if (deviceData.isBatteryDevice) {
 						oldLowBatState = deviceData.LowBat;
-						if (state.val === 0 && deviceData.BatteryRaw >= 5) return;
+						if (state.val === 0 && deviceData.BatteryRaw >= 5) {
+							return;
+						}
 						batteryData = await this.getBatteryData(state.val, oldLowBatState, deviceData.faultReport, deviceData.adapterID);
 
 						deviceData.Battery = batteryData[0];
 						deviceData.BatteryRaw = batteryData[2];
 						deviceData.BatteryUnitRaw = batteryData[3];
 						if (deviceData.LowBatDP !== 'none') {
-							isLowBatValue = await tools.getInitValue(this,deviceData.LowBatDP);
+							isLowBatValue = await tools.getInitValue(this, deviceData.LowBatDP);
 						} else {
 							isLowBatValue = undefined;
 						}
@@ -1294,7 +1202,7 @@ class DeviceWatcher extends utils.Adapter {
 
 						if (deviceData.LowBat && oldLowBatState !== deviceData.LowBat) {
 							if (this.config.checkSendBatteryMsg && !this.blacklistNotify.includes(deviceData.Path)) {
-								await this.sendStateNotifications('Devices', 'lowBatDevice', deviceID);
+								await this.sendStateNotifications('Devices', 'lowBatDevice', deviceID, silentEnabled.telegramSilent);
 							}
 						}
 					}
@@ -1312,7 +1220,7 @@ class DeviceWatcher extends utils.Adapter {
 
 						if (deviceData.LowBat && oldLowBatState !== deviceData.LowBat) {
 							if (this.config.checkSendBatteryMsg && !this.blacklistNotify.includes(deviceData.Path)) {
-								await this.sendStateNotifications('Devices', 'lowBatDevice', deviceID);
+								await this.sendStateNotifications('Devices', 'lowBatDevice', deviceID, silentEnabled.telegramSilent);
 							}
 						}
 					}
@@ -1331,7 +1239,7 @@ class DeviceWatcher extends utils.Adapter {
 
 						if (deviceData.LowBat && oldLowBatState !== deviceData.LowBat) {
 							if (this.config.checkSendBatteryMsg && !this.blacklistNotify.includes(deviceData.Path)) {
-								await this.sendStateNotifications('Devices', 'lowBatDevice', deviceID);
+								await this.sendStateNotifications('Devices', 'lowBatDevice', deviceID, silentEnabled.telegramSilent);
 							}
 						}
 					}
@@ -1339,10 +1247,11 @@ class DeviceWatcher extends utils.Adapter {
 
 				// device unreach
 				case deviceData.UnreachDP:
-					if (deviceData.instancedeviceConnected !== undefined) {
+					if (deviceData.instanceDeviceConnected !== undefined) {
 						if (deviceData.UnreachState !== state.val) {
 							oldStatus = deviceData.Status;
 							deviceData.UnreachState = state.val;
+
 							contactData = await this.getOnlineState(
 								deviceData.timeSelector,
 								deviceData.adapterID,
@@ -1352,20 +1261,21 @@ class DeviceWatcher extends utils.Adapter {
 								deviceData.deviceStateSelectorHMRPC,
 								deviceData.rssiPeerSelectorHMRPC,
 							);
-							if (contactData !== undefined && contactData !== null) {
+
+							if (contactData !== undefined || contactData !== null) {
 								deviceData.LastContact = contactData[0];
 								deviceData.Status = contactData[1];
 								deviceData.SignalStrength = contactData[2];
 							}
+
 							if (this.config.checkSendOfflineMsg && oldStatus !== deviceData.Status && !this.blacklistNotify.includes(deviceData.Path)) {
 								// check if the generally deviceData connected state is for a while true
 								if (await tools.getTimestampConnectionDP(this, deviceData.instanceDeviceConnectionDP, 50000)) {
-									await this.sendStateNotifications('Devices', 'onlineStateDevice', deviceID);
+									await this.sendStateNotifications('Devices', 'onlineStateDevice', deviceID, silentEnabled.telegramSilent);
 								}
 							}
 						}
 					}
-					break;
 			}
 		}
 	}
@@ -1384,6 +1294,7 @@ class DeviceWatcher extends utils.Adapter {
 
 	/**
 	 * get instance data
+	 *
 	 *@param {string} instanceObject
 	 */
 	async getInstanceData(instanceObject) {
@@ -1392,22 +1303,23 @@ class DeviceWatcher extends utils.Adapter {
 
 			this.adapterUpdatesJsonRaw = await this.getAdapterUpdateData(adapterUpdateListDP);
 
-
 			for (const [id] of Object.entries(instanceAliveDP)) {
-				if (!(typeof id === 'string' && id.startsWith(`system.adapter.`))) continue;
+				if (!(typeof id === 'string' && id.startsWith(`system.adapter.`))) {
+					continue;
+				}
 
 				// get instance name
 				const instanceID = await this.getInstanceName(id);
 
 				// get instance connected to host data
 				const instanceConnectedHostDP = `system.adapter.${instanceID}.connected`;
-				const instanceConnectedHostVal = await tools.getInitValue(this,instanceConnectedHostDP);
+				const instanceConnectedHostVal = await tools.getInitValue(this, instanceConnectedHostDP);
 
 				// get instance connected to device data
 				const instanceConnectedDeviceDP = `${instanceID}.info.connection`;
 				let instanceConnectedDeviceVal;
 				if (instanceConnectedDeviceDP !== undefined && typeof instanceConnectedDeviceDP === 'boolean') {
-					instanceConnectedDeviceVal = await tools.getInitValue(this,instanceConnectedDeviceDP);
+					instanceConnectedDeviceVal = await tools.getInitValue(this, instanceConnectedDeviceDP);
 				} else {
 					instanceConnectedDeviceVal = 'N/A';
 				}
@@ -1421,7 +1333,6 @@ class DeviceWatcher extends utils.Adapter {
 				let scheduleTime = 'N/A';
 				const instanceObjectData = await this.getForeignObjectAsync(instanceObjectPath);
 				if (instanceObjectData) {
-					// @ts-ignore
 					adapterName = tools.capitalize(instanceObjectData.common.name);
 					adapterVersion = instanceObjectData.common.version;
 					instanceMode = instanceObjectData.common.mode;
@@ -1431,10 +1342,7 @@ class DeviceWatcher extends utils.Adapter {
 					}
 				}
 
-
-				const updateEntry = this.adapterUpdatesJsonRaw.find(
-					entry => entry.adapter.toLowerCase() === adapterName.toLowerCase()
-				);
+				const updateEntry = this.adapterUpdatesJsonRaw.find((entry) => entry.adapter.toLowerCase() === adapterName.toLowerCase());
 
 				if (updateEntry) {
 					adapterAvailableUpdate = updateEntry.newVersion;
@@ -1492,6 +1400,7 @@ class DeviceWatcher extends utils.Adapter {
 
 	/**
 	 * get Instances
+	 *
 	 * @param {string} id - Path of alive datapoint
 	 */
 	async getInstanceName(id) {
@@ -1503,12 +1412,13 @@ class DeviceWatcher extends utils.Adapter {
 
 	/**
 	 * Check if instance is alive and ok
+	 *
 	 * @param {string} instanceID
 	 */
 	async checkDaemonIsHealthy(instanceID) {
-		const connectedHostState = await tools.getInitValue(this,`system.adapter.${instanceID}.connected`);
-		const isAlive = await tools.getInitValue(this,`system.adapter.${instanceID}.alive`);
-		let connectedDeviceState = await tools.getInitValue(this,`${instanceID}.info.connection`);
+		const connectedHostState = await tools.getInitValue(this, `system.adapter.${instanceID}.connected`);
+		const isAlive = await tools.getInitValue(this, `system.adapter.${instanceID}.alive`);
+		let connectedDeviceState = await tools.getInitValue(this, `${instanceID}.info.connection`);
 		if (connectedDeviceState === undefined) {
 			connectedDeviceState = true;
 		}
@@ -1532,11 +1442,12 @@ class DeviceWatcher extends utils.Adapter {
 
 	/**
 	 * Check if instance is alive and ok
+	 *
 	 * @param {string} instanceID
 	 * @param {number} instanceDeactivationTime
 	 */
 	async checkDaemonIsAlive(instanceID, instanceDeactivationTime) {
-		let isAlive = await tools.getInitValue(this,`system.adapter.${instanceID}.alive`);
+		let isAlive = await tools.getInitValue(this, `system.adapter.${instanceID}.alive`);
 		let daemonIsAlive;
 		let isHealthy = false;
 		let instanceStatusString = isAlive ? translations.instance_activated[this.config.userSelectedLanguage] : translations.instance_deactivated[this.config.userSelectedLanguage];
@@ -1573,7 +1484,7 @@ class DeviceWatcher extends utils.Adapter {
 
 		if (isAliveSchedule) {
 			lastUpdate = Math.round((Date.now() - isAliveSchedule.lc) / 1000); // Last state change in seconds
-			previousCronRun = tools.getPreviousCronRun(this, scheduleTime); // When was the last cron run
+			previousCronRun = this.getPreviousCronRun(scheduleTime); // When was the last cron run
 			if (previousCronRun) {
 				lastCronRun = Math.round(previousCronRun / 1000); // change distance to last run in seconds
 				diff = lastCronRun - lastUpdate;
@@ -1591,6 +1502,7 @@ class DeviceWatcher extends utils.Adapter {
 
 	/**
 	 * set status for instance
+	 *
 	 * @param {string} instanceMode
 	 * @param {string} scheduleTime
 	 * @param {any} instanceID
@@ -1655,33 +1567,29 @@ class DeviceWatcher extends utils.Adapter {
 
 	/**
 	 * create adapter update raw lists
+	 *
 	 * @param {string} adapterUpdateListDP
 	 */
 	async getAdapterUpdateData(adapterUpdateListDP) {
 		// Clear the existing adapter updates data
 		let adapterUpdatesJsonRaw = [];
+		let adapterJsonList;
 
 		// Fetch the adapter updates list
 		const adapterUpdatesListVal = await this.getForeignStatesAsync(adapterUpdateListDP);
 
-		let adapterJsonList;
-		let adapterUpdatesJsonPath;
-
 		// Extract adapter data from the list
 		for (const [id, value] of Object.entries(adapterUpdatesListVal)) {
 			adapterJsonList = tools.parseData(value.val);
-			adapterUpdatesJsonPath = id;
 		}
 
 		// Populate the adapter updates data
 		for (const [id, adapterData] of Object.entries(adapterJsonList)) {
-			adapterUpdatesJsonRaw.push(
-				{
-					adapter: tools.capitalize(id),
-					newVersion: adapterData.availableVersion,
-					oldVersion: adapterData.installedVersion,
-				}
-			);
+			adapterUpdatesJsonRaw.push({
+				adapter: tools.capitalize(id),
+				newVersion: adapterData.availableVersion,
+				oldVersion: adapterData.installedVersion,
+			});
 		}
 
 		return adapterUpdatesJsonRaw;
@@ -1746,7 +1654,9 @@ class DeviceWatcher extends utils.Adapter {
 				});
 			}
 
-			if (this.blacklistInstancesLists.includes(instance)) continue;
+			if (this.blacklistInstancesLists.includes(instance)) {
+				continue;
+			}
 			// all instances
 			this.listAllInstances.push({
 				[translations.Adapter[this.config.userSelectedLanguage]]: instanceData.Adapter,
@@ -1862,9 +1772,7 @@ class DeviceWatcher extends utils.Adapter {
 
 		// Update instances with available adapter updates
 		for (const instance of this.listInstanceRaw.values()) {
-			const adapterUpdate = this.adapterUpdatesJsonRaw.find(
-				entry => entry.adapter.toLowerCase() === instance.Adapter.toLowerCase()
-			);
+			const adapterUpdate = this.adapterUpdatesJsonRaw.find((entry) => entry.adapter.toLowerCase() === instance.Adapter.toLowerCase());
 
 			if (adapterUpdate) {
 				instance.updateAvailable = adapterUpdate.newVersion;
@@ -1875,6 +1783,7 @@ class DeviceWatcher extends utils.Adapter {
 	}
 	/**
 	 * call function on state change, renew data and send messages
+	 *
 	 * @param {string} id
 	 * @param {ioBroker.State} state
 	 */
@@ -1900,7 +1809,9 @@ class DeviceWatcher extends utils.Adapter {
 						await checkInstance(instanceID, instanceData);
 						// send message when instance was deactivated
 						if (this.config.checkSendInstanceDeactivatedMsg && !instanceData.isAlive) {
-							if (this.blacklistInstancesNotify.includes(instanceID)) return;
+							if (this.blacklistInstancesNotify.includes(instanceID)) {
+								return;
+							}
 							await this.sendStateNotifications('Instances', 'deactivatedInstance', instanceID);
 						}
 					}
@@ -1911,7 +1822,9 @@ class DeviceWatcher extends utils.Adapter {
 						await checkInstance(instanceID, instanceData);
 						// send message when instance has an error
 						if (this.config.checkSendInstanceFailedMsg && !instanceData.isHealthy && instanceData.isAlive) {
-							if (this.blacklistInstancesNotify.includes(instanceID)) return;
+							if (this.blacklistInstancesNotify.includes(instanceID)) {
+								return;
+							}
 							await this.sendStateNotifications('Instances', 'errorInstance', instanceID);
 						}
 					}
@@ -1922,7 +1835,9 @@ class DeviceWatcher extends utils.Adapter {
 						await checkInstance(instanceID, instanceData);
 						// send message when instance has an error
 						if (this.config.checkSendInstanceFailedMsg && !instanceData.isHealthy && instanceData.isAlive) {
-							if (this.blacklistInstancesNotify.includes(instanceID)) return;
+							if (this.blacklistInstancesNotify.includes(instanceID)) {
+								return;
+							}
 							await this.sendStateNotifications('Instances', 'errorInstance', instanceID);
 						}
 					}
@@ -1937,14 +1852,16 @@ class DeviceWatcher extends utils.Adapter {
 
 	/**
 	 * Notification service
+	 *
 	 * @param {string} text - Text which should be send
+	 * @param silent
 	 */
-	async sendNotification(text) {
+	async sendNotification(text, silent = false) {
 		// Pushover
 		if (this.config.instancePushover) {
 			try {
 				//first check if instance is living
-				const pushoverAliveState = await tools.getInitValue(this,'system.adapter.' + this.config.instancePushover + '.alive');
+				const pushoverAliveState = await tools.getInitValue(this, `system.adapter.${this.config.instancePushover}.alive`);
 
 				if (!pushoverAliveState) {
 					this.log.warn('Pushover instance is not running. Message could not be sent. Please check your instance configuration.');
@@ -1966,7 +1883,7 @@ class DeviceWatcher extends utils.Adapter {
 		if (this.config.instanceTelegram) {
 			try {
 				//first check if instance is living
-				const telegramAliveState = await tools.getInitValue(this,'system.adapter.' + this.config.instanceTelegram + '.alive');
+				const telegramAliveState = await tools.getInitValue(this, `system.adapter.${this.config.instanceTelegram}.alive`);
 
 				if (!telegramAliveState) {
 					this.log.warn('Telegram instance is not running. Message could not be sent. Please check your instance configuration.');
@@ -1975,6 +1892,7 @@ class DeviceWatcher extends utils.Adapter {
 						text: text,
 						user: this.config.deviceTelegram,
 						chatId: this.config.chatIdTelegram,
+						disable_notification: silent,
 					});
 				}
 			} catch (error) {
@@ -1986,7 +1904,7 @@ class DeviceWatcher extends utils.Adapter {
 		if (this.config.instanceWhatsapp) {
 			try {
 				//first check if instance is living
-				const whatsappAliveState = await tools.getInitValue(this,'system.adapter.' + this.config.instanceWhatsapp + '.alive');
+				const whatsappAliveState = await tools.getInitValue(this, `system.adapter.${this.config.instanceWhatsapp}.alive`);
 
 				if (!whatsappAliveState) {
 					this.log.warn('Whatsapp instance is not running. Message could not be sent. Please check your instance configuration.');
@@ -2005,7 +1923,7 @@ class DeviceWatcher extends utils.Adapter {
 		if (this.config.instanceMatrix) {
 			try {
 				//first check if instance is living
-				const matrixAliveState = await tools.getInitValue(this,'system.adapter.' + this.config.instanceMatrix + '.alive');
+				const matrixAliveState = await tools.getInitValue(this, `system.adapter.${this.config.instanceMatrix}.alive`);
 
 				if (!matrixAliveState) {
 					this.log.warn('Matrix instance is not running. Message could not be sent. Please check your instance configuration.');
@@ -2024,7 +1942,7 @@ class DeviceWatcher extends utils.Adapter {
 		if (this.config.instanceSignal) {
 			try {
 				//first check if instance is living
-				const signalAliveState = await tools.getInitValue(this,'system.adapter.' + this.config.instanceSignal + '.alive');
+				const signalAliveState = await tools.getInitValue(this, `system.adapter.${this.config.instanceSignal}.alive`);
 
 				if (!signalAliveState) {
 					this.log.warn('Signal instance is not running. Message could not be sent. Please check your instance configuration.');
@@ -2043,7 +1961,7 @@ class DeviceWatcher extends utils.Adapter {
 		if (this.config.instanceEmail) {
 			try {
 				//first check if instance is living
-				const eMailAliveState = await tools.getInitValue(this,'system.adapter.' + this.config.instanceEmail + '.alive');
+				const eMailAliveState = await tools.getInitValue(this, `system.adapter.${this.config.instanceEmail}.alive`);
 
 				if (!eMailAliveState) {
 					this.log.warn('eMail instance is not running. Message could not be sent. Please check your instance configuration.');
@@ -2063,7 +1981,7 @@ class DeviceWatcher extends utils.Adapter {
 		if (this.config.instanceJarvis) {
 			try {
 				//first check if instance is living
-				const jarvisAliveState = await tools.getInitValue(this,'system.adapter.' + this.config.instanceJarvis + '.alive');
+				const jarvisAliveState = await tools.getInitValue(this, `system.adapter.${this.config.instanceJarvis}.alive`);
 
 				if (!jarvisAliveState) {
 					this.log.warn('Jarvis instance is not running. Message could not be sent. Please check your instance configuration.');
@@ -2071,7 +1989,7 @@ class DeviceWatcher extends utils.Adapter {
 					const jsonText = JSON.stringify(text);
 					await this.setForeignStateAsync(
 						`${this.config.instanceJarvis}.addNotification`,
-						'{"title":"' + this.config.titleJarvis + ' (' + this.formatDate(new Date(), 'DD.MM.YYYY - hh:mm:ss') + ')","message": ' + jsonText + ',"display": "drawer"}',
+						`{"title":"${this.config.titleJarvis} (${this.formatDate(new Date(), 'DD.MM.YYYY - hh:mm:ss')})","message": ${jsonText},"display": "drawer"}`,
 					);
 				}
 			} catch (error) {
@@ -2083,7 +2001,7 @@ class DeviceWatcher extends utils.Adapter {
 		if (this.config.instanceLovelace) {
 			try {
 				//first check if instance is living
-				const lovelaceAliveState = await tools.getInitValue(this,'system.adapter.' + this.config.instanceLovelace + '.alive');
+				const lovelaceAliveState = await tools.getInitValue(this, `system.adapter.${this.config.instanceLovelace}.alive`);
 
 				if (!lovelaceAliveState) {
 					this.log.warn('Lovelace instance is not running. Message could not be sent. Please check your instance configuration.');
@@ -2091,7 +2009,7 @@ class DeviceWatcher extends utils.Adapter {
 					const jsonText = JSON.stringify(text);
 					await this.setForeignStateAsync(
 						`${this.config.instanceLovelace}.notifications.add`,
-						'{"message":' + jsonText + ', "title":"' + this.config.titleLovelace + ' (' + this.formatDate(new Date(), 'DD.MM.YYYY - hh:mm:ss') + ')"}',
+						`{"message":${jsonText}, "title":"${this.config.titleLovelace} (${this.formatDate(new Date(), 'DD.MM.YYYY - hh:mm:ss')})"}`,
 					);
 				}
 			} catch (error) {
@@ -2103,7 +2021,7 @@ class DeviceWatcher extends utils.Adapter {
 		if (this.config.instanceSynochat) {
 			try {
 				//first check if instance is living
-				const synochatAliveState = await tools.getInitValue(this,'system.adapter.' + this.config.instanceSynochat + '.alive');
+				const synochatAliveState = await tools.getInitValue(this, `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.');
@@ -2123,12 +2041,16 @@ class DeviceWatcher extends utils.Adapter {
 	/*---------- Notifications ----------*/
 	/**
 	 * Notifications on state changes
+	 *
 	 * @param {string} mainType
 	 * @param {string} type
 	 * @param {object} id
+	 * @param silent
 	 */
-	async sendStateNotifications(mainType, type, id) {
-		if (isUnloaded) return;
+	async sendStateNotifications(mainType, type, id, silent = false) {
+		if (isUnloaded) {
+			return;
+		}
 		let objectData;
 		let adapterName;
 		let list = '';
@@ -2146,7 +2068,7 @@ class DeviceWatcher extends utils.Adapter {
 		const setMessage = async (message) => {
 			this.log.info(message);
 			await this.setStateAsync('lastNotification', message, true);
-			await this.sendNotification(message);
+			await this.sendNotification(message, silent);
 		};
 
 		switch (type) {
@@ -2174,7 +2096,9 @@ class DeviceWatcher extends utils.Adapter {
 				break;
 
 			case 'updateAdapter':
-				if (this.countAdapterUpdates === 0) return;
+				if (this.countAdapterUpdates === 0) {
+					return;
+				}
 
 				objectData = this.listAdapterUpdates;
 				list = '';
@@ -2197,10 +2121,14 @@ class DeviceWatcher extends utils.Adapter {
 
 	/**
 	 * Notifications per user defined schedule
+	 *
 	 * @param {string} type
+	 * @param silent
 	 */
-	async sendScheduleNotifications(type) {
-		if (isUnloaded) return;
+	async sendScheduleNotifications(type, silent = false) {
+		if (isUnloaded) {
+			return;
+		}
 
 		const checkDays = [];
 		const dayConfigKeys = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
@@ -2211,28 +2139,34 @@ class DeviceWatcher extends utils.Adapter {
 			this.log.info(message);
 			await this.setStateAsync('lastNotification', message, true);
 			if (!message.includes('no updates')) {
-				await this.sendNotification(message);
+				await this.sendNotification(message, silent);
 			}
 		};
 
 		const processDeviceList = (deviceList, property1, property2) => {
 			list = '';
 			for (const id of deviceList) {
-				if (this.blacklistNotify.includes(id.Path)) continue;
-				list += `\n${!this.config.showAdapterNameinMsg ? '' : id.Adapter + ': '}${id[property1]}${property2 ? ` (${id[property2]})` : ''}`;
+				if (this.blacklistNotify.includes(id.Path)) {
+					continue;
+				}
+				list += `\n${!this.config.showAdapterNameinMsg ? '' : `${id.Adapter}: `}${id[property1]}${property2 ? ` (${id[property2]})` : ''}`;
 			}
 		};
 
 		const processInstanceList = (instanceList, property) => {
 			list = '';
 			for (const id of instanceList) {
-				if (this.blacklistInstancesNotify.includes(id[translations['Instance'][this.config.userSelectedLanguage]])) continue;
+				if (this.blacklistInstancesNotify.includes(id[translations['Instance'][this.config.userSelectedLanguage]])) {
+					continue;
+				}
 				list += `\n${id[translations['Instance'][this.config.userSelectedLanguage]]}${property ? `: ${id[property]}` : ''}`;
 			}
 		};
 
 		const processNotification = async (list, messageType) => {
-			if (list.length === 0) return;
+			if (list.length === 0) {
+				return;
+			}
 
 			switch (checkDays.length) {
 				case 1:
@@ -2251,7 +2185,7 @@ class DeviceWatcher extends utils.Adapter {
 
 		switch (type) {
 			case 'lowBatteryDevices':
-				checkDays.push(...dayConfigKeys.map((day, index) => (this.config['check' + day] ? index : null)).filter((day) => day !== null));
+				checkDays.push(...dayConfigKeys.map((day, index) => (this.config[`check${day}`] ? index : null)).filter((day) => day !== null));
 
 				if (checkDays.length === 0) {
 					this.log.warn(`No days selected for daily low battery devices message. Please check the instance configuration!`);
@@ -2267,7 +2201,7 @@ class DeviceWatcher extends utils.Adapter {
 				break;
 
 			case 'offlineDevices':
-				checkDays.push(...dayConfigKeys.map((day, index) => (this.config['checkOffline' + day] ? index : null)).filter((day) => day !== null));
+				checkDays.push(...dayConfigKeys.map((day, index) => (this.config[`checkOffline${day}`] ? index : null)).filter((day) => day !== null));
 
 				if (checkDays.length === 0) {
 					this.log.warn(`No days selected for daily offline devices message. Please check the instance configuration!`);
@@ -2283,7 +2217,7 @@ class DeviceWatcher extends utils.Adapter {
 				break;
 
 			case 'updateDevices':
-				checkDays.push(...dayConfigKeys.map((day, index) => (this.config['checkUpgrade' + day] ? index : null)).filter((day) => day !== null));
+				checkDays.push(...dayConfigKeys.map((day, index) => (this.config[`checkUpgrade${day}`] ? index : null)).filter((day) => day !== null));
 
 				if (checkDays.length === 0) {
 					this.log.warn(`No days selected for daily updatable devices message. Please check the instance configuration!`);
@@ -2299,7 +2233,7 @@ class DeviceWatcher extends utils.Adapter {
 				break;
 
 			case 'updateAdapter':
-				checkDays.push(...dayConfigKeys.map((day, index) => (this.config['checkAdapterUpdate' + day] ? index : null)).filter((day) => day !== null));
+				checkDays.push(...dayConfigKeys.map((day, index) => (this.config[`checkAdapterUpdate${day}`] ? index : null)).filter((day) => day !== null));
 
 				if (checkDays.length === 0) {
 					this.log.warn(`No days selected for daily adapter update message. Please check the instance configuration!`);
@@ -2317,7 +2251,7 @@ class DeviceWatcher extends utils.Adapter {
 				break;
 
 			case 'errorInstance':
-				checkDays.push(...dayConfigKeys.map((day, index) => (this.config['checkFailedInstances' + day] ? index : null)).filter((day) => day !== null));
+				checkDays.push(...dayConfigKeys.map((day, index) => (this.config[`checkFailedInstances${day}`] ? index : null)).filter((day) => day !== null));
 
 				if (checkDays.length === 0) {
 					this.log.warn(`No days selected for daily instance error message. Please check the instance configuration!`);
@@ -2333,7 +2267,7 @@ class DeviceWatcher extends utils.Adapter {
 				break;
 
 			case 'deactivatedInstance':
-				checkDays.push(...dayConfigKeys.map((day, index) => (this.config['checkInstanceDeactivated' + day] ? index : null)).filter((day) => day !== null));
+				checkDays.push(...dayConfigKeys.map((day, index) => (this.config[`checkInstanceDeactivated${day}`] ? index : null)).filter((day) => day !== null));
 
 				if (checkDays.length === 0) {
 					this.log.warn(`No days selected for daily instance deactivated message. Please check the instance configuration!`);
@@ -2349,6 +2283,19 @@ class DeviceWatcher extends utils.Adapter {
 				break;
 		}
 	}
+	async getPreviousCronRun(lastCronRun) {
+		try {
+			const cronParser = cronParserLib.parseExpression
+				? cronParserLib // klassischer Import
+				: cronParserLib.default; // ESM-Fallback
+
+			const interval = cronParser.parseExpression(lastCronRun);
+			const previous = interval.prev();
+			return Math.floor(Date.now() - previous.getTime()); // in ms
+		} catch (error) {
+			this.log.error(`[getPreviousCronRun] - ${error}`);
+		}
+	}
 
 	/**
 	 * @param {() => void} callback
@@ -2373,11 +2320,10 @@ class DeviceWatcher extends utils.Adapter {
 	}
 }
 
-// @ts-ignore parent is a valid property on module
 if (require.main !== module) {
 	// Export the constructor in compact mode
 	/**
-	 * @param {Partial<utils.AdapterOptions>} [options={}]
+	 * @param {Partial<utils.AdapterOptions>} [options]
 	 */
 	module.exports = (options) => new DeviceWatcher(options);
 } else {