iobroker.device-watcher 2.9.2 → 2.9.4

package/io-package.json

@@ -1,8 +1,34 @@
 {
 	"common": {
 		"name": "device-watcher",
-		"version": "2.9.2",
+		"version": "2.9.4",
 		"news": {
+			"2.9.4": {
+				"en": "Added: Fallback for HmIp-eTRV-2 batterie devices [#218](https://github.com/ciddi89/ioBroker.device-watcher/issues/218)\n(@mango1402) Fixed: Proxmox VM/CT online status [#241](https://github.com/ciddi89/ioBroker.device-watcher/issues/241)\nUpdated: Dependencies",
+				"de": "Hinzugefügt: Fallback für HmIp-eTRV-2 Batterie-Geräte [#218](https://github.com/ciddi89/ioBroker.device-watcher/issues/218)\n(@mango1402) Behoben: Proxmox VM/CT Online-Status [#241](https://github.com/ciddi89/ioBroker.device-watcher/issues/241)\nAktualisiert: Abhängigkeiten",
+				"ru": "Добавлено: Падение для батареек HmIp-eTRV-2 [#218](https://github.com/ciddi89/ioBroker.device-watcher/issues/218)\n(@mango1402) Исправлено: Proxmox VM/CT онлайн статус [#241](https://github.com/ciddi89/ioBroker.device-watcher/issues/241)\nОбновлено: зависимости",
+				"pt": "Adicionado: Fallback for HmIp-eTRV-2 batterie devices [#218](https://github.com/ciddi89/ioBroker.device-watcher/issues/218)\n(@mango1402) Corrigido: status online Proxmox VM/CT [#241](https://github.com/ciddi89/ioBroker.device-watcher/issues/241)\nAtualizado: Dependências",
+				"nl": "Vertaling:\n (@mango1402) Quality over Quantity Releases Vertaling:\nOpgepast",
+				"fr": "Ajouté: Fallback for HmIp-eTRV-2 batterie devices [#218](https://github.com/ciddi89/ioBroker.device-watcher/issues/218)\n(@mango1402) Correction : Proxmox VM/CT statut en ligne [#241](https://github.com/ciddi89/ioBroker.device-watcher/issues/241)\nActualisé : dépenses",
+				"it": "Aggiunto: Fallback for HmIp-eTRV-2 batterie [#218](https://github.com/ciddi89/ioBroker.device-watcher/issues/218)\n(@mango1402) Fisso: Proxmox VM/CT stato online [#241](https://github.com/ciddi89/ioBroker.device-watcher/issues/241)\nAggiornato: Dipendenze",
+				"es": "Añadido: Fallback for HmIp-eTRV-2 batterie devices [#218](https://github.com/ciddi89/ioBroker.device-watcher/issues/218)\n(@mango1402) Arreglado: Proxmox VM/CT online status [#241](https://github.com/ciddi89/ioBroker.device-watcher/issues/241)\nActualizado: Dependencias",
+				"pl": "Added: Fallback for HmIp-eTRV-2 batterie devices #218(https:/github.com/ciddi89/ioBroker.device-watcher/issues/218 (ang.)\n(@mango1402) Proxmox VM/CT online status #241(https:/github.com/ciddi89/ioBroker.device-watcher/issues/241) (ang.)\nZastrzeżenie: Zależność",
+				"uk": "Додано: Fallback для пристроїв HmIp-eTRV-2 [#218](https://github.com/ciddi89/ioBroker.device-watcher/products/218)\n(@mango1402) Виправлено: Proxmox VM/CT онлайн статус [#241](https://github.com/ciddi89/ioBroker.device-watcher/issues/241)\nОновлено: Залежності",
+				"zh-cn": "增 编:HmIp-eTRV-2电池装置的Faback[#218](http://github.com/ciddi89/ioBroker.device-watcher/issues/218)\n(@mango1402) 固定:Proxmox VM/CT在线地位[第241号](http://github.com/ciddi89/ioBroker.device-watcher/issues/241)\n更新:属地"
+			},
+			"2.9.3": {
+				"en": "Dropped: Node v14.x support and added: Node v20.x support\nFixed: last seen of Ping devices\nFixed: Connection messages of devices without instance connection datapoint\nFixed: Data & Lists of instances wasn't refreshed correctly\nFixed: Tradfri state alive must be false for device offline state",
+				"de": "Dropped: Node v14.x Unterstützung und hinzugefügt: Node v20.x Unterstützung\nFix: zuletzt gesehen von Ping-Geräten\nFix: Verbindungsnachrichten von Geräten ohne Instanz-Verbindungsdatenpunkt\nFix: Daten & Instanzlisten wurden nicht korrekt aktualisiert\nFix: Tradfri der Datenpunkt alive muss für den Offlinezustand eines Gerätes false sein",
+				"ru": "Dropped: Поддержка Node v14.x и добавил: Поддержка Node v20.x\nИсправлено: последний раз видели Ping устройств\nИсправлено: Соединение сообщений устройств без контактной точки\nИсправлено: Данные и списки инстанций не были обновлены правильно\nИсправлено: состояние Tradfri живое должно быть ложным для состояния устройства offline",
+				"pt": "Dropped: Node v14.x suporte e adicionado: Suporte de Node v20.x\nFixo: visto pela última vez de dispositivos Ping\nCorrigido: Mensagens de conexão de dispositivos sem datapoint de conexão de instância\nCorrigido: Dados e listas de instâncias não foram atualizados corretamente\nCorrigido: Estado Tradfri vivo deve ser falso para o estado off-line do dispositivo",
+				"nl": "Node v14.x steun en toegevoegd: Node v20\n_\nVerbindingsberichten van apparatuur zonder instantie datapoint\nVertaling:\nVertaling:",
+				"fr": "Dropped: Node v14.x support et ajouté: Node v20.x support\nCorrection : dernière vue des appareils Ping\nCorrection : Messages de connexion des périphériques sans point de données de connexion par instance\nCorrection : Les listes des cas n'ont pas été rafraîchies correctement\nCorrection : l'état de Tradfri vivant doit être faux pour l'état hors ligne",
+				"it": "Dropped: Node v14.x supporto e aggiunto: Supporto Node v20.x\nFisso: ultimo visto di dispositivi Ping\nRisolto: Messaggi di connessione di dispositivi senza datapoint di connessione di istanza\nRisolto: i dati e le liste delle istanze non sono stati aggiornati correttamente\nFisso: Tradfri stato vivo deve essere falso per lo stato offline del dispositivo",
+				"es": "Suprimido: soporte Nodo v14.x y añadido: Soporte Node v20.x\nFijación: última vista de dispositivos Ping\nFijo: mensajes de conexión de dispositivos sin punto de datos de conexión de instancia\nFijo: Datos \" Listas de casos no se refrescó correctamente\nFijo: El estado de Tradfri vivo debe ser falso para el estado fuera de línea del dispositivo",
+				"pl": "Przewodnik: wsparcie i dodanie. Node v20x (ang.)\nFixed: ostatni raz widziany z urządzenia Ping\nFixe: Powiązane wiadomości urządzeń bez użycia danych\nFixed: Data & Lists nie został odświeżony\nFixed: żywy stan Tradfri jest fałszywy dla ubezpieczenia",
+				"uk": "Dropped: Node v14.x підтримка і додано: Підтримка Node v20.x\nВиправлено: Останній бачив Ping пристроїв\nВиправлено: З'єднання повідомлень пристроїв без точки з'єднання\nВиправлено: Дані та списки екземплярів не освіжали правильно\nВиправлено: Tradfri держава живий повинен бути помилковим для пристрою автономний стан",
+				"zh-cn": "增 编: 无de v20.x 支持\nFixed:最后可见的装置\n固定:无线数据识别装置的识别信息\n固定:案例的数据和清单正确地予以驳斥。\n固定:Tdfri State的活活性必须为线性州的装置作假"
+			},
 			"2.9.2": {
 				"en": "Fixed: Instance name in schedule notifications for faulty instances\nFixed: Ignore null values in update datapoints of devices\nUpdated: Dependencies",
 				"de": "Behoben: Instancenamen in Schedule Benachrichtigungen für Fehlerhafte Instanzen\nBehoben: Nullwerte in Update-Datenpunkten von Geräten ignorieren\nAktualisiert: Abhängigkeiten",
@@ -67,32 +93,6 @@
 				"pl": "Fixed: Functions for example full new #170(https:/github.com/ciddi89/ioBroker,device-watcher/issues/170) (ang.)\nAdded: wiadomość Popup, gdy instancja nie jest uruchomiona, a użytkownik próbuje wybrać urządzenie/instance in the settings table #170(https:/github.com/ciddi89/ioBrokerdevice-watcher/issues/170)",
 				"uk": "Виправлено: Функції статусу екземпляра повністю оновлено [#170] (https://github.com/ciddi89/ioBroker.device-watcher/issues/170)\nДодано: Поповнення повідомлення, коли екземпляр не працює, і користувач намагається вибрати пристрій/інстанцію в таблицях налаштувань [#170](https://github.com/ciddi89/ioBroker.device-watcher/issues/170)",
 				"zh-cn": "固定:举例身份功能完全延长[第170](http://github.com/ciddi89/ioBroker.device-watcher/issues/170)\n添加:当事没有运行时,Popup讯息和用户在表格[第170](http://github.com/ciddi89/ioBroker.device-watcher/issues/170)中选择一种装置/装置。"
-			},
-			"2.8.3": {
-				"en": "Fixed: Multiple push messages when restarting an instance ([#170](https://github.com/ciddi89/ioBroker.device-watcher/issues/170))",
-				"de": "Behoben: Mehrere Push-Nachrichten beim Neustart einer Instanz [#170](https://github.com/ciddi89/ioBroker.device-watcher/issues/170)",
-				"ru": "Исправлено: Несколько push-сообщений при перезагрузке экземпляра [#170](https://github.com/ciddi89/ioBroker.device-watcher/issues/170)",
-				"pt": "Corrigido: Múltiplas mensagens de push ao reiniciar uma instância [#170](https://github.com/ciddi89/ioBroker.device-watcher/issues/170)",
-				"nl": "Meerdere persberichten als het herstarten van een instance 70170:",
-				"fr": "Correction : Messages multiples pour le redémarrage d ' une instance [#170](https://github.com/ciddi89/ioBroker.device-watcher/issues/170)",
-				"it": "Risolto: Messaggi push multipli al riavvio di un'istanza [#170](https://github.com/ciddi89/ioBroker.device-watcher/issues/170)",
-				"es": "Corregido: Múltiples mensajes de empuje al reiniciar una instancia [#170](https://github.com/ciddi89/ioBroker.device-watcher/issues/170)",
-				"pl": "Fixed: Multiple push messages when restarting a program #170(https:/github.com/ciddi89/ioBroker.device-watcher/issues/170) (ang.)",
-				"uk": "Виправлено: Кілька поштових повідомлень при перезапускі екземпляра [#170] (https://github.com/ciddi89/ioBroker.device-watcher/issues/170)",
-				"zh-cn": "九. 固定:在重新树立一个例子(http://github.com/ciddi89/ioBroker.device-watcher/issues/170)时,多人传信息。"
-			},
-			"2.8.2": {
-				"en": "Fixed: Don't handle id's which ends with fullstop\nAdded: Possibility for the user to select the global deactivation time for instances",
-				"de": "Behoben: Behandle nicht id's, die mit einem Punkt enden\nHinzugefügt: Möglichkeit für den Benutzer, die globale Deaktivierungszeit für Instanzen selbst zu wählen",
-				"ru": "Исправлено: Не обрабатывайте id's который заканчивается с fullstop\nДобавлена: Возможность для пользователя выбрать глобальное время деактивации для инстанций",
-				"pt": "Corrigido: Não manuseie id's que termina com fullstop\nAdicionado: Possibilidade para o usuário selecionar o tempo de desativação global para instâncias",
-				"nl": "Niet omgaan met ID's die eindigen met volledige stop\nToegevoegd, mogelijk voor de gebruiker om de wereldwijde deactiveringstijd te selecteren voor bijvoorbeeld",
-				"fr": "Fixé: Ne manipule pas l'id qui se termine avec le haut\nAjouté: Possibilité pour l'utilisateur de sélectionner le temps de désactivation global pour les instances",
-				"it": "Fisso: Non maneggiare id che termina con fullstop\nAggiunto: Possibilità per l'utente di selezionare il tempo di disattivazione globale per le istanze",
-				"es": "Arreglado: No maneje id's que termina con fullstop\nAñadido: Posibilidad para que el usuario seleccione el tiempo de desactivación global para los casos",
-				"pl": "Fixed: Don't handle id's (ang.)\nAdded: Possibility for the user to select the global deactivation time",
-				"uk": "Виправлено: Не робіть id's, які закінчуються повною поверхнею\nДодано: Можливість вибору глобального часу деактивації екземплярів",
-				"zh-cn": "九. 固定:捐税处理停止完全停战的叛国行为\n增 编:用户可以选择全球启动时间,以选择发生的情况"
 			}
 		},
 		"titleLang": {

package/lib/arrApart.js

@@ -196,6 +196,7 @@ const arrApart = {
 		reach: '.UNREACH_ALARM',
 		isLowBat: '.LOW_BAT_ALARM',
 		isLowBat2: '.LOWBAT_ALARM',
+		isLowBat3: '.LOW_BAT',
 		stateValue: '.1.STATE',
 		faultReporting: '.4.FAULT_REPORTING',
 		hmDNBattery: '.4.BATTERY_STATE',

package/main.js

@@ -412,7 +412,7 @@ class DeviceWatcher extends utils.Adapter {
 								instanceData.isAlive = instanceStatusRaw[0];
 								instanceData.isHealthy = instanceStatusRaw[1];
 								instanceData.status = instanceStatusRaw[2];
-
+								instanceData.checkIsRunning = false;
 								if (oldIsHealthyValue === instanceData.isHealthy) continue;
 								// send message when instance was deactivated
 								if (this.config.checkSendInstanceDeactivatedMsg && !instanceData.isAlive) {
@@ -424,8 +424,6 @@ class DeviceWatcher extends utils.Adapter {
 									if (this.blacklistInstancesNotify.includes(instanceID)) continue;
 									await this.sendStateNotifications('errorInstance', instanceID);
 								}
-
-								instanceData.checkIsRunning = false;
 							}
 							break;
 					}
@@ -541,7 +539,7 @@ class DeviceWatcher extends utils.Adapter {
 								deviceData.SignalStrength = contactData[2];
 							}
 							if (this.config.checkSendOfflineMsg && oldStatus !== deviceData.Status && !this.blacklistNotify.includes(deviceData.Path)) {
-								if (deviceData.instanceDeviceConnectionDP !== undefined) {
+								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);
@@ -938,6 +936,10 @@ class DeviceWatcher extends utils.Adapter {
 					if (deviceLowBatState === undefined) {
 						isLowBatDP = currDeviceString + this.selAdapter[i].isLowBat2;
 						deviceLowBatState = await this.getInitValue(isLowBatDP);
+						if (deviceLowBatState === undefined) {
+							isLowBatDP = currDeviceString + this.selAdapter[i].isLowBat3;
+							deviceLowBatState = await this.getInitValue(isLowBatDP);
+						}
 					}
 					if (deviceLowBatState === undefined) isLowBatDP = 'none';
 
@@ -1327,7 +1329,7 @@ class DeviceWatcher extends utils.Adapter {
 		if (deviceLowBatState !== undefined || faultReportState !== undefined) {
 			switch (adapterID) {
 				case 'hmrpc':
-					if (deviceLowBatState === 1 || faultReportState === 6) {
+					if (deviceLowBatState === 1 || deviceLowBatState === true || faultReportState === 6) {
 						lowBatIndicator = true;
 					}
 					break;
@@ -1425,7 +1427,7 @@ class DeviceWatcher extends utils.Adapter {
 							}
 						}
 					} else {
-						if (deviceUnreachState === 0 && deviceTimeSelector) {
+						if ((!deviceUnreachState || deviceUnreachState === 0) && deviceTimeSelector) {
 							lastContactString = await this.getLastContact(deviceTimeSelector.lc);
 						} else {
 							if (deviceTimeSelector) lastContactString = await this.getLastContact(deviceTimeSelector.ts);
@@ -1456,7 +1458,8 @@ class DeviceWatcher extends utils.Adapter {
 					case 'proxmox':
 						if (this.configMaxMinutes[adapterID] <= 0) {
 							if (deviceUnreachState !== 'running' && deviceUnreachState !== 'online') {
-								if (linkQuality !== ' - ') deviceState = 'Offline'; //set online state to offline
+								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') {
 							deviceState = 'Offline'; //set online state to offline
@@ -1482,6 +1485,7 @@ class DeviceWatcher extends utils.Adapter {
 					case 'deconz':
 					case 'shelly':
 					case 'sonoff':
+					case 'tradfri':
 					case 'unifi':
 					case 'zigbee':
 					case 'zigbee2MQTT':
@@ -2247,7 +2251,6 @@ class DeviceWatcher extends utils.Adapter {
 		let daemonIsNotAlive;
 		let instanceDeactivationTime = (this.config.offlineTimeInstances * 1000) / 2;
 		let instanceErrorTime = (this.config.errorTimeInstances * 1000) / 2;
-
 		switch (instanceMode) {
 			case 'schedule':
 				scheduleIsAlive = await this.checkScheduleisHealty(instanceID, scheduleTime);
@@ -2266,9 +2269,7 @@ class DeviceWatcher extends utils.Adapter {
 					instanceErrorTime = this.userTimeInstancesList.get(instanceID).errorTime;
 					instanceErrorTime = (instanceErrorTime * 1000) / 2; // calculate sec to ms and divide into two
 				}
-
 				daemonIsAlive = await this.checkDaemonIsHealthy(instanceID);
-
 				if (daemonIsAlive[0]) {
 					if (daemonIsAlive[1]) {
 						isAlive = Boolean(daemonIsAlive[0]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.device-watcher",
-  "version": "2.9.2",
+  "version": "2.9.4",
   "description": "Watchdog for devices",
   "author": {
     "name": "Christian Behrends",
@@ -22,36 +22,36 @@
     "url": "https://github.com/ciddi89/ioBroker.device-watcher"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "^2.6.8"
+    "@iobroker/adapter-core": "^3.0.3"
   },
   "devDependencies": {
-    "@alcalzone/release-script": "^3.5.9",
-    "@alcalzone/release-script-plugin-iobroker": "^3.5.9",
+    "@alcalzone/release-script": "^3.6.0",
+    "@alcalzone/release-script-plugin-iobroker": "^3.6.0",
     "@alcalzone/release-script-plugin-license": "^3.5.9",
     "@alcalzone/release-script-plugin-manual-review": "^3.5.9",
     "@iobroker/adapter-dev": "^1.2.0",
     "@iobroker/testing": "^4.1.0",
-    "@types/chai": "^4.3.5",
-    "@types/chai-as-promised": "^7.1.5",
-    "@types/mocha": "^10.0.1",
-    "@types/node": "^18.16.3",
-    "@types/node-schedule": "^2.1.0",
-    "@types/proxyquire": "^1.3.28",
-    "@types/sinon": "^10.0.13",
-    "@types/sinon-chai": "^3.2.9",
-    "chai": "^4.3.7",
+    "@types/chai": "^4.3.6",
+    "@types/chai-as-promised": "^7.1.6",
+    "@types/mocha": "^10.0.2",
+    "@types/node": "^20.8.0",
+    "@types/node-schedule": "^2.1.1",
+    "@types/proxyquire": "^1.3.29",
+    "@types/sinon": "^10.0.16",
+    "@types/sinon-chai": "^3.2.10",
+    "chai": "^4.3.10",
     "chai-as-promised": "^7.1.1",
-    "cron-parser": "^4.8.1",
-    "eslint": "^8.39.0",
-    "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-prettier": "^4.2.1",
+    "cron-parser": "^4.9.0",
+    "eslint": "^8.50.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-plugin-prettier": "^5.0.0",
     "mocha": "^10.2.0",
     "node-schedule": "^2.1.1",
-    "prettier": "^2.8.8",
+    "prettier": "^3.0.3",
     "proxyquire": "^2.1.3",
-    "sinon": "^15.0.4",
+    "sinon": "^16.0.0",
     "sinon-chai": "^3.7.0",
-    "typescript": "~5.0.4"
+    "typescript": "~5.2.2"
   },
   "main": "main.js",
   "files": [