aioamazondevices 3.2.10__py3-none-any.whl → 3.3.1__py3-none-any.whl

aioamazondevices/__init__.py

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

aioamazondevices/api.py

@@ -9,16 +9,16 @@ from dataclasses import dataclass
 from datetime import UTC, datetime, timedelta
 from enum import StrEnum
 from http import HTTPMethod, HTTPStatus
-from http.cookies import Morsel, SimpleCookie
+from http.cookies import Morsel
 from pathlib import Path
 from typing import Any, cast
 from urllib.parse import parse_qs, urlencode
 
 import orjson
-from aiohttp import ClientConnectorError, ClientResponse, ClientSession
+from aiohttp import ClientConnectorError, ClientResponse, ClientSession, CookieJar
 from bs4 import BeautifulSoup, Tag
 from langcodes import Language
-from multidict import CIMultiDictProxy, MultiDictProxy
+from multidict import MultiDictProxy
 from yarl import URL
 
 from .const import (
@@ -305,29 +305,9 @@ class AmazonEchoApi:
         """Create HTTP client session."""
         if not hasattr(self, "session") or self.session.closed:
             _LOGGER.debug("Creating HTTP session (aiohttp)")
-            headers = DEFAULT_HEADERS
-            headers.update({"Accept-Language": self._language})
-            self.session = ClientSession(
-                headers=headers,
-                cookies=self._cookies,
-            )
-
-    async def _parse_cookies_from_headers(
-        self, headers: CIMultiDictProxy[str]
-    ) -> dict[str, str]:
-        """Parse cookies with a value from headers."""
-        cookies_with_value: dict[str, str] = {}
-
-        for value in headers.getall("Set-Cookie", ()):
-            cookie = SimpleCookie()
-            cookie.load(value)
-
-            for name, morsel in cookie.items():
-                if morsel.value and morsel.value not in ("-", ""):
-                    cookies_with_value[name] = morsel.value
-
-        _LOGGER.debug("Cookies from headers: %s", cookies_with_value)
-        return cookies_with_value
+            cookie_jar = CookieJar()
+            cookie_jar.update_cookies(self._cookies)
+            self.session = ClientSession(cookie_jar=cookie_jar)
 
     async def _ignore_ap_signin_error(self, response: ClientResponse) -> bool:
         """Return true if error is due to signin endpoint."""
@@ -382,29 +362,28 @@ class AmazonEchoApi:
             headers.update({"User-Agent": DEFAULT_AGENT})
         if self._csrf_cookie:
             csrf = {CSRF_COOKIE: self._csrf_cookie}
-            _LOGGER.debug("Adding <%s> to headers", csrf)
+            _LOGGER.debug("Adding to headers: %s", csrf)
             headers.update(csrf)
 
         if json_data:
             json_header = {"Content-Type": "application/json; charset=utf-8"}
-            _LOGGER.debug("Adding %s to headers", json_header)
+            _LOGGER.debug("Adding to headers: %s", json_header)
             headers.update(json_header)
 
         _cookies = (
             self._load_website_cookies() if self._login_stored_data else self._cookies
         )
+        self.session.cookie_jar.update_cookies(_cookies)
         try:
             resp = await self.session.request(
                 method,
                 URL(url, encoded=True),
                 data=input_data if not json_data else orjson.dumps(input_data),
-                cookies=_cookies,
                 headers=headers,
             )
         except (TimeoutError, ClientConnectorError) as exc:
             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)

aioamazondevices/const.py

@@ -42,7 +42,7 @@ DOMAIN_BY_ISO3166_COUNTRY = {
     },
     "au": {
         "domain": "com.au",
-        "openid.assoc_handle": DEFAULT_ASSOC_HANDLE,
+        "openid.assoc_handle": f"{DEFAULT_ASSOC_HANDLE}_au",
     },
     "be": {
         "domain": "com.be",
@@ -66,7 +66,7 @@ DOMAIN_BY_ISO3166_COUNTRY = {
     },
     "nz": {
         "domain": "com.au",
-        "openid.assoc_handle": DEFAULT_ASSOC_HANDLE,
+        "openid.assoc_handle": f"{DEFAULT_ASSOC_HANDLE}_au",
     },
     "tr": {
         "domain": "com.tr",

{aioamazondevices-3.2.10.dist-info → aioamazondevices-3.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: aioamazondevices
-Version: 3.2.10
+Version: 3.3.1
 Summary: Python library to control Amazon devices
 License: Apache-2.0
 Author: Simone Chemelli
@@ -11,7 +11,7 @@ Classifier: Intended Audience :: Developers
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: Software Development :: Libraries
-Requires-Dist: aiohttp
+Requires-Dist: aiohttp (>=3.12.7)
 Requires-Dist: beautifulsoup4
 Requires-Dist: colorlog
 Requires-Dist: langcodes

aioamazondevices-3.3.1.dist-info/RECORD

@@ -0,0 +1,11 @@
+aioamazondevices/__init__.py,sha256=Dgok2Xxu-FJDmSIfY-mQcaI6Xe1dCMQXfyyXYUVu4-c,276
+aioamazondevices/api.py,sha256=4r1VMWkuk8GCVtrHlNq8Wvscl_ThscglHjuZyHgOm9U,39885
+aioamazondevices/const.py,sha256=NVqS6TKQGlJJoViG9Mw9_dsKKyDL7v61OHHyjjkCqeY,9059
+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.3.1.dist-info/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
+aioamazondevices-3.3.1.dist-info/METADATA,sha256=hOfbN_9Bb0dMcvlOhsiwUAcbxxMa_MkMmGC_GGIF9bM,5245
+aioamazondevices-3.3.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+aioamazondevices-3.3.1.dist-info/RECORD,,

aioamazondevices-3.2.10.dist-info/RECORD

@@ -1,11 +0,0 @@
-aioamazondevices/__init__.py,sha256=-Ar_mvX5S_358fTLtKk3D2qoFUXnyf4K_jQ-uSuX4kk,277
-aioamazondevices/api.py,sha256=a8VNFKe_eU4xoc0sCF7GTsEdEFvzjzdWpbsDeYzf1bU,40665
-aioamazondevices/const.py,sha256=1TTqejdLJVB-8fBODXx4Ha9dxiQnuLVjbWusJ7WILdo,9043
-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.10.dist-info/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
-aioamazondevices-3.2.10.dist-info/METADATA,sha256=QzUzTQA62DVSsDnGshjApO9iPw0OM90KvmBSnJE2rvk,5235
-aioamazondevices-3.2.10.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-aioamazondevices-3.2.10.dist-info/RECORD,,