Merge pull request #280 from plugwise/mdi_switch

prevent multiple subscriptions to the same NodeFeature

Author: dirixmjm

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Versions from 0.4x
 
+### v0.55.4 - 2025-07-08
+
+- PR [280](https://github.com/plugwise/plugwise_usb-beta/pull/280): Prevent multiple NodeFeature subscriptions
+
 ### v0.55.3 - 2025-07-08
 
 - Bump plugwise to [v0.44.7](https://github.com/plugwise/python-plugwise-usb/releases/tag/v0.44.7)

custom_components/plugwise_usb/__init__.py

@@ -163,6 +163,8 @@ async def async_unload_entry(
 ) -> bool:
     """Unload the Plugwise USB stick connection."""
     config_entry.runtime_data[UNSUBSCRIBE_DISCOVERY]()
+    for coordinator in config_entry.runtime_data[NODES].values():
+        coordinator.unsubscribe_all_nodefeatures()
     unload = await hass.config_entries.async_unload_platforms(
         config_entry, PLUGWISE_USB_PLATFORMS
     )

custom_components/plugwise_usb/coordinator.py

@@ -3,9 +3,9 @@
 from collections import Counter
 from datetime import timedelta
 import logging
-from typing import Any
+from typing import Any, Callable
 
-from plugwise_usb.api import NodeFeature, PlugwiseNode
+from plugwise_usb.api import PUSHING_FEATURES, NodeFeature, PlugwiseNode
 from plugwise_usb.exceptions import NodeError, NodeTimeout, StickError, StickTimeout
 
 from homeassistant.config_entries import ConfigEntry
@@ -37,6 +37,9 @@ def __init__(
     ) -> None:
         """Initialize Plugwise USB data update coordinator."""
         self.node = node
+        self.subscribed_nodefeatures: list[NodeFeature] = []
+        self._subscribe_to_feature_fn = self.node.subscribe_to_feature_update
+        self.unsubscribe_push_events: list[Callable[[], None]] = []
         if node.node_info.is_battery_powered:
             _LOGGER.debug("Create battery powered DUC for %s", node.mac)
             super().__init__(
@@ -86,3 +89,35 @@ async def async_node_update(self) -> dict[NodeFeature, Any]:
             raise UpdateFailed("Device is not responding")
 
         return states
+
+    async def subscribe_nodefeature(self, node_feature: NodeFeature) -> None:
+        """Subscribe to a nodefeature."""
+        if (
+            node_feature in PUSHING_FEATURES
+            and node_feature in self.node.node_info.features
+            and node_feature not in self.subscribed_nodefeatures
+        ):
+            self.unsubscribe_push_events.append(
+                self._subscribe_to_feature_fn(
+                    self.async_push_event,
+                    node_feature,
+                )
+            )
+            self.subscribed_nodefeatures.append(node_feature)
+
+    async def async_push_event(self, feature: NodeFeature, state: Any) -> None:
+        """Update data pushed by node."""
+        self.async_set_updated_data(
+            {
+                feature: state,
+            }
+        )
+
+    async def unsubscribe_all_nodefeatures(self) -> None:
+        """Unsubscribe to updates."""
+        for unsubscribe_push_event in self.unsubscribe_push_events:
+            if unsubscribe_push_event is not None:
+                unsubscribe_push_event()
+        self.unsubscribe_push_events.clear()
+        self.subscribed_nodefeatures.clear()
+

custom_components/plugwise_usb/entity.py

@@ -2,12 +2,10 @@
 
 from __future__ import annotations
 
-from collections.abc import Callable
 from dataclasses import dataclass
 import logging
-from typing import Any
 
-from plugwise_usb.api import PUSHING_FEATURES, NodeFeature, NodeInfo
+from plugwise_usb.api import NodeFeature, NodeInfo
 
 from homeassistant.helpers.device_registry import CONNECTION_ZIGBEE, DeviceInfo
 from homeassistant.helpers.entity import EntityDescription
@@ -40,10 +38,8 @@ def __init__(
         super().__init__(node_duc, context=entity_description.node_feature)
         self.node_duc = node_duc
         self.entity_description = entity_description
-        self.unsubscribe_push_events: Callable[[], None] | None = None
         self._node_info: NodeInfo = node_duc.node.node_info
         self._attr_unique_id = f"{self._node_info.mac}-{entity_description.key}"
-        self._subscribe_to_feature_fn = node_duc.node.subscribe_to_feature_update
         self._via_device = (DOMAIN, str(node_duc.api_stick.mac_stick))
 
     @property
@@ -70,34 +66,10 @@ def device_info(self) -> DeviceInfo:
     async def async_added_to_hass(self):
         """Subscribe for push updates."""
         await super().async_added_to_hass()
-        if ( 
-            self.entity_description.node_feature in PUSHING_FEATURES
-            and self.entity_description.node_feature in self._node_info.features
-        ):
-            self.unsubscribe_push_events = self._subscribe_to_feature_fn(
-                self.async_push_event,
-                self.entity_description.node_feature,
-            )
-
-    async def async_push_event(self, feature: NodeFeature, state: Any) -> None:
-        """Update data on pushed event."""
-        if self.node_duc is None:
-            _LOGGER.warning(
-                "Unable to push event=%s, state=%s, mac=%s",
-                feature,
-                state,
-                self._node_info.mac,
-            )
-        else:
-            self.node_duc.async_set_updated_data(
-                {
-                    feature: state,
-                }
-            )
+        await self.node_duc.subscribe_nodefeature(
+                 self.entity_description.node_feature
+              )
 
     async def async_will_remove_from_hass(self):
         """Unsubscribe to updates."""
-        if self.unsubscribe_push_events is not None:
-            self.unsubscribe_push_events()
-            self.unsubscribe_push_events = None
         await super().async_will_remove_from_hass()

custom_components/plugwise_usb/manifest.json

@@ -9,5 +9,5 @@
   "iot_class": "local_polling",
   "loggers": ["plugwise_usb"],
   "requirements": ["plugwise-usb==0.44.7"],
-  "version": "0.55.3"
+  "version": "0.55.4"
 }

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "plugwise_usb-beta"
-version = "0.55.3"
+version = "0.55.4"
 description = "Plugwise USB custom_component (BETA)"
 readme = "README.md"
 requires-python = ">=3.13"