iobroker.device-watcher 2.9.1 → 2.9.3

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);
@@ -1425,7 +1423,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);
@@ -1482,6 +1480,7 @@ class DeviceWatcher extends utils.Adapter {
 					case 'deconz':
 					case 'shelly':
 					case 'sonoff':
+					case 'tradfri':
 					case 'unifi':
 					case 'zigbee':
 					case 'zigbee2MQTT':
@@ -1604,10 +1603,12 @@ class DeviceWatcher extends utils.Adapter {
 				}
 				break;
 			default:
-				if (deviceUpdateSelector) {
-					isUpgradable = true;
-				} else if (!deviceUpdateSelector) {
-					isUpgradable = false;
+				if (deviceUpdateSelector !== null && typeof deviceUpdateSelector === 'boolean') {
+					if (deviceUpdateSelector) {
+						isUpgradable = true;
+					} else if (!deviceUpdateSelector) {
+						isUpgradable = false;
+					}
 				}
 		}
 
@@ -2245,7 +2246,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);
@@ -2264,9 +2264,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]);
@@ -3265,7 +3263,7 @@ class DeviceWatcher extends utils.Adapter {
 
 					for (const id of this.listErrorInstanceRaw) {
 						if (this.blacklistInstancesNotify.includes(id)) continue;
-						list = `${list}\n${id}: ${id.Status}`;
+						list = `${list}\n${id.Instance}: ${id.Status}`;
 					}
 					if (list.length === 0) return;
 					message = `Tägliche Meldung über fehlerhafte Instanzen: ${list}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.device-watcher",
-  "version": "2.9.1",
+  "version": "2.9.3",
   "description": "Watchdog for devices",
   "author": {
     "name": "Christian Behrends",
@@ -31,10 +31,10 @@
     "@alcalzone/release-script-plugin-manual-review": "^3.5.9",
     "@iobroker/adapter-dev": "^1.2.0",
     "@iobroker/testing": "^4.1.0",
-    "@types/chai": "^4.3.4",
+    "@types/chai": "^4.3.5",
     "@types/chai-as-promised": "^7.1.5",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^18.15.11",
+    "@types/node": "^20.3.3",
     "@types/node-schedule": "^2.1.0",
     "@types/proxyquire": "^1.3.28",
     "@types/sinon": "^10.0.13",
@@ -42,16 +42,16 @@
     "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",
     "cron-parser": "^4.8.1",
-    "eslint": "^8.37.0",
+    "eslint": "^8.44.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-prettier": "^4.2.1",
     "mocha": "^10.2.0",
     "node-schedule": "^2.1.1",
-    "prettier": "^2.8.7",
+    "prettier": "^2.8.8",
     "proxyquire": "^2.1.3",
-    "sinon": "^15.0.3",
+    "sinon": "^15.2.0",
     "sinon-chai": "^3.7.0",
-    "typescript": "~5.0.3"
+    "typescript": "~5.1.6"
   },
   "main": "main.js",
   "files": [