Unsubscribe Alarmo handlers cleanly on unload

Author: codyc1515

custom_components/alarmo/__init__.py

@@ -511,23 +511,25 @@ def async_update_sensor_group_config(
 
         async_dispatcher_send(self.hass, "alarmo_sensors_updated")
 
-    async def async_unload(self):
-        """Remove all alarmo objects."""
-        # remove alarm_control_panel entities
-        areas = list(self.hass.data[const.DOMAIN]["areas"].keys())
-        for area in areas:
-            await self.async_remove_entity(area)
-        if self.hass.data[const.DOMAIN]["master"]:
-            await self.async_remove_entity("master")
-
-        del self.hass.data[const.DOMAIN]["sensor_handler"]
-        del self.hass.data[const.DOMAIN]["automation_handler"]
-        del self.hass.data[const.DOMAIN]["mqtt_handler"]
-        del self.hass.data[const.DOMAIN]["event_handler"]
-
-        # remove subscriptions for coordinator
-        while len(self._subscriptions):
-            self._subscriptions.pop()()
+    async def async_unload(self):
+        """Remove all alarmo objects."""
+        # remove alarm_control_panel entities
+        areas = list(self.hass.data[const.DOMAIN]["areas"].keys())
+        for area in areas:
+            await self.async_remove_entity(area)
+        if self.hass.data[const.DOMAIN]["master"]:
+            await self.async_remove_entity("master")
+
+        for key in ["sensor_handler", "automation_handler", "mqtt_handler", "event_handler"]:
+            handler = self.hass.data[const.DOMAIN].get(key)
+            if handler and hasattr(handler, "async_unload"):
+                handler.async_unload()
+            if key in self.hass.data[const.DOMAIN]:
+                del self.hass.data[const.DOMAIN][key]
+
+        # remove subscriptions for coordinator
+        while len(self._subscriptions):
+            self._subscriptions.pop()()
 
     async def async_delete_config(self):
         """Wipe alarmo storage."""

custom_components/alarmo/alarm_control_panel.py

@@ -102,12 +102,18 @@ async def async_setup_platform(hass, config, async_add_entities, discovery_info=
     return True
 
 
-async def async_setup_entry(hass, config_entry, async_add_devices):
-    """Set up the Alarmo entities."""
-
+async def async_setup_entry(hass, config_entry, async_add_devices):
+    """Set up the Alarmo entities."""
+
     @callback
     def async_add_alarm_entity(config: dict):
         """Add each entity as Alarm Control Panel."""
+        if not hass.config_entries.async_get_entry(config_entry.entry_id):
+            _LOGGER.debug(
+                "Skipping area registration for unloaded config entry %s",
+                config_entry.entry_id,
+            )
+            return
         unique_id = _build_unique_id(hass, config["area_id"])
         entity_registry = er.async_get(hass)
         existing_entity_id = entity_registry.async_get_entity_id(
@@ -146,6 +152,12 @@ def async_add_alarm_entity(config: dict):
     @callback
     def async_add_alarm_master(config: dict):
         """Add each entity as Alarm Control Panel."""
+        if not hass.config_entries.async_get_entry(config_entry.entry_id):
+            _LOGGER.debug(
+                "Skipping master registration for unloaded config entry %s",
+                config_entry.entry_id,
+            )
+            return
         unique_id = _build_unique_id(hass)
         entity_registry = er.async_get(hass)
         existing_entity_id = entity_registry.async_get_entity_id(
@@ -1310,9 +1322,11 @@ def async_alarm_state_changed(area_id: str, old_state: str, new_state: str):
                 return
             self.async_update_state()
 
-        async_dispatcher_connect(
-            self.hass, "alarmo_state_updated", async_alarm_state_changed
-        )
+        self.async_on_remove(
+            async_dispatcher_connect(
+                self.hass, "alarmo_state_updated", async_alarm_state_changed
+            )
+        )
 
         @callback
         def async_handle_event(event: str, area_id: str, args: dict = {}):
@@ -1352,7 +1366,9 @@ def async_handle_event(event: str, area_id: str, args: dict = {}):
             if event == const.EVENT_READY_TO_ARM_MODES_CHANGED:
                 self.update_ready_to_arm_modes()
 
-        async_dispatcher_connect(self.hass, "alarmo_event", async_handle_event)
+        self.async_on_remove(
+            async_dispatcher_connect(self.hass, "alarmo_event", async_handle_event)
+        )
 
         state = await self.async_get_last_state()
         if state and state.state:

custom_components/alarmo/automations.py

@@ -172,10 +172,14 @@ async def async_handle_event(event: str, area_id: str, args: dict = {}):
             async_dispatcher_connect(self.hass, "alarmo_event", async_handle_event)
         )
 
-    def __del__(self):
-        """Prepare for removal."""
-        while len(self._subscriptions):
-            self._subscriptions.pop()()
+    def __del__(self):
+        """Prepare for removal."""
+        self.async_unload()
+
+    def async_unload(self):
+        """Unload dispatcher subscriptions."""
+        while len(self._subscriptions):
+            self._subscriptions.pop()()
 
     async def async_execute_automation(
         self, automation_id: str, alarm_entity: AlarmoBaseEntity

custom_components/alarmo/event.py

@@ -18,6 +18,10 @@ def __init__(self, hass):
 
     def __del__(self):
         """Class destructor."""
+        self.async_unload()
+
+    def async_unload(self):
+        """Unload dispatcher subscription."""
         self._subscription()
 
     @callback

custom_components/alarmo/mqtt.py

@@ -173,6 +173,10 @@ def async_handle_event(event: str, area_id: str, args: dict = {}):
 
     def __del__(self):
         """Prepare for removal."""
+        self.async_unload()
+
+    def async_unload(self):
+        """Unload subscriptions and subscribed topics."""
         while len(self._subscribed_topics):
             self._subscribed_topics.pop()()
         while len(self._subscriptions):

custom_components/alarmo/sensors.py

@@ -193,13 +193,25 @@ def handle_startup(_event):
         else:
             hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STARTED, handle_startup)
 
-    def __del__(self):
-        """Prepare for removal."""
-        if self._state_listener:
-            self._state_listener()
-            self._state_listener = None
-        while len(self._subscriptions):
-            self._subscriptions.pop()()
+    def __del__(self):
+        """Prepare for removal."""
+        self.async_unload()
+
+    def async_unload(self):
+        """Unload listeners and timers for the sensor handler."""
+        if self._state_listener:
+            self._state_listener()
+            self._state_listener = None
+        while len(self._subscriptions):
+            self._subscriptions.pop()()
+        while len(self._arm_timers):
+            _key, unsub = self._arm_timers.popitem()
+            if unsub:
+                unsub()
+        while len(self._delay_on_timers):
+            _key, unsub = self._delay_on_timers.popitem()
+            if unsub:
+                unsub()
 
     def async_watch_sensor_states(
         self,