Correct subscription to feature updates for only intended node

Author: ArnoutD

plugwise_usb/nodes/helpers/subscription.py

@@ -7,6 +7,7 @@
 from dataclasses import dataclass
 from typing import Any
 
+
 from ...api import NodeFeature
 
 
@@ -20,11 +21,12 @@ class NodeFeatureSubscription:
 
 class FeaturePublisher:
     """Base Class to call awaitable of subscription when event happens."""
+    def __init__(self) -> None:
+        self._feature_update_subscribers: dict[
+            Callable[[], None],
+            NodeFeatureSubscription,
+        ] = {}
 
-    _feature_update_subscribers: dict[
-        Callable[[], None],
-        NodeFeatureSubscription,
-    ] = {}
 
     def subscribe_to_feature_update(
         self,

plugwise_usb/nodes/node.py

@@ -63,6 +63,7 @@ def __init__(
         loaded_callback: Callable[[NodeEvent, str], Awaitable[None]],
     ):
         """Initialize Plugwise base node class."""
+        super().__init__()
         self._loaded_callback = loaded_callback
         self._message_subscribe = controller.subscribe_to_messages
         self._features: tuple[NodeFeature, ...] = NODE_FEATURES
@@ -415,7 +416,8 @@ async def _available_update_state(
             if (
                 self._last_seen is not None
                 and timestamp is not None
-                and self._last_seen < timestamp
+                and (timestamp - self._last_seen).seconds > 5
+
             ):
                 self._last_seen = timestamp
                 await self.publish_feature_update_to_subscribers(

tests/test_usb.py

@@ -838,7 +838,7 @@ async def test_node_relay_and_power(self, monkeypatch: pytest.MonkeyPatch) -> No
         assert await stick.nodes["2222222222222222"].load()
         self.test_init_relay_state_on = asyncio.Future()
         self.test_init_relay_state_off = asyncio.Future()
-        unsub_inti_relay = stick.nodes["0098765432101234"].subscribe_to_feature_update(
+        unsub_inti_relay = stick.nodes["2222222222222222"].subscribe_to_feature_update(
             node_feature_callback=self.node_init_relay_state,
             features=(pw_api.NodeFeature.RELAY_INIT,),
         )