iobroker.device-watcher 2.9.12 → 2.9.13

package/README.md

@@ -189,6 +189,11 @@ 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)

package/io-package.json

@@ -1,8 +1,21 @@
 {
 	"common": {
 		"name": "device-watcher",
-		"version": "2.9.12",
+		"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)",
@@ -80,19 +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其他:清洁档案"
 			}
 		},
 		"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}`);
@@ -498,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;
@@ -532,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
 
@@ -668,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		          =
@@ -677,8 +688,9 @@ class DeviceWatcher extends utils.Adapter {
 				const instanceDeviceConnectionDP = `${instance}.info.connection`;
 				const instancedeviceConnected = await this.getInitValue(instanceDeviceConnectionDP);
 				// this.subscribeForeignStates(instanceDeviceConnectionDP);
-				//this.subscribeForeignObjects(`${this.selAdapter[i].Selektor}`);
-				this.subscribeForeignObjects('*');
+				this.subscribeForeignObjects(`${this.selAdapter[i].Selektor}`);
+				// this.subscribeForeignObjects('*');
+				this.subscribeForeignStates('*');
 				/*=============================================
 				=              Get device name		          =
 				=============================================*/
@@ -881,6 +893,7 @@ class DeviceWatcher extends utils.Adapter {
 				const setupList = () => {
 					this.listAllDevicesRaw.set(currDeviceString, {
 						Path: id,
+						mainSelector: mainSelector,
 						instanceDeviceConnectionDP: instanceDeviceConnectionDP,
 						instancedeviceConnected: instancedeviceConnected,
 						instance: instance,
@@ -1964,31 +1977,34 @@ class DeviceWatcher extends utils.Adapter {
 
 				// 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)) {
+					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);
 								}
-							} else {
-								await this.sendStateNotifications('onlineStateDevice', deviceID);
 							}
 						}
 					}
@@ -2083,9 +2099,9 @@ class DeviceWatcher extends utils.Adapter {
 				// this.subscribeForeignStates(id);
 				// this.subscribeForeignStates(instanceConnectedHostDP);
 				// this.subscribeForeignStates(instanceConnectedDeviceDP);
+				this.subscribeForeignObjects(`system.adapter.*`);
 				this.subscribeForeignStates('*');
-				//this.subscribeForeignObjects(`system.adapter.*`);
-				this.subscribeForeignObjects('*');
+				// this.subscribeForeignObjects('*');
 
 				// create raw list
 				this.listInstanceRaw.set(instanceID, {
@@ -2134,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;
@@ -2172,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);

package/package.json

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