Fix HACS becomes unresponsive after multiple sidepanel name changes

custom_components/hacs/__init__.py

@@ -214,10 +214,11 @@ async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) ->
 
     unload_ok = await hass.config_entries.async_unload_platforms(config_entry, PLATFORMS)
 
-    hacs.set_stage(None)
-    hacs.disable_hacs(HacsDisabledReason.REMOVED)
-
-    hass.data.pop(DOMAIN, None)
+    # Only clean up if unload was successful
+    if unload_ok:
+        hacs.set_stage(None)
+        hacs.disable_hacs(HacsDisabledReason.REMOVED)
+        hass.data.pop(DOMAIN, None)
 
     return unload_ok
 

custom_components/hacs/switch.py

@@ -22,7 +22,11 @@ async def async_setup_entry(
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Setup switch platform."""
-    hacs: HacsBase = hass.data[DOMAIN]
+    hacs: HacsBase = hass.data.get(DOMAIN)
+    if hacs is None:
+        # HACS is not properly initialized
+        return
+
     async_add_entities(
         HacsRepositoryPreReleaseSwitchEntity(hacs=hacs, repository=repository)
         for repository in hacs.repositories.list_downloaded

custom_components/hacs/update.py

@@ -21,7 +21,11 @@ async def async_setup_entry(
     hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
 ) -> None:
     """Setup update platform."""
-    hacs: HacsBase = hass.data[DOMAIN]
+    hacs: HacsBase = hass.data.get(DOMAIN)
+    if hacs is None:
+        # HACS is not properly initialized
+        return
+
     async_add_entities(
         HacsRepositoryUpdateEntity(hacs=hacs, repository=repository)
         for repository in hacs.repositories.list_downloaded

custom_components/hacs/websocket/repositories.py

@@ -35,6 +35,11 @@ async def hacs_repositories_list(
 ) -> None:
     """List repositories."""
     hacs: HacsBase = hass.data.get(DOMAIN)
+    if hacs is None:
+        # HACS is not properly initialized, return empty list
+        connection.send_message(websocket_api.result_message(msg["id"], []))
+        return
+
     connection.send_message(
         websocket_api.result_message(
             msg["id"],
@@ -92,6 +97,10 @@ async def hacs_repositories_clear_new(
 ) -> None:
     """Clear new repositories for specific categories."""
     hacs: HacsBase = hass.data.get(DOMAIN)
+    if hacs is None:
+        # HACS is not properly initialized
+        connection.send_message(websocket_api.result_message(msg["id"]))
+        return
 
     if repo := msg.get("repository"):
         repository = hacs.repositories.get_by_id(repo)
@@ -124,6 +133,11 @@ async def hacs_repositories_removed(
 ) -> None:
     """Get information about removed repositories."""
     hacs: HacsBase = hass.data.get(DOMAIN)
+    if hacs is None:
+        # HACS is not properly initialized, return empty list
+        connection.send_message(websocket_api.result_message(msg["id"], []))
+        return
+
     content = []
     for repo in hacs.repositories.list_removed:
         if repo.repository not in hacs.common.ignored_repositories:
@@ -147,6 +161,11 @@ async def hacs_repositories_add(
 ) -> None:
     """Add custom repositoriy."""
     hacs: HacsBase = hass.data.get(DOMAIN)
+    if hacs is None:
+        # HACS is not properly initialized
+        connection.send_message(websocket_api.result_message(msg["id"], {}))
+        return
+
     repository = regex.extract_repository_from_url(msg["repository"])
     category = msg["category"]
 
@@ -208,6 +227,11 @@ async def hacs_repositories_remove(
 ) -> None:
     """Remove custom repositoriy."""
     hacs: HacsBase = hass.data.get(DOMAIN)
+    if hacs is None:
+        # HACS is not properly initialized
+        connection.send_message(websocket_api.result_message(msg["id"], {}))
+        return
+
     repository = hacs.repositories.get_by_id(msg["repository"])
 
     repository.remove()