aioamazondevices 3.1.19__py3-none-any.whl → 3.1.23__py3-none-any.whl

aioamazondevices/__init__.py

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

aioamazondevices/api.py

@@ -146,6 +146,15 @@ class AmazonEchoApi:
         self.session: ClientSession
         self._devices: dict[str, Any] = {}
 
+        lang_object = Language.make(territory=self._login_country_code.upper())
+        lang_maximized = lang_object.maximize()
+        self._language = f"{lang_maximized.language}-{lang_maximized.region}"
+        _LOGGER.debug(
+            "Initialize library with domain <%s> and language <%s>",
+            self._domain,
+            self._language,
+        )
+
     def _load_website_cookies(self) -> dict[str, str]:
         """Get website cookies, if avaliables."""
         if not self._login_stored_data:
@@ -210,22 +219,23 @@ class AmazonEchoApi:
         code_challenge = self._create_s256_code_challenge(code_verifier)
 
         oauth_params = {
-            "openid.oa2.response_type": "code",
-            "openid.oa2.code_challenge_method": "S256",
-            "openid.oa2.code_challenge": code_challenge,
             "openid.return_to": f"https://www.amazon.{self._domain}/ap/maplanding",
+            "openid.oa2.code_challenge_method": "S256",
             "openid.assoc_handle": self._assoc_handle,
             "openid.identity": "http://specs.openid.net/auth/2.0/identifier_select",
+            "pageId": self._assoc_handle,
             "accountStatusPolicy": "P1",
             "openid.claimed_id": "http://specs.openid.net/auth/2.0/identifier_select",
             "openid.mode": "checkid_setup",
             "openid.ns.oa2": "http://www.amazon.com/ap/ext/oauth/2",
             "openid.oa2.client_id": f"device:{client_id}",
+            "language": self._language.replace("-", "_"),
             "openid.ns.pape": "http://specs.openid.net/extensions/pape/1.0",
+            "openid.oa2.code_challenge": code_challenge,
             "openid.oa2.scope": "device_auth_access",
-            "forceMobileLayout": "true",
             "openid.ns": "http://specs.openid.net/auth/2.0",
             "openid.pape.max_auth_age": "0",
+            "openid.oa2.response_type": "code",
         }
 
         return (
@@ -273,8 +283,10 @@ 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=DEFAULT_HEADERS,
+                headers=headers,
                 cookies=self._cookies,
             )
 
@@ -323,6 +335,7 @@ class AmazonEchoApi:
         )
 
         headers = DEFAULT_HEADERS
+        headers.update({"Accept-Language": self._language})
         if self._csrf_cookie and CSRF_COOKIE not in headers:
             csrf = {CSRF_COOKIE: self._csrf_cookie}
             _LOGGER.debug("Adding <%s> to headers", csrf)
@@ -479,11 +492,6 @@ class AmazonEchoApi:
             )
             raise CannotRegisterDevice(f"{HTTPStatus(resp.status).phrase}: {msg}")
 
-        await self._save_to_file(
-            await resp.text(),
-            url=register_url,
-            extension=JSON_EXTENSION,
-        )
         success_response = resp_json["response"]["success"]
 
         tokens = success_response["tokens"]
@@ -530,16 +538,43 @@ class AmazonEchoApi:
         location_details = network_detail["locationDetails"]["locationDetails"]
         default_location = location_details["Default_Location"]
         amazon_bridge = default_location["amazonBridgeDetails"]["amazonBridgeDetails"]
-        lambda_bridge = amazon_bridge.get("LambdaBridge_AAA/SonarCloudService")
-        if not lambda_bridge:
-            # Some very old devices lack the key for sensors data
-            return []
-        appliance_details = lambda_bridge["applianceDetails"]["applianceDetails"]
 
