iobroker.device-watcher 2.15.11 → 2.15.13

package/README.md

@@ -191,6 +191,12 @@ 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.13 (2026-05-13)
+* (arteck) fix new devices
+
+### 2.15.12 (2026-05-06)
+* (arteck) fix hueExtended battery check
+
 ### 2.15.11 (2026-05-06)
 * (arteck)
 
@@ -201,13 +207,6 @@ This adapter would not have been possible without the great work of Christian Be
 ### 2.15.9 (2026-04-22)
 * (arteck) new xsense (v. 0.4.0) structure, plz update before
 
-### 2.15.8 (2026-04-18)
-* (arteck) fix cronParserLib.parseExpression message
-
-### 2.15.7 (2026-04-18)
-* (arteck) fix matter 
-* (arteck) fix cronParserLib.parseExpression message
-
 ## License
 
 MIT License

package/io-package.json

@@ -1,85 +1,46 @@
 {
   "common": {
     "name": "device-watcher",
-    "version": "2.15.11",
+    "version": "2.15.13",
     "news": {
+      "2.15.13": {
+        "en": "fix new devices",
+        "de": "neue geräte installieren",
+        "ru": "ремонт новых устройств",
+        "pt": "corrigir novos dispositivos",
+        "nl": "nieuwe apparaten herstellen",
+        "fr": "correction de nouveaux dispositifs",
+        "it": "fissare nuovi dispositivi",
+        "es": "nuevos dispositivos",
+        "pl": "naprawić nowe urządzenia",
+        "uk": "фіксувати нові пристрої",
+        "zh-cn": "修复新设备"
+      },
+      "2.15.12": {
+        "en": "fix hueExtended battery check",
+        "de": "hueExtended Akku Check",
+        "ru": "проверка батареи Extended battery check",
+        "pt": "corrigir matizExtended verificação da bateria",
+        "nl": "fix hueExtended batterijcontrole",
+        "fr": "fix hueVérification étendue de la batterie",
+        "it": "correggere il controllo della batteria estesa",
+        "es": "hue de fijaciónComprobar la batería",
+        "pl": "fix hueExtended kontrola baterii",
+        "uk": "fix hueExtended перевірка батареї",
+        "zh-cn": "修复 hue 扩展电池检查"
+      },
       "2.15.11": {
-        "en": "",
-        "de": "",
-        "ru": "",
-        "pt": "",
-        "nl": "",
-        "fr": "",
-        "it": "",
-        "es": "",
-        "pl": "",
-        "uk": "",
-        "zh-cn": ""
-      },
-      "2.15.10": {
-        "en": "Adapter requires node.js >= 22 now\nfix adapter crash after delete a device",
-        "de": "Adapter benötigt node.js >= 22 jetzt\nfix adapter crash nach dem löschen eines geräts",
-        "ru": "Адаптер требует node.js >= 22 сейчас\nисправить сбой адаптера после удаления устройства",
-        "pt": "Adaptador requer nod.js >= 22 agora\ncorrigir falha do adaptador após apagar um dispositivo",
-        "nl": "Voor de adapter zijn node.js < 22 nu nodig\nfix adapter crash na het verwijderen van een apparaat",
-        "fr": "Adaptateur nécessite node.js >= 22 maintenant\ncorrection du crash de l'adaptateur après suppression d'un périphérique",
-        "it": "Adattatore richiede node.js >= 22 ora\nfissare l'arresto dell'adattatore dopo eliminare un dispositivo",
-        "es": "Adaptador requiere node.js ю= 22 ahora\najuste de bloqueo del adaptador después de eliminar un dispositivo",
-        "pl": "Adapter wymaga node.js > = 22\nnaprawić awarię adaptera po usunięciu urządzenia",
-        "uk": "Адаптер вимагає node.js >= 22 тепер\nвиправлено аварійний перехід після видалення пристрою",
-        "zh-cn": "适配器需要节点.js 现在22\n删除设备后修复适配器崩溃"
-      },
-      "2.15.9": {
-        "en": "new xsense (v. 0.4.0) structure, plz update before",
-        "de": "neue xsense (v. 0.4.0) struktur, plz update vor",
-        "ru": "новая структура xsense (v. 0.4.0), обновление plz до",
-        "pt": "nova estrutura xsense (v. 0.4.0), atualização plz antes",
-        "nl": "nieuwe xsense (v. 0.4.0) structuur, plz update voor",
-        "fr": "nouvelle structure xsense (v. 0.4.0), mise à jour plz",
-        "it": "nuova struttura xsense (v. 0.4.0), aggiornamento plz prima",
-        "es": "nueva estructura xsense (v. 0.4.0)",
-        "pl": "nowa struktura xsense (v. 0.4.0), aktualizacja plz przed",
-        "uk": "новий xsense (v. 0.4.0) структура, оновлення plz перед",
-        "zh-cn": "新的 xsense (v. 04. 0) 结构, plz 更新前"
-      },
-      "2.15.8": {
-        "en": "fix cronParserLib.parseExpression message",
-        "de": "cronParserLib.parseExpressionsnachricht",
-        "ru": "исправить сообщение cronParserLib.parse",
-        "pt": "corrigir cronParserLib.parseExpression message",
-        "nl": "fix cronParserLib.parseExpressiebericht",
-        "fr": "correction du message cronParserLib.parseExpression",
-        "it": "correzione cronParserLib.parseExpression messaggio",
-        "es": "fijar cronParserLib.parse",
-        "pl": "naprawić wiadomość cronParserLib.parseExpression",
-        "uk": "виправлено cronParserLib.parseExpression повідомлення",
-        "zh-cn": "修补 cronParserLib.parsepression 信件"
-      },
-      "2.15.7": {
-        "en": "fix matter \n",
-        "de": "fixkosten\n",
-        "ru": "исправлять\n",
-        "pt": "corrigir a matéria\n",
-        "nl": "fix materie\n",
-        "fr": "fixer la matière\n",
-        "it": "risolvere la questione\n",
-        "es": "arregla la materia\n",
-        "pl": "materia stabilna\n",
-        "uk": "фіксувати матерію\n",
-        "zh-cn": "固定事项\n"
-      },
-      "2.15.6": {
-        "en": "Adapter requires admin >= 7.7.22 now\nfix instanz restart\nfix cronParserLib.parseExpression message\nfix group in zigbee2mqtt",
-        "de": "Adapter benötigt admin >= 7.7.22 jetzt\ninstanz restart\ncronParserLib.parseExpressionsnachricht\nfix group in zigbee2mqtt",
-        "ru": "Адаптер требует администратора >= 7.7.22\nвосстановление instanz\nисправить сообщение cronParserLib.parse\nфиксированная группа в zigbee2mqtt",
-        "pt": "Adaptador requer admin >= 7.7.22 agora\ncorrigir instanz reiniciar\ncorrigir cronParserLib.parseExpression message\ngrupo de correção em zigbee2mqtt",
-        "nl": "Adapter vereist admin < 7.7.22 nu\nfix instanz herstart\nfix cronParserLib.parseExpressiebericht\nfix groep in zigbee2mqtt",
-        "fr": "Adaptateur nécessite admin >= 7.7.22 maintenant\ncorrection du redémarrage de l'instanz\ncorrection du message cronParserLib.parseExpression\nfixer le groupe dans zigbee2mqtt",
-        "it": "Adattatore richiede admin >= 7.7.22 ora\nfix instanz riavvio\ncorrezione cronParserLib.parseExpression messaggio\ngruppo di correzione in zigbee2mqt",
-        "es": "El adaptador requiere administrador= 7.7.22 ahora\nfijación instanz restart\nfijar cronParserLib.parse\ngrupo de fijación en zigbee2mqt",
-        "pl": "Adapter wymaga admin > = 7.7.22\nfix instanz restart\nnaprawić wiadomość cronParserLib.parseExpression\nfix group in zigbee2mqtt",
-        "uk": "Адаптер вимагає адмін >= 7.7.22 тепер\nвиправити instanz перезавантаження\nвиправлено cronParserLib.parseExpression повідомлення\nфіксувати групу в zigbee2mqtt",
-        "zh-cn": "适任者需要管理员 \\ 7.7.22 现在\n修复即时状态重新启动\n修补 cronParserLib.parsepression 信件\n以zigbee2mqtt为单位的固定组"
+        "en": "fix",
+        "de": "fix",
+        "ru": "fix",
+        "pt": "fix",
+        "nl": "fix",
+        "fr": "fix",
+        "it": "fix",
+        "es": "fix",
+        "pl": "fix",
+        "uk": "fix",
+        "zh-cn": "fix"
       },
       "2.15.5": {
         "en": "fix admin",

package/lib/crud.js

@@ -1204,18 +1204,28 @@ async function createData(adaptr, i) {
 							deviceBatteryState = await tools.getInitValue(adaptr, deviceBatteryStateDP);
 						}
 						break;
-					case 'hueExt':
-					case 'mihomeVacuum':
-					case 'mqttNuki':
-					case 'loqedSmartLock':
-						deviceBatteryStateDP = shortCurrDeviceString + adaptr.selAdapter[i].battery;
+				case 'hueExt':
+					// hue-extended: battery is at currDeviceString level (e.g. hue-extended.0.lights.1.config.battery)
+					// NOT shortCurrDeviceString (which is the lights/sensors folder, e.g. hue-extended.0.lights)
+					deviceBatteryStateDP = currDeviceString + adaptr.selAdapter[i].battery;
+					deviceBatteryState = await tools.getInitValue(adaptr, deviceBatteryStateDP);
+
+					if (deviceBatteryState === undefined) {
+						deviceBatteryStateDP = currDeviceString + adaptr.selAdapter[i].battery2;
 						deviceBatteryState = await tools.getInitValue(adaptr, deviceBatteryStateDP);
-
-						if (deviceBatteryState === undefined) {
-							deviceBatteryStateDP = shortCurrDeviceString + adaptr.selAdapter[i].battery2;
-							deviceBatteryState = await tools.getInitValue(adaptr, deviceBatteryStateDP);
-						}
-						break;
+					}
+					break;
+				case 'mihomeVacuum':
+				case 'mqttNuki':
+				case 'loqedSmartLock':
+					deviceBatteryStateDP = shortCurrDeviceString + adaptr.selAdapter[i].battery;
+					deviceBatteryState = await tools.getInitValue(adaptr, deviceBatteryStateDP);
+
+					if (deviceBatteryState === undefined) {
+						deviceBatteryStateDP = shortCurrDeviceString + adaptr.selAdapter[i].battery2;
+						deviceBatteryState = await tools.getInitValue(adaptr, deviceBatteryStateDP);
+					}
+					break;
 					case 'homee': // only battery devices, structure problem like homee.0.*.BatteryLevel-964
 						const devicePrefix = `${currDeviceString}.BatteryLevel-`;
 						const listeDP = await adaptr.getObjectViewAsync('system', 'state', {

package/main.js

@@ -86,6 +86,9 @@ class DeviceWatcher extends utils.Adapter {
 		// Check if main function is running
 		this.mainRunning = false;
 
+		// Pending rescan flag (set if a new device was detected while main() was running)
+		this.pendingRescan = false;
+
 		this.on('ready', this.onReady.bind(this));
 		this.on('stateChange', this.onStateChange.bind(this));
 		this.on('objectChange', this.onObjectChange.bind(this));
@@ -280,6 +283,13 @@ class DeviceWatcher extends utils.Adapter {
 		}
 		this.mainRunning = false;
 		this.log.debug(`Function finished: ${this.main.name}`);
+
+		// If a new device was detected while main() was running, trigger a rescan now
+		if (this.pendingRescan) {
+			this.pendingRescan = false;
+			this.log.info(`[main] Pending rescan detected – restarting main() for new device`);
+			await this.main();
+		}
 	} //<--End of main function
 
 	// If you need to react to object changes, uncomment the following block and the corresponding line in the constructor.
@@ -302,10 +312,23 @@ class DeviceWatcher extends utils.Adapter {
 						if (!this.mainRunning) {
 							await this.main();
 						} else {
-							return;
+							this.pendingRescan = true;
 						}
 					} else {
-						return;
+						// Check if the changed object belongs to a monitored adapter (new device)
+						const belongsToMonitoredAdapter = this.adapterSelected.some((adapterKey) =>
+							id.toLowerCase().startsWith(`${adapterKey.toLowerCase()  }.`)
+						);
+
+						if (belongsToMonitoredAdapter) {
+							if (!this.mainRunning) {
+								this.log.info(`[onObjectChange] New device detected: ${id} – triggering rescan`);
+								await this.main();
+							} else {
+								this.log.debug(`[onObjectChange] main() is running – rescan for ${id} queued`);
+								this.pendingRescan = true;
+							}
+						}
 					}
 				}
 			} catch (error) {
@@ -366,6 +389,21 @@ class DeviceWatcher extends utils.Adapter {
 				=============================================*/
 				if (Array.from(this.listAllDevicesRaw.values()).some((obj) => Object.values(obj).includes(id))) {
 					await this.renewDeviceData(id, state);
+
+					// Update lists and datapoints immediately after device data change
+					await crud.createLists(this);
+					await crud.writeDatapoints(this);
+
+					// Also update per-adapter folder if configured
+					if (this.configCreateOwnFolder) {
+						for (const [adId] of Object.entries(adapterArray)) {
+							const adapter = adapterArray[adId];
+							if (this.adapterSelected.includes(adapter.adapterKey)) {
+								await crud.createLists(this, adId);
+								await crud.writeDatapoints(this, adId);
+							}
+						}
+					}
 				}
 			} catch (error) {
 				this.log.error(`Issue at state change: ${id}`);
@@ -1085,76 +1123,113 @@ class DeviceWatcher extends utils.Adapter {
 	async theLists(device) {
 		// Raw List with all devices for user
 		if (device.Status !== 'disabled') {
-			this.listAllDevicesUserRaw.push({
-				Device: device.Device,
-				Adapter: device.Adapter,
-				Instance: device.instance,
-				'Instance connected': device.instanceDeviceConnected,
-				isBatteryDevice: device.isBatteryDevice,
-				Battery: device.Battery,
-				BatteryRaw: device.BatteryRaw,
-				BatteryUnitRaw: device.BatteryUnitRaw,
-				isLowBat: device.LowBat,
-				'Signal strength': device.SignalStrength,
-				'Signal strength Raw': device.SignalStrengthRaw,
-				'Last contact': device.LastContact,
-				'Update Available': device.Upgradable,
-				Status: device.Status,
-			});
+			// Deduplication: some adapters (e.g. hmrpc with multiple channels, hue-extended with
+			// devices appearing under both lights and sensors) create multiple Map entries for the
+			// same physical device. Use Path as unique key to prevent duplicate list entries.
+			const lang = this.config.userSelectedLanguage;
+			const alreadyInUserRaw = this.listAllDevicesUserRaw.some((d) => d.Device === device.Device && d.Adapter === device.Adapter);
+			if (!alreadyInUserRaw) {
+				this.listAllDevicesUserRaw.push({
+					Device: device.Device,
+					Adapter: device.Adapter,
+					Instance: device.instance,
+					'Instance connected': device.instanceDeviceConnected,
+					isBatteryDevice: device.isBatteryDevice,
+					Battery: device.Battery,
+					BatteryRaw: device.BatteryRaw,
+					BatteryUnitRaw: device.BatteryUnitRaw,
+					isLowBat: device.LowBat,
+					'Signal strength': device.SignalStrength,
+					'Signal strength Raw': device.SignalStrengthRaw,
+					'Last contact': device.LastContact,
+					'Update Available': device.Upgradable,
+					Status: device.Status,
+				});
+			}
 
 			// List with all devices
-			this.listAllDevices.push({
-				[translations.Device[this.config.userSelectedLanguage]]: device.Device,
-				[translations.Adapter[this.config.userSelectedLanguage]]: device.Adapter,
-				[translations.Battery[this.config.userSelectedLanguage]]: device.Battery,
-				[translations.Signal_strength[this.config.userSelectedLanguage]]: device.SignalStrength,
-				[translations.Last_Contact[this.config.userSelectedLanguage]]: device.LastContact,
-				[translations.Status[this.config.userSelectedLanguage]]: device.Status,
-			});
+			const alreadyInAll = this.listAllDevices.some(
+				(d) => d[translations.Device[lang]] === device.Device && d[translations.Adapter[lang]] === device.Adapter,
+			);
+			if (!alreadyInAll) {
+				this.listAllDevices.push({
+					[translations.Device[lang]]: device.Device,
+					[translations.Adapter[lang]]: device.Adapter,
+					[translations.Battery[lang]]: device.Battery,
+					[translations.Signal_strength[lang]]: device.SignalStrength,
+					[translations.Last_Contact[lang]]: device.LastContact,
+					[translations.Status[lang]]: device.Status,
+				});
+			}
 
 			// LinkQuality lists
 			if (device.SignalStrength !== ' - ') {
-				this.linkQualityDevices.push({
-					[translations.Device[this.config.userSelectedLanguage]]: device.Device,
-					[translations.Adapter[this.config.userSelectedLanguage]]: device.Adapter,
-					[translations.Signal_strength[this.config.userSelectedLanguage]]: device.SignalStrength,
-				});
+				const alreadyInLQ = this.linkQualityDevices.some(
+					(d) => d[translations.Device[lang]] === device.Device && d[translations.Adapter[lang]] === device.Adapter,
+				);
+				if (!alreadyInLQ) {
+					this.linkQualityDevices.push({
+						[translations.Device[lang]]: device.Device,
+						[translations.Adapter[lang]]: device.Adapter,
+						[translations.Signal_strength[lang]]: device.SignalStrength,
+					});
+				}
 			}
 
 			// Battery lists
 			if (device.isBatteryDevice) {
-				this.batteryPowered.push({
-					[translations.Device[this.config.userSelectedLanguage]]: device.Device,
-					[translations.Adapter[this.config.userSelectedLanguage]]: device.Adapter,
-					[translations.Battery[this.config.userSelectedLanguage]]: device.Battery,
-					[translations.Status[this.config.userSelectedLanguage]]: device.Status,
-				});
+				const alreadyInBat = this.batteryPowered.some(
+					(d) => d[translations.Device[lang]] === device.Device && d[translations.Adapter[lang]] === device.Adapter,
+				);
+				if (!alreadyInBat) {
+					this.batteryPowered.push({
+						[translations.Device[lang]]: device.Device,
+						[translations.Adapter[lang]]: device.Adapter,
+						[translations.Battery[lang]]: device.Battery,
+						[translations.Status[lang]]: device.Status,
+					});
+				}
 			}
 
 			// Low Bat lists
 			if (device.LowBat && device.Status !== 'Offline') {
-				this.batteryLowPowered.push({
-					[translations.Device[this.config.userSelectedLanguage]]: device.Device,
-					[translations.Adapter[this.config.userSelectedLanguage]]: device.Adapter,
-					[translations.Battery[this.config.userSelectedLanguage]]: device.Battery,
-				});
+				const alreadyInLowBat = this.batteryLowPowered.some(
+					(d) => d[translations.Device[lang]] === device.Device && d[translations.Adapter[lang]] === device.Adapter,
+				);
+				if (!alreadyInLowBat) {
+					this.batteryLowPowered.push({
+						[translations.Device[lang]]: device.Device,
+						[translations.Adapter[lang]]: device.Adapter,
+						[translations.Battery[lang]]: device.Battery,
+					});
+				}
 			}
 
 			// Offline List
 			if (device.Status === 'Offline') {
-				this.offlineDevices.push({
-					[translations.Device[this.config.userSelectedLanguage]]: device.Device,
-					[translations.Adapter[this.config.userSelectedLanguage]]: device.Adapter,
-					[translations.Last_Contact[this.config.userSelectedLanguage]]: device.LastContact,
-				});
+				const alreadyOffline = this.offlineDevices.some(
+					(d) => d[translations.Device[lang]] === device.Device && d[translations.Adapter[lang]] === device.Adapter,
+				);
+				if (!alreadyOffline) {
+					this.offlineDevices.push({
+						[translations.Device[lang]]: device.Device,
+						[translations.Adapter[lang]]: device.Adapter,
+						[translations.Last_Contact[lang]]: device.LastContact,
+					});
+				}
 			}
 
 			// Device update List
 			if (device.Upgradable === true || device.Upgradable === 1) {
-				this.upgradableList.push({
-					[translations.Device[this.config.userSelectedLanguage]]: device.Device,
-					[translations.Adapter[this.config.userSelectedLanguage]]: device.Adapter,
-				});
+				const alreadyUpgradable = this.upgradableList.some(
+					(d) => d[translations.Device[lang]] === device.Device && d[translations.Adapter[lang]] === device.Adapter,
+				);
+				if (!alreadyUpgradable) {
+					this.upgradableList.push({
+						[translations.Device[lang]]: device.Device,
+						[translations.Adapter[lang]]: device.Adapter,
+					});
+				}
 			}
 		}
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.device-watcher",
-  "version": "2.15.11",
+  "version": "2.15.13",
   "description": "Watchdog for devices",
   "author": "Christian Behrends <mail@christian-behrends.de>",
   "contributors": [
@@ -38,9 +38,9 @@
     "@iobroker/adapter-dev": "^1.5.0",
     "@iobroker/eslint-config": "^2.1.0",
     "@iobroker/testing": "^5.2.2",
-    "@types/node": "^24.12.0",
+    "@types/node": "^24.12.2",
     "@types/node-schedule": "^2.1.8",
-    "typescript": "~6.0.2"
+    "typescript": "~6.0.3"
   },
   "main": "main.js",
   "files": [