aioamazondevices 3.1.17rc1__tar.gz → 3.1.22__tar.gz

{aioamazondevices-3.1.17rc1 → aioamazondevices-3.1.22}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.3
 Name: aioamazondevices
-Version: 3.1.17rc1
+Version: 3.1.22
 Summary: Python library to control Amazon devices
 License: Apache-2.0
 Author: Simone Chemelli
 Author-email: simone.chemelli@gmail.com
 Requires-Python: >=3.12
-Classifier: Development Status :: 2 - Pre-Alpha
+Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent

{aioamazondevices-3.1.17rc1 → aioamazondevices-3.1.22}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "aioamazondevices"
-version = "3.1.17-rc.1"
+version = "3.1.22"
 requires-python = ">=3.12"
 description = "Python library to control Amazon devices"
 authors = [
@@ -10,7 +10,7 @@ license = "Apache-2.0"
 readme = "README.md"
 repository = "https://github.com/chemelli74/aioamazondevices"
 classifiers = [
-    "Development Status :: 2 - Pre-Alpha",
+    "Development Status :: 4 - Beta",
     "Intended Audience :: Developers",
     "Natural Language :: English",
     "Operating System :: OS Independent",
@@ -38,7 +38,7 @@ pytest = "^8.4"
 pytest-cov = ">=5,<7"
 
 [tool.semantic_release]
-version_toml = ["pyproject.toml:tool.poetry.version"]
+version_toml = ["pyproject.toml:project.version"]
 version_variables = [
     "src/aioamazondevices/__init__.py:__version__",
 ]

{aioamazondevices-3.1.17rc1 → aioamazondevices-3.1.22}/src/aioamazondevices/__init__.py

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

{aioamazondevices-3.1.17rc1 → aioamazondevices-3.1.22}/src/aioamazondevices/api.py

@@ -58,6 +58,7 @@ from .exceptions import (
     CannotRetrieveData,
     WrongMethod,
 )
+from .utils import obfuscate_email, scrub_fields
 
 
 @dataclass
@@ -317,7 +318,7 @@ class AmazonEchoApi:
             "%s request: %s with payload %s [json=%s]",
             method,
             url,
-            input_data,
+            scrub_fields(input_data) if input_data else None,
             json_data,
         )
 
@@ -473,16 +474,11 @@ class AmazonEchoApi:
             msg = resp_json["response"]["error"]["message"]
             _LOGGER.error(
                 "Cannot register device for %s: %s",
-                self._login_email,
+                obfuscate_email(self._login_email),
                 msg,
             )
             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"]
@@ -529,16 +525,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"]
@@ -601,7 +624,11 @@ class AmazonEchoApi:
 
     async def login_mode_interactive(self, otp_code: str) -> dict[str, Any]:
         """Login to Amazon interactively via OTP."""
-        _LOGGER.debug("Logging-in for %s [otp code %s]", self._login_email, otp_code)
+        _LOGGER.debug(
+            "Logging-in for %s [otp code: %s]",
+            obfuscate_email(self._login_email),
+            bool(otp_code),
+        )
         self._client_session()
 
         code_verifier = self._create_code_verifier()
@@ -657,7 +684,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]:
@@ -671,7 +698,7 @@ class AmazonEchoApi:
 
         _LOGGER.debug(
             "Logging-in for %s with stored data",
-            self._login_email,
+            obfuscate_email(self._login_email),
         )
 
         self._client_session()
@@ -699,7 +726,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
@@ -707,7 +733,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")
@@ -723,7 +749,11 @@ class AmazonEchoApi:
 
         final_devices_list: dict[str, AmazonDevice] = {}
         for device in self._devices.values():
-            devices_node = device[NODE_DEVICES]
+            # Remove stale, orphaned and virtual devices
+            devices_node = device.get(NODE_DEVICES)
+            if not devices_node or (devices_node.get("deviceType") in DEVICE_TO_IGNORE):
+                continue
+
             preferences_node = device.get(NODE_PREFERENCES)
             do_not_disturb_node = device[NODE_DO_NOT_DISTURB]
             bluetooth_node = device[NODE_BLUETOOTH]
@@ -736,13 +766,6 @@ class AmazonEchoApi:
                     if _device_id == identifier_node["entityId"]:
                         sensors = _device_sensors
 
-            # Remove stale, orphaned and virtual devices
-            if (
-                NODE_DEVICES not in device
-                or devices_node.get("deviceType") in DEVICE_TO_IGNORE
-            ):
-                continue
-
             serial_number: str = devices_node["serialNumber"]
             final_devices_list[serial_number] = AmazonDevice(
                 account_name=devices_node["accountName"],

{aioamazondevices-3.1.17rc1 → aioamazondevices-3.1.22}/src/aioamazondevices/const.py

@@ -6,6 +6,27 @@ _LOGGER = logging.getLogger(__package__)
 
 DEFAULT_ASSOC_HANDLE = "amzn_dp_project_dee_ios"
 
+TO_REDACT = {
+    "address",
+    "address1",
+    "address2",
+    "address3",
+    "city",
+    "county",
+    "customerId",
+    "deviceAccountId",
+    "deviceAddress",
+    "deviceOwnerCustomerId",
+    "given_name",
+    "name",
+    "password",
+    "postalCode",
+    "searchCustomerId",
+    "state",
+    "street",
+    "user_id",
+}
+
 DOMAIN_BY_ISO3166_COUNTRY = {
     "ar": {
         "domain": "com",

aioamazondevices-3.1.22/src/aioamazondevices/utils.py

@@ -0,0 +1,60 @@
+"""Utils module for Amazon devices."""
+
+from collections.abc import Collection
+from typing import Any
+
+from .const import TO_REDACT
+
+
+def obfuscate_email(email: str) -> str:
+    """Obfuscate an email address partially."""
+    try:
+        username, domain = email.split("@")
+        domain_name, domain_ext = domain.rsplit(".", 1)
+
+        def obfuscate_part(part: str, visible: int = 1) -> str:
+            if len(part) <= visible:
+                return "*" * len(part)
+            return part[:visible] + "*" * (len(part) - visible)
+
+        # Obfuscate username and domain parts
+        obf_user = ".".join(obfuscate_part(u, 1) for u in username.split("."))
+        obf_domain = obfuscate_part(domain_name, 1)
+
+    except (SyntaxError, ValueError):
+        return "[invalid email]"
+    else:
+        return f"{obf_user}@{obf_domain}.{domain_ext}"
+
+
+def scrub_fields(
+    obj: Any,  # noqa: ANN401
+    field_names: Collection[str] = TO_REDACT,
+    replacement: str = "[REDACTED]",
+) -> Any:  # noqa: ANN401
+    """Return a deep-copied version of *obj* with redacted keys."""
+    if isinstance(obj, dict):
+        result = {}
+        for k, v in obj.items():
+            # If the key itself is sensitive → overwrite its value
+            if k == "email":
+                result[k] = obfuscate_email(v)
+            elif k in field_names:
+                result[k] = replacement
+            else:
+                # Otherwise keep walking
+                result[k] = scrub_fields(v, field_names, replacement)
+        return result
+
+    if isinstance(obj, list):
+        return [scrub_fields(item, field_names, replacement) for item in obj]
+
+    if isinstance(obj, tuple):
+        return tuple(scrub_fields(item, field_names, replacement) for item in obj)
+
+    if isinstance(obj, set):
+        # Note: a set cannot contain mutable/unhashable items like dicts,
+        # so we assume its members are hashable after scrubbing.
+        return {scrub_fields(item, field_names, replacement) for item in obj}
+
+    return obj