aioamazondevices 6.1.1__tar.gz → 6.1.3__tar.gz

{aioamazondevices-6.1.1 → aioamazondevices-6.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: aioamazondevices
-Version: 6.1.1
+Version: 6.1.3
 Summary: Python library to control Amazon devices
 License: Apache-2.0
 Author: Simone Chemelli

{aioamazondevices-6.1.1 → aioamazondevices-6.1.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "aioamazondevices"
-version = "6.1.1"
+version = "6.1.3"
 requires-python = ">=3.12"
 description = "Python library to control Amazon devices"
 authors = [

{aioamazondevices-6.1.1 → aioamazondevices-6.1.3}/src/aioamazondevices/__init__.py

@@ -1,6 +1,6 @@
 """aioamazondevices library."""
 
-__version__ = "6.1.1"
+__version__ = "6.1.3"
 
 
 from .api import AmazonDevice, AmazonEchoApi

{aioamazondevices-6.1.1 → aioamazondevices-6.1.3}/src/aioamazondevices/api.py

@@ -20,6 +20,7 @@ from aiohttp import (
     ClientConnectorError,
     ClientResponse,
     ClientSession,
+    ContentTypeError,
 )
 from bs4 import BeautifulSoup, Tag
 from langcodes import Language, standardize_tag
@@ -528,15 +529,15 @@ class AmazonEchoApi:
         }
 
         register_url = "https://api.amazon.com/auth/register"
-        _, resp = await self._session_request(
+        _, raw_resp = await self._session_request(
             method=HTTPMethod.POST,
             url=register_url,
             input_data=body,
             json_data=True,
         )
-        resp_json = await resp.json()
+        resp_json = await self._response_to_json(raw_resp)
 
-        if resp.status != HTTPStatus.OK:
+        if raw_resp.status != HTTPStatus.OK:
             msg = resp_json["response"]["error"]["message"]
             _LOGGER.error(
                 "Cannot register device for %s: %s",
@@ -544,7 +545,7 @@ class AmazonEchoApi:
                 msg,
             )
             raise CannotRegisterDevice(
-                f"{await self._http_phrase_error(resp.status)}: {msg}"
+                f"{await self._http_phrase_error(raw_resp.status)}: {msg}"
             )
 
         success_response = resp_json["response"]["success"]
@@ -599,7 +600,7 @@ class AmazonEchoApi:
             json_data=True,
         )
 
-        return cast("dict", await raw_resp.json())
+        return await self._response_to_json(raw_resp)
 
     async def _get_sensors_states(
         self,
@@ -655,6 +656,19 @@ class AmazonEchoApi:
 
         return device_sensors
 
+    async def _response_to_json(self, raw_resp: ClientResponse) -> dict[str, Any]:
+        """Convert response to JSON, if possible."""
+        try:
+            data = await raw_resp.json(loads=orjson.loads)
+            if not data:
+                _LOGGER.warning("Empty JSON data received")
+                data = {}
+            return cast("dict[str, Any]", data)
+        except ContentTypeError as exc:
+            raise ValueError("Response not in JSON format") from exc
+        except orjson.JSONDecodeError as exc:
+            raise ValueError("Response with corrupted JSON format") from exc
+
     async def login_mode_interactive(self, otp_code: str) -> dict[str, Any]:
         """Login to Amazon interactively via OTP."""
         _LOGGER.debug(
@@ -704,7 +718,7 @@ class AmazonEchoApi:
             _LOGGER.debug(
                 'Cannot find "auth-mfa-otpcode" in html source [%s]', login_url
             )
-            raise CannotAuthenticate
+            raise CannotAuthenticate("MFA OTP code not found on login page")
 
         login_method, login_url = self._get_request_from_soup(login_soup)
 
@@ -743,6 +757,10 @@ class AmazonEchoApi:
             obfuscate_email(self._login_email),
         )
 
+        # Check if session is still authenticated
+        if not await self.auth_check_status():
+            raise CannotAuthenticate("Session no longer authenticated")
+
         return self._login_stored_data
 
     async def _get_alexa_domain(self) -> str:
@@ -752,7 +770,7 @@ class AmazonEchoApi:
             method=HTTPMethod.GET,
             url=f"https://alexa.amazon.{self._domain}/api/welcome",
         )
-        json_data = await raw_resp.json()
+        json_data = await self._response_to_json(raw_resp)
         return cast(
             "str", json_data.get("alexaHostName", f"alexa.amazon.{self._domain}")
         )
@@ -798,8 +816,7 @@ class AmazonEchoApi:
             url=f"https://alexa.amazon.{self._domain}{URI_DEVICES}",
         )
 
-        response_data = await raw_resp.text()
-        json_data = {} if len(response_data) == 0 else await raw_resp.json()
+        json_data = await self._response_to_json(raw_resp)
 
         _LOGGER.debug("JSON devices data: %s", scrub_fields(json_data))
 
@@ -861,7 +878,7 @@ class AmazonEchoApi:
             )
             return False
 
-        resp_json = await raw_resp.json()
+        resp_json = await self._response_to_json(raw_resp)
         if not (authentication := resp_json.get("authentication")):
             _LOGGER.debug('Session not authenticated: reply missing "authentication"')
             return False
@@ -1106,21 +1123,21 @@ class AmazonEchoApi:
             "domain": f"www.amazon.{self._domain}",
         }
 
-        response = await self._session.post(
+        raw_resp = await self._session.post(
             "https://api.amazon.com/auth/token",
             data=data,
         )
         _LOGGER.debug(
             "Refresh data response %s with payload %s",
-            response.status,
+            raw_resp.status,
             orjson.dumps(data),
         )
 
-        if response.status != HTTPStatus.OK:
+        if raw_resp.status != HTTPStatus.OK:
             _LOGGER.debug("Failed to refresh data")
             return False, {}
 
-        json_response = await response.json()
+        json_response = await self._response_to_json(raw_resp)
         _LOGGER.debug("Refresh data json:\n%s ", json_response)
 
         if data_type == REFRESH_ACCESS_TOKEN and (
@@ -1128,7 +1145,7 @@ class AmazonEchoApi:
         ):
             self._login_stored_data[REFRESH_ACCESS_TOKEN] = new_token
             self.expires_in = datetime.now(tz=UTC).timestamp() + int(
-                json_response.get("expires_in")
+                json_response.get("expires_in", 0)
             )
             return True, json_response