Improve error handling again

custom_components/livisi/__init__.py

@@ -5,13 +5,16 @@
 from typing import Final
 
 from homeassistant import core
+from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, callback
 
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers import entity_registry as er
 
+from .livisi_errors import WrongCredentialException
+
 
 from .const import CONF_HOST, DOMAIN, LOGGER, SWITCH_DEVICE_TYPES
 from .coordinator import LivisiDataUpdateCoordinator
@@ -32,7 +35,14 @@
 async def async_setup_entry(hass: core.HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Livisi Smart Home from a config entry."""
     coordinator = LivisiDataUpdateCoordinator(hass, entry)
-    await coordinator.async_setup()
+    try:
+        await coordinator.async_setup()
+    except Exception as exception:
+        LOGGER.error(exception, exc_info=True)
+        # no need to retry if the credentials are wrong
+        if isinstance(exception, WrongCredentialException):
+            return False
+        raise ConfigEntryNotReady(exception) from exception
 
     hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
     device_registry = dr.async_get(hass)
@@ -93,7 +103,7 @@ async def async_migrate_entry(hass, config_entry):
         await coordinator.async_setup()
         devices = await coordinator.async_get_devices()
     except Exception as exception:
-        LOGGER.error(exception)
+        LOGGER.error(exception, exc_info=True)
         return False
     finally:
         if coordinator.aiolivisi is not None:

custom_components/livisi/coordinator.py

@@ -7,7 +7,6 @@
 
 from aiohttp import ClientConnectorError
 
-from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import async_dispatcher_send
@@ -17,13 +16,6 @@
 from .livisi_connector import LivisiConnection, connect as livisi_connect
 from .livisi_websocket import LivisiWebsocketEvent
 
-from .livisi_errors import (
-    IncorrectIpAddressException,
-    ShcUnreachableException,
-    WrongCredentialException,
-)
-
-
 from .const import (
     CONF_HOST,
     CONF_PASSWORD,
@@ -66,17 +58,10 @@ def __init__(self, hass: HomeAssistant, config_entry: ConfigEntry) -> None:
 
     async def async_setup(self) -> None:
         """Set up the Livisi Smart Home Controller."""
-        try:
-            self.aiolivisi = await livisi_connect(
-                self.config_entry.data[CONF_HOST],
-                self.config_entry.data[CONF_PASSWORD],
-            )
-        except ShcUnreachableException as exception:
-            raise ConfigEntryNotReady from exception
-        except WrongCredentialException as exception:
-            raise ConfigEntryNotReady from exception
-        except IncorrectIpAddressException as exception:
-            raise ConfigEntryNotReady from exception
+        self.aiolivisi = await livisi_connect(
+            self.config_entry.data[CONF_HOST],
+            self.config_entry.data[CONF_PASSWORD],
+        )
 
     async def _async_update_data(self) -> list[LivisiDevice]:
         """Get device configuration from LIVISI."""

custom_components/livisi/livisi_connector.py

@@ -65,10 +65,9 @@ async def connect(self, host: str, password: str):
             self._password = password
         try:
             await self._async_retrieve_token()
-        except Exception as connection_error:
-            LOGGER.error(connection_error)
+        except:
             await self.close()
-            raise connection_error
+            raise
 
         self.controller = await self._async_get_controller()
         if self.controller.is_v2: