fix: Throw MQTT authentication errors as authentication related exceptions

roborock/mqtt/roborock_session.py

@@ -15,9 +15,10 @@
 from contextlib import asynccontextmanager
 
 import aiomqtt
-from aiomqtt import MqttError, TLSParameters
+from aiomqtt import MqttCodeError, MqttError, TLSParameters
 
 from roborock.callbacks import CallbackMap
+from roborock.exceptions import RoborockInvalidCredentials
 
 from .session import MqttParams, MqttSession, MqttSessionException
 
@@ -33,6 +34,16 @@
 BACKOFF_MULTIPLIER = 1.5
 
 
+class MqttReasonCode:
+    """MQTT Reason Codes used by Roborock devices.
+
+    This is a subset of paho.mqtt.reasoncodes.ReasonCode where we would like
+    different error handling behavior.
+    """
+
+    RC_ERROR_UNAUTHORIZED = 135
+
+
 class RoborockMqttSession(MqttSession):
     """An MQTT session for sending and receiving messages.
 
@@ -83,6 +94,10 @@ async def start(self) -> None:
         self._reconnect_task = loop.create_task(self._run_reconnect_loop(start_future))
         try:
             await start_future
+        except MqttCodeError as err:
+            if err.rc == MqttReasonCode.RC_ERROR_UNAUTHORIZED:
+                raise RoborockInvalidCredentials(f"Authorization error starting MQTT session: {err}") from err
+            raise MqttSessionException(f"Error starting MQTT session: {err}") from err
         except MqttError as err:
             raise MqttSessionException(f"Error starting MQTT session: {err}") from err
         except Exception as err:

roborock/mqtt/session.py

@@ -64,4 +64,9 @@ async def close(self) -> None:
 
 
 class MqttSessionException(RoborockException):
-    """ "Raised when there is an error communicating with MQTT."""
+    """Raised when there is an error communicating with MQTT.
+
+    Note that not all exceptions raised by the MQTT session are of this type
+    as other `RoborockException`s may be raised for specific error conditions
+    such as authentication errors.
+    """

tests/mqtt/test_roborock_session.py

@@ -11,6 +11,7 @@
 import paho.mqtt.client as mqtt
 import pytest
 
+from roborock.exceptions import RoborockInvalidCredentials
 from roborock.mqtt.roborock_session import RoborockMqttSession, create_mqtt_session
 from roborock.mqtt.session import MqttParams, MqttSessionException
 from tests import mqtt_packet
@@ -366,3 +367,42 @@ async def test_idle_timeout_multiple_callbacks(mock_mqtt_client: AsyncMock) -> N
     mock_mqtt_client.unsubscribe.assert_called_once_with(topic)
 
     await session.close()
+
+
+@pytest.mark.parametrize(
+    ("side_effect", "expected_exception", "match"),
+    [
+        (
+            aiomqtt.MqttError("Connection failed"),
+            MqttSessionException,
+            "Error starting MQTT session",
+        ),
+        (
+            aiomqtt.MqttCodeError(rc=135),
+            RoborockInvalidCredentials,
+            "Authorization error starting MQTT session",
+        ),
+        (
+            aiomqtt.MqttCodeError(rc=128),
+            MqttSessionException,
+            "Error starting MQTT session",
+        ),
+        (
+            ValueError("Unexpected"),
+            MqttSessionException,
+            "Unexpected error starting session",
+        ),
+    ],
+)
+async def test_connect_failure(
+    side_effect: Exception,
+    expected_exception: type[Exception],
+    match: str,
+) -> None:
+    """Test connection failure with different exceptions."""
+    mock_aenter = AsyncMock()
+    mock_aenter.side_effect = side_effect
+
+    with patch("roborock.mqtt.roborock_session.aiomqtt.Client.__aenter__", mock_aenter):
+        with pytest.raises(expected_exception, match=match):
+            await create_mqtt_session(FAKE_PARAMS)