aioamazondevices 1.2.0__tar.gz → 1.4.0__tar.gz

{aioamazondevices-1.2.0 → aioamazondevices-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: aioamazondevices
-Version: 1.2.0
+Version: 1.4.0
 Summary: Python library to control Amazon devices
 License: Apache-2.0
 Author: Simone Chemelli
@@ -15,12 +15,12 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries
+Requires-Dist: aiohttp
+Requires-Dist: babel
 Requires-Dist: beautifulsoup4
 Requires-Dist: colorlog
-Requires-Dist: httpx
 Requires-Dist: orjson
-Requires-Dist: pyasn1
-Requires-Dist: rsa
+Requires-Dist: yarl
 Project-URL: Bug Tracker, https://github.com/chemelli74/aioamazondevices/issues
 Project-URL: Changelog, https://github.com/chemelli74/aioamazondevices/blob/main/CHANGELOG.md
 Project-URL: Repository, https://github.com/chemelli74/aioamazondevices
@@ -82,6 +82,7 @@ The script accept command line arguments or a library_test.json config file:
   "country": "IT",
   "email": "<my_address@gmail.com>",
   "password": "<my_password>",
+  "device_name": "Echo Dot Livingroom",
   "login_data_file": "out/login_data.json",
   "save_raw_data": "True"
 }

{aioamazondevices-1.2.0 → aioamazondevices-1.4.0}/README.md

@@ -54,6 +54,7 @@ The script accept command line arguments or a library_test.json config file:
   "country": "IT",
   "email": "<my_address@gmail.com>",
   "password": "<my_password>",
+  "device_name": "Echo Dot Livingroom",
   "login_data_file": "out/login_data.json",
   "save_raw_data": "True"
 }

