aioamazondevices 3.2.0__py3-none-any.whl → 3.2.2__py3-none-any.whl

aioamazondevices/__init__.py

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

aioamazondevices/api.py

@@ -32,6 +32,7 @@ from .const import (
     AMAZON_DEVICE_TYPE,
     BIN_EXTENSION,
     CSRF_COOKIE,
+    DEFAULT_AGENT,
     DEFAULT_ASSOC_HANDLE,
     DEFAULT_HEADERS,
     DEVICE_TO_IGNORE,
@@ -161,7 +162,17 @@ class AmazonEchoApi:
         if not self._login_stored_data:
             return {}
 
-        return cast("dict", self._login_stored_data["website_cookies"])
+        website_cookies: dict[str, Any] = self._login_stored_data["website_cookies"]
+        website_cookies.update(
+            {
+                "session-token": self._login_stored_data["store_authentication_cookie"][
+                    "cookie"
+                ]
+            }
+        )
+        website_cookies.update({"lc-acbit": self._language})
+
+        return website_cookies
 
     def _serial_number(self) -> str:
         """Get or calculate device serial number."""
@@ -325,6 +336,7 @@ class AmazonEchoApi:
         url: str,
         input_data: dict[str, Any] | None = None,
         json_data: bool = False,
+        amazon_user_agent: bool = True,
     ) -> tuple[BeautifulSoup, ClientResponse]:
         """Return request response context data."""
         _LOGGER.debug(
@@ -337,7 +349,10 @@ class AmazonEchoApi:
 
         headers = DEFAULT_HEADERS
         headers.update({"Accept-Language": self._language})
-        if self._csrf_cookie and CSRF_COOKIE not in headers:
+        if not amazon_user_agent:
+            _LOGGER.debug("Changing User-Agent to %s", DEFAULT_AGENT)
+            headers.update({"User-Agent": DEFAULT_AGENT})
+        if self._csrf_cookie:
             csrf = {CSRF_COOKIE: self._csrf_cookie}
             _LOGGER.debug("Adding <%s> to headers", csrf)
             headers.update(csrf)
@@ -362,6 +377,9 @@ class AmazonEchoApi:
             raise CannotConnect(f"Connection error during {method}") from exc
 
         self._cookies.update(**await self._parse_cookies_from_headers(resp.headers))
+        if not self._csrf_cookie:
+            self._csrf_cookie = resp.cookies.get(CSRF_COOKIE, Morsel()).value
+            _LOGGER.debug("CSRF cookie value: <%s>", self._csrf_cookie)
 
         content_type: str = resp.headers.get("Content-Type", "")
         _LOGGER.debug(
@@ -556,6 +574,7 @@ class AmazonEchoApi:
         _, raw_resp = await self._session_request(
             "GET",
             url=f"https://alexa.amazon.{self._domain}{URI_IDS}",
+            amazon_user_agent=False,
         )
         json_data = await raw_resp.json()
 
@@ -770,11 +789,6 @@ class AmazonEchoApi:
             _LOGGER.debug("Response code: |%s|", response_code)
 
             response_data = await raw_resp.text()
-
-            if not self._csrf_cookie:
-                self._csrf_cookie = raw_resp.cookies.get(CSRF_COOKIE, Morsel()).value
-                _LOGGER.debug("CSRF cookie value: <%s>", self._csrf_cookie)
-
             json_data = {} if len(response_data) == 0 else await raw_resp.json()
 
             _LOGGER.debug("JSON data: |%s|", scrub_fields(json_data))

aioamazondevices/const.py

@@ -86,6 +86,7 @@ DEFAULT_HEADERS = {
     "Accept-Encoding": "gzip",
     "Connection": "keep-alive",
 }
+DEFAULT_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36 Edg/138.0.0.0"  # noqa: E501
 CSRF_COOKIE = "csrf"
 
 NODE_DEVICES = "devices"

{aioamazondevices-3.2.0.dist-info → aioamazondevices-3.2.2.dist-info}/METADATA

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

aioamazondevices-3.2.2.dist-info/RECORD

@@ -0,0 +1,11 @@
+aioamazondevices/__init__.py,sha256=qelvi3_OmLOGJDAwlKAmQe5biPKQ8p0sbMx3c2Tpif0,276
+aioamazondevices/api.py,sha256=yIU0w95V9v7fDlArNK26azOtogBX8yxJJKBJbA_UWKs,39169
+aioamazondevices/const.py,sha256=q2TlD1O4jPtQ-hIxCCZuD-uoXCFNudF11JSjSC2hClY,8687
+aioamazondevices/exceptions.py,sha256=CfOFKDvE_yl5BFoFcpTOuDfgRi_2oAtKk-nNJgfWBAs,726
+aioamazondevices/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+aioamazondevices/sounds.py,sha256=01pVCDFIuhrLypXInw4JNuHsC6zjMLsuKocet1R6we8,13409
+aioamazondevices/utils.py,sha256=RzuKRhnq_8ymCoJMoQJ2vBYyuew06RSWpqQWmqdNczE,2019
+aioamazondevices-3.2.2.dist-info/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
+aioamazondevices-3.2.2.dist-info/METADATA,sha256=JIkelm9RwNWUra00wyvNp_wR09BNskKA-NFF013cbHU,5234
+aioamazondevices-3.2.2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+aioamazondevices-3.2.2.dist-info/RECORD,,

aioamazondevices-3.2.0.dist-info/RECORD

@@ -1,11 +0,0 @@
-aioamazondevices/__init__.py,sha256=2bsaWXIfe39pE5Jjw25d1t7wCVNWK36dLG4zXoSQZpU,276
-aioamazondevices/api.py,sha256=W4LyCmiWCSJlHzpTSAQkb8DMcZbBQxJufZ3lnSasiik,38648
-aioamazondevices/const.py,sha256=J47aHAfoA6rRgHDvn-q_S4xp8MrC6O1rEk1ZeRnN-8E,8529
-aioamazondevices/exceptions.py,sha256=CfOFKDvE_yl5BFoFcpTOuDfgRi_2oAtKk-nNJgfWBAs,726
-aioamazondevices/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-aioamazondevices/sounds.py,sha256=01pVCDFIuhrLypXInw4JNuHsC6zjMLsuKocet1R6we8,13409
-aioamazondevices/utils.py,sha256=RzuKRhnq_8ymCoJMoQJ2vBYyuew06RSWpqQWmqdNczE,2019
-aioamazondevices-3.2.0.dist-info/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
-aioamazondevices-3.2.0.dist-info/METADATA,sha256=7d6AfzuC3n4IVSV1FWk37dR_Ruej_mCc1coKc5KE_yY,5234
-aioamazondevices-3.2.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-aioamazondevices-3.2.0.dist-info/RECORD,,