aioamazondevices 6.2.6__py3-none-any.whl → 6.2.8__py3-none-any.whl

aioamazondevices/__init__.py

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

aioamazondevices/api.py

@@ -40,8 +40,6 @@ from .const import (
     AMAZON_DEVICE_TYPE,
     BIN_EXTENSION,
     CSRF_COOKIE,
-    DEFAULT_AGENT,
-    DEFAULT_ASSOC_HANDLE,
     DEFAULT_HEADERS,
     DEFAULT_SITE,
     DEVICE_TO_IGNORE,
@@ -88,6 +86,7 @@ class AmazonDevice:
     device_family: str
     device_type: str
     device_owner_customer_id: str
+    household_device: bool
     device_cluster_members: list[str]
     online: bool
     serial_number: str
@@ -138,6 +137,7 @@ class AmazonEchoApi:
         self._save_raw_data = False
         self._login_stored_data = login_data or {}
         self._serial = self._serial_number()
+        self._account_owner_customer_id: str | None = None
         self._list_for_clusters: dict[str, str] = {}
 
         self._session = client_session
@@ -254,9 +254,9 @@ class AmazonEchoApi:
         oauth_params = {
             "openid.return_to": "https://www.amazon.com/ap/maplanding",
             "openid.oa2.code_challenge_method": "S256",
-            "openid.assoc_handle": DEFAULT_ASSOC_HANDLE,
+            "openid.assoc_handle": "amzn_dp_project_dee_ios",
             "openid.identity": "http://specs.openid.net/auth/2.0/identifier_select",
-            "pageId": DEFAULT_ASSOC_HANDLE,
+            "pageId": "amzn_dp_project_dee_ios",
             "accountStatusPolicy": "P1",
             "openid.claimed_id": "http://specs.openid.net/auth/2.0/identifier_select",
             "openid.mode": "checkid_setup",
@@ -339,7 +339,6 @@ 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(
@@ -352,9 +351,7 @@ class AmazonEchoApi:
 
         headers = DEFAULT_HEADERS.copy()
         headers.update({"Accept-Language": self._language})
-        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 to headers: %s", csrf)
@@ -370,14 +367,6 @@ class AmazonEchoApi:
         )
         self._session.cookie_jar.update_cookies(_cookies, URL(f"amazon.{self._domain}"))
 
-        if url.endswith("/auth/token"):
-            headers.update(
-                {
-                    "Content-Type": "application/x-www-form-urlencoded",
-                    "x-amzn-identity-auth-domain": "api.amazon.com",
-                }
-            )
-
         resp: ClientResponse | None = None
         for delay in [0, 1, 2, 5, 8, 12, 21]:
             if delay:
@@ -444,7 +433,7 @@ class AmazonEchoApi:
             mimetypes.guess_extension(content_type.split(";")[0]) or ".raw",
         )
 
-        return BeautifulSoup(await resp.read(), "html.parser"), resp
+        return BeautifulSoup(await resp.read() or "", "html.parser"), resp
 
     async def _save_to_file(
         self,
@@ -613,7 +602,19 @@ class AmazonEchoApi:
         devices_sensors: dict[str, dict[str, AmazonDeviceSensor]] = {}
         devices_endpoints: dict[str, dict[str, Any]] = {}
 
-        endpoints = devices_state["data"]["listEndpoints"]
+        if error := devices_state.get("errors"):
+            if isinstance(error, list):
+                error = error[0]
+            msg = error.get("message", "Unknown error")
+            path = error.get("path", "Unknown path")
+            _LOGGER.error("Error retrieving devices state: %s for path %s", msg, path)
+            return {}, {}
+
+        if not (data := devices_state.get("data")) or not data.get("listEndpoints"):
+            _LOGGER.error("Malformed devices state data received: %s", devices_state)
+            return {}, {}
+
+        endpoints = data["listEndpoints"]
         for endpoint in endpoints.get("endpoints"):
             serial_number = (
                 endpoint["serialNumber"]["value"]["text"]
@@ -856,9 +857,14 @@ class AmazonEchoApi:
 
         _LOGGER.debug("JSON devices data: %s", scrub_fields(json_data))
 
+        this_device_serial = self._login_stored_data["device_info"][
+            "device_serial_number"
+        ]
         for data in json_data["devices"]:
             dev_serial = data.get("serialNumber")
             self._devices[dev_serial] = data
+            if dev_serial == this_device_serial:
+                self._account_owner_customer_id = data["deviceOwnerCustomerId"]
 
         devices_endpoints, devices_sensors = await self._get_sensors_states()
 
@@ -879,6 +885,8 @@ class AmazonEchoApi:
                 device_family=device["deviceFamily"],
                 device_type=device["deviceType"],
                 device_owner_customer_id=device["deviceOwnerCustomerId"],
+                household_device=device["deviceOwnerCustomerId"]
+                == self._account_owner_customer_id,
                 device_cluster_members=(device["clusterMembers"] or [serial_number]),
                 online=device["online"],
                 serial_number=serial_number,
@@ -953,7 +961,7 @@ class AmazonEchoApi:
             "deviceType": device.device_type,
             "deviceSerialNumber": device.serial_number,
             "locale": self._language,
-            "customerId": device.device_owner_customer_id,
+            "customerId": self._account_owner_customer_id,
         }
 
         payload: dict[str, Any]
@@ -962,7 +970,7 @@ class AmazonEchoApi:
                 **base_payload,
                 "textToSpeak": message_body,
                 "target": {
-                    "customerId": device.device_owner_customer_id,
+                    "customerId": self._account_owner_customer_id,
                     "devices": [
                         {
                             "deviceSerialNumber": device.serial_number,
@@ -999,7 +1007,7 @@ class AmazonEchoApi:
                     }
                 ],
                 "target": {
-                    "customerId": device.device_owner_customer_id,
+                    "customerId": self._account_owner_customer_id,
                     "devices": playback_devices,
                 },
                 "skillId": "amzn1.ask.1p.routines.messaging",
@@ -1171,9 +1179,11 @@ class AmazonEchoApi:
             "domain": f"www.amazon.{self._domain}",
         }
 
-        raw_resp = await self._session.post(
+        _, raw_resp = await self._session_request(
+            HTTPMethod.POST,
             "https://api.amazon.com/auth/token",
-            data=data,
+            input_data=data,
+            json_data=False,
         )
         _LOGGER.debug(
             "Refresh data response %s with payload %s",

aioamazondevices/const.py

@@ -4,8 +4,6 @@ import logging
 
 _LOGGER = logging.getLogger(__package__)
 
-DEFAULT_ASSOC_HANDLE = "amzn_dp_project_dee_ios"
-
 HTTP_ERROR_199 = 199
 HTTP_ERROR_299 = 299
 
@@ -48,7 +46,6 @@ 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"
 
 REFRESH_ACCESS_TOKEN = "access_token"  # noqa: S105

aioamazondevices/query.py

@@ -2,7 +2,7 @@
 
 QUERY_DEVICE_STATE = """
 query getDevicesState ($latencyTolerance: LatencyToleranceValue) {
-  listEndpoints(listEndpointsInput: {}) {
+  listEndpoints(listEndpointsInput: { includeHouseholdDevices: true }) {
     endpoints {
       endpointId: id
       friendlyNameObject { value { text } }

{aioamazondevices-6.2.6.dist-info → aioamazondevices-6.2.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aioamazondevices
-Version: 6.2.6
+Version: 6.2.8
 Summary: Python library to control Amazon devices
 License-Expression: Apache-2.0
 License-File: LICENSE

aioamazondevices-6.2.8.dist-info/RECORD

@@ -0,0 +1,12 @@
+aioamazondevices/__init__.py,sha256=fC_cVxoQ9UV0g3MPcq9xo24JwXEXPPXuU1x5i1IA00o,276
+aioamazondevices/api.py,sha256=xJyDMmWDizrr4k8cpoUtr3FMb7A0K3y-ls9sbh3x0lw,44084
+aioamazondevices/const.py,sha256=pPjMhNABj3rN8uvHzqj41tDiGPx-C50QRcSckvzX9z8,11561
+aioamazondevices/exceptions.py,sha256=gRYrxNAJnrV6uRuMx5e76VMvtNKyceXd09q84pDBBrI,638
+aioamazondevices/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+aioamazondevices/query.py,sha256=qLCuNyVlSbvVQmckZUsmftsz8s04GIukdidsOo4BrD0,2084
+aioamazondevices/sounds.py,sha256=CXMDk-KoKVFxBdVAw3MeOClqgpzcVDxvQhFOJp7qX-Y,1896
+aioamazondevices/utils.py,sha256=RzuKRhnq_8ymCoJMoQJ2vBYyuew06RSWpqQWmqdNczE,2019
+aioamazondevices-6.2.8.dist-info/METADATA,sha256=HM04uPbCYPajVoqRxnrnywFsqV7YUmHDEupi0qWLd1k,7656
+aioamazondevices-6.2.8.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+aioamazondevices-6.2.8.dist-info/licenses/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
+aioamazondevices-6.2.8.dist-info/RECORD,,

{aioamazondevices-6.2.6.dist-info → aioamazondevices-6.2.8.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.2.0
+Generator: poetry-core 2.2.1
 Root-Is-Purelib: true
 Tag: py3-none-any

aioamazondevices-6.2.6.dist-info/RECORD

@@ -1,12 +0,0 @@
-aioamazondevices/__init__.py,sha256=2rkrcsrHU_OkLuxwVmHbM2zQIokytaNz17RY5Sme80U,276
-aioamazondevices/api.py,sha256=h3LVTzj4f2unlD8PPyezBT0OsbF5viICIK8YhT2MoIU,43533
-aioamazondevices/const.py,sha256=laRFapeQRpg3aGi10iCOH5OzBi1cnaPJX0s1phSl21w,11769
-aioamazondevices/exceptions.py,sha256=gRYrxNAJnrV6uRuMx5e76VMvtNKyceXd09q84pDBBrI,638
-aioamazondevices/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-aioamazondevices/query.py,sha256=AGHHzefzfYzB7RLWPtlFxYc_rpUZdoeApsU2jYz3urQ,2053
-aioamazondevices/sounds.py,sha256=CXMDk-KoKVFxBdVAw3MeOClqgpzcVDxvQhFOJp7qX-Y,1896
-aioamazondevices/utils.py,sha256=RzuKRhnq_8ymCoJMoQJ2vBYyuew06RSWpqQWmqdNczE,2019
-aioamazondevices-6.2.6.dist-info/METADATA,sha256=us19gN-RKVrY6ICis6RkboCyMzStX5jHSTWbbfKfAXc,7656
-aioamazondevices-6.2.6.dist-info/WHEEL,sha256=M5asmiAlL6HEcOq52Yi5mmk9KmTVjY2RDPtO4p9DMrc,88
-aioamazondevices-6.2.6.dist-info/licenses/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
-aioamazondevices-6.2.6.dist-info/RECORD,,