aioamazondevices 0.7.0__tar.gz → 0.7.2__tar.gz

{aioamazondevices-0.7.0 → aioamazondevices-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aioamazondevices
-Version: 0.7.0
+Version: 0.7.2
 Summary: Python library to control Amazon devices
 Home-page: https://github.com/chemelli74/aioamazondevices
 License: Apache Software License 2.0
@@ -15,8 +15,10 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries
 Requires-Dist: beautifulsoup4
+Requires-Dist: colorlog
 Requires-Dist: httpx
 Requires-Dist: orjson
 Project-URL: Bug Tracker, https://github.com/chemelli74/aioamazondevices/issues

{aioamazondevices-0.7.0 → aioamazondevices-0.7.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aioamazondevices"
-version = "0.7.0"
+version = "0.7.2"
 description = "Python library to control Amazon devices"
 authors = ["Simone Chemelli <simone.chemelli@gmail.com>"]
 license = "Apache Software License 2.0"
@@ -24,6 +24,7 @@ packages = [
 [tool.poetry.dependencies]
 python = "^3.11"
 beautifulsoup4 = "*"
+colorlog = "*"
 httpx = "*"
 orjson = "*"
 

{aioamazondevices-0.7.0 → aioamazondevices-0.7.2}/src/aioamazondevices/__init__.py

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

{aioamazondevices-0.7.0 → aioamazondevices-0.7.2}/src/aioamazondevices/api.py

@@ -2,13 +2,15 @@
 
 import base64
 import hashlib
+import json
+import mimetypes
 import secrets
 import uuid
 from dataclasses import dataclass
 from datetime import UTC, datetime, timedelta
 from http import HTTPStatus
 from pathlib import Path
-from typing import Any
+from typing import Any, cast
 from urllib.parse import parse_qs, urlencode
 
 import orjson
@@ -24,8 +26,12 @@ from .const import (
     AMAZON_CLIENT_OS,
     AMAZON_DEVICE_SOFTWARE_VERSION,
     AMAZON_DEVICE_TYPE,
+    DEFAULT_ASSOC_HANDLE,
     DEFAULT_HEADERS,
     DOMAIN_BY_COUNTRY,
+    HTML_EXTENSION,
+    JSON_EXTENSION,
+    SAVE_PATH,
     URI_QUERIES,
 )
 from .exceptions import CannotAuthenticate, CannotRegisterDevice
@@ -61,9 +67,10 @@ class AmazonEchoApi:
         locale = DOMAIN_BY_COUNTRY.get(country_code)
         domain = locale["domain"] if locale else country_code
 
-        assoc_handle = "amzn_dp_project_dee_ios"
-        if not locale:
-            assoc_handle += f"_{country_code}"
+        if locale and (assoc := locale.get("openid.assoc_handle")):
+            assoc_handle = assoc
+        else:
+            assoc_handle = f"{DEFAULT_ASSOC_HANDLE}_{country_code}"
         self._assoc_handle = assoc_handle
 
         self._login_email = login_email
@@ -73,10 +80,24 @@ class AmazonEchoApi:
         self._cookies = self._build_init_cookies()
         self._headers = DEFAULT_HEADERS
         self._save_html = save_html
-        self._serial = uuid.uuid4().hex.upper()
+        self._serial = self._serial_number()
 
         self.session: AsyncClient
 
+    def _serial_number(self) -> str:
+        """Get or calculate device serial number."""
+        fullpath = Path(SAVE_PATH, "login_data.json")
+        if not fullpath.exists():
+            # Create a new serial number
+            _LOGGER.debug("Cannot find previous login data, creating new serial number")
+            return uuid.uuid4().hex.upper()
+
+        with Path.open(fullpath, "rb") as file:
+            data = json.load(file)
+
+        _LOGGER.debug("Found previous login data, loading serial number")
+        return cast(str, data["device_info"]["device_serial_number"])
+
     def _build_init_cookies(self) -> dict[str, str]:
         """Build initial cookies to prevent captcha in most cases."""
         token_bytes = secrets.token_bytes(313)
@@ -195,32 +216,23 @@ class AmazonEchoApi:
             url,
             data=input_data,
         )
-        content_type = resp.headers.get("Content-Type", "")
+        content_type: str = resp.headers.get("Content-Type", "")
         _LOGGER.debug("Response content type: %s", content_type)
 
-        if "text/html" in content_type:
-            await self._save_to_file(
-                resp.text,
-                url,
-            )
-        elif content_type == "application/json":
-            await self._save_to_file(
-                orjson.dumps(
-                    orjson.loads(resp.text),
-                    option=orjson.OPT_INDENT_2,
-                ).decode("utf-8"),
-                url,
-                extension="json",
-            )
+        await self._save_to_file(
+            resp.text,
+            url,
+            mimetypes.guess_extension(content_type.split(";")[0]) or ".raw",
+        )
 
         return BeautifulSoup(resp.content, "html.parser"), resp
 
     async def _save_to_file(
         self,
-        html_code: str,
+        raw_data: str | dict,
         url: str,
-        extension: str = "html",
-        output_path: str = "out",
+        extension: str = HTML_EXTENSION,
+        output_path: str = SAVE_PATH,
     ) -> None:
         """Save response data to disk."""
         if not self._save_html:
@@ -229,10 +241,33 @@ class AmazonEchoApi:
         output_dir = Path(output_path)
         output_dir.mkdir(parents=True, exist_ok=True)
 
-        url_split = url.split("/")
-        filename = f"{url_split[3]}-{url_split[4].split('?')[0]}.{extension}"
-        with Path.open(output_dir / filename, "w+") as file:
-            file.write(html_code)
+        if url.startswith("http"):
+            url_split = url.split("/")
+            base_filename = f"{url_split[3]}-{url_split[4].split('?')[0]}"
+        else:
+            base_filename = url
+        fullpath = Path(output_dir, base_filename + extension)
+
+        if type(raw_data) is dict:
+            data = orjson.dumps(raw_data, option=orjson.OPT_INDENT_2).decode("utf-8")
+        elif extension == HTML_EXTENSION:
+            data = raw_data
+        else:
+            data = orjson.dumps(
+                orjson.loads(raw_data),
+                option=orjson.OPT_INDENT_2,
+            ).decode("utf-8")
+
+        i = 2
+        while fullpath.exists():
+            filename = f"{base_filename}_{i!s}{extension}"
+            fullpath = Path(output_dir, filename)
+            i += 1
+
+        _LOGGER.warning("Saving data to %s", fullpath)
+
+        with Path.open(fullpath, "w+") as file:
+            file.write(data)
             file.write("\n")
 
     async def _register_device(
@@ -277,9 +312,9 @@ class AmazonEchoApi:
 
         headers = {"Content-Type": "application/json"}
 
-        _LOGGER.warning("_register_device: [data=%s],[headers=%s]", body, headers)
+        register_url = f"https://api.amazon.{self._domain}/auth/register"
         resp = await self.session.post(
-            f"https://api.amazon.{self._domain}/auth/register",
+            register_url,
             json=body,
             headers=headers,
         )
@@ -293,6 +328,11 @@ class AmazonEchoApi:
             )
             raise CannotRegisterDevice(resp_json)
 
+        await self._save_to_file(
+            resp.text,
+            url=register_url,
+            extension=JSON_EXTENSION,
+        )
         success_response = resp_json["response"]["success"]
 
         tokens = success_response["tokens"]
@@ -312,7 +352,7 @@ class AmazonEchoApi:
         for cookie in tokens["website_cookies"]:
             website_cookies[cookie["Name"]] = cookie["Value"].replace(r'"', r"")
 
-        return {
+        login_data = {
             "adp_token": adp_token,
             "device_private_key": device_private_key,
             "access_token": access_token,
@@ -323,6 +363,8 @@ class AmazonEchoApi:
             "device_info": device_info,
             "customer_info": customer_info,
         }
+        await self._save_to_file(login_data, "login_data", JSON_EXTENSION)
+        return login_data
 
     async def login(self, otp_code: str) -> dict[str, Any]:
         """Login to Amazon."""
@@ -386,7 +428,7 @@ class AmazonEchoApi:
 
         register_device = await self._register_device(device_login_data)
 
-        _LOGGER.warning("Register device: %s", register_device)
+        _LOGGER.info("Register device: %s", register_device)
         return register_device
 
     async def close(self) -> None:

{aioamazondevices-0.7.0 → aioamazondevices-0.7.2}/src/aioamazondevices/const.py

@@ -4,10 +4,12 @@ import logging
 
 _LOGGER = logging.getLogger(__package__)
 
+DEFAULT_ASSOC_HANDLE = "amzn_dp_project_dee_ios"
+
 DOMAIN_BY_COUNTRY = {
     "us": {
         "domain": "com",
-        "openid.assoc_handle": "amzn_dp_project_dee_ios",
+        "openid.assoc_handle": DEFAULT_ASSOC_HANDLE,
     },
     "uk": {
         "domain": "co.uk",
@@ -17,6 +19,7 @@ DOMAIN_BY_COUNTRY = {
     },
     "jp": {
         "domain": "co.jp",
+        "openid.assoc_handle": "jpflex",
     },
     "br": {
         "domain": "com.br",
@@ -48,3 +51,8 @@ AMAZON_APP_VERSION = "2.2.556530.0"
 AMAZON_DEVICE_SOFTWARE_VERSION = "35602678"
 AMAZON_DEVICE_TYPE = "A2IVLV5VM2W81"
 AMAZON_CLIENT_OS = "16.6"
+
+# File extensions
+SAVE_PATH = "out"
+HTML_EXTENSION = ".html"
+JSON_EXTENSION = ".json"