iobroker.device-watcher 2.15.5 → 2.15.12

package/README.md

@@ -191,21 +191,21 @@ 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.5 (2026-01-12)
-* (arteck) fix admin
+### 2.15.12 (2026-05-06)
+* (arteck) fix hueExtended battery check
 
-### 2.15.4 (2026-01-11)
-* (arteck) define subscribe rules new
+### 2.15.11 (2026-05-06)
+* (arteck)
 
-### 2.15.3 (2026-01-10)
-* (arteck) fix ping adapter, fritzdec
+### 2.15.10 (2026-05-06)
+- (copilot) Adapter requires node.js >= 22 now
+* (arteck) fix adapter crash after delete a device
 
-### 2.15.2 (2026-01-10)
-* (arteck) fix cronjob response
+### 2.15.9 (2026-04-22)
+* (arteck) new xsense (v. 0.4.0) structure, plz update before
 
-### 2.15.1 (2026-01-10)
-* (arteck) fix instance check
-* (arteck) fix admin json
+### 2.15.8 (2026-04-18)
+* (arteck) fix cronParserLib.parseExpression message
 
 ## License
 

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "device-watcher",
-    "version": "2.15.5",
+    "version": "2.15.12",
     "news": {
+      "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": "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",
         "de": "admin",
@@ -15,71 +41,6 @@
         "pl": "fix admin",
         "uk": "адмін",
         "zh-cn": "固定管理员"
-      },
-      "2.15.4": {
-        "en": "define subscribe rules new",
-        "de": "anmelderegeln neu definieren",
-        "ru": "новые правила подписки",
-        "pt": "definir regras de subscrição novas",
-        "nl": "nieuwe ondertekenregels definiëren",
-        "fr": "définir des règles de souscription nouvelles",
-        "it": "definire le regole di abbonamento",
-        "es": "definir reglas de suscripción nuevas",
-        "pl": "nowe zasady subskrypcji",
-        "uk": "визначити правила підписки",
-        "zh-cn": "定义订阅规则新"
-      },
-      "2.15.3": {
-        "en": "fix ping adapter, fritzdec",
-        "de": "fixierpistole, fritzdec",
-        "ru": "адаптер для фиксации пингов, fritzdec",
-        "pt": "corrigir adaptador de ping, fritzdec",
-        "nl": "fix ping adapter, fritzdec",
-        "fr": "adaptateur de fixation de ping, fritzdec",
-        "it": "correzione adattatore ping, fritzdec",
-        "es": "adaptador de fijación, fritzdec",
-        "pl": "fix adapter ping, fritzdec",
-        "uk": "фіксатор ping, fritzdec",
-        "zh-cn": "修补 ping 适配器, fritzdec"
-      },
-      "2.15.2": {
-        "en": "fix cronjob response",
-        "de": "fix cronjob antwort",
-        "ru": "реакция cronjob",
-        "pt": "corrigir a resposta do cronjob",
-        "nl": "cronjob respons repareren",
-        "fr": "corriger la réponse cronjob",
-        "it": "correzione di cronjob risposta",
-        "es": "solución respuesta cronjob",
-        "pl": "naprawić odpowiedź cronjob",
-        "uk": "виправити cronjob відповідь",
-        "zh-cn": "固定 curonjob 响应"
-      },
-      "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",
-        "ru": "фиксированный массив устройств\nудаленный zwave2mqtt Адаптер\nдобавить zwavews Адаптер\nЗависимости были обновлены\nдобавить zwave2mqtt Адаптер\nфиксированные все счетные устройства\nисправленный искатель",
-        "pt": "arranjo fixo do dispositivo\napagado zwave2mqtt Adaptador\nzwavews adicionados Adaptador\nAs dependências foram atualizadas\nadicionado zwave2mqtt Adaptador\nfixou todos os dispositivos de contagem\nlocalizador corrigido",
-        "nl": "vaste apparaatarray\nverwijderde zwave2mqtt Adapter\nzwavews toegevoegd Adapter\nAfhankelijkheden zijn bijgewerkt\nzwave2mqtt toegevoegd Adapter\nvaste alle telapparaten\ngecorrigeerde zoeker",
-        "fr": "tableau de périphériques fixes\nsupprimé zwave2mqtt Adaptateur\nzwavews ajoutés Adaptateur\nLes dépendances ont été actualisées\najouté zwave2mqtt Adaptateur\nfixe tous les appareils de comptage\ncorrecteur",
-        "it": "array di dispositivi fissi\ncancellato zwave2mqt Adattatore\naggiunto zwavews Adattatore\nLe dipendenze sono state aggiornate\naggiunto zwave2mqt Adattatore\nfissi tutti i dispositivi di conteggio\ncercatore corretto",
-        "es": "array de dispositivo fijo\nborrado zwave2mqt Adaptador\nañadido zwavews Adaptador\nSe han actualizado las dependencias\nzwave2mqt Adaptador\nfijo todos los dispositivos de cuenta\nbuscador corregido",
-        "pl": "stała tablica urządzeń\nusunięty zwave2mqtt Adapter\ndodane zwavews Adapter\nZaktualizowano zależności\ndodane zwave2mqtt Adapter\nwszystkie urządzenia liczące\npoprawiony wykrywacz",
-        "uk": "фіксований масив пристрою\nвидалено zwave2mqtt Адаптери\nдодано zwavews Адаптери\nЗалежність було оновлено\nдодано zwave2mqtt Адаптери\nфіксовані всі пристрої підрахунку\nвиправлений пошук",
-        "zh-cn": "固定设备阵列\n删除 zwave2mqtt 适配器\n添加z波长 适配器\n依赖关系已更新\n添加 zwave2mqtt 适配器\n固定所有计数设备\n更正的查找者"
       }
     },
     "titleLang": {
@@ -163,7 +124,7 @@
     ],
     "globalDependencies": [
       {
-        "admin": ">=7.6.17"
+        "admin": ">=7.7.22"
       }
     ],
     "messages": [

package/lib/adapterArray.js

@@ -374,15 +374,18 @@ const adapterArray = {
 	},
 	matter: {
 		adapterKey: 'matterDevices',
-		selektor: 'matter.*.online',
+		// Selektor: matter.0.controller.<nodeId>.info.connection (boolean, true = online)
+		selektor: 'matter.*.controller.*.info.connection',
+		timeSelector: '.info.connection',
 		adapterID: 'matter',
-		adapter: 'matter',
+		adapter: 'Matter',
 		rssiState: 'none',
-		battery: '.BATTERY',
-		reach: '.connection',
-		isLowBat: '.LOWBAT',
+		battery: 'none',
+		battery2: 'none',
+		reach: '.info.connection',
+		isLowBat: 'none',
 		id: 'none',
-		upgrade: 'none',
+		upgrade: '.info.updateAvailable',
 	},
 	maxcube: {
 		adapterKey: 'maxcubeDevices',
@@ -738,7 +741,7 @@ const adapterArray = {
 	},
 	xsense: {
 		adapterKey: 'xsenseDevices',
-		selektor: 'xsense.*.online',
+		selektor: 'xsense.*.*.online',
 		timeSelector: '.online',
 		adapterID: 'xsense',
 		adapter: 'XSense',
@@ -773,8 +776,8 @@ const adapterArray = {
 	},
 	zigbee2MQTT: {
 		adapterKey: 'zigbee2mqttDevices',
-		selektor: 'zigbee2mqtt.*.link_quality',
-		timeSelector: '.link_quality',
+		selektor: 'zigbee2mqtt.*.available',
+		timeSelector: '.last_seen',
 		adapterID: 'zigbee2MQTT',
 		adapter: 'Zigbee2MQTT',
 		battery: '.battery',
@@ -794,7 +797,7 @@ const adapterArray = {
 		rssiState: 'none',
 		isLowBat: '.Battery.isLow',
 	},
-  zwavews: {
+    zwavews: {
 		adapterKey: 'zwavewsDevices',
 		selektor: 'zwavews.*.ready',
 		timeSelector: '.status',

package/lib/crud.js

@@ -1071,6 +1071,44 @@ async function createData(adaptr, i) {
 			if (id.endsWith('.')) {
 				continue;
 			}
+
+			// matter: nur matter.<inst>.controller.<nodeId>.info.connection zulassen
+			if (adapterID === 'matter') {
+				const parts = id.split('.');
+				if (parts.length !== 6 || parts[2] !== 'controller' || parts[4] !== 'info' || parts[5] !== 'connection') {
+					continue;
+				}
+			}
+
+			// zigbee2MQTT: Bridge/Coordinator/System-Objekte ausfiltern (kein echter Gerätepfad)
+			if (adapterID === 'zigbee2MQTT') {
+				const parts = id.split('.');
+				// Pfad muss mindestens 4 Teile haben: zigbee2mqtt.0.<device>.<state>
+				if (parts.length < 4) {
+					continue;
+				}
+				// Bridge und System-Objekte ausschließen
+				const deviceSegment = parts[2].toLowerCase();
+				if (deviceSegment === 'bridge' || deviceSegment === 'coordinator' || deviceSegment === 'info' || deviceSegment === 'groups') {
+					continue;
+				}
+				// Zigbee2MQTT Gruppen ausschließen: Gruppen haben native.type === 'group'
+				// Gruppen liegen direkt auf Instanz-Ebene z.B. zigbee2mqtt.0.büro
+				const currDevStr = id.slice(0, id.lastIndexOf('.'));
+				const deviceObj = await adaptr.getForeignObjectAsync(currDevStr);
+				if (deviceObj && deviceObj.native && deviceObj.native.type === 'group') {
+					adaptr.log.debug(`[createData zigbee2MQTT] Skipping group (native.type): ${currDevStr}`);
+					continue;
+				}
+				// Fallback: Gruppen haben weder last_seen noch link_quality → kein echtes Gerät
+				const hasLastSeen = await tools.getInitValue(adaptr, `${currDevStr}.last_seen`);
+				const hasLinkQuality = await tools.getInitValue(adaptr, `${currDevStr}.link_quality`);
+				if (hasLastSeen === undefined && hasLinkQuality === undefined) {
+					adaptr.log.debug(`[createData zigbee2MQTT] Skipping group (no last_seen/link_quality): ${currDevStr}`);
+					continue;
+				}
+			}
+
 			const mainSelector = id;
 
 			/*=============================================
@@ -1166,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', {
@@ -1192,17 +1240,39 @@ async function createData(adaptr, i) {
 						deviceBatteryState = await tools.getInitValue(adaptr, deviceBatteryStateDP);
 						break;
 
+					case 'matter': {
+						// matter: Batterie liegt unter shortCurrDeviceString.PowerSource-N.BATTERY
+						// N ist variabel -> dynamisch per getObjectViewAsync suchen
+						const matterBattPrefix = `${shortCurrDeviceString}.PowerSource-`;
+						const matterBattList = await adaptr.getObjectViewAsync('system', 'state', {
+							startkey: `${matterBattPrefix}`,
+							endkey: `${matterBattPrefix}\u9999`,
+						});
+						// ersten BATTERY-State nehmen
+						const matterBattRow = matterBattList.rows.find((r) => r.id.endsWith('.BATTERY'));
+						if (matterBattRow) {
+							deviceBatteryStateDP = matterBattRow.id;
+							deviceBatteryState = await tools.getInitValue(adaptr, deviceBatteryStateDP);
+						}
+						break;
+					}
+
 					default:
 						deviceBatteryStateDP = currDeviceString + adaptr.selAdapter[i].battery;
-						deviceBatteryState = await tools.getInitValue(adaptr, deviceBatteryStateDP);
-
-						if (deviceBatteryState === undefined) {
-							deviceBatteryStateDP = currDeviceString + adaptr.selAdapter[i].battery2;
+						if (adaptr.selAdapter[i].battery === 'none') {
+							// adapter has no battery percentage DP (e.g. hmiP) – skip lookups
+							deviceBatteryState = undefined;
+						} else {
 							deviceBatteryState = await tools.getInitValue(adaptr, deviceBatteryStateDP);
 
 							if (deviceBatteryState === undefined) {
-								deviceBatteryStateDP = currDeviceString + adaptr.selAdapter[i].battery3;
+								deviceBatteryStateDP = currDeviceString + adaptr.selAdapter[i].battery2;
 								deviceBatteryState = await tools.getInitValue(adaptr, deviceBatteryStateDP);
+
+								if (deviceBatteryState === undefined) {
+									deviceBatteryStateDP = currDeviceString + adaptr.selAdapter[i].battery3;
+									deviceBatteryState = await tools.getInitValue(adaptr, deviceBatteryStateDP);
+								}
 							}
 						}
 						break;
@@ -1221,6 +1291,21 @@ async function createData(adaptr, i) {
 						deviceLowBatState = await tools.getInitValue(adaptr, isLowBatDP);
 					}
 				}
+
+				// matter: LOWBAT dynamisch über PowerSource-N.LOWBAT suchen
+				if (adapterID === 'matter' && deviceLowBatState === undefined) {
+					const matterLowBatPrefix = `${shortCurrDeviceString}.PowerSource-`;
+					const matterLowBatList = await adaptr.getObjectViewAsync('system', 'state', {
+						startkey: matterLowBatPrefix,
+						endkey: `${matterLowBatPrefix}\u9999`,
+					});
+					const matterLowBatRow = matterLowBatList.rows.find((r) => r.id.endsWith('.LOWBAT'));
+					if (matterLowBatRow) {
+						isLowBatDP = matterLowBatRow.id;
+						deviceLowBatState = await tools.getInitValue(adaptr, isLowBatDP);
+					}
+				}
+
 				if (deviceLowBatState === undefined) {
 					isLowBatDP = 'none';
 				}

package/lib/tools.js

@@ -11,7 +11,15 @@ async function isDisabledDevice(adaptr, treeDP) {
 
 	const device = await adaptr.getForeignObject(treeDP);
 
-	if (device.native.deviceRemoved == true || device.common.desc.includes('disabled') || device.common.desc.includes('Deaktiviert') || device.common.desc.includes('disabled')) {
+	if (!device || !device.common) {
+		return isDisabled;
+	}
+
+	const desc = device.common.desc ?? '';
+	const descStr = typeof desc === 'object' ? JSON.stringify(desc) : String(desc);
+	const deviceRemoved = device.native && device.native.deviceRemoved === true;
+
+	if (deviceRemoved || descStr.includes('disabled') || descStr.includes('Deaktiviert')) {
 		isDisabled = true;
 	}
 	return isDisabled;
@@ -114,11 +122,19 @@ async function countDevices(adaptr) {
  */
 async function checkLastContact(adaptr) {
 	for (const [deviceID, deviceData] of adaptr.listAllDevicesRaw.entries()) {
-		if (deviceData.instanceDeviceConnected !== false && deviceData.instanceDeviceConnected != undefined) {
-			deviceData.UnreachState = await this.getInitValue(adaptr, deviceData.UnreachDP);
+		if (deviceData.instanceDeviceConnected !== false && deviceData.instanceDeviceConnected !== undefined) {
+			deviceData.UnreachState = await getInitValue(adaptr, deviceData.UnreachDP);
 
 			const gefundenerAdapter = Object.values(adapterArray).find((adapter) => adapter.adapterID === deviceData.adapterID);
+			if (!gefundenerAdapter) {
+				adaptr.log.warn(`[checkLastContact] - adapter not found for adapterID: ${deviceData.adapterID}, skipping device ${deviceID}`);
+				continue;
+			}
 			const silentEnabled = Object.values(adaptr.config.tableDevices).find((adapter) => adapter.adapterKey === gefundenerAdapter.adapterKey);
+			if (!silentEnabled) {
+				adaptr.log.warn(`[checkLastContact] - device config not found for adapterKey: ${gefundenerAdapter.adapterKey}, skipping device ${deviceID}`);
+				continue;
+			}
 
 			const oldContactState = deviceData.Status;
 
@@ -138,7 +154,7 @@ async function checkLastContact(adaptr) {
 			}
 			if (adaptr.config.checkSendOfflineMsg && oldContactState !== deviceData.Status && !adaptr.blacklistNotify.includes(deviceData.Path)) {
 				// check if the generally deviceData connected state is for a while true
-				if (await this.getTimestampConnectionDP(adaptr, deviceData.instanceDeviceConnectionDP, 50000)) {
+				if (await getTimestampConnectionDP(adaptr, deviceData.instanceDeviceConnectionDP, 50000)) {
 					await adaptr.sendStateNotifications('Devices', 'onlineStateDevice', deviceID, silentEnabled.telegramSilent);
 				}
 			}

package/lib/translations.js

@@ -582,7 +582,7 @@ const translations = {
 		'zh-cn': '链接质量设备',
 	},
 	low: {
-		en: 'low',
+		en: 'Low',
 		de: 'Niedrige',
 		ru: 'низкая',
 		pt: 'baixa',

package/main.js

@@ -118,7 +118,7 @@ class DeviceWatcher extends utils.Adapter {
 			// create list with enabled adapters for monitor devices
 			for (const device of Object.values(this.config.tableDevices)) {
 				if (device.enabled) {
-					for (const [adapterName, adapter] of Object.entries(adapterArray)) {
+					for (const [_adapterName, adapter] of Object.entries(adapterArray)) {
 						if (String(adapter.adapterKey).toLowerCase() === String(device.adapterKey).toLowerCase()) {
 							this.selAdapter.push(adapter);
 							this.adapterSelected.push(adapter.adapterKey);
@@ -325,6 +325,14 @@ class DeviceWatcher extends utils.Adapter {
 				if (this.listAllDevicesRaw.has(id)) {
 					this.listAllDevicesRaw.delete(id);
 				}
+				// also remove all child devices if a parent/adapter object was deleted
+				const idPrefix = `${id  }.`;
+				for (const key of this.listAllDevicesRaw.keys()) {
+					if (key.startsWith(idPrefix)) {
+						this.log.debug(`[onObjectChange] removing child device from map: ${key}`);
+						this.listAllDevicesRaw.delete(key);
+					}
+				}
 
 				//unsubscribe of Objects and states
 				this.unsubscribeForeignObjects(id);
@@ -450,6 +458,9 @@ class DeviceWatcher extends utils.Adapter {
 					}
 				}
 				break;
+			default:
+				this.log.warn(`[onMessage] Unknown command: ${obj.command}`);
+				break;
 		}
 	}
 
@@ -531,6 +542,7 @@ class DeviceWatcher extends utils.Adapter {
 				// Get ID with short currDeviceString from objectjson
 				case 'hueExt':
 				case 'hmrpc':
+				case 'matter':
 				case 'nukiExt':
 				case 'wled':
 				case 'mqttNuki':
@@ -740,10 +752,16 @@ class DeviceWatcher extends utils.Adapter {
 			default:
 				if (deviceBatteryState === undefined) {
 					if (deviceLowBatState !== undefined) {
-						if (deviceLowBatState !== true && deviceLowBatState !== 'NORMAL' && deviceLowBatState !== 1) {
+						// Explicit OK states: false, 'NORMAL', 0 (some adapters use 0=ok)
+						if (
+							deviceLowBatState === false ||
+							deviceLowBatState === 'NORMAL' ||
+							deviceLowBatState === 0
+						) {
 							batteryHealth = 'ok';
 							isBatteryDevice = true;
-						} else if (deviceLowBatState !== true) {
+						} else {
+							// true, 1, any other string != 'NORMAL' → low
 							batteryHealth = 'low';
 							isBatteryDevice = true;
 						}
@@ -790,11 +808,14 @@ class DeviceWatcher extends utils.Adapter {
 					}
 					break;
 				default:
-					if (typeof deviceLowBatState === 'number' && deviceLowBatState === 0) {
+					if (typeof deviceLowBatState === 'boolean' && deviceLowBatState === true) {
+						// true = low bat
 						lowBatIndicator = true;
 					} else if (typeof deviceLowBatState === 'string' && deviceLowBatState !== 'NORMAL') {
+						// any string other than 'NORMAL' = low bat
 						lowBatIndicator = true;
-					} else if (typeof deviceLowBatState === 'boolean' && deviceLowBatState) {
+					} else if (typeof deviceLowBatState === 'number' && deviceLowBatState === 1) {
+						// 1 = low bat (0 = ok), consistent with getBatteryData
 						lowBatIndicator = true;
 					}
 			}
@@ -813,20 +834,16 @@ class DeviceWatcher extends utils.Adapter {
 	 * @param {object} selector - Selector
 	 */
 	async getLastContact(selector) {
-		const lastContact = tools.getTimestamp(selector); // z. B. Differenz in Sekunden?
-
-		let lastContactString = `${this.formatDate(new Date(selector), 'hh:mm:ss')}`;
+		const lastContact = tools.getTimestamp(selector);
 
-		// Falls du die vergangene Zeit in Sekunden anzeigen willst:
-		if (Math.round(lastContact) >= 0) {
-			lastContactString = `${Math.round(lastContact)} ${translations.secs[this.config.userSelectedLanguage]}`;
-		}
+		let lastContactString;
 
-		// Optional: Wenn du ab einem bestimmten Wert lieber Minuten oder Stunden willst
 		if (lastContact >= 3600) {
 			lastContactString = `${(lastContact / 3600).toFixed(1)} ${translations.hours[this.config.userSelectedLanguage]}`;
-		} else {
+		} else if (lastContact >= 60) {
 			lastContactString = `${Math.round(lastContact / 60)} ${translations.minits[this.config.userSelectedLanguage]}`;
+		} else {
+			lastContactString = `${Math.round(lastContact)} ${translations.secs[this.config.userSelectedLanguage]}`;
 		}
 
 		return lastContactString;
@@ -842,7 +859,7 @@ class DeviceWatcher extends utils.Adapter {
 			const deviceTimeSelector = await this.getForeignStateAsync(timeSelector);
 			const deviceUnreachSelector = await this.getForeignStateAsync(treeDP);
 
-			const lastDeviceUnreachStateChange = deviceUnreachSelector != undefined ? tools.getTimestamp(deviceUnreachSelector.lc) : tools.getTimestamp(timeSelector.ts);
+			const lastDeviceUnreachStateChange = deviceUnreachSelector?.lc != null ? tools.getTimestamp(deviceUnreachSelector.lc) : tools.getTimestamp(deviceTimeSelector?.ts ?? Date.now());
 
 			// ignore disabled device from zigbee2MQTT
 			if (adapterID === 'zigbee2MQTT') {
@@ -875,7 +892,15 @@ class DeviceWatcher extends utils.Adapter {
 			}
 
 			const gefundenerAdapter = Object.values(adapterArray).find((adapter) => adapter.adapterID === adapterID);
+			if (!gefundenerAdapter) {
+				this.log.warn(`[getOnlineState] - adapter not found in adapterArray for adapterID: ${adapterID}`);
+				return [lastContactString ?? ' - ', deviceState, linkQualitySet];
+			}
 			const device = Object.values(this.config.tableDevices).find((adapter) => adapter.adapterKey === gefundenerAdapter.adapterKey);
+			if (!device) {
+				this.log.warn(`[getOnlineState] - device config not found for adapterKey: ${gefundenerAdapter.adapterKey}`);
+				return [lastContactString ?? ' - ', deviceState, linkQualitySet];
+			}
 			const maxSecondDevicesOffline = device.maxSecondDevicesOffline;
 
 			switch (adapterID) {
@@ -931,6 +956,7 @@ class DeviceWatcher extends utils.Adapter {
 				case 'apcups':
 				case 'hue':
 				case 'hueExt':
+				case 'matter':
 				case 'ping':
 				case 'deconz':
 				case 'shelly':
@@ -1059,76 +1085,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,
-				});
+			if (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,
+					});
+				}
 			}
 		}
 	}
@@ -1138,7 +1201,6 @@ class DeviceWatcher extends utils.Adapter {
 	 * @param {ioBroker.State} state
 	 */
 	async renewDeviceData(id, state) {
-		const regex = /^([^.]+\.\d+\.[^.]+)/;
 		let batteryData;
 		let signalData;
 		let oldLowBatState;
@@ -1153,7 +1215,15 @@ class DeviceWatcher extends utils.Adapter {
 
 		if (deviceData) {
 			const gefundenerAdapter = Object.values(adapterArray).find((adapter) => adapter.adapterID === deviceData.adapterID);
+			if (!gefundenerAdapter) {
+				this.log.warn(`[renewDeviceData] - adapter not found for adapterID: ${deviceData.adapterID}`);
+				return;
+			}
 			const silentEnabled = Object.values(this.config.tableDevices).find((adapter) => adapter.adapterKey === gefundenerAdapter.adapterKey);
+			if (!silentEnabled) {
+				this.log.warn(`[renewDeviceData] - device config not found for adapterKey: ${gefundenerAdapter.adapterKey}`);
+				return;
+			}
 
 			// On statechange update available datapoint
 			switch (id) {
@@ -1188,7 +1258,8 @@ class DeviceWatcher extends utils.Adapter {
 					if (deviceData.isBatteryDevice) {
 						oldLowBatState = deviceData.LowBat;
 						if (state.val === 0 && deviceData.BatteryRaw >= 5) {
-							return;
+							// Glitch-Filter: ignore single 0-value if battery was above 5 before
+							break;
 						}
 						batteryData = await this.getBatteryData(state.val, oldLowBatState, deviceData.faultReport, deviceData.adapterID);
 
@@ -1264,7 +1335,7 @@ class DeviceWatcher extends utils.Adapter {
 								deviceData.rssiPeerSelectorHMRPC,
 							);
 
-							if (contactData !== undefined || contactData !== null) {
+							if (contactData !== undefined && contactData !== null) {
 								deviceData.LastContact = contactData[0];
 								deviceData.Status = contactData[1];
 								deviceData.SignalStrength = contactData[2];
@@ -1323,7 +1394,7 @@ class DeviceWatcher extends utils.Adapter {
 				const devicesState = await this.getForeignStateAsync(instanceConnectedDeviceDP);
 
 				let instanceConnectedDeviceVal;
-				if (instanceConnectedDeviceDP !== undefined && devicesState !== null && typeof devicesState.val === 'boolean') {
+				if (devicesState !== null && typeof devicesState.val === 'boolean') {
 					instanceConnectedDeviceVal = await tools.getInitValue(this, instanceConnectedDeviceDP);
 				} else {
 					instanceConnectedDeviceVal = 'N/A';
@@ -1549,13 +1620,19 @@ class DeviceWatcher extends utils.Adapter {
 						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]);
-						}
+						// nach allen Retries: Status übernehmen (egal ob erholt oder weiterhin fehlerhaft)
+						isAlive = Boolean(daemonIsAliveAfterSecondDelay[0]);
+						isHealthy = Boolean(daemonIsAliveAfterSecondDelay[1]);
+						instanceStatusString = String(daemonIsAliveAfterSecondDelay[2]);
+						connectedToHost = Boolean(daemonIsAliveAfterSecondDelay[3]);
+						connectedToDevice = Boolean(daemonIsAliveAfterSecondDelay[4]);
+					} else {
+						// nach erstem Retry wieder gesund
+						isAlive = Boolean(daemonIsAliveAfterDelay[0]);
+						isHealthy = Boolean(daemonIsAliveAfterDelay[1]);
+						instanceStatusString = String(daemonIsAliveAfterDelay[2]);
+						connectedToHost = Boolean(daemonIsAliveAfterDelay[3]);
+						connectedToDevice = Boolean(daemonIsAliveAfterDelay[4]);
 					}
 				} else {
 					daemonIsNotAlive = await this.checkDaemonIsAlive(instanceID, instanceDeactivationTime);
@@ -1580,14 +1657,17 @@ class DeviceWatcher extends utils.Adapter {
 	async getAdapterUpdateData(adapterUpdateListDP) {
 		// Clear the existing adapter updates data
 		let adapterUpdatesJsonRaw = [];
-		let adapterJsonList;
+		let adapterJsonList = {};
 
 		// Fetch the adapter updates list
 		const adapterUpdatesListVal = await this.getForeignStatesAsync(adapterUpdateListDP);
 
-		// Extract adapter data from the list
-		for (const [id, value] of Object.entries(adapterUpdatesListVal)) {
-			adapterJsonList = tools.parseData(value.val);
+		// Extract adapter data from the list - merge all admin instances
+		for (const [_id, value] of Object.entries(adapterUpdatesListVal)) {
+			const parsed = tools.parseData(value.val);
+			if (parsed && typeof parsed === 'object') {
+				Object.assign(adapterJsonList, parsed);
+			}
 		}
 
 		// Populate the adapter updates data
@@ -1817,8 +1897,24 @@ class DeviceWatcher extends utils.Adapter {
 						// send message when instance was deactivated
 						if (this.config.checkSendInstanceDeactivatedMsg && !instanceData.isAlive) {
 							if (this.blacklistInstancesNotify.includes(instanceID)) {
-								return;
+								break;
+							}
+							// Restart-Erkennung: Toleranzzeit abwarten und prüfen ob Instanz schon wieder läuft
+							const restartTolerance = this.userTimeInstancesList.has(instanceID)
+								? this.userTimeInstancesList.get(instanceID).deactivationTime * 1000
+								: this.config.offlineTimeInstances * 1000;
+
+							this.log.debug(`[renewInstanceData] Instance ${instanceID} went offline - waiting ${restartTolerance}ms to check for restart...`);
+							await this.delay(restartTolerance);
+
+							const aliveAfterWait = await tools.getInitValue(this, `system.adapter.${instanceID}.alive`);
+							if (aliveAfterWait) {
+								// Instanz ist bereits wieder online → war nur ein Neustart
+								this.log.debug(`[renewInstanceData] Instance ${instanceID} is back online after restart. No deactivation notification sent.`);
+								await checkInstance(instanceID, instanceData);
+								break;
 							}
+
 							await this.sendStateNotifications('Instances', 'deactivatedInstance', instanceID);
 						}
 					}
@@ -2291,18 +2387,24 @@ class DeviceWatcher extends utils.Adapter {
 		}
 	}
 	async getPreviousCronRun(lastCronRun) {
-	  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;
-	  }
+		try {
+			let interval;
+			// cron-parser v4: parseExpression() – v5: CronExpressionParser.parse()
+			if (typeof cronParserLib.parseExpression === 'function') {
+				interval = cronParserLib.parseExpression(lastCronRun);
+			} else if (cronParserLib.CronExpressionParser && typeof cronParserLib.CronExpressionParser.parse === 'function') {
+				interval = cronParserLib.CronExpressionParser.parse(lastCronRun);
+			} else {
+				throw new Error('cron-parser: no compatible API found (parseExpression / CronExpressionParser.parse)');
+			}
+			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;
+		}
 	}
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.device-watcher",
-  "version": "2.15.5",
+  "version": "2.15.12",
   "description": "Watchdog for devices",
   "author": "Christian Behrends <mail@christian-behrends.de>",
   "contributors": [
@@ -23,26 +23,24 @@
     "url": "https://github.com/iobroker-community-adapters/ioBroker.device-watcher"
   },
   "engines": {
-    "node": ">=20"
+    "node": ">=22"
   },
   "dependencies": {
     "@iobroker/adapter-core": "^3.3.2",
     "node-schedule": "^2.1.1",
-    "cron-parser": "^4.9.0"
+    "cron-parser": "^5.5.0"
   },
   "devDependencies": {
-    "@alcalzone/release-script": "^5.0.0",
-    "@alcalzone/release-script-plugin-iobroker": "^4.0.0",
-    "@alcalzone/release-script-plugin-license": "^4.0.0",
-    "@alcalzone/release-script-plugin-manual-review": "^4.0.0",
+    "@alcalzone/release-script": "^5.1.1",
+    "@alcalzone/release-script-plugin-iobroker": "^5.1.2",
+    "@alcalzone/release-script-plugin-license": "^5.1.1",
+    "@alcalzone/release-script-plugin-manual-review": "^5.1.1",
     "@iobroker/adapter-dev": "^1.5.0",
     "@iobroker/eslint-config": "^2.1.0",
     "@iobroker/testing": "^5.2.2",
-    "@types/node": "^24.10.4",
+    "@types/node": "^24.12.2",
     "@types/node-schedule": "^2.1.8",
-    "@typescript-eslint/eslint-plugin": "^8.52.0",
-    "@typescript-eslint/parser": "^8.48.1",
-    "typescript": "~5.9.3"
+    "typescript": "~6.0.3"
   },
   "main": "main.js",
   "files": [