Raise InvalidHostError if URL build fails (#838)

Author: bieniu

aioshelly/common.py

@@ -23,7 +23,9 @@
 from .exceptions import (
     DeviceConnectionError,
     DeviceConnectionTimeoutError,
+    InvalidHostError,
     MacAddressMismatchError,
+    ShellyError,
 )
 
 _LOGGER = logging.getLogger(__name__)
@@ -80,9 +82,7 @@ async def get_info(
     port: int = DEFAULT_HTTP_PORT,
 ) -> dict[str, Any]:
     """Get info from device through REST call."""
-    error: (
-        DeviceConnectionError | DeviceConnectionTimeoutError | MacAddressMismatchError
-    )
+    error: ShellyError
     try:
         async with aiohttp_session.get(
             URL.build(scheme="http", host=ip_address, port=port, path="/shelly"),
@@ -94,6 +94,10 @@ async def get_info(
         error = DeviceConnectionTimeoutError(err)
         _LOGGER.debug("host %s:%s: timeout error: %r", ip_address, port, error)
         raise error from err
+    except ValueError as err:
+        error = InvalidHostError(err)
+        _LOGGER.debug("host %s is invalid: %r", ip_address, error)
+        raise error from err
     except CONNECT_ERRORS as err:
         error = DeviceConnectionError(err)
         _LOGGER.debug("host %s:%s: error: %r", ip_address, port, error)

aioshelly/exceptions.py

@@ -43,6 +43,10 @@ class InvalidAuthError(ShellyError):
     """Raised to indicate invalid or missing authentication error."""
 
 
+class InvalidHostError(ShellyError):
+    """Raised to indicate invalid host error."""
+
+
 class MacAddressMismatchError(ShellyError):
     """Raised if input MAC address does not match the device MAC address."""
 

tests/test_common.py

@@ -17,6 +17,7 @@
 from aioshelly.exceptions import (
     DeviceConnectionError,
     DeviceConnectionTimeoutError,
+    InvalidHostError,
     MacAddressMismatchError,
 )
 
@@ -139,3 +140,16 @@ async def test_get_info_exc(exc: Exception, expected_exc: Exception) -> None:
             await get_info(session, ip_address, "AABBCCDDEEFF")
 
     await session.close()
+
+
+@pytest.mark.asyncio
+async def test_get_info_invalid_error() -> None:
+    """Test get_info function with an invalid host exception."""
+    session = ClientSession()
+
+    with pytest.raises(
+        InvalidHostError, match="Host 'http://10.10.10.10' cannot contain ':'"
+    ):
+        await get_info(session, "http://10.10.10.10", "AABBCCDDEEFF")
+
+    await session.close()