{aioamazondevices-1.2.0 → aioamazondevices-1.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aioamazondevices"
-version = "1.2.0"
+version = "1.4.0"
 description = "Python library to control Amazon devices"
 authors = ["Simone Chemelli <simone.chemelli@gmail.com>"]
 license = "Apache-2.0"
@@ -22,13 +22,13 @@ packages = [
 "Changelog" = "https://github.com/chemelli74/aioamazondevices/blob/main/CHANGELOG.md"
 
 [tool.poetry.dependencies]
+aiohttp = "*"
 python = "^3.12"
+babel = "*"
 beautifulsoup4 = "*"
 colorlog = "*"
-httpx = "*"
 orjson = "*"
-pyasn1 = "*"
-rsa = "*"
+yarl = "*"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^8.1"

{aioamazondevices-1.2.0 → aioamazondevices-1.4.0}/src/aioamazondevices/__init__.py

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

{aioamazondevices-1.2.0 → aioamazondevices-1.4.0}/src/aioamazondevices/api.py

@@ -8,13 +8,16 @@ import uuid
 from dataclasses import dataclass
 from datetime import UTC, datetime, timedelta
 from http import HTTPStatus
+from http.cookies import SimpleCookie
 from pathlib import Path
 from typing import Any, cast
 from urllib.parse import parse_qs, urlencode
 
 import orjson
+from aiohttp import ClientResponse, ClientSession
+from babel import Locale
 from bs4 import BeautifulSoup, Tag
-from httpx import URL, AsyncClient, Response
+from yarl import URL
 
 from .const import (
     _LOGGER,
@@ -25,6 +28,8 @@ from .const import (
     AMAZON_CLIENT_OS,
     AMAZON_DEVICE_SOFTWARE_VERSION,
     AMAZON_DEVICE_TYPE,
+    BIN_EXTENSION,
+    CSRF_COOKIE,
     DEFAULT_ASSOC_HANDLE,
     DEFAULT_HEADERS,
     DOMAIN_BY_ISO3166_COUNTRY,
@@ -48,6 +53,7 @@ class AmazonDevice:
     capabilities: list[str]
     device_family: str
     device_type: str
+    device_owner_customer_id: str
     online: bool
     serial_number: str
     software_version: str
@@ -82,22 +88,23 @@ class AmazonEchoApi:
 
         self._login_email = login_email
         self._login_password = login_password
+        self._login_country_code = country_code
         self._domain = domain
         self._cookies = self._build_init_cookies()
+        self._csrf_cookie: str | None = None
         self._headers = DEFAULT_HEADERS
         self._save_raw_data = save_raw_data
         self._login_stored_data = login_data
         self._serial = self._serial_number()
-        self._website_cookies: dict[str, Any] = self._load_website_cookies()
 
-        self.session: AsyncClient
+        self.session: ClientSession
 
-    def _load_website_cookies(self) -> dict[str, Any]:
+    def _load_website_cookies(self) -> list[SimpleCookie]:
         """Get website cookies, if avaliables."""
         if not self._login_stored_data:
-            return {}
+            return []
 
-        return cast("dict", self._login_stored_data["website_cookies"])
+        return cast("list", self._login_stored_data["website_cookies"])
 
     def _serial_number(self) -> str:
         """Get or calculate device serial number."""
@@ -208,13 +215,11 @@ class AmazonEchoApi:
 
     def _client_session(self) -> None:
         """Create HTTP client session."""
-        if not hasattr(self, "session") or self.session.is_closed:
-            _LOGGER.debug("Creating HTTP session (httpx)")
-            self.session = AsyncClient(
-                base_url=f"https://www.amazon.{self._domain}",
+        if not hasattr(self, "session") or self.session.closed:
+            _LOGGER.debug("Creating HTTP session (aiohttp)")
+            self.session = ClientSession(
                 headers=DEFAULT_HEADERS,
                 cookies=self._cookies,
-                follow_redirects=True,
             )
 
     async def _session_request(
@@ -223,7 +228,7 @@ class AmazonEchoApi:
         url: str,
         input_data: dict[str, Any] | None = None,
         json_data: bool = False,
-    ) -> tuple[BeautifulSoup, Response]:
+    ) -> tuple[BeautifulSoup, ClientResponse]:
         """Return request response context data."""
         _LOGGER.debug(
             "%s request: %s with payload %s [json=%s]",
@@ -232,28 +237,41 @@ class AmazonEchoApi:
             input_data,
             json_data,
         )
+
+        headers = DEFAULT_HEADERS
+        if self._csrf_cookie and CSRF_COOKIE not in headers:
+            csrf = {CSRF_COOKIE: self._csrf_cookie}
+            _LOGGER.debug("Adding <%s> to headers", csrf)
+            headers.update(csrf)
+
+        if json_data:
+            json_header = {"Content-Type": "application/json"}
+            _LOGGER.debug("Adding %s to headers", json_header)
+            headers.update(json_header)
+
         resp = await self.session.request(
             method,
             url,
             data=input_data if not json_data else orjson.dumps(input_data),
-            cookies=self._website_cookies,
-            headers={"Content-Type": "application/json"} if json_data else None,
+            cookies=self._load_website_cookies(),
+            headers=headers,
+            allow_redirects=True,
         )
         content_type: str = resp.headers.get("Content-Type", "")
         _LOGGER.debug(
             "Response %s for url %s with content type: %s",
-            resp.status_code,
+            resp.status,
             url,
             content_type,
         )
 
         await self._save_to_file(
-            resp.text,
+            await resp.text(),
             url,
             mimetypes.guess_extension(content_type.split(";")[0]) or ".raw",
         )
 
-        return BeautifulSoup(resp.content, "html.parser"), resp
+        return BeautifulSoup(await resp.read(), "html.parser"), resp
 
     async def _save_to_file(
         self,
@@ -278,7 +296,7 @@ class AmazonEchoApi:
 
         if type(raw_data) is dict:
             data = orjson.dumps(raw_data, option=orjson.OPT_INDENT_2).decode("utf-8")
-        elif extension == HTML_EXTENSION:
+        elif extension in [HTML_EXTENSION, BIN_EXTENSION]:
             data = raw_data
         else:
             data = orjson.dumps(
@@ -347,7 +365,7 @@ class AmazonEchoApi:
         )
         resp_json = resp.json()
 
-        if resp.status_code != HTTPStatus.OK:
+        if resp.status != HTTPStatus.OK:
             _LOGGER.error(
                 "Cannot register device for %s: %s",
                 self._login_email,
@@ -456,6 +474,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)
         return register_device
@@ -481,8 +500,8 @@ class AmazonEchoApi:
     async def close(self) -> None:
         """Close http client session."""
         if hasattr(self, "session"):
-            _LOGGER.debug("Closing HTTP session (httpx)")
-            await self.session.aclose()
+            _LOGGER.debug("Closing HTTP session (aiohttp)")
+            await self.session.close()
 
     async def get_devices_data(
         self,
@@ -495,12 +514,16 @@ class AmazonEchoApi:
                 url=f"https://alexa.amazon.{self._domain}{URI_QUERIES[key]}",
             )
             _LOGGER.debug("Response URL: %s", raw_resp.url)
-            response_code = raw_resp.status_code
-            _LOGGER.debug("Response code: %s", response_code)
+            response_code = raw_resp.status
+            _LOGGER.debug("Response code: |%s|", response_code)
 
-            response_data = raw_resp.text
+            response_data = await raw_resp.text()
             _LOGGER.debug("Response data: |%s|", response_data)
-            json_data = {} if len(response_data) == 0 else raw_resp.json()
+
+            if not self._csrf_cookie:
+                self._csrf_cookie = raw_resp.cookies.get(CSRF_COOKIE).value
+
+            json_data = {} if len(response_data) == 0 else await raw_resp.json()
 
             _LOGGER.debug("JSON data: |%s|", json_data)
 
@@ -527,6 +550,7 @@ class AmazonEchoApi:
                 capabilities=device[NODE_DEVICES]["capabilities"],
                 device_family=device[NODE_DEVICES]["deviceFamily"],
                 device_type=device[NODE_DEVICES]["deviceType"],
+                device_owner_customer_id=device[NODE_DEVICES]["deviceOwnerCustomerId"],
                 online=device[NODE_DEVICES]["online"],
                 serial_number=serial_number,
                 software_version=device[NODE_DEVICES]["softwareVersion"],
@@ -543,14 +567,14 @@ class AmazonEchoApi:
             method="GET",
             url=f"https://alexa.amazon.{self._domain}/api/bootstrap?version=0",
         )
-        if raw_resp.status_code != HTTPStatus.OK:
+        if raw_resp.status != HTTPStatus.OK:
             _LOGGER.debug(
                 "Session not authenticated: reply error %s",
-                raw_resp.status_code,
+                raw_resp.status,
             )
             return False
 
-        resp_json = raw_resp.json()
+        resp_json = await raw_resp.json()
         if not (authentication := resp_json.get("authentication")):
             _LOGGER.debug('Session not authenticated: reply missing "authentication"')
             return False
@@ -558,3 +582,61 @@ class AmazonEchoApi:
         authenticated = authentication.get("authenticated")
         _LOGGER.debug("Session authenticated: %s", authenticated)
         return bool(authenticated)
+
+    async def call_alexa_speak(
+        self,
+        device: AmazonDevice,
+        message_body: str,
+    ) -> dict[str, Any]:
+        """Call Alexa.Speak to send a message."""
+        locale_data = Locale.parse(f"und_{self._login_country_code}")
+        locale = f"{locale_data.language}-{locale_data.language}"
+
+        if not self._login_stored_data:
+            _LOGGER.warning("Trying to send message before login")
+            return {}
+
+        sequence = {
+            "@type": "com.amazon.alexa.behaviors.model.Sequence",
+            "startNode": {
+                "@type": "com.amazon.alexa.behaviors.model.SerialNode",
+                "nodesToExecute": [
+                    {
+                        "@type": "com.amazon.alexa.behaviors.model.OpaquePayloadOperationNode",  # noqa: E501
+                        "type": "Alexa.Speak",
+                        "operationPayload": {
+                            "deviceType": device.device_type,
+                            "deviceSerialNumber": device.serial_number,
+                            "locale": locale,
+                            "customerId": device.device_owner_customer_id,
+                            "textToSpeak": message_body,
+                            "target": {
+                                "customerId": device.device_owner_customer_id,
+                                "devices": [
+                                    {
+                                        "deviceSerialNumber": device.serial_number,
+                                        "deviceTypeId": device.device_type,
+                                    },
+                                ],
+                            },
+                            "skillId": "amzn1.ask.1p.saysomething",
+                        },
+                    },
+                ],
+            },
+        }
+        node_data = {
+            "behaviorId": "PREVIEW",
+            "sequenceJson": orjson.dumps(sequence).decode("utf-8"),
+            "status": "ENABLED",
+        }
+
+        _LOGGER.debug("Preview data payload: %s", node_data)
+        await self._session_request(
+            method="POST",
+            url=f"https://alexa.amazon.{self._domain}/api/behaviors/preview",
+            input_data=node_data,
+            json_data=True,
+        )
+
+        return node_data

{aioamazondevices-1.2.0 → aioamazondevices-1.4.0}/src/aioamazondevices/const.py

@@ -43,6 +43,7 @@ DEFAULT_HEADERS = {
     "Accept-Language": "en-US",
     "Accept-Encoding": "gzip",
 }
+CSRF_COOKIE = "csrf"
 
 NODE_DEVICES = "devices"
 NODE_DO_NOT_DISTURB = "doNotDisturbDeviceStatusList"
@@ -60,6 +61,7 @@ URI_QUERIES = {
 SAVE_PATH = "out"
 HTML_EXTENSION = ".html"
 JSON_EXTENSION = ".json"
+BIN_EXTENSION = ".bin"
 
 DEVICE_TYPE_TO_MODEL = {
     "A1RABVCI4QCIKC": "Echo Dot (Gen3)",