Allow forwarding Node Events (#370)

matter_server/client/client.py

@@ -20,6 +20,7 @@
     EventMessage,
     EventType,
     MatterNodeData,
+    MatterNodeEvent,
     MessageType,
     ResultMessageBase,
     ServerDiagnostics,
@@ -486,6 +487,19 @@ def _handle_event_message(self, msg: EventMessage) -> None:
             node_id = msg.data["node_id"]
             endpoint_id = msg.data["endpoint_id"]
             self.logger.debug("Endpoint added: %s/%s", node_id, endpoint_id)
+        if msg.event == EventType.NODE_EVENT:
+            if self.logger.isEnabledFor(logging.DEBUG):
+                self.logger.debug(
+                    "Node event: %s",
+                    msg.data,
+                )
+            node_event = dataclass_from_dict(MatterNodeEvent, msg.data)
+            self._signal_event(
+                EventType.NODE_EVENT,
+                data=node_event,
+                node_id=node_event.node_id,
+            )
+            return
         # simply forward all other events as-is
         if self.logger.isEnabledFor(logging.DEBUG):
             self.logger.debug("Received event: %s", msg)

matter_server/common/models.py

@@ -82,6 +82,21 @@ class MatterNodeData:
     )
 
 
+@dataclass
+class MatterNodeEvent:
+    """Representation of a NodeEvent for a Matter node."""
+
+    node_id: int
+    endpoint_id: int
+    cluster_id: int
+    event_id: int
+    event_number: int
+    priority: int
+    timestamp: int
+    timestamp_type: int
+    data: dict[str, Any] | None
+
+
 @dataclass
 class ServerDiagnostics:
     """Full dump of the server information and data."""

matter_server/server/device_controller.py

@@ -35,7 +35,7 @@
     dataclass_from_dict,
     parse_attribute_path,
 )
-from ..common.models import APICommand, EventType, MatterNodeData
+from ..common.models import APICommand, EventType, MatterNodeData, MatterNodeEvent
 from .const import PAA_ROOT_CERTS_DIR
 from .helpers.paa_certificates import fetch_certificates
 
@@ -674,9 +674,20 @@ def event_callback(
             node_logger.debug(
                 "Received node event: %s - transaction: %s", data, transaction
             )
-            self.event_history.append(data)
+            node_event = MatterNodeEvent(
+                node_id=node_id,
+                endpoint_id=data.Header.EndpointId,
+                cluster_id=data.Header.ClusterId,
+                event_id=data.Header.EventId,
+                event_number=data.Header.EventNumber,
+                priority=data.Header.Priority,
+                timestamp=data.Header.Timestamp,
+                timestamp_type=data.Header.TimestampType,
+                data=data.Data,
+            )
+            self.event_history.append(node_event)
             self.server.loop.call_soon_threadsafe(
-                self.server.signal_event, EventType.NODE_EVENT, data
+                self.server.signal_event, EventType.NODE_EVENT, node_event
             )
 
         def error_callback(