node-red-contrib-knx-ultimate 6.0.10 → 6.0.12

package/nodes/locales/en/knxUltimateMatterControllerDevice.html

@@ -1,6 +1,4 @@
 <script type="text/markdown" data-help-name="knxUltimateMatterControllerDevice">
-# Control Matter from KNX (BETA)
-
 > This node is in **BETA**: behaviour can change while the Matter implementation is refined.
 
 This node controls a commissioned Matter endpoint from KNX. Select the Matter device and the editor detects its capabilities, then shows only the KNX mappings that make sense for that endpoint.
@@ -23,6 +21,16 @@ It replaces the unpublished per-device Matter controller nodes and keeps the ful
 | Update local state from KNX write | Updates the local Matter/KNX cache when a telegram is written on a configured KNX GA. |
 | Node Input/Output PINs | Shows Node-RED input/output pins. Input accepts boolean payloads and Matter-style `msg.payload` or `msg.on.on`; output emits state updates. The selection is preserved when the editor is reopened. |
 
+## Universal Mode
+
+Select **Universal Mode** in the **Mode** selector to receive every attribute report, cluster event and device initialization from this Matter controller. It always has one input and one output and does not use endpoint mappings. A KNX gateway is optional and is used only by the Battery Monitor alarm/text GAs.
+
+The **Universal Battery Monitor** scans all endpoints for Power Source, emits an initial snapshot, and caches complete normalized battery state. The optional KNX GAs publish an aggregate alarm as DPT 1.005 and cycle low-battery device names every 2 seconds as DPT 16.001. Send `{payload:{action:"getAllBatteries"}}` to retrieve the cached inventory.
+
+Outputs carry the raw value in `msg.payload` and routing details in `msg.matter` (`source`, `nodeId`, `endpointId`, `clusterId`, attribute/event name). Inputs use `msg.nodeId`, `msg.endpointId`, `msg.clusterId` and either `msg.command` with `msg.args`, or `msg.attribute`; add `msg.value` to write, omit it to read. The selectors may also be nested under `msg.matter`.
+
+Examples: `{nodeId:"100",endpointId:1,clusterId:6,command:"on",args:{}}` turns On; `{nodeId:"100",endpointId:1,clusterId:47,attribute:"batPercentRemaining"}` reads battery. Battery reports remain in raw Matter half-percent units; divide by two in a Function node when a percentage is needed.
+
 ## Behaviour
 
 The node keeps a local cache from Matter updates and KNX writes, answers KNX read requests from that cache, and can emit/read values at startup. Only the configured group addresses are listened to, so unrelated KNX traffic is ignored.

package/nodes/locales/en/knxUltimateMatterControllerDevice.json

@@ -92,7 +92,23 @@
     "matter_controller": "Matter controller",
     "matter_device": "Matter device",
     "device_type": "Device type",