+        # New devices are based on LambdaBridge_AAA structure
+        lambda_bridge_aaa = amazon_bridge.get("LambdaBridge_AAA/SonarCloudService")
+        appliance_details_aaa = (
+            lambda_bridge_aaa["applianceDetails"]["applianceDetails"]
+            if lambda_bridge_aaa
+            else {}
+        )
+
+        entity_ids_list: list[dict[str, str]] = await self._get_entities_ids(
+            appliance_details_aaa, "AAA_SonarCloudService"
+        )
+
+        # Old devices are based on LambdaBridge_AlexaBridge structure
+        for bridge_key, bridge_value in amazon_bridge.items():
+            if "LambdaBridge_AlexaBridge/" in bridge_key:
+                # Value key:    "LambdaBridge_AlexaBridge/XXXXXXXXXXXXXX@XXXXXXXXXXXXXX"
+                # Value subkey: "AlexaBridge_XXXXXXXXXXXXXX@XXXXXXXXXXXXXX_XXXXXXXXXXXX"
+                subkey = bridge_key.split("_")[1].replace("/", "_")
+
+                appliance_details_alexa = bridge_value["applianceDetails"][
+                    "applianceDetails"
+                ]
+                entity_ids_list.extend(
+                    await self._get_entities_ids(appliance_details_alexa, subkey)
+                )
+
+        return entity_ids_list
+
+    async def _get_entities_ids(
+        self, appliance_details: dict[str, Any], searchkey: str
+    ) -> list[dict[str, str]]:
+        """Extract entityId and applianceId."""
         entity_ids_list: list[dict[str, str]] = []
-        # Process each appliance that starts with AAA_SonarCloudService
+        # Process each appliance that starts with "searchkey"
         for appliance_key, appliance_data in appliance_details.items():
-            if not appliance_key.startswith("AAA_SonarCloudService"):
+            if not appliance_key.startswith(searchkey):
                 continue
 
             entity_id = appliance_data["entityId"]
@@ -662,7 +697,7 @@ class AmazonEchoApi:
         register_device = await self._register_device(device_login_data)
         self._login_stored_data = register_device
 
-        _LOGGER.info("Register device: %s", register_device)
+        _LOGGER.info("Register device: %s", scrub_fields(register_device))
         return register_device
 
     async def login_mode_stored_data(self) -> dict[str, Any]:
@@ -704,7 +739,6 @@ class AmazonEchoApi:
             _LOGGER.debug("Response code: |%s|", response_code)
 
             response_data = await raw_resp.text()
-            _LOGGER.debug("Response data: |%s|", response_data)
 
             if not self._csrf_cookie:
                 self._csrf_cookie = raw_resp.cookies.get(CSRF_COOKIE, Morsel()).value
@@ -712,7 +746,7 @@ class AmazonEchoApi:
 
             json_data = {} if len(response_data) == 0 else await raw_resp.json()
 
-            _LOGGER.debug("JSON data: |%s|", json_data)
+            _LOGGER.debug("JSON data: |%s|", scrub_fields(json_data))
 
             for data in json_data[key]:
                 dev_serial = data.get("serialNumber") or data.get("deviceSerialNumber")
@@ -821,10 +855,6 @@ class AmazonEchoApi:
         message_source: AmazonMusicSource | None = None,
     ) -> None:
         """Send message to specific device."""
-        lang_object = Language.make(territory=self._login_country_code.upper())
-        lang_maximized = lang_object.maximize()
-        locale = f"{lang_maximized.language}-{lang_maximized.region}"
-
         if not self._login_stored_data:
             _LOGGER.warning("Trying to send message before login")
             return
@@ -832,7 +862,7 @@ class AmazonEchoApi:
         base_payload = {
             "deviceType": device.device_type,
             "deviceSerialNumber": device.serial_number,
-            "locale": locale,
+            "locale": self._language,
             "customerId": device.device_owner_customer_id,
         }
 
