iobroker.device-watcher 2.10.4 → 2.11.0

package/lib/arrApart.js

@@ -430,6 +430,19 @@ const arrApart = {
 		reach: '.status',
 		isLowBat: 'none',
 	},
+	ring: {
+		Selektor: 'ring.*.latest_signal_strength',
+		timeSelector: '.latest_signal_strength',
+		adapterID: 'ring',
+		adapter: 'Ring',
+		rssiState: '.latest_signal_strength',
+		battery: '.battery_percentage',
+		charger: '.external_connection',
+		reach: 'none',
+		isLowBat: 'none',
+		id: 'none',
+		upgrade: '.firmware',
+	},
 	roomba: {
 		Selektor: 'roomba.*.signal',
 		timeSelector: '.signal',

package/main.js

@@ -151,6 +151,7 @@ class DeviceWatcher extends utils.Adapter {
 			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,
@@ -212,6 +213,7 @@ class DeviceWatcher extends utils.Adapter {
 			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,
@@ -997,6 +999,7 @@ class DeviceWatcher extends utils.Adapter {
 				case 'loqedSmartLock':
 				case 'viessmann':
 				case 'homekitController':
+				case 'ring':
 					if (shortDeviceObject && typeof shortDeviceObject === 'object' && shortDeviceObject.common) {
 						deviceName = shortDeviceObject.common.name;
 					}
@@ -1138,41 +1141,44 @@ class DeviceWatcher extends utils.Adapter {
 		let batteryHealthRaw;
 		let batteryHealthUnitRaw;
 
-		if (adapterID === 'hmrpc') {
-			if (deviceBatteryState === undefined) {
-				if (faultReportingState !== undefined && faultReportingState !== 6) {
-					batteryHealth = 'ok';
-					isBatteryDevice = true;
-				} else if (deviceLowBatState !== undefined && deviceLowBatState !== 1) {
-					batteryHealth = 'ok';
-					isBatteryDevice = true;
-				} else if (deviceLowBatState !== undefined) {
-					batteryHealth = 'low';
-					isBatteryDevice = true;
-				}
-			} else if (deviceBatteryState !== 0 && deviceBatteryState < 6) {
-				batteryHealth = `${deviceBatteryState}V`;
-				batteryHealthRaw = deviceBatteryState;
-				batteryHealthUnitRaw = 'V';
-				isBatteryDevice = true;
-			}
-		} else {
-			if (deviceBatteryState === undefined) {
-				if (deviceLowBatState !== undefined) {
-					if (deviceLowBatState !== true && deviceLowBatState !== 'NORMAL' && deviceLowBatState !== 1) {
+		switch (adapterID) {
+			case 'hmrpc':
+				if (deviceBatteryState === undefined) {
+					if (faultReportingState !== undefined && faultReportingState !== 6) {
 						batteryHealth = 'ok';
 						isBatteryDevice = true;
-					} else if (deviceLowBatState !== true) {
+					} else if (deviceLowBatState !== undefined && deviceLowBatState !== 1) {
+						batteryHealth = 'ok';
+						isBatteryDevice = true;
+					} else if (deviceLowBatState !== undefined) {
 						batteryHealth = 'low';
 						isBatteryDevice = true;
 					}
+				} else if (deviceBatteryState !== 0 && deviceBatteryState < 6) {
+					batteryHealth = `${deviceBatteryState}V`;
+					batteryHealthRaw = deviceBatteryState;
+					batteryHealthUnitRaw = 'V';
+					isBatteryDevice = true;
 				}
-			} else {
-				batteryHealth = `${deviceBatteryState}%`;
-				batteryHealthRaw = deviceBatteryState;
-				batteryHealthUnitRaw = '%';
-				isBatteryDevice = true;
-			}
+				break;
+			default:
+				if (deviceBatteryState === undefined) {
+					if (deviceLowBatState !== undefined) {
+						if (deviceLowBatState !== true && deviceLowBatState !== 'NORMAL' && deviceLowBatState !== 1) {
+							batteryHealth = 'ok';
+							isBatteryDevice = true;
+						} else if (deviceLowBatState !== true) {
+							batteryHealth = 'low';
+							isBatteryDevice = true;
+						}
+					}
+				} else {
+					batteryHealth = `${deviceBatteryState}%`;
+					batteryHealthRaw = deviceBatteryState;
+					batteryHealthUnitRaw = '%';
+					isBatteryDevice = true;
+				}
+				break;
 		}
 
 		return [batteryHealth, isBatteryDevice, batteryHealthRaw, batteryHealthUnitRaw];
@@ -1459,6 +1465,13 @@ class DeviceWatcher extends utils.Adapter {
 					isUpgradable = false;
 				}
 				break;
+			case 'ring':
+				if (deviceUpdateSelector !== 'Up to Date') {
+					isUpgradable = true;
+				} else {
+					isUpgradable = false;
+				}
+				break;
 			default:
 				if (deviceUpdateSelector !== null && typeof deviceUpdateSelector === 'boolean') {
 					if (deviceUpdateSelector) {
@@ -2109,7 +2122,6 @@ class DeviceWatcher extends utils.Adapter {
 					isConnectedHost: instanceConnectedHostVal,
 					isConnectedDevice: instanceConnectedDeviceVal,
 					status: instanceStatus,
-					checkIsRunning: false,
 					aliveDP: `system.adapter.${instanceID}.alive`,
 					hostConnectionDP: instanceConnectedHostDP,
 					deviceConnectionDP: instanceConnectedDeviceDP,
@@ -2141,7 +2153,6 @@ class DeviceWatcher extends utils.Adapter {
 		const connectedHostState = await this.getInitValue(`system.adapter.${instanceID}.connected`);
 		const isAlive = await this.getInitValue(`system.adapter.${instanceID}.alive`);
 		let connectedDeviceState = await this.getInitValue(`${instanceID}.info.connection`);
-
 		if (connectedDeviceState === undefined) {
 			connectedDeviceState = true;
 		}
@@ -2160,7 +2171,7 @@ class DeviceWatcher extends utils.Adapter {
 			}
 		}
 
-		return [Boolean(isAlive), Boolean(isHealthy), String(instanceStatusString)];
+		return [Boolean(isAlive), Boolean(isHealthy), String(instanceStatusString), Boolean(connectedHostState), Boolean(connectedDeviceState)];
 	}
 
 	/**
@@ -2188,8 +2199,10 @@ class DeviceWatcher extends utils.Adapter {
 		isAlive = Boolean(daemonIsAlive[0]);
 		isHealthy = Boolean(daemonIsAlive[1]);
 		instanceStatusString = String(daemonIsAlive[2]);
+		const connectedToHost = Boolean(daemonIsAlive[3]);
+		const connectedToDevice = Boolean(daemonIsAlive[4]);
 
-		return [isAlive, isHealthy, instanceStatusString];
+		return [isAlive, isHealthy, instanceStatusString, connectedToHost, connectedToDevice];
 	}
 
 	async checkScheduleisHealty(instanceID, scheduleTime) {
@@ -2229,52 +2242,21 @@ class DeviceWatcher extends utils.Adapter {
 	async setInstanceStatus(instanceMode, scheduleTime, instanceID) {
 		let instanceDeactivationTime = (this.config.offlineTimeInstances * 1000) / 2;
 		let instanceErrorTime = (this.config.errorTimeInstances * 1000) / 2;
-
-		const checkScheduleIsHealthy = async () => {
-			const scheduleIsAlive = await this.checkScheduleisHealty(instanceID, scheduleTime);
-			return {
-				isAlive: Boolean(scheduleIsAlive[0]),
-				isHealthy: Boolean(scheduleIsAlive[1]),
-				instanceStatusString: String(scheduleIsAlive[2]),
-			};
-		};
-
-		const checkDaemonIsHealthy = async () => {
-			const daemonIsAlive = await this.checkDaemonIsHealthy(instanceID);
-
-			if (daemonIsAlive[0] && !daemonIsAlive[1]) {
-				await this.delay(instanceErrorTime);
-				const daemonIsAliveAfterDelay = await this.checkDaemonIsHealthy(instanceID);
-
-				if (daemonIsAliveAfterDelay[0] && !daemonIsAliveAfterDelay[1]) {
-					await this.delay(instanceErrorTime);
-					const daemonIsAliveAfterSecondDelay = await this.checkDaemonIsHealthy(instanceID);
-
-					if (daemonIsAliveAfterSecondDelay[0] && !daemonIsAliveAfterSecondDelay[1]) {
-						return {
-							isAlive: Boolean(daemonIsAliveAfterSecondDelay[0]),
-							isHealthy: Boolean(daemonIsAliveAfterSecondDelay[1]),
-							instanceStatusString: String(daemonIsAliveAfterSecondDelay[2]),
-						};
-					}
-				}
-			}
-
-			const daemonIsNotAlive = await this.checkDaemonIsAlive(instanceID, instanceDeactivationTime);
-			return {
-				isAlive: Boolean(daemonIsNotAlive[0]),
-				isHealthy: Boolean(daemonIsNotAlive[1]),
-				instanceStatusString: String(daemonIsNotAlive[2]),
-			};
-		};
-
-		let isAlive = false;
-		let isHealthy = false;
-		let instanceStatusString = translations.instance_deactivated[this.config.userSelectedLanguage];
+		let isAlive;
+		let isHealthy;
+		let instanceStatusString;
+		let daemonIsAlive;
+		let daemonIsNotAlive;
+		let scheduleIsAlive;
+		let connectedToHost;
+		let connectedToDevice;
 
 		switch (instanceMode) {
 			case 'schedule':
-				({ isAlive, isHealthy, instanceStatusString } = await checkScheduleIsHealthy());
+				scheduleIsAlive = await this.checkScheduleisHealty(instanceID, scheduleTime);
+				isAlive = Boolean(scheduleIsAlive[0]);
+				isHealthy = Boolean(scheduleIsAlive[1]);
+				instanceStatusString = String(scheduleIsAlive[2]);
 				break;
 			case 'daemon':
 				// check with time the user did define for error and deactivation
@@ -2283,12 +2265,36 @@ class DeviceWatcher extends utils.Adapter {
 					instanceDeactivationTime = (userTimeInstances.deactivationTime * 1000) / 2;
 					instanceErrorTime = (userTimeInstances.errorTime * 1000) / 2;
 				}
+				daemonIsAlive = await this.checkDaemonIsHealthy(instanceID);
+				if (daemonIsAlive[0] && !daemonIsAlive[1]) {
+					await this.delay(instanceErrorTime);
+					const daemonIsAliveAfterDelay = await this.checkDaemonIsHealthy(instanceID);
+
+					if (daemonIsAliveAfterDelay[0] && !daemonIsAliveAfterDelay[1]) {
+						await this.delay(instanceErrorTime);
+						const daemonIsAliveAfterSecondDelay = await this.checkDaemonIsHealthy(instanceID);
+
+						if (daemonIsAliveAfterSecondDelay[0] && !daemonIsAliveAfterSecondDelay[1]) {
+							isAlive = Boolean(daemonIsAliveAfterSecondDelay[0]);
+							isHealthy = Boolean(daemonIsAliveAfterSecondDelay[1]);
+							instanceStatusString = String(daemonIsAliveAfterSecondDelay[2]);
+							connectedToHost = Boolean(daemonIsAliveAfterSecondDelay[3]);
+							connectedToDevice = Boolean(daemonIsAliveAfterSecondDelay[4]);
+						}
+					}
+				} else {
+					daemonIsNotAlive = await this.checkDaemonIsAlive(instanceID, instanceDeactivationTime);
+					isAlive = Boolean(daemonIsNotAlive[0]);
+					isHealthy = Boolean(daemonIsNotAlive[1]);
+					instanceStatusString = String(daemonIsNotAlive[2]);
+					connectedToHost = Boolean(daemonIsNotAlive[3]);
+					connectedToDevice = Boolean(daemonIsNotAlive[4]);
+				}
 
-				({ isAlive, isHealthy, instanceStatusString } = await checkDaemonIsHealthy());
 				break;
 		}
 
-		return [isAlive, isHealthy, instanceStatusString];
+		return [isAlive, isHealthy, instanceStatusString, connectedToHost, connectedToDevice];
 	}
 
 	/**
@@ -2530,15 +2536,13 @@ class DeviceWatcher extends utils.Adapter {
 			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;
-				}
+				instanceStatusRaw = await this.setInstanceStatus(instanceData.instanceMode, instanceData.schedule, instanceID);
+				instanceData.isAlive = instanceStatusRaw[0];
+				instanceData.isHealthy = instanceStatusRaw[1];
+				instanceData.status = instanceStatusRaw[2];
+				instanceData.isConnectedHost = instanceStatusRaw[3];
+				instanceData.isConnectedDevice = instanceStatusRaw[4];
+				return;
 			};
 
 			switch (id) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.device-watcher",
-  "version": "2.10.4",
+  "version": "2.11.0",
   "description": "Watchdog for devices",
   "author": {
     "name": "Christian Behrends",
@@ -37,22 +37,22 @@
     "@types/chai": "^4.3.11",
     "@types/chai-as-promised": "^7.1.8",
     "@types/mocha": "^10.0.6",
-    "@types/node": "^20.11.14",
-    "@types/node-schedule": "^2.1.5",
+    "@types/node": "^20.11.24",
+    "@types/node-schedule": "^2.1.6",
     "@types/proxyquire": "^1.3.31",
     "@types/sinon": "^17.0.3",
     "@types/sinon-chai": "^3.2.12",
-    "@typescript-eslint/eslint-plugin": "^6.20.0",
+    "@typescript-eslint/eslint-plugin": "^7.0.0",
     "@typescript-eslint/parser": "^6.20.0",
     "chai": "^4.4.1",
     "chai-as-promised": "^7.1.1",
     "cron-parser": "^4.9.0",
-    "eslint": "^8.56.0",
+    "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.1.3",
-    "mocha": "^10.2.0",
+    "mocha": "^10.3.0",
     "node-schedule": "^2.1.1",
-    "prettier": "^3.2.4",
+    "prettier": "^3.2.5",
     "proxyquire": "^2.1.3",
     "sinon": "^17.0.1",
     "sinon-chai": "^3.7.0",