-    "matter_section": "Matter device"
+    "matter_section": "Matter device",
+    "controller_mode": "Mode",
+    "single_mode": "Single device",
+    "universal_mode": "Universal Mode (all Matter devices)",
+    "universal_mode_description": "Listen to and control all Matter devices connected to this controller. Universal Mode works without KNX mappings.",
+    "universal_service": "Service",
+    "universal_service_battery_monitor": "Universal Battery Monitor",
+    "universal_service_all_events": "All Matter events",
+    "universal_battery_threshold": "Low battery threshold",
+    "universal_low_battery_ga": "Low battery alarm GA",
+    "universal_low_battery_text_ga": "Low battery device GA",
+    "universal_battery_only_low": "Emit only low batteries",
+    "universal_emit_initial": "Emit initial battery snapshot",
+    "universal_include_raw": "Include raw Matter event",
+    "universal_mode_status": "Universal Matter mode",
+    "universal_mode_locate_disabled": "Locate is unavailable in Universal Mode.",
+    "universal_controller_name": "Matter Universal Controller"
   },
   "common": {
     "ga": "GA",

package/nodes/locales/es/knxUltimateMatterBridge.html

@@ -1,6 +1,4 @@
 <script type="text/markdown" data-help-name="knxUltimateMatterBridge">
-# Expose KNX to Matter (BETA)
-
 > Este nodo está en **BETA**: funciona, pero algunos detalles pueden cambiar entre versiones.
 
 ## Descripción general

package/nodes/locales/es/knxUltimateMatterControllerDevice.html

@@ -1,6 +1,4 @@
 <script type="text/markdown" data-help-name="knxUltimateMatterControllerDevice">
-# Control Matter from KNX (BETA)
-
 > Este nodo está en **BETA**: el comportamiento puede cambiar mientras se mejora la implementación Matter.
 
 Este nodo controla desde KNX un endpoint Matter ya emparejado. Selecciona el dispositivo Matter y el editor detecta sus capacidades, mostrando solo las asignaciones KNX coherentes con ese endpoint.
@@ -23,6 +21,16 @@ Sustituye a los nodos Matter separados no publicados y conserva toda la UI de lu
 | Update local state from KNX write | Actualiza la caché local Matter/KNX cuando se escribe un telegrama en una GA KNX configurada. |
 | Node Input/Output PINs | Muestra pines de entrada/salida Node-RED. La entrada acepta payloads booleanos y mensajes Matter en `msg.payload` o `msg.on.on`; la salida emite estados. La selección se conserva al volver a abrir el editor. |
 
+## Modo universal
+
+Selecciona **Modo universal** para supervisar todos los dispositivos. Siempre tiene una entrada y una salida y no usa mapeos de endpoint. El gateway KNX es opcional y solo se utiliza para las GA de alarma/texto del monitor.
+
+El **Monitor universal de baterías** conserva el estado completo. Las GA KNX opcionales publican la alarma global como DPT 1.005 y alternan cada 2 segundos los dispositivos como DPT 16.001. `{payload:{action:"getAllBatteries"}}` devuelve el inventario.
+
+La salida contiene el valor raw en `msg.payload` y el enrutamiento en `msg.matter` (`source`, `nodeId`, `endpointId`, `clusterId`, nombre de atributo/evento). La entrada usa `msg.nodeId`, `msg.endpointId`, `msg.clusterId` y `msg.command` con `msg.args`, o `msg.attribute`; añade `msg.value` para escribir y omítelo para leer. Los campos también pueden estar bajo `msg.matter`.
+
+Ejemplos: `{nodeId:"100",endpointId:1,clusterId:6,command:"on",args:{}}` enciende; `{nodeId:"100",endpointId:1,clusterId:47,attribute:"batPercentRemaining"}` lee la batería. La batería permanece en unidades Matter raw de medio porcentaje; divídela entre dos en un nodo Function.
+
 ## Comportamiento
 
 El nodo mantiene una caché local con actualizaciones Matter y escrituras KNX, responde lecturas KNX desde esa caché y puede emitir/leer valores al inicio. Solo escucha las direcciones de grupo configuradas, por lo que ignora el tráfico KNX no relacionado.

package/nodes/locales/es/knxUltimateMatterControllerDevice.json

@@ -92,7 +92,23 @@
     "matter_controller": "Controlador Matter",
     "matter_device": "Dispositivo Matter",
     "device_type": "Tipo de dispositivo",
-    "matter_section": "Dispositivo Matter"
+    "matter_section": "Dispositivo Matter",
+    "controller_mode": "Modo",
+    "single_mode": "Dispositivo individual",
+    "universal_mode": "Modo universal (todos los dispositivos Matter)",
+    "universal_mode_description": "Escucha y controla todos los dispositivos Matter conectados a este controlador. El modo universal funciona sin mapeos KNX.",
+    "universal_service": "Servicio",
+    "universal_service_battery_monitor": "Monitor universal de baterías",
+    "universal_service_all_events": "Todos los eventos Matter",
+    "universal_battery_threshold": "Umbral de batería baja",
+    "universal_low_battery_ga": "GA alarma de batería",
+    "universal_low_battery_text_ga": "GA nombre del dispositivo",
+    "universal_battery_only_low": "Emitir solo baterías bajas",
+    "universal_emit_initial": "Emitir instantánea inicial de baterías",
+    "universal_include_raw": "Incluir evento Matter raw",
+    "universal_mode_status": "Modo Matter universal",
+    "universal_mode_locate_disabled": "Localizar no está disponible en el modo universal.",
+    "universal_controller_name": "Controlador Matter universal"
   },
   "common": {
     "ga": "Georgia",

package/nodes/locales/fr/knxUltimateMatterBridge.html

@@ -1,6 +1,4 @@
 <script type="text/markdown" data-help-name="knxUltimateMatterBridge">
-# Expose KNX to Matter (BETA)
-
 > Ce nœud est en **BETA** : il fonctionne, mais des détails peuvent encore changer entre les versions.
 
 ## Vue d'ensemble

package/nodes/locales/fr/knxUltimateMatterControllerDevice.html

@@ -1,6 +1,4 @@
 <script type="text/markdown" data-help-name="knxUltimateMatterControllerDevice">
-# Control Matter from KNX (BETA)
-
 > Ce nœud est en **BETA** : le comportement peut changer pendant l amélioration de l'implémentation Matter.
 
 Ce nœud contrôle depuis KNX un endpoint Matter déjà appairé. Sélectionnez l'appareil Matter et l'éditeur détecte ses capacités, puis affiche uniquement les mappings KNX adaptés à cet endpoint.
@@ -23,6 +21,16 @@ Il remplace les nœuds Matter séparés non publiés et conserve toute l'UI lumi
 | Update local state from KNX write | Met à jour le cache local Matter/KNX lorsqu'un télégramme est écrit sur une GA KNX configurée. |
 | Node Input/Output PINs | Affiche les pins entrée/sortie Node-RED. L'entrée accepte les payloads booléens et les messages Matter dans `msg.payload` ou `msg.on.on`; la sortie émet les états. La sélection est conservée à la réouverture de l'éditeur. |
 
+## Mode universel
+
+Sélectionnez **Mode universel** pour surveiller tous les appareils. Le nœud possède toujours une entrée et une sortie et n'utilise pas les mappings d'un endpoint. La passerelle KNX est optionnelle et sert uniquement aux GA alarme/texte du moniteur.
+
+Le **Moniteur universel de batteries** conserve l'état complet. Les GA KNX optionnelles publient l'alarme globale en DPT 1.005 et font défiler les appareils toutes les 2 secondes en DPT 16.001. `{payload:{action:"getAllBatteries"}}` renvoie l'inventaire.
+
+La sortie place la valeur brute dans `msg.payload` et le routage dans `msg.matter` (`source`, `nodeId`, `endpointId`, `clusterId`, nom d'attribut/événement). L'entrée utilise `msg.nodeId`, `msg.endpointId`, `msg.clusterId` et soit `msg.command` avec `msg.args`, soit `msg.attribute`; ajoutez `msg.value` pour écrire, omettez-le pour lire. Ces champs peuvent aussi être placés sous `msg.matter`.
+
+Exemples : `{nodeId:"100",endpointId:1,clusterId:6,command:"on",args:{}}` allume ; `{nodeId:"100",endpointId:1,clusterId:47,attribute:"batPercentRemaining"}` lit la batterie. La batterie reste dans l'unité Matter brute par demi-pourcent ; divisez par deux dans un nœud Function.
+
 ## Comportement
 
 Le nœud garde un cache local depuis les mises à jour Matter et les écritures KNX, répond aux lectures KNX depuis ce cache et peut émettre/lire les valeurs au démarrage. Il n'écoute que les adresses de groupe configurées, donc le trafic KNX non lié est ignoré.

package/nodes/locales/fr/knxUltimateMatterControllerDevice.json

@@ -84,7 +84,23 @@
     "matter_controller": "Contrôleur Matter",
     "matter_device": "Appareil Matter",
     "device_type": "Type d'appareil",
-    "matter_section": "Appareil Matter"
+    "matter_section": "Appareil Matter",
+    "controller_mode": "Mode",
+    "single_mode": "Appareil unique",
+    "universal_mode": "Mode universel (tous les appareils Matter)",
+    "universal_mode_description": "Écoute et contrôle tous les appareils Matter connectés à ce contrôleur. Le mode universel fonctionne sans mappages KNX.",
+    "universal_service": "Service",
+    "universal_service_battery_monitor": "Moniteur universel de batteries",
+    "universal_service_all_events": "Tous les événements Matter",
+    "universal_battery_threshold": "Seuil de batterie faible",
+    "universal_low_battery_ga": "GA alarme batterie",
+    "universal_low_battery_text_ga": "GA nom appareil",
+    "universal_battery_only_low": "Émettre uniquement les batteries faibles",
+    "universal_emit_initial": "Émettre l’instantané initial des batteries",
+    "universal_include_raw": "Inclure l’événement Matter brut",
+    "universal_mode_status": "Mode Matter universel",
+    "universal_mode_locate_disabled": "La fonction Localiser n’est pas disponible en mode universel.",
+    "universal_controller_name": "Contrôleur Matter universel"
   },
   "common": {
     "ga": "Géorgie",

package/nodes/locales/it/knxUltimateMatterBridge.html

@@ -1,6 +1,4 @@
 <script type="text/markdown" data-help-name="knxUltimateMatterBridge">
-# Expose KNX to Matter (BETA)
-
 > Questo nodo è in **BETA**: funziona, ma alcuni dettagli potrebbero cambiare tra una release e l'altra.
 
 ## Panoramica

package/nodes/locales/it/knxUltimateMatterControllerDevice.html

@@ -1,6 +1,4 @@
 <script type="text/markdown" data-help-name="knxUltimateMatterControllerDevice">
-# Control Matter from KNX (BETA)
-
 > Questo nodo è in **BETA**: il comportamento può cambiare mentre l'implementazione Matter viene rifinita.
 
 Questo nodo controlla da KNX un endpoint Matter già abbinato. Seleziona il dispositivo Matter e l'editor rileva le sue capability, mostrando solo le mappature KNX coerenti con quell'endpoint.
@@ -23,6 +21,16 @@ Sostituisce i nodi Matter separati non pubblicati e mantiene tutta la UI luce qu
 | Update local state from KNX write | Aggiorna la cache locale Matter/KNX quando arriva una scrittura su un GA KNX configurato. |
 | Node Input/Output PINs | Mostra i pin input/output Node-RED. L'input accetta payload booleani e messaggi stile Matter in `msg.payload` o `msg.on.on`; l'output emette gli aggiornamenti di stato. La selezione viene mantenuta alla riapertura dell'editor. |
 
+## Modalità Universale
+
+Seleziona **Modalità Universale** nel selettore **Modalità** per ricevere tutti i report attributo, gli eventi cluster e le inizializzazioni dei dispositivi. Ha sempre un input e un output e non usa le mappature del singolo endpoint. Il gateway KNX è opzionale e serve solo alle GA allarme/testo del Monitor batterie.
+
+Il **Monitor batterie universale** cerca Power Source in tutti gli endpoint e conserva lo stato normalizzato completo. Le GA KNX opzionali pubblicano l'allarme complessivo come DPT 1.005 e ciclano ogni 2 secondi i nomi dei device scarichi come DPT 16.001. Invia `{payload:{action:"getAllBatteries"}}` per ottenere l'inventario in cache.
+
+L'output contiene il valore raw in `msg.payload` e i dati di instradamento in `msg.matter` (`source`, `nodeId`, `endpointId`, `clusterId`, nome attributo/evento). L'input usa `msg.nodeId`, `msg.endpointId`, `msg.clusterId` e `msg.command` con `msg.args`, oppure `msg.attribute`; aggiungi `msg.value` per scrivere, omettilo per leggere. Gli stessi campi possono stare in `msg.matter`.
+
+Esempi: `{nodeId:"100",endpointId:1,clusterId:6,command:"on",args:{}}` accende; `{nodeId:"100",endpointId:1,clusterId:47,attribute:"batPercentRemaining"}` legge la batteria. Il valore batteria resta nell'unità raw Matter a mezzi punti percentuali; dividilo per due in un nodo Function.
+
 ## Comportamento
 
 Il nodo mantiene una cache locale da aggiornamenti Matter e scritture KNX, risponde alle letture KNX dalla cache e può emettere/leggere i valori all'avvio. Ascolta solo gli indirizzi di gruppo configurati, quindi ignora il traffico KNX non pertinente.

package/nodes/locales/it/knxUltimateMatterControllerDevice.json

@@ -92,7 +92,23 @@
     "matter_controller": "Controller Matter",
     "matter_device": "Dispositivo Matter",
     "device_type": "Tipo dispositivo",
-    "matter_section": "Dispositivo Matter"
+    "matter_section": "Dispositivo Matter",
+    "controller_mode": "Modalità",
+    "single_mode": "Dispositivo singolo",
+    "universal_mode": "Modalità universale (tutti i dispositivi Matter)",
+    "universal_mode_description": "Ascolta e controlla tutti i dispositivi Matter collegati a questo controller. La Modalità Universale funziona senza mappature KNX.",
+    "universal_service": "Servizio",
+    "universal_service_battery_monitor": "Monitor batterie universale",
+    "universal_service_all_events": "Tutti gli eventi Matter",
+    "universal_battery_threshold": "Soglia batteria scarica",
+    "universal_low_battery_ga": "GA allarme batteria",
+    "universal_low_battery_text_ga": "GA nome device scarico",
+    "universal_battery_only_low": "Emetti solo batterie scariche",
+    "universal_emit_initial": "Emetti snapshot iniziale batterie",
+    "universal_include_raw": "Includi evento Matter raw",
+    "universal_mode_status": "Modalità Matter universale",
+    "universal_mode_locate_disabled": "La funzione Trova non è disponibile in Modalità Universale.",
+    "universal_controller_name": "Controller Matter Universale"
   },
   "common": {
     "ga": "GA",

package/nodes/locales/zh-CN/knxUltimateMatterBridge.html

@@ -1,6 +1,4 @@
 <script type="text/markdown" data-help-name="knxUltimateMatterBridge">
-# Expose KNX to Matter (BETA)
-
 > 此节点处于 **BETA** 阶段：可以正常工作，但细节可能在版本之间发生变化。
 
 ## 概述

package/nodes/locales/zh-CN/knxUltimateMatterControllerDevice.html

@@ -1,6 +1,4 @@
 <script type="text/markdown" data-help-name="knxUltimateMatterControllerDevice">
-# 从 KNX 控制 Matter (BETA)
-
 > 此节点为 **BETA**：Matter 实现继续完善时，行为可能会变化。
 
 此节点用于从 KNX 控制已经配对的 Matter endpoint。选择 Matter 设备后，编辑器会检测它的能力，并只显示与该 endpoint 匹配的 KNX 映射。
@@ -23,6 +21,16 @@
 | Update local state from KNX write | 当配置的 KNX GA 收到写入 telegram 时，更新本地 Matter/KNX 缓存。 |
 | Node Input/Output PINs | 显示 Node-RED 输入/输出端口。输入接受布尔 payload，以及 `msg.payload` 或 `msg.on.on` 中的 Matter 风格消息；输出发送状态更新。重新打开编辑器时会保留此选择。 |
 
+## 通用模式
+
+选择 **通用模式** 可监视所有设备。该节点始终有一个输入和一个输出，不使用单个 endpoint 映射。KNX 网关为可选，仅用于电池监视器的报警/文本组地址。
+
+**通用电池监视器** 会缓存完整电池状态。可选 KNX 组地址以 DPT 1.005 输出总报警，并以 DPT 16.001 每 2 秒轮播低电量设备名称。发送 `{payload:{action:"getAllBatteries"}}` 可获取缓存清单。
+
+输出将原始值放在 `msg.payload`，并在 `msg.matter` 中提供路由信息（`source`、`nodeId`、`endpointId`、`clusterId`、属性/事件名称）。输入使用 `msg.nodeId`、`msg.endpointId`、`msg.clusterId`，以及带 `msg.args` 的 `msg.command` 或 `msg.attribute`；添加 `msg.value` 表示写入，省略则读取。这些字段也可放在 `msg.matter` 下。
+
+示例：`{nodeId:"100",endpointId:1,clusterId:6,command:"on",args:{}}` 执行开启；`{nodeId:"100",endpointId:1,clusterId:47,attribute:"batPercentRemaining"}` 读取电池。电池值保留 Matter 原始的半百分比单位，需要百分比时可在 Function 节点中除以二。
+
 ## 行为
 
 节点根据 Matter 更新和 KNX 写入维护本地缓存，用该缓存响应 KNX 读取请求，并可在启动时读取/发送值。节点只监听已配置的组地址，因此会忽略无关的 KNX 流量。

package/nodes/locales/zh-CN/knxUltimateMatterControllerDevice.json

@@ -84,7 +84,23 @@
     "matter_controller": "Matter 控制器",
     "matter_device": "Matter 设备",
     "device_type": "设备类型",
-    "matter_section": "Matter 设备"
+    "matter_section": "Matter 设备",
+    "controller_mode": "模式",
+    "single_mode": "单个设备",
+    "universal_mode": "通用模式（所有 Matter 设备）",
+    "universal_mode_description": "监听并控制连接到此控制器的所有 Matter 设备。通用模式无需 KNX 映射即可工作。",
+    "universal_service": "服务",
+    "universal_service_battery_monitor": "通用电池监视器",
+    "universal_service_all_events": "所有 Matter 事件",
+    "universal_battery_threshold": "低电量阈值",
+    "universal_low_battery_ga": "低电量报警组地址",
+    "universal_low_battery_text_ga": "低电量设备名称组地址",
+    "universal_battery_only_low": "仅输出低电量设备",
+    "universal_emit_initial": "输出初始电池快照",
+    "universal_include_raw": "包含原始 Matter 事件",
+    "universal_mode_status": "Matter 通用模式",
+    "universal_mode_locate_disabled": "通用模式下无法使用定位功能。",
+    "universal_controller_name": "Matter 通用控制器"
   },
   "common": {
     "ga": "组地址",

package/nodes/matter-config.js

@@ -52,6 +52,7 @@ module.exports = (RED) => {
         node.sysLogger?.warn(`Matter client ${label} error: ${error.message}`)
       }
     }
+    const clientMatchesNode = (client, nodeId) => client?.matterNodeId === '__UNIVERSAL__' || String(client?.matterNodeId) === String(nodeId)
 
     node.initMatterConnection = async () => {
       try {
@@ -90,8 +91,8 @@ module.exports = (RED) => {
       // A paired node completed the initial sync: let the clients do their initial read
       node.matterManager.on('nodeInitialized', (_nodeId) => {
         node.nodeClients.forEach((_oClient) => {
-          if (_oClient.matterNodeId === _nodeId) {
-            safeClientCall(_oClient, () => _oClient.handleMatterNodeInitialized(), 'handleMatterNodeInitialized')
+          if (clientMatchesNode(_oClient, _nodeId)) {
+            safeClientCall(_oClient, () => _oClient.handleMatterNodeInitialized(_nodeId), 'handleMatterNodeInitialized')
           }
         })
       })
@@ -99,7 +100,7 @@ module.exports = (RED) => {
       // Connection state of a single paired device changed
       node.matterManager.on('nodeState', (_nodeId, _state) => {
         node.nodeClients.forEach((_oClient) => {
-          if (_oClient.matterNodeId === _nodeId) {
+          if (clientMatchesNode(_oClient, _nodeId)) {
             safeClientCall(_oClient, () => _oClient.setNodeStatusMatter({
               fill: _state === 'connected' ? 'green' : 'yellow',
               shape: _state === 'connected' ? 'dot' : 'ring',
@@ -107,7 +108,7 @@ module.exports = (RED) => {
               payload: ''
             }), 'setNodeStatusMatter')
             if (_state === 'connected') {
-              safeClientCall(_oClient, () => _oClient.handleMatterNodeInitialized(), 'handleMatterNodeInitialized')
+              safeClientCall(_oClient, () => _oClient.handleMatterNodeInitialized(_nodeId), 'handleMatterNodeInitialized')
             }
           }
         })

package/nodes/utils/matterControllerProfiles/doorLock.js

@@ -52,6 +52,7 @@ const setupDoorLockProfile = (RED, node, config) => {
   node.inputRBE = 'false'
   node.passthrough = 'no'
   node.currentLockState = undefined
+  node.matterConnectionStatus = ''
   node.knxUltimateAcceptedGAs = [config.GALightSwitch, config.GALightState]
     .map((ga) => String(ga || '').trim())
     .filter((ga) => ga !== '')
@@ -60,7 +61,15 @@ const setupDoorLockProfile = (RED, node, config) => {
   // knxUltimate-config invokes this synchronously from addClient(). Profiles return
   // early from the main light constructor, so they must expose the callback before
   // registering with the shared KNX configuration node.
-  node.setNodeStatus = ({ fill = 'grey', shape = 'ring', text = '' } = {}) => setStatus(fill, shape, text)
+  node.setNodeStatus = ({ fill = 'grey', shape = 'ring', text = '' } = {}) => {
+    if (node.currentLockState !== undefined) {
+      const state = lockStateToBoolean(node.currentLockState)
+      const knxText = text ? ` | KNX: ${text}` : ''
+      setStatus(state === undefined ? 'yellow' : 'blue', state === undefined ? 'ring' : 'dot', `Matter: ${lockStateName(node.currentLockState)}${knxText}`)
+      return
+    }
+    setStatus(fill, shape, text)
+  }
 
   const commandArgs = () => {
     // Matter represents the remote credential as bytes. Keep the PIN in Node-RED's
@@ -181,7 +190,15 @@ const setupDoorLockProfile = (RED, node, config) => {
     }
   }
   node.setNodeStatusMatter = (status) => {
-    if (status && status.text) setStatus(status.fill || 'grey', status.shape || 'ring', status.text)
+    if (!status || !status.text) return
+    node.matterConnectionStatus = status.text
+    const isAvailable = /^(connected|ready|controller ready)$/i.test(status.text)
+    if (isAvailable && node.currentLockState !== undefined) {
+      const state = lockStateToBoolean(node.currentLockState)
+      setStatus(state === undefined ? 'yellow' : 'blue', state === undefined ? 'ring' : 'dot', `Matter: ${lockStateName(node.currentLockState)}`)
+      return
+    }
+    setStatus(status.fill || 'grey', status.shape || 'ring', status.text)
   }
 
   if (node.serverKNX) {

package/nodes/utils/matterControllerProfiles/fan.js

@@ -0,0 +1,20 @@
+'use strict'
+
+const { setupMappedEndpointProfile } = require('./mappedEndpoint')
+
+const FAN_CONTROL_CLUSTER_ID = 0x0202
+
+const setupFanProfile = (RED, node, config) => setupMappedEndpointProfile(RED, node, config, {
+  profileName: 'fan',
+  inputClusterId: FAN_CONTROL_CLUSTER_ID,
+  eventClusterId: FAN_CONTROL_CLUSTER_ID,
+  formatAttributeStatus: (event) => {
+    if (['percentCurrent', 'percentSetting'].includes(event.attributeName) && event.value !== null && event.value !== undefined) {
+      return `Matter fan: ${Math.round(Number(event.value))}%`
+    }
+    if (event.attributeName === 'fanMode') return `Matter fan mode: ${event.value}`
+    return ''
+  }
+})
+
+module.exports = { FAN_CONTROL_CLUSTER_ID, setupFanProfile }

package/nodes/utils/matterControllerProfiles/index.js

@@ -2,13 +2,23 @@
 
 const { setupDoorLockProfile } = require('./doorLock')
 const { setupMappedEndpointProfile } = require('./mappedEndpoint')
+const { setupWindowCoveringProfile } = require('./windowCovering')
+const { setupThermostatProfile } = require('./thermostat')
+const { setupFanProfile } = require('./fan')
+const { setupSwitchProfile } = require('./switch')
+const { setupUniversalProfile } = require('./universal')
 
 // Controller-side Matter device profiles live behind this registry.  Keep profile
 // selection capability-driven: the editor records the profile only after inspecting
 // the endpoint's actual device types, clusters, attributes and supported commands.
 const PROFILE_SETUPS = Object.freeze({
   doorLock: setupDoorLockProfile,
-  mapped: setupMappedEndpointProfile
+  windowCovering: setupWindowCoveringProfile,
+  thermostat: setupThermostatProfile,
+  fan: setupFanProfile,
+  switch: setupSwitchProfile,
+  mapped: setupMappedEndpointProfile,
+  universal: setupUniversalProfile
 })
 
 const setupMatterControllerProfile = (profile, RED, node, config) => {

package/nodes/utils/matterControllerProfiles/mappedEndpoint.js

@@ -24,7 +24,7 @@ const parseMappings = (value) => {
   }
 }
 
-const setupMappedEndpointProfile = (RED, node, config) => {
+const setupMappedEndpointProfile = (RED, node, config, options = {}) => {
   node.name = config.name || node.matterDeviceName || 'Control Matter from KNX'
   node.topic = node.name
   node.mappings = parseMappings(config.matterMappings)
@@ -40,6 +40,7 @@ const setupMappedEndpointProfile = (RED, node, config) => {
   node.outputRBE = 'false'
   node.inputRBE = 'false'
   node.passthrough = 'no'
+  node.matterProfile = options.profileName || 'mapped'
   const enablePins = config.enableNodePINS === 'yes'
   let lastInitialReadTs = 0
 
@@ -111,7 +112,8 @@ const setupMappedEndpointProfile = (RED, node, config) => {
         sendKnx(mapping, matterToKnx(event.clusterId, event.attributeName, event.value))
       })
       if (enablePins) node.send({ topic: `${event.clusterId}.${event.attributeName}`, payload: event.value, matter: event })
-      status('blue', 'dot', `Matter→KNX: ${event.attributeName}`)
+      const profileStatus = typeof options.formatAttributeStatus === 'function' ? options.formatAttributeStatus(event) : ''
+      status('blue', 'dot', profileStatus || `Matter→KNX: ${event.attributeName}`)
     } catch (error) {
       RED.log.error(`knxUltimateMatterControllerDevice mapped Matter: ${error.message}`)
       status('red', 'ring', error.message)
@@ -120,8 +122,11 @@ const setupMappedEndpointProfile = (RED, node, config) => {
   node.handleMatterClusterEvent = (event) => {
     // Cluster events have no implicit KNX mapping. They are exposed as raw flow output
     // only when the user explicitly enables the node pins.
-    if (enablePins && String(event?.nodeId) === String(node.matterNodeId) && Number(event?.endpointId) === Number(node.matterEndpointId)) {
+    const clusterAccepted = options.eventClusterId === undefined || Number(event?.clusterId) === Number(options.eventClusterId)
+    if (enablePins && clusterAccepted && String(event?.nodeId) === String(node.matterNodeId) && Number(event?.endpointId) === Number(node.matterEndpointId)) {
       node.send({ topic: `${event.clusterId}.${event.eventName}`, payload: event.events, matter: event })
+      const profileStatus = typeof options.formatEventStatus === 'function' ? options.formatEventStatus(event) : ''
+      if (profileStatus) status('blue', 'dot', profileStatus)
     }
   }
   node.handleMatterNodeInitialized = () => {
@@ -137,20 +142,53 @@ const setupMappedEndpointProfile = (RED, node, config) => {
   if (node.serverKNX) { node.serverKNX.removeClient(node); node.serverKNX.addClient(node) } else status('yellow', 'ring', 'No KNX gateway selected')
   if (node.serverMatter) { node.serverMatter.removeClient(node); node.serverMatter.addClient(node) }
   node.on('input', (msg, send, done) => {
-    try {
-      const payload = msg.payload || {}
+    const complete = typeof done === 'function' ? done : () => {}
+    const output = typeof send === 'function' ? send : node.send.bind(node)
+    Promise.resolve().then(async () => {
       const mapping = {
-        endpointId: payload.endpointId ?? node.matterEndpointId,
-        clusterId: payload.clusterId,
-        targetKind: payload.command !== undefined ? 'command' : 'attribute',
-        target: payload.command ?? payload.attribute
+        endpointId: msg.endpointId ?? node.matterEndpointId,
+        clusterId: msg.clusterId,
+        targetKind: msg.command !== undefined ? 'command' : 'attribute',
+        target: msg.command ?? msg.attribute
       }
-      if (!mapping.target || mapping.clusterId === undefined) throw new Error('Matter input requires clusterId and command or attribute')
-      enqueue(mapping, payload.args ?? payload.value)
-      if (done) done()
-    } catch (error) {
-      if (done) done(error); else node.error(error, msg)
-    }
+      if (mapping.target === undefined || mapping.target === null || mapping.target === '' || mapping.clusterId === undefined || mapping.clusterId === null) {
+        throw new Error('Matter input requires clusterId and command or attribute')
+      }
+      if (options.inputClusterId !== undefined && Number(mapping.clusterId) !== Number(options.inputClusterId)) {
+        throw new Error(`${node.matterProfile} input requires clusterId ${options.inputClusterId}`)
+      }
+      const isAttributeRead = mapping.targetKind === 'attribute' && msg.value === undefined
+      if (isAttributeRead) {
+        const currentManager = manager()
+        if (!currentManager) throw new Error('Matter controller not ready')
+        const value = await currentManager.readAttribute(
+          node.matterNodeId,
+          mapping.endpointId,
+          mapping.clusterId,
+          mapping.target,
+          msg.requestFromRemote === true
+        )
+        output({
+          ...msg,
+          payload: value,
+          matter: {
+            source: 'inputRead',
+            nodeId: node.matterNodeId,
+            endpointId: mapping.endpointId,
+            clusterId: mapping.clusterId,
+            attribute: mapping.target
+          }
+        })
+        status('blue', 'dot', `Matter read: ${mapping.target}`)
+        complete()
+        return
+      }
+      enqueue(mapping, mapping.targetKind === 'command' ? msg.args : msg.value)
+      complete()
+    }).catch((error) => {
+      status('red', 'ring', error.message)
+      if (typeof done === 'function') done(error); else node.error(error, msg)
+    })
   })
   node.on('close', (done) => {
     try { if (node.serverKNX) node.serverKNX.removeClient(node) } catch (error) { /* empty */ }

package/nodes/utils/matterControllerProfiles/switch.js

@@ -0,0 +1,14 @@
+'use strict'
+
+const { setupMappedEndpointProfile } = require('./mappedEndpoint')
+
+const SWITCH_CLUSTER_ID = 0x003b
+
+const setupSwitchProfile = (RED, node, config) => setupMappedEndpointProfile(RED, node, config, {
+  profileName: 'switch',
+  inputClusterId: SWITCH_CLUSTER_ID,
+  eventClusterId: SWITCH_CLUSTER_ID,
+  formatEventStatus: (event) => `Matter switch: ${event.eventName}`
+})
+
+module.exports = { SWITCH_CLUSTER_ID, setupSwitchProfile }

package/nodes/utils/matterControllerProfiles/thermostat.js

@@ -0,0 +1,20 @@
+'use strict'
+
+const { setupMappedEndpointProfile } = require('./mappedEndpoint')
+
+const THERMOSTAT_CLUSTER_ID = 0x0201
+
+const setupThermostatProfile = (RED, node, config) => setupMappedEndpointProfile(RED, node, config, {
+  profileName: 'thermostat',
+  inputClusterId: THERMOSTAT_CLUSTER_ID,
+  eventClusterId: THERMOSTAT_CLUSTER_ID,
+  formatAttributeStatus: (event) => {
+    if (['localTemperature', 'occupiedHeatingSetpoint', 'occupiedCoolingSetpoint'].includes(event.attributeName) && event.value !== null && event.value !== undefined) {
+      return `Matter thermostat: ${(Number(event.value) / 100).toFixed(1)} °C`
+    }
+    if (event.attributeName === 'systemMode') return `Matter thermostat mode: ${event.value}`
+    return ''
+  }
+})
+
+module.exports = { THERMOSTAT_CLUSTER_ID, setupThermostatProfile }