@@ -867,7 +897,7 @@ class AmazonEchoApi:
                 "expireAfter": "PT5S",
                 "content": [
                     {
-                        "locale": locale,
+                        "locale": self._language,
                         "display": {
                             "title": "Home Assistant",
                             "body": message_body,

aioamazondevices/const.py

@@ -7,11 +7,13 @@ _LOGGER = logging.getLogger(__package__)
 DEFAULT_ASSOC_HANDLE = "amzn_dp_project_dee_ios"
 
 TO_REDACT = {
+    "address",
     "address1",
     "address2",
     "address3",
     "city",
     "county",
+    "customerId",
     "deviceAccountId",
     "deviceAddress",
     "deviceOwnerCustomerId",
@@ -82,7 +84,6 @@ DEFAULT_HEADERS = {
     ),
     "Accept-Charset": "utf-8",
     "Accept-Encoding": "gzip",
-    "Accept-Language": "en-US",
     "Connection": "keep-alive",
 }
 CSRF_COOKIE = "csrf"

aioamazondevices/utils.py

@@ -37,7 +37,9 @@ def scrub_fields(
         result = {}
         for k, v in obj.items():
             # If the key itself is sensitive → overwrite its value
-            if k in field_names:
+            if k == "email":
+                result[k] = obfuscate_email(v)
+            elif k in field_names:
                 result[k] = replacement
             else:
                 # Otherwise keep walking

{aioamazondevices-3.1.19.dist-info → aioamazondevices-3.1.23.dist-info}/METADATA

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

aioamazondevices-3.1.23.dist-info/RECORD

@@ -0,0 +1,11 @@
+aioamazondevices/__init__.py,sha256=mZIaRiUx4hb3bx5kIhZc9PX7hxD-qnhod-h81ENTXac,277
+aioamazondevices/api.py,sha256=J4e85fBrHIWPeTvP7TYsezvdHKQ0I_Pqz3HCcdmF6J8,37542
+aioamazondevices/const.py,sha256=J47aHAfoA6rRgHDvn-q_S4xp8MrC6O1rEk1ZeRnN-8E,8529
+aioamazondevices/exceptions.py,sha256=JDnSFi_7oEhqK31sHXf0S_cyMoMjiRJuLp4ow7mYgLY,643
+aioamazondevices/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+aioamazondevices/sounds.py,sha256=01pVCDFIuhrLypXInw4JNuHsC6zjMLsuKocet1R6we8,13409
+aioamazondevices/utils.py,sha256=RzuKRhnq_8ymCoJMoQJ2vBYyuew06RSWpqQWmqdNczE,2019
+aioamazondevices-3.1.23.dist-info/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
+aioamazondevices-3.1.23.dist-info/METADATA,sha256=xEheLDnUfjp1pQbgAMvDsWmOcG5xnDnU8eZfmYSWg4A,5235
+aioamazondevices-3.1.23.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+aioamazondevices-3.1.23.dist-info/RECORD,,

aioamazondevices-3.1.19.dist-info/RECORD

@@ -1,11 +0,0 @@
-aioamazondevices/__init__.py,sha256=yYJH7153YmQfYcpIzSJNgHgxNQI7bZK5Aq0emVmfVQg,277
-aioamazondevices/api.py,sha256=7IJF_bOSs0C1fLKeOR2Y87qyADlfGEGWlihZ2vlLaL8,36250
-aioamazondevices/const.py,sha256=KQbHCOvzBTcWMc3O-kLR72wJJDBbrFK9dPHJVEPMY4M,8528
-aioamazondevices/exceptions.py,sha256=JDnSFi_7oEhqK31sHXf0S_cyMoMjiRJuLp4ow7mYgLY,643
-aioamazondevices/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-aioamazondevices/sounds.py,sha256=01pVCDFIuhrLypXInw4JNuHsC6zjMLsuKocet1R6we8,13409
-aioamazondevices/utils.py,sha256=1PrzAtQHigN2rGxdMVPKzbjOnwh-MLc9YWkQaVQIHT4,1941
-aioamazondevices-3.1.19.dist-info/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
-aioamazondevices-3.1.19.dist-info/METADATA,sha256=eOPZwC2lraH2xYJgydkqHCnPoe96hYBy0Qmua9AltY8,5235
-aioamazondevices-3.1.19.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-aioamazondevices-3.1.19.dist-info/RECORD,,