iobroker.device-watcher 2.9.11 → 2.9.13

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 ciddi89 <mail@christian-behrends.de>
+Copyright (c) 2024 ciddi89 <mail@christian-behrends.de>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -189,6 +189,15 @@ It's possible to select:
     Placeholder for the next version (at the beginning of the line):
     ### **WORK IN PROGRESS**
 -->
+### 2.9.13 (2024-01-03)
+
+-   (ciddi89) Fixed: Issues from v2.9.12 [#283](https://github.com/ciddi89/ioBroker.device-watcher/issues/283)
+-   (ciddi89) Fixed: High CPU usage at object and state changes [#283](https://github.com/ciddi89/ioBroker.device-watcher/issues/283)
+
+### 2.9.12 (2024-01-02)
+
+-   (ciddi89) Fixed: Changed handling for state changes and subscriptions [#283](https://github.com/ciddi89/ioBroker.device-watcher/issues/283)
+
 ### 2.9.11 (2023-12-12)
 
 -   (ciddi89) Fixed: Fullybroswer >v3 use id not common name
@@ -522,7 +531,7 @@ It's possible to select:
 
 MIT License
 
-Copyright (c) 2023 Christian Behrends <mail@christian-behrends.de>
+Copyright (c) 2024 Christian Behrends <mail@christian-behrends.de>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/io-package.json

@@ -1,8 +1,34 @@
 {
 	"common": {
 		"name": "device-watcher",
-		"version": "2.9.11",
+		"version": "2.9.13",
 		"news": {
+			"2.9.13": {
+				"en": "Fixed: Issues from v2.9.12 [#283](https://github.com/ciddi89/ioBroker.device-watcher/issues/283)\nFixed: High CPU usage at object and state changes [#283](https://github.com/ciddi89/ioBroker.device-watcher/issues/283)",
+				"de": "Behoben: Fehler von v2.9.12 [#283](https://github.com/ciddi89/ioBroker.device-watcher/issues/283)\nBehoben: Hohe CPU-Nutzung bei Objekt- und Zustandsänderungen [#283](https://github.com/ciddi89/ioBroker.device-watcher/issues/283)",
+				"ru": "Исправлено: Вопросы от v2.9.12 [#283](https://github.com/ciddi89/ioBroker.device-watcher/issues/283)\nИсправлено: Высокое использование процессора на объектах и государственных изменениях [#283](https://github.com/ciddi89/ioBroker.device-watcher/issues/283)",
+				"pt": "Corrigido: Questões do v2.9.12 [#283](https://github.com/ciddi89/ioBroker.device-watcher/issues/283)\nCorrigido: Uso de alta CPU em alterações de objeto e estado [#283](https://github.com/ciddi89/ioBroker.device-watcher/issues/283)",
+				"nl": "Quality over Quantity (QoQ) Releases Vertaling:\nQuality over Quantity (QoQ) Releases Vertaling:",
+				"fr": "Correction : Questions renvoyées à l ' adresse v2.9.12 [#283](https://github.com/ciddi89/ioBroker.device-watcher/issues/283)\nFixed: High CPU use at object and state changes [#283](https://github.com/ciddi89/ioBroker.device-watcher/issues/283)",
+				"it": "Risolto: Problemi da v2.9.12 [#283](https://github.com/ciddi89/ioBroker.device-watcher/issues/283)\nRisolto: alto uso della CPU a oggetto e cambiamenti di stato [#283](https://github.com/ciddi89/ioBroker.device-watcher/issues/283)",
+				"es": "Arreglado: Cuestiones de v2.9.12 [#283](https://github.com/ciddi89/ioBroker.device-watcher/issues/283)\nFijo: Alto uso de la CPU en los cambios de objeto y estado [#283](https://github.com/ciddi89/ioBroker.device-watcher/issues/283)",
+				"pl": "Fixed: Issues from v2.9.12 #283(https:/github.com/ciddi89/ioBroker,device-watcher/issues/283) (ang.)\n(Użycie procesora) w obiektach i stanach zmienia liczbę #283 (https:/github.com/ciddi89/ioBroker,device-watcher/issues/283)",
+				"uk": "Виправлено: Випуски від v2.9.12 [#283](https://github.com/ciddi89/ioBroker.device-watcher/issues/283)\nВиправлено: Високий рівень використання процесора при об'єктах та змінах стану [#283] (https://github.com/ciddi89/ioBroker.device-watcher/issues/283)",
+				"zh-cn": "Fixed: Issues from v2.9.12[#283] (http://github.com/ciddi89/ioBroker.device-watcher/issues/283)\n九. 固定:在物体和州变化中使用高频单位[第283](http://github.com/ciddi89/ioBroker.device-watcher/issues/283)"
+			},
+			"2.9.12": {
+				"en": "Fixed: Changed handling for state changes and subscriptions [#283](https://github.com/ciddi89/ioBroker.device-watcher/issues/283)",
+				"de": "Behoben: Handhabung für Zustandsänderungen und Abonnements geändert [#283](https://github.com/ciddi89/ioBroker.device-watcher/issues/283)",
+				"ru": "Исправлено: Изменение обработки государственных изменений и подписок [#283](https://github.com/ciddi89/ioBroker.device-watcher/issues/283)",
+				"pt": "Corrigido: Manuseio alterado para alterações e assinaturas do Estado [#283](https://github.com/ciddi89/ioBroker.device-watcher/issues/283)",
+				"nl": "Gewijzigd voor staatsverandering en abonnementen",
+				"fr": "Correction : Traitement modifié pour les changements d ' état et les abonnements [#283](https://github.com/ciddi89/ioBroker.device-watcher/issues/283)",
+				"it": "Risolto: Modificato il trattamento per le modifiche dello stato e gli abbonamenti [#283](https://github.com/ciddi89/ioBroker.device-watcher/issues/283)",
+				"es": "Corregido: Modificación de la tramitación de los cambios y suscripciones estatales [#283](https://github.com/ciddi89/ioBroker.device-watcher/issues/283)",
+				"pl": "Fixed: Changed handling for state changes and subscriptions #283(https:/github.com/ciddi89/ioBroker.device-watcher/issues/283) (ang.)",
+				"uk": "Виправлено: Змінене поводження з державними змінами та підписками [#283](https://github.com/ciddi89/ioBroker.device-watcher/issues/283)",
+				"zh-cn": "固定:国家变化和订阅的改变(第283号)"
+			},
 			"2.9.11": {
 				"en": "Fixed: Fullybroswer >v3 use id not common name",
 				"de": "Behoben: Fullybroswer >v3 verwende den ID Namen",
@@ -67,32 +93,6 @@
 				"pl": "Wspieranie Wifilight\nFixed: Multiple messages, jeśli urządzenia Sonoff docierają do miejsca #244 (https:/github.com/ciddi89/ioBroker.device-watcher/issues/244)",
 				"uk": "Доданий: Підтримка Wifilight\nВиправлено: Кілька повідомлень, якщо пристрої Sonoff досягаються [#244](https://github.com/ciddi89/ioBroker.device-watcher/issues/244)",
 				"zh-cn": "增 编:支持光明\nFixed:Sonoff装置可达到[第244](http://github.com/ciddi89/ioBroker.device-watcher/issues/244)"
-			},
-			"2.9.6": {
-				"en": "Fixed: Admin jsonConfig schema\nChanged: Admin jsonConfig to json5\nAdded: Support for Tuya devices with online state\nOthers: cleaned up files",
-				"de": "Behoben: Admin jsonConfig Schema\nGeändert: Admin jsonConfig zu json5\nHinzugefügt: Unterstützung für Tuya-Geräte mit Online-Zustand\nAnderes: Dateien aufgeräumt",
-				"ru": "Исправлено: Admin jsonConfig schema\nИзменено: Admin jsonConfig в json5\nДобавлена: Поддержка устройств Tuya с онлайн состоянием\nДругое: очищенные файлы",
-				"pt": "Corrigido: Admin jsonConfig schema\nAlterado: Admin jsonConfig to json5\nAdicionado: Suporte para dispositivos Tuya com estado on-line\nOutros: limpe arquivos",
-				"nl": "Admin jsonConfig schema\nAdministratie JsonConfig aan Json5\nVersterking voor Tuya apparaten met online staat\nVertaling:",
-				"fr": "Correction : Admin jsonConfig schema\nChanged: Admin jsonConfig to json5\nAjouté: Support pour les appareils Tuya avec l'état en ligne\nAutre: nettoyer les fichiers",
-				"it": "Fisso: Schema Admin jsonConfig\nModificato: Admin jsonConfig a json5\nAggiunto: Supporto per dispositivi Tuya con stato online\nAltro: file ripuliti",
-				"es": "Arreglado: Amin jsonConfig schema\nCambios: Admin jsonConfig a json5\nAñadido: Soporte para dispositivos Tuya con estado en línea\nOtros: limpiar archivos",
-				"pl": "Admin jsonConfig schema\nZmiana: Admin jsonConfig to json5\nWstęp: Wsparcie dla urządzeń Tuya z internetowym państwem\nInne: czyste pliki plikowe",
-				"uk": "Виправлено: Admin jsonConfig schema\nЗмінено: Admin jsonConfig to json5\nДодано: Підтримка пристроїв Туя з онлайн-державою\nІнше: очищення файлів",
-				"zh-cn": "Fix: Admin json Config schema\n修改: Admin json Configg to json5\n增 编:在网上国家支持图亚装置\n其他:清洁档案"
-			},
-			"2.9.5": {
-				"en": "Added: if available use deviceName datapoint for sonoff devices\nFixed: Changed zwave to zwave2\nFixed: minor bugfixes\nAdded: FullyBrowser > v3",
-				"de": "Hinzugefügt: Wenn verfügbar benutze deviceName Datenpunkt für Sonoff Geräte\nBehoben: Zwave zu zwave2 geändert\nBehoben: kleinere Bugfixes\nHinzugefügt: FullyBrowser > V3",
-				"ru": "Добавлена: если доступно использование устройстваName datapoint для устройств sonoff\nИсправлено: Изменено zwave в zwave2\nИсправлено: незначительные багфиксы\nДобавлено: FullyBrowser > В3",
-				"pt": "Adicionado: se disponível use deviceName datapoint for sonoff devices\nCorrigido: Alterado zwave para zwave2\nCorrigido: pequenos bugfixes\nAdicionado: FullyBrowser > v3",
-				"nl": "Toegegeven:\nQuality over Quantity (QoQ) Releases Vertaling:\nQuality over Quantity (QoQ) Releases Vertaling:\nVertaling: Vertaling:",
-				"fr": "Ajouté: si le dispositif d'utilisation disponibleNom datapoint pour les appareils à sonoff\nFixé: Zwave changée en zwave2\nCorrection : corrections mineures\nAjouté: FullyBrowser phy v3",
-				"it": "Aggiunto: if available use deviceName datapoint for sonoff devices\nFisso: Cambiato zwave a zwave2\nRisolto: bugfix minori\nAggiunto: FullyBrowser > V",
-				"es": "Añadido: si está disponible el punto de datos del dispositivoName para dispositivos sonoff\nFijo: Cambio de onda de zwave2\nFijación: bugfixes menores\nAñadido: FullyBrowser v3",
-				"pl": "Addd: jeśli urządzenie użyte do transmisji danych\nFixed: Changed zwave to zwave2 (ang.)\nFixed: minor bugfixes\nAdded: FullyBrowser> (ang.). v3",
-				"uk": "Додано: якщо доступний пристрій useName для пристроїв sonoff\nВиправлено: Змінено zwave to zwave2\nВиправлено: незначні виправлення\nДоданий: FullyBrowser > в3",
-				"zh-cn": "增删:如果能用装置Name数据点用于子壳装置\n九. 固定:对兹瓦韦的改变\n固定:小额配件\n增 编:全页 评 注"
 			}
 		},
 		"titleLang": {

package/main.js

@@ -79,6 +79,8 @@ class DeviceWatcher extends utils.Adapter {
 		// Interval timer
 		this.refreshDataTimeout = null;
 
+		this.mainRunning = false;
+
 		this.on('ready', this.onReady.bind(this));
 		this.on('stateChange', this.onStateChange.bind(this));
 		this.on('objectChange', this.onObjectChange.bind(this));
@@ -332,12 +334,19 @@ class DeviceWatcher extends utils.Adapter {
 				// The object was changed
 				//this.log.debug(`object ${id} changed: ${JSON.stringify(obj)}`);
 
-				if (id.startsWith('system.adapter.')) {
+				if (this.config.checkAdapterInstances && id.startsWith('system.adapter.')) {
 					//read new instance data and add it to the lists
 					await this.getInstanceData(id);
 				} else {
-					//read devices data and renew the lists
-					await this.main();
+					if (Array.from(this.listAllDevicesRaw.values()).some((obj) => obj.mainSelector === id)) {
+						if (!this.mainRunning) {
+							await this.main();
+						} else {
+							return;
+						}
+					} else {
+						return;
+					}
 				}
 			} catch (error) {
 				this.log.error(`Issue at object change: ${error}`);
@@ -374,215 +383,27 @@ class DeviceWatcher extends utils.Adapter {
 	async onStateChange(id, state) {
 		if (state) {
 			// this.log.debug(`State changed: ${id} changed ${state.val}`);
-			let batteryData;
-			let signalData;
-			let oldLowBatState;
-			let contactData;
-			let oldStatus;
-			let isLowBatValue;
-			let instanceStatusRaw;
-			let oldAdapterUpdatesCounts;
 
 			try {
 				/*=============================================
-				=           	 Adapter Updates      	     =
+				=        	Instances / Adapter     	     =
 				=============================================*/
-				if (id.endsWith('updatesJson')) {
-					oldAdapterUpdatesCounts = this.countAdapterUpdates;
-					await this.getAdapterUpdateData(id);
-					await this.createAdapterUpdateList();
-					if (this.config.checkSendAdapterUpdateMsg && this.countAdapterUpdates > oldAdapterUpdatesCounts) {
-						await this.sendStateNotifications('updateAdapter', null);
-					}
-					for (const instance of this.listInstanceRaw.values()) {
-						if (this.adapterUpdatesJsonRaw.has(instance.Adapter)) {
-							for (const adapter of this.adapterUpdatesJsonRaw.values()) {
-								instance.updateAvailable = adapter.newVersion;
-							}
-						} else {
-							instance.updateAvailable = ' - ';
-						}
+				if (this.config.checkAdapterInstances) {
+					// Adapter Update data
+					if (id.endsWith('updatesJson')) {
+						await this.renewAdapterUpdateData(id);
 					}
-				}
-
-				/*=============================================
-				=       	    	Instances       	     =
-				=============================================*/
-				for (const [instanceID, instanceData] of this.listInstanceRaw) {
-					const checkInstance = async (instanceID, instanceData) => {
-						if (!instanceData.checkIsRunning) {
-							instanceData.checkIsRunning = true;
-							instanceStatusRaw = await this.setInstanceStatus(instanceData.instanceMode, instanceData.schedule, instanceID);
-							instanceData.isAlive = instanceStatusRaw[0];
-							instanceData.isHealthy = instanceStatusRaw[1];
-							instanceData.status = instanceStatusRaw[2];
-							instanceData.checkIsRunning = false;
-							return;
-						}
-					};
-
-					switch (id) {
-						case `system.adapter.${instanceID}.alive`:
-							if (state.val !== instanceData.isAlive) {
-								await checkInstance(instanceID, instanceData);
-								// send message when instance was deactivated
-								if (this.config.checkSendInstanceDeactivatedMsg && !instanceData.isAlive) {
-									if (this.blacklistInstancesNotify.includes(instanceID)) continue;
-									await this.sendStateNotifications('deactivatedInstance', instanceID);
-								}
-							}
-
-							break;
-						case `system.adapter.${instanceID}.connected`:
-							if (state.val !== instanceData.isConnectedHost && instanceData.isAlive) {
-								await checkInstance(instanceID, instanceData);
-								// send message when instance has an error
-								if (this.config.checkSendInstanceFailedMsg && !instanceData.isHealthy && instanceData.isAlive) {
-									if (this.blacklistInstancesNotify.includes(instanceID)) continue;
-									await this.sendStateNotifications('errorInstance', instanceID);
-								}
-							}
-							break;
-						case `${instanceID}.info.connection`:
-							if (state.val !== instanceData.isConnectedDevice && instanceData.isAlive) {
-								await checkInstance(instanceID, instanceData);
-								// send message when instance has an error
-								if (this.config.checkSendInstanceFailedMsg && !instanceData.isHealthy && instanceData.isAlive) {
-									if (this.blacklistInstancesNotify.includes(instanceID)) continue;
-									await this.sendStateNotifications('errorInstance', instanceID);
-								}
-							}
-
-							break;
+					// Instanz data
+					if (Array.from(this.listInstanceRaw.values()).some((obj) => Object.values(obj).includes(id))) {
+						await this.renewInstanceData(id, state);
 					}
 				}
 
 				/*=============================================
 				=          		  Devices     			      =
 				=============================================*/
-				for (const [device, deviceData] of this.listAllDevicesRaw) {
-					// On statechange update available datapoint
-					switch (id) {
-						// device connection
-						case deviceData.instanceDeviceConnectionDP:
-							if (state.val !== deviceData.instancedeviceConnected) {
-								deviceData.instancedeviceConnected = state.val;
-							}
-							break;
-
-						// device updates
-						case deviceData.UpdateDP:
-							if (state.val !== deviceData.Upgradable) {
-								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);
-									}
-								}
-							}
-							break;
-
-						// device signal
-						case deviceData.SignalStrengthDP:
-							signalData = await this.calculateSignalStrength(state, deviceData.adapterID);
-							deviceData.SignalStrength = signalData[0];
-
-							break;
-
-						// device battery
-						case deviceData.batteryDP:
-							if (deviceData.isBatteryDevice) {
-								oldLowBatState = deviceData.LowBat;
-								if (state.val === 0 && deviceData.BatteryRaw >= 5) continue;
-								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 this.getInitValue(deviceData.LowBatDP);
-								} else {
-									isLowBatValue = undefined;
-								}
-								deviceData.LowBat = await this.setLowbatIndicator(state.val, isLowBatValue, deviceData.faultReport, deviceData.adapterID);
-
-								if (deviceData.LowBat && oldLowBatState !== deviceData.LowBat) {
-									if (this.config.checkSendBatteryMsg && !this.blacklistNotify.includes(deviceData.Path)) {
-										await this.sendStateNotifications('lowBatDevice', device);
-									}
-								}
-							}
-							break;
-
-						// device low bat
-						case deviceData.LowBatDP:
-							if (deviceData.isBatteryDevice) {
-								oldLowBatState = deviceData.LowBat;
-								batteryData = await this.getBatteryData(deviceData.BatteryRaw, state.val, deviceData.faultReport, deviceData.adapterID);
-								deviceData.Battery = batteryData[0];
-								deviceData.BatteryRaw = batteryData[2];
-								deviceData.BatteryUnitRaw = batteryData[3];
-								deviceData.LowBat = await this.setLowbatIndicator(deviceData.BatteryRaw, state.val, deviceData.faultReport, deviceData.adapterID);
-
-								if (deviceData.LowBat && oldLowBatState !== deviceData.LowBat) {
-									if (this.config.checkSendBatteryMsg && !this.blacklistNotify.includes(deviceData.Path)) {
-										await this.sendStateNotifications('lowBatDevice', device);
-									}
-								}
-							}
-							break;
-
-						//device error / fault reports
-						case deviceData.faultReportDP:
-							if (deviceData.isBatteryDevice) {
-								oldLowBatState = deviceData.LowBat;
-								batteryData = await this.getBatteryData(deviceData.BatteryRaw, oldLowBatState, state.val, deviceData.adapterID);
-
-								deviceData.Battery = batteryData[0];
-								deviceData.BatteryRaw = batteryData[2];
-								deviceData.BatteryUnitRaw = batteryData[3];
-								deviceData.LowBat = await this.setLowbatIndicator(deviceData.BatteryRaw, undefined, state.val, deviceData.adapterID);
-
-								if (deviceData.LowBat && oldLowBatState !== deviceData.LowBat) {
-									if (this.config.checkSendBatteryMsg && !this.blacklistNotify.includes(deviceData.Path)) {
-										await this.sendStateNotifications('lowBatDevice', device);
-									}
-								}
-							}
-							break;
-
-						// device unreach
-						case deviceData.UnreachDP:
-							if (deviceData.UnreachState !== state.val) {
-								oldStatus = deviceData.Status;
-								deviceData.UnreachState = state.val;
-								contactData = await this.getOnlineState(
-									deviceData.timeSelector,
-									deviceData.adapterID,
-									deviceData.UnreachDP,
-									deviceData.SignalStrength,
-									deviceData.UnreachState,
-									deviceData.DeviceStateSelectorDP,
-									deviceData.rssiPeerSelectorDP,
-								);
-								if (contactData !== undefined) {
-									deviceData.LastContact = contactData[0];
-									deviceData.Status = contactData[1];
-									deviceData.SignalStrength = contactData[2];
-								}
-								if (this.config.checkSendOfflineMsg && oldStatus !== deviceData.Status && !this.blacklistNotify.includes(deviceData.Path)) {
-									if (deviceData.instanceDeviceConnectionDP.val !== undefined) {
-										// check if the generally deviceData connected state is for a while true
-										if (await this.getTimestampConnectionDP(deviceData.instanceDeviceConnectionDP, 20000)) {
-											await this.sendStateNotifications('onlineStateDevice', device);
-										}
-									} else {
-										await this.sendStateNotifications('onlineStateDevice', device);
-									}
-								}
-							}
-							break;
-					}
+				if (Array.from(this.listAllDevicesRaw.values()).some((obj) => Object.values(obj).includes(id))) {
+					await this.renewDeviceData(id, state);
 				}
 			} catch (error) {
 				this.log.error(`Issue at state change: ${error}`);
@@ -686,6 +507,7 @@ class DeviceWatcher extends utils.Adapter {
 	 */
 	async main() {
 		this.log.debug(`Function started: ${this.main.name}`);
+		this.mainRunning = true;
 
 		// cancel run if no adapter is selected
 		if (this.adapterSelected.length === 0) return;
@@ -720,7 +542,7 @@ class DeviceWatcher extends utils.Adapter {
 				this.log.error(`[main - create and fill datapoints for each adapter] - ${error}`);
 			}
 		}
-
+		this.mainRunning = false;
 		this.log.debug(`Function finished: ${this.main.name}`);
 	} //<--End of main function
 
@@ -856,6 +678,7 @@ class DeviceWatcher extends utils.Adapter {
 			/*----------  Start of loop  ----------*/
 			for (const [id] of Object.entries(devices)) {
 				if (id.endsWith('.')) continue;
+				const mainSelector = id;
 
 				/*=============================================
 				=              get Instanz		          =
@@ -864,9 +687,10 @@ class DeviceWatcher extends utils.Adapter {
 
 				const instanceDeviceConnectionDP = `${instance}.info.connection`;
 				const instancedeviceConnected = await this.getInitValue(instanceDeviceConnectionDP);
-				this.subscribeForeignStates(instanceDeviceConnectionDP);
+				// this.subscribeForeignStates(instanceDeviceConnectionDP);
 				this.subscribeForeignObjects(`${this.selAdapter[i].Selektor}`);
-
+				// this.subscribeForeignObjects('*');
+				this.subscribeForeignStates('*');
 				/*=============================================
 				=              Get device name		          =
 				=============================================*/
@@ -884,7 +708,7 @@ class DeviceWatcher extends utils.Adapter {
 				const shortCurrDeviceString = currDeviceString.slice(0, currDeviceString.lastIndexOf('.') + 1 - 1);
 
 				// subscribe to object device path
-				this.subscribeForeignObjects(currDeviceString);
+				// this.subscribeForeignStates(currDeviceString);
 
 				/*=============================================
 				=            Get signal strength              =
@@ -911,7 +735,7 @@ class DeviceWatcher extends utils.Adapter {
 						break;
 				}
 				//subscribe to states
-				this.subscribeForeignStates(deviceQualityDP);
+				// this.subscribeForeignStates(deviceQualityDP);
 
 				const signalData = await this.calculateSignalStrength(deviceQualityState, adapterID);
 				let linkQuality = signalData[0];
@@ -983,9 +807,9 @@ class DeviceWatcher extends utils.Adapter {
 					faultReportingState = await this.getInitValue(faultReportingDP);
 
 					//subscribe to states
-					this.subscribeForeignStates(deviceBatteryStateDP);
-					this.subscribeForeignStates(isLowBatDP);
-					this.subscribeForeignStates(faultReportingDP);
+					// this.subscribeForeignStates(deviceBatteryStateDP);
+					// this.subscribeForeignStates(isLowBatDP);
+					// this.subscribeForeignStates(faultReportingDP);
 
 					const batteryData = await this.getBatteryData(deviceBatteryState, deviceLowBatState, faultReportingState, adapterID);
 					batteryHealth = batteryData[0];
@@ -1018,10 +842,10 @@ class DeviceWatcher extends utils.Adapter {
 				}
 
 				// subscribe to states
-				this.subscribeForeignStates(timeSelector);
-				this.subscribeForeignStates(unreachDP);
-				this.subscribeForeignStates(deviceStateSelectorDP);
-				this.subscribeForeignStates(rssiPeerSelectorDP);
+				// this.subscribeForeignStates(timeSelector);
+				// this.subscribeForeignStates(unreachDP);
+				// this.subscribeForeignStates(deviceStateSelectorDP);
+				// this.subscribeForeignStates(rssiPeerSelectorDP);
 
 				const onlineState = await this.getOnlineState(timeSelector, adapterID, unreachDP, linkQuality, deviceUnreachState, deviceStateSelectorDP, rssiPeerSelectorDP);
 				let deviceState;
@@ -1059,7 +883,8 @@ class DeviceWatcher extends utils.Adapter {
 					}
 
 					// subscribe to states
-					this.subscribeForeignStates(deviceUpdateDP);
+					// this.subscribeForeignStates(deviceUpdateDP);
+					this.subscribeForeignStates('*');
 				}
 
 				/*=============================================
@@ -1068,6 +893,7 @@ class DeviceWatcher extends utils.Adapter {
 				const setupList = () => {
 					this.listAllDevicesRaw.set(currDeviceString, {
 						Path: id,
+						mainSelector: mainSelector,
 						instanceDeviceConnectionDP: instanceDeviceConnectionDP,
 						instancedeviceConnected: instancedeviceConnected,
 						instance: instance,
@@ -2043,6 +1869,149 @@ class DeviceWatcher extends utils.Adapter {
 		this.log.debug(`Function finished: ${this.writeDatapoints.name}`);
 	} //<--End  of writing Datapoints
 
+	/**
+	 * @param {string | string[]} id
+	 * @param {ioBroker.State} state
+	 */
+	async renewDeviceData(id, state) {
+		let batteryData;
+		let signalData;
+		let oldLowBatState;
+		let contactData;
+		let oldStatus;
+		let isLowBatValue;
+
+		const deviceID = id.slice(0, id.lastIndexOf('.') + 1 - 1);
+		const deviceData = this.listAllDevicesRaw.get(deviceID);
+
+		if (deviceData) {
+			// On statechange update available datapoint
+			switch (id) {
+				// device connection
+				case deviceData.instanceDeviceConnectionDP:
+					if (state.val !== deviceData.instancedeviceConnected) {
+						deviceData.instancedeviceConnected = state.val;
+					}
+					break;
+
+				// device updates
+				case deviceData.UpdateDP:
+					if (state.val !== deviceData.Upgradable) {
+						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', deviceID);
+							}
+						}
+					}
+					break;
+
+				// device signal
+				case deviceData.SignalStrengthDP:
+					signalData = await this.calculateSignalStrength(state, deviceData.adapterID);
+					deviceData.SignalStrength = signalData[0];
+
+					break;
+
+				// device battery
+				case deviceData.batteryDP:
+					if (deviceData.isBatteryDevice) {
+						oldLowBatState = deviceData.LowBat;
+						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 this.getInitValue(deviceData.LowBatDP);
+						} else {
+							isLowBatValue = undefined;
+						}
+						deviceData.LowBat = await this.setLowbatIndicator(state.val, isLowBatValue, deviceData.faultReport, deviceData.adapterID);
+
+						if (deviceData.LowBat && oldLowBatState !== deviceData.LowBat) {
+							if (this.config.checkSendBatteryMsg && !this.blacklistNotify.includes(deviceData.Path)) {
+								await this.sendStateNotifications('lowBatDevice', deviceID);
+							}
+						}
+					}
+					break;
+
+				// device low bat
+				case deviceData.LowBatDP:
+					if (deviceData.isBatteryDevice) {
+						oldLowBatState = deviceData.LowBat;
+						batteryData = await this.getBatteryData(deviceData.BatteryRaw, state.val, deviceData.faultReport, deviceData.adapterID);
+						deviceData.Battery = batteryData[0];
+						deviceData.BatteryRaw = batteryData[2];
+						deviceData.BatteryUnitRaw = batteryData[3];
+						deviceData.LowBat = await this.setLowbatIndicator(deviceData.BatteryRaw, state.val, deviceData.faultReport, deviceData.adapterID);
+
+						if (deviceData.LowBat && oldLowBatState !== deviceData.LowBat) {
+							if (this.config.checkSendBatteryMsg && !this.blacklistNotify.includes(deviceData.Path)) {
+								await this.sendStateNotifications('lowBatDevice', deviceID);
+							}
+						}
+					}
+					break;
+
+				//device error / fault reports
+				case deviceData.faultReportDP:
+					if (deviceData.isBatteryDevice) {
+						oldLowBatState = deviceData.LowBat;
+						batteryData = await this.getBatteryData(deviceData.BatteryRaw, oldLowBatState, state.val, deviceData.adapterID);
+
+						deviceData.Battery = batteryData[0];
+						deviceData.BatteryRaw = batteryData[2];
+						deviceData.BatteryUnitRaw = batteryData[3];
+						deviceData.LowBat = await this.setLowbatIndicator(deviceData.BatteryRaw, undefined, state.val, deviceData.adapterID);
+
+						if (deviceData.LowBat && oldLowBatState !== deviceData.LowBat) {
+							if (this.config.checkSendBatteryMsg && !this.blacklistNotify.includes(deviceData.Path)) {
+								await this.sendStateNotifications('lowBatDevice', deviceID);
+							}
+						}
+					}
+					break;
+
+				// device unreach
+				case deviceData.UnreachDP:
+					if (deviceData.instanceDeviceConnectionDP.val !== undefined) {
+						// check if the generally deviceData connected state is for a while true
+						if (deviceData.UnreachState !== state.val) {
+							oldStatus = deviceData.Status;
+							deviceData.UnreachState = state.val;
+							contactData = await this.getOnlineState(
+								deviceData.timeSelector,
+								deviceData.adapterID,
+								deviceData.UnreachDP,
+								deviceData.SignalStrength,
+								deviceData.UnreachState,
+								deviceData.DeviceStateSelectorDP,
+								deviceData.rssiPeerSelectorDP,
+							);
+							if (contactData !== undefined) {
+								deviceData.LastContact = contactData[0];
+								deviceData.Status = contactData[1];
+								deviceData.SignalStrength = contactData[2];
+							}
+							if (this.config.checkSendOfflineMsg && oldStatus !== deviceData.Status && !this.blacklistNotify.includes(deviceData.Path)) {
+								if (deviceData.instanceDeviceConnectionDP.val !== undefined) {
+									// check if the generally deviceData connected state is for a while true
+									if (await this.getTimestampConnectionDP(deviceData.instanceDeviceConnectionDP, 20000)) {
+										await this.sendStateNotifications('onlineStateDevice', deviceID);
+									}
+								} else {
+									await this.sendStateNotifications('onlineStateDevice', deviceID);
+								}
+							}
+						}
+					}
+					break;
+			}
+		}
+	}
 	/**
 	 * get all Instances at start
 	 */
@@ -2127,10 +2096,12 @@ class DeviceWatcher extends utils.Adapter {
 				}
 
 				//subscribe to statechanges
-				this.subscribeForeignStates(id);
-				this.subscribeForeignStates(instanceConnectedHostDP);
-				this.subscribeForeignStates(instanceConnectedDeviceDP);
+				// this.subscribeForeignStates(id);
+				// this.subscribeForeignStates(instanceConnectedHostDP);
+				// this.subscribeForeignStates(instanceConnectedDeviceDP);
 				this.subscribeForeignObjects(`system.adapter.*`);
+				this.subscribeForeignStates('*');
+				// this.subscribeForeignObjects('*');
 
 				// create raw list
 				this.listInstanceRaw.set(instanceID, {
@@ -2146,6 +2117,9 @@ class DeviceWatcher extends utils.Adapter {
 					isConnectedDevice: instanceConnectedDeviceVal,
 					status: instanceStatus,
 					checkIsRunning: false,
+					aliveDP: `system.adapter.${instanceID}.alive`,
+					hostConnectionDP: instanceConnectedHostDP,
+					deviceConnectionDP: instanceConnectedDeviceDP,
 				});
 			}
 			await this.createInstanceList();
@@ -2176,9 +2150,9 @@ class DeviceWatcher extends utils.Adapter {
 		let connectedDeviceState = await this.getInitValue(`${instanceID}.info.connection`);
 		if (connectedDeviceState === undefined) connectedDeviceState = true;
 
-		let isAlive = false;
+		let isAlive = aliveState;
 		let isHealthy = false;
-		let instanceStatusString = 'Instanz deaktiviert';
+		let instanceStatusString = aliveState ? 'Instanz aktiviert' : 'Instanz deaktiviert';
 
 		if (!aliveState) {
 			isAlive = false;
@@ -2214,7 +2188,7 @@ class DeviceWatcher extends utils.Adapter {
 
 		let isAlive = false;
 		let isHealthy = false;
-		let instanceStatusString = 'Instanz deaktiviert';
+		let instanceStatusString = aliveState ? 'Instanz aktiviert' : 'Instanz deaktiviert';
 
 		if (aliveState) {
 			daemonIsAlive = await this.checkDaemonIsHealthy(instanceID);
@@ -2364,7 +2338,7 @@ class DeviceWatcher extends utils.Adapter {
 		const adapterUpdateListDP = `admin.*.info.updatesJson`;
 
 		// subscribe to datapoint
-		this.subscribeForeignStates(adapterUpdateListDP);
+		// this.subscribeForeignStates(adapterUpdateListDP);
 
 		await this.getAdapterUpdateData(adapterUpdateListDP);
 
@@ -2535,6 +2509,81 @@ class DeviceWatcher extends utils.Adapter {
 		await this.setStateChangedAsync(`adapterAndInstances.countInstancesError`, { val: this.countErrorInstance, ack: true });
 	}
 
+	/**
+	 * @param {string} id
+	 */
+	async renewAdapterUpdateData(id) {
+		const oldAdapterUpdatesCounts = this.countAdapterUpdates;
+		await this.getAdapterUpdateData(id);
+		await this.createAdapterUpdateList();
+		if (this.config.checkSendAdapterUpdateMsg && this.countAdapterUpdates > oldAdapterUpdatesCounts) {
+			await this.sendStateNotifications('updateAdapter', null);
+		}
+		this.listInstanceRaw.forEach((instance) => {
+			const adapterUpdate = this.adapterUpdatesJsonRaw.get(instance.Adapter);
+			instance.updateAvailable = adapterUpdate ? adapterUpdate.newVersion : ' - ';
+		});
+	}
+	/**
+	 * call function on state change, renew data and send messages
+	 * @param {string} id
+	 * @param {ioBroker.State} state
+	 */
+	async renewInstanceData(id, state) {
+		const instanceID = await this.getInstanceName(id);
+		const instanceData = this.listInstanceRaw.get(instanceID);
+		if (instanceData) {
+			let instanceStatusRaw;
+
+			const checkInstance = async (instanceID, instanceData) => {
+				if (!instanceData.checkIsRunning) {
+					instanceData.checkIsRunning = true;
+					instanceStatusRaw = await this.setInstanceStatus(instanceData.instanceMode, instanceData.schedule, instanceID);
+					instanceData.isAlive = instanceStatusRaw[0];
+					instanceData.isHealthy = instanceStatusRaw[1];
+					instanceData.status = instanceStatusRaw[2];
+					instanceData.checkIsRunning = false;
+					return;
+				}
+			};
+
+			switch (id) {
+				case `system.adapter.${instanceID}.alive`:
+					if (state.val !== instanceData.isAlive) {
+						await checkInstance(instanceID, instanceData);
+						// send message when instance was deactivated
+						if (this.config.checkSendInstanceDeactivatedMsg && !instanceData.isAlive) {
+							if (this.blacklistInstancesNotify.includes(instanceID)) return;
+							await this.sendStateNotifications('deactivatedInstance', instanceID);
+						}
+					}
+					break;
+
+				case `system.adapter.${instanceID}.connected`:
+					if (state.val !== instanceData.isConnectedHost && instanceData.isAlive) {
+						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;
+							await this.sendStateNotifications('errorInstance', instanceID);
+						}
+					}
+					break;
+
+				case `${instanceID}.info.connection`:
+					if (state.val !== instanceData.isConnectedDevice && instanceData.isAlive) {
+						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;
+							await this.sendStateNotifications('errorInstance', instanceID);
+						}
+					}
+					break;
+			}
+		}
+	}
+
 	/**
 	 * create Datapoints for Instances
 	 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.device-watcher",
-  "version": "2.9.11",
+  "version": "2.9.13",
   "description": "Watchdog for devices",
   "author": {
     "name": "Christian Behrends",
@@ -37,24 +37,24 @@
     "@types/chai": "^4.3.11",
     "@types/chai-as-promised": "^7.1.8",
     "@types/mocha": "^10.0.6",
-    "@types/node": "^20.10.1",
-    "@types/node-schedule": "^2.1.4",
+    "@types/node": "^20.10.6",
+    "@types/node-schedule": "^2.1.5",
     "@types/proxyquire": "^1.3.31",
     "@types/sinon": "^17.0.2",
     "@types/sinon-chai": "^3.2.12",
     "chai": "^4.3.10",
     "chai-as-promised": "^7.1.1",
     "cron-parser": "^4.9.0",
-    "eslint": "^8.54.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-prettier": "^5.0.1",
+    "eslint": "^8.56.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-prettier": "^5.1.2",
     "mocha": "^10.2.0",
     "node-schedule": "^2.1.1",
-    "prettier": "^3.1.0",
+    "prettier": "^3.1.1",
     "proxyquire": "^2.1.3",
     "sinon": "^17.0.1",
     "sinon-chai": "^3.7.0",
-    "typescript": "~5.3.2"
+    "typescript": "~5.3.3"
   },
   "main": "main.js",
   "files": [