iobroker.device-watcher 2.15.0 → 2.15.1

package/README.md

@@ -191,6 +191,10 @@ This adapter would not have been possible without the great work of Christian Be
     Placeholder for the next version (at the beginning of the line):
     ### **WORK IN PROGRESS**
 -->
+### 2.15.1 (2026-01-10)
+* (arteck) fix instance check
+* (arteck) fix admin json
+
 ### 2.15.0 (2026-01-07)
 * (arteck) fixed device array
 * (arteck) deleted zwave2mqtt Adapter
@@ -216,10 +220,6 @@ This adapter would not have been possible without the great work of Christian Be
 * (arteck) add homee battery devices (only)
 * (arteck) fix battery list
 
-### 2.14.4 (2025-11-13)
-* (arteck) fix silent telegram notification
-* (arteck) fix offline list
-
 ## License
 
 MIT License

package/admin/jsonConfig.json5

@@ -41,7 +41,7 @@
 							type: 'checkbox',
 							attr: 'enabled',
 							width: '3%',
-							default: false,
+							default: 'false',
 						},
 						{
 							type: 'text',
@@ -51,7 +51,7 @@
 							width: '47%',
 							filter: true,
 							sort: true,
-							disabled: true,
+							disabled: 'true',
 						},
 						{
 							type: 'number',
@@ -69,7 +69,7 @@
 						  title: 'Telegram Silent Mode',
 						  attr: 'telegramSilent',
 						  width: '20%',
-						  default: false,
+						  default: 'false',
 						  disabled: '!data.enabled',
 						},
 						{
@@ -77,7 +77,7 @@
 							title: '',
 							attr: 'adapterKey',
 							width: '1%',
-							disabled: true,
+							disabled: 'true',
 							hidden: true,
 						},
 					],

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "device-watcher",
-    "version": "2.15.0",
+    "version": "2.15.1",
     "news": {
+      "2.15.1": {
+        "en": "fix instance check\nfix admin json",
+        "de": "fehlerbehebung\nadmin json",
+        "ru": "установить проверку\nисполнитель: admin json",
+        "pt": "corrigir verificação de instância\ncorrigir o administrador json",
+        "nl": "fix instantiecontrole\nfix admin json",
+        "fr": "correction de la vérification de l'instance\nréparer admin json",
+        "it": "verifica dell'istanza di correzione\ncorrezione admin json",
+        "es": "control de instancia de fijación\nadmin json",
+        "pl": "fix instance check\nfix admin json",
+        "uk": "перевірка екземпляра\nвиправлено admin json",
+        "zh-cn": "修补实例检查\n固定管理员json"
+      },
       "2.15.0": {
         "en": "fixed device array\ndeleted zwave2mqtt Adapter\nadded zwavews Adapter\nDependencies have been updated\nadded zwave2mqtt Adapter\nfixed all count devices\ncorrected finder",
         "de": "Geräteanordnung bereinigt\nzwave2mqt Adapter gelöscht\nzwavews Adapter hinzugefügt\nAbhängigkeiten wurden aktualisiert\nzwave2mqtt Adapter hinzugefügt\nalle Zählgeräte überarbeitet\nfinder korrigiert",

package/main.js

@@ -294,7 +294,9 @@ class DeviceWatcher extends utils.Adapter {
 
 				if (this.config.checkAdapterInstances && id.startsWith('system.adapter.')) {
 					//read new instance data and add it to the lists
-					await this.getInstanceData(id);
+					if (typeof id === 'string' && /\d$/.test(id)) {
+						await this.getInstanceData(id);
+					}
 				} else {
 					if (Array.from(this.listAllDevicesRaw.values()).some((obj) => obj.mainSelector === id)) {
 						if (!this.mainRunning) {
@@ -1299,7 +1301,8 @@ class DeviceWatcher extends utils.Adapter {
 	 */
 	async getInstanceData(instanceObject) {
 		try {
-			const instanceAliveDP = await this.getForeignStatesAsync(`${instanceObject}.alive`);
+			const idDP = `${instanceObject}.alive`;
+			const instanceAliveDP = await this.getForeignStatesAsync(idDP);
 
 			this.adapterUpdatesJsonRaw = await this.getAdapterUpdateData(adapterUpdateListDP);
 
@@ -1317,8 +1320,10 @@ class DeviceWatcher extends utils.Adapter {
 
 				// get instance connected to device data
 				const instanceConnectedDeviceDP = `${instanceID}.info.connection`;
+				const devicesState = await this.getForeignStateAsync(instanceConnectedDeviceDP);
+
 				let instanceConnectedDeviceVal;
-				if (instanceConnectedDeviceDP !== undefined && typeof instanceConnectedDeviceDP === 'boolean') {
+				if (instanceConnectedDeviceDP !== undefined && devicesState !== null && typeof devicesState.val === 'boolean') {
 					instanceConnectedDeviceVal = await tools.getInitValue(this, instanceConnectedDeviceDP);
 				} else {
 					instanceConnectedDeviceVal = 'N/A';
@@ -1331,7 +1336,9 @@ class DeviceWatcher extends utils.Adapter {
 				let adapterAvailableUpdate = '';
 				let instanceMode;
 				let scheduleTime = 'N/A';
+
 				const instanceObjectData = await this.getForeignObjectAsync(instanceObjectPath);
+
 				if (instanceObjectData) {
 					adapterName = tools.capitalize(instanceObjectData.common.name);
 					adapterVersion = instanceObjectData.common.version;
@@ -2284,19 +2291,21 @@ class DeviceWatcher extends utils.Adapter {
 		}
 	}
 	async getPreviousCronRun(lastCronRun) {
-		try {
-			const cronParser = cronParserLib.parseExpression
-				? cronParserLib // klassischer Import
-				: cronParserLib.default; // ESM-Fallback
-
-			const interval = cronParser.parseExpression(lastCronRun);
-			const previous = interval.prev();
-			return Math.floor(Date.now() - previous.getTime()); // in ms
-		} catch (error) {
-			this.log.error(`[getPreviousCronRun] - ${error}`);
-		}
+	  try {
+		const cronParser = cronParserLib.parseExpression ? cronParserLib : cronParserLib.default;
+
+		const interval = cronParser.parseExpression(lastCronRun);
+		const previous = interval.prev();
+
+		// Differenz in ms seit dem vorherigen Cron-Zeitpunkt
+		return Date.now() - previous.getTime();
+	  } catch (error) {
+		this.log.error(`[getPreviousCronRun] - ${error}`);
+		return null;
+	  }
 	}
 
+
 	/**
 	 * @param {() => void} callback
 	 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.device-watcher",
-  "version": "2.15.0",
+  "version": "2.15.1",
   "description": "Watchdog for devices",
   "author": "Christian Behrends <mail@christian-behrends.de>",
   "contributors": [
@@ -27,7 +27,8 @@
   },
   "dependencies": {
     "@iobroker/adapter-core": "^3.3.2",
-    "node-schedule": "^2.1.1"
+    "node-schedule": "^2.1.1",
+    "cron-parser": "^4.9.0"
   },
   "devDependencies": {
     "@alcalzone/release-script": "^5.0.0",