Support RSSI channel 3 (Long Range) (#1254)

Author: AlCalzone

test/model/test_controller.py

@@ -1617,6 +1617,7 @@ async def test_statistics_updated(controller):
     assert event_stats.background_rssi.channel_1.average == -93
     assert event_stats.background_rssi.channel_1.current == -94
     assert event_stats.background_rssi.channel_2 is None
+    assert event_stats.background_rssi.channel_3 is None
 
     statistics_data = {
         "messagesTX": 1,
@@ -1663,6 +1664,52 @@ async def test_statistics_updated(controller):
     assert event_stats.background_rssi.channel_1.current == -84
     assert event_stats.background_rssi.channel_2.average == -85
     assert event_stats.background_rssi.channel_2.current == -86
+    assert event_stats.background_rssi.channel_3 is None
+
+    statistics_data = {
+        "messagesTX": 1,
+        "messagesRX": 1,
+        "messagesDroppedRX": 1,
+        "NAK": 1,
+        "CAN": 1,
+        "timeoutACK": 1,
+        "timeoutResponse": 1,
+        "timeoutCallback": 1,
+        "messagesDroppedTX": 1,
+        "backgroundRSSI": {
+            "timestamp": 1234567890,
+            "channel0": {
+                "average": -81,
+                "current": -82,
+            },
+            "channel1": {
+                "average": -83,
+                "current": -84,
+            },
+            "channel2": {
+                "average": -85,
+                "current": -86,
+            },
+            "channel3": {
+                "average": -87,
+                "current": -88,
+            },
+        },
+    }
+    event = Event(
+        "statistics updated",
+        {
+            "source": "controller",
+            "event": "statistics updated",
+            "statistics": statistics_data,
+        },
+    )
+    controller.receive_event(event)
+    event_stats = event.data["statistics_updated"]
+    assert isinstance(event_stats, ControllerStatistics)
+    assert event_stats.background_rssi
+    assert event_stats.background_rssi.channel_3.average == -87
+    assert event_stats.background_rssi.channel_3.current == -88
 
 
 async def test_grant_security_classes(controller, uuid4, mock_command) -> None:

zwave_js_server/model/controller/statistics.py

@@ -53,6 +53,7 @@ class BackgroundRSSIDataType(TypedDict, total=False):
     channel0: ChannelRSSIDataType  # required
     channel1: ChannelRSSIDataType  # required
     channel2: ChannelRSSIDataType
+    channel3: ChannelRSSIDataType
 
 
 class ControllerStatisticsDataType(TypedDict, total=False):
@@ -94,16 +95,20 @@ class BackgroundRSSI:
     channel_0: ChannelRSSI = field(init=False)
     channel_1: ChannelRSSI = field(init=False)
     channel_2: ChannelRSSI | None = field(init=False)
+    channel_3: ChannelRSSI | None = field(init=False)
 
     def __post_init__(self) -> None:
         """Post initialize."""
         self.timestamp = self.data["timestamp"]
         self.channel_0 = ChannelRSSI(self.data["channel0"])
         self.channel_1 = ChannelRSSI(self.data["channel1"])
-        if not (channel_2 := self.data.get("channel2")):
-            self.channel_2 = None
-            return
-        self.channel_2 = ChannelRSSI(channel_2)
+        # Channels 2 and 3 may not be present, but 3 requires 2 to be present
+        self.channel_2 = None
+        self.channel_3 = None
+        if channel_2 := self.data.get("channel2"):
+            self.channel_2 = ChannelRSSI(channel_2)
+            if channel_3 := self.data.get("channel3"):
+                self.channel_3 = ChannelRSSI(channel_3)
 
 
 @dataclass