aioamazondevices 3.0.1__tar.gz → 3.0.3__tar.gz

{aioamazondevices-3.0.1 → aioamazondevices-3.0.3}/PKG-INFO

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

{aioamazondevices-3.0.1 → aioamazondevices-3.0.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aioamazondevices"
-version = "3.0.1"
+version = "3.0.3"
 description = "Python library to control Amazon devices"
 authors = ["Simone Chemelli <simone.chemelli@gmail.com>"]
 license = "Apache-2.0"

{aioamazondevices-3.0.1 → aioamazondevices-3.0.3}/src/aioamazondevices/__init__.py

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

{aioamazondevices-3.0.1 → aioamazondevices-3.0.3}/src/aioamazondevices/api.py

@@ -18,7 +18,9 @@ import orjson
 from aiohttp import ClientResponse, ClientSession
 from babel import Locale
 from bs4 import BeautifulSoup, Tag
-from yarl import URL
+from httpx import URL as HTTPX_URL
+from multidict import MultiDictProxy
+from yarl import URL as YARL_URL
 
 from .const import (
     _LOGGER,
@@ -116,13 +118,12 @@ class AmazonEchoApi:
         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._list_for_clusters: dict[str, str] = {}
 
-        self.session: ClientSession
+        self.session: ClientSession | HttpxClientSession
 
     def _load_website_cookies(self) -> dict[str, str]:
         """Get website cookies, if avaliables."""
@@ -162,7 +163,7 @@ class AmazonEchoApi:
         map_md_str = orjson.dumps(map_md_dict).decode("utf-8")
         map_md = base64.b64encode(map_md_str.encode()).decode().rstrip("=")
 
-        return {"frc": frc, "map-md": map_md, "amzn-app-id": AMAZON_APP_ID}
+        return {"amzn-app-id": AMAZON_APP_ID, "frc": frc, "map-md": map_md}
 
     def _create_code_verifier(self, length: int = 32) -> bytes:
         """Create code verifier."""
@@ -213,11 +214,11 @@ class AmazonEchoApi:
         form = soup.find("form", {"name": "signIn"}) or soup.find("form")
 
         if not isinstance(form, Tag):
-            raise TypeError("No form found in page or something other is going wrong.")
+            raise TypeError("Unable to find form in login response")
 
         inputs = {}
         for field in form.find_all("input"):
-            if field.get("type") and field["type"] == "hidden":
+            if isinstance(field, Tag) and field.get("type", "") == "hidden":
                 inputs[field["name"]] = field.get("value", "")
 
         return inputs
@@ -227,15 +228,22 @@ class AmazonEchoApi:
         _LOGGER.debug("Get request data from HTML source")
         form = soup.find("form", {"name": "signIn"}) or soup.find("form")
         if isinstance(form, Tag):
-            method = form["method"]
-            url = form["action"]
+            method = form.get("method")
+            url = form.get("action")
             if isinstance(method, str) and isinstance(url, str):
                 return method, url
-        raise TypeError("Unable to extract form data from response.")
+        raise TypeError("Unable to extract form data from response")
 
-    def _extract_code_from_url(self, url: URL) -> str:
+    def _extract_code_from_url(self, url: YARL_URL | HTTPX_URL) -> str:
         """Extract the access token from url query after login."""
-        parsed_url = parse_qs(url.query.decode())
+        parsed_url: dict[str, list[str]] = {}
+        if isinstance(url.query, bytes):
+            parsed_url = parse_qs(url.query.decode())
+        elif isinstance(url.query, MultiDictProxy):
+            for key, value in url.query.items():
+                parsed_url[key] = [value]
+        else:
+            raise TypeError(f"Unable to extract authorization code from url: {url}")
         return parsed_url["openid.oa2.authorization_code"][0]
 
     def _client_session(self) -> None:
@@ -281,9 +289,13 @@ class AmazonEchoApi:
             _LOGGER.debug("Adding %s to headers", json_header)
             headers.update(json_header)
 
+        _url: YARL_URL | str = url
+        if LIBRARY == "aiohttp":
+            _url = YARL_URL(url, encoded=True)
+
         resp = await self.session.request(
             method,
-            url,
+            _url,
             data=input_data if not json_data else orjson.dumps(input_data),
             cookies=self._load_website_cookies(),
             headers=headers,
@@ -325,7 +337,8 @@ class AmazonEchoApi:
             base_filename = url
         fullpath = Path(output_dir, base_filename + extension)
 
-        if type(raw_data) is dict:
+        data: str
+        if isinstance(raw_data, dict):
             data = orjson.dumps(raw_data, option=orjson.OPT_INDENT_2).decode("utf-8")
         elif extension in [HTML_EXTENSION, BIN_EXTENSION]:
             data = raw_data
@@ -484,22 +497,13 @@ class AmazonEchoApi:
             url=login_url,
             input_data=login_inputs,
         )
+        _LOGGER.debug("Login response url:%s", login_resp.url)
 
-        authcode_url = None
-        _LOGGER.debug("Login query: %s", login_resp.url.query)
-        if b"openid.oa2.authorization_code" in login_resp.url.query:
-            authcode_url = login_resp.url
-        elif len(login_resp.history) > 0:
-            for history in login_resp.history:
-                if b"openid.oa2.authorization_code" in history.url.query:
-                    authcode_url = history.url
-                    break
-
-        if authcode_url is None:
-            raise CannotAuthenticate
+        authcode = self._extract_code_from_url(login_resp.url)
+        _LOGGER.debug("Login extracted authcode: %s", authcode)
 
         device_login_data = {
-            "authorization_code": self._extract_code_from_url(authcode_url),
+            "authorization_code": authcode,
             "code_verifier": code_verifier,
             "domain": self._domain,
         }

{aioamazondevices-3.0.1 → aioamazondevices-3.0.3}/src/aioamazondevices/const.py

@@ -42,6 +42,7 @@ DEFAULT_HEADERS = {
     ),
     "Accept-Language": "en-US",
     "Accept-Encoding": "gzip",
+    "Connection": "keep-alive",
 }
 CSRF_COOKIE = "csrf"
 
@@ -66,10 +67,26 @@ BIN_EXTENSION = ".bin"
 SPEAKER_GROUP_MODEL = "Speaker Group"
 
 DEVICE_TYPE_TO_MODEL: dict[str, dict[str, str | None]] = {
+    "A10A33FOX2NUBK": {
+        "model": "Echo Spot",
+        "hw_version": "Gen1",
+    },
+    "A11QM4H9HGV71H": {
+        "model": "Echo Show 5",
+        "hw_version": "Gen3",
+    },
+    "A1Q6UGEXJZWJQ0": {
+        "model": "Fire TV Stick 4K",
+        "hw_version": "Gen2",
+    },
     "A1RABVCI4QCIKC": {
         "model": "Echo Dot",
         "hw_version": "Gen3",
     },
+    "A271DR1789MXDS": {
+        "model": "Fire Tablet 7",
+        "hw_version": "Gen12",
+    },
     "A2DS1Q2TPDJ48U": {
         "model": "Echo Dot Clock",
         "hw_version": "Gen5",
@@ -78,10 +95,26 @@ DEVICE_TYPE_TO_MODEL: dict[str, dict[str, str | None]] = {
         "model": "Echo Dot Clock",
         "hw_version": "Gen4",
     },
+    "A2LWARUGJLBYEW": {
+        "model": "Fire TV Stick",
+        "hw_version": "Gen2",
+    },
+    "A2M4YX06LWP8WI": {
+        "model": "Fire Tablet 7",
+        "hw_version": "Gen5",
+    },
     "A2U21SRK4QGSE1": {
         "model": "Echo Dot Clock",
         "hw_version": "Gen4",
     },
+    "A303PJF6ISQ7IC": {
+        "model": "Echo Auto",
+        "hw_version": "Gen1",
+    },
+    "A30YDR2MK8HMRV": {
+        "model": "Echo Dot",
+        "hw_version": "Gen3",
+    },
     "A32DDESGESSHZA": {
         "model": "Echo Dot",
         "hw_version": "Gen3",
@@ -90,6 +123,10 @@ DEVICE_TYPE_TO_MODEL: dict[str, dict[str, str | None]] = {
         "model": "Echo Dot",
         "hw_version": "Gen3",
     },
+    "A3C9PE6TNYLTCH": {
+        "model": "Speaker Group",
+        "hw_version": "None",
+    },
     "A3RMGO6LYLH7YN": {
         "model": "Echo Dot",
         "hw_version": "Gen4",
@@ -98,28 +135,44 @@ DEVICE_TYPE_TO_MODEL: dict[str, dict[str, str | None]] = {
         "model": "Echo Dot",
         "hw_version": "Gen2",
     },
+    "A3VRME03NAXFUB": {
+        "model": "Echo Flex",
+        "hw_version": "None",
+    },
+    "A4ZP7ZC4PI6TO": {
+        "model": "Echo Show 3",
+        "hw_version": "Gen1",
+    },
     "A4ZXE0RM7LQ7A": {
         "model": "Echo Dot",
         "hw_version": "Gen5",
     },
+    "A7WXQPH584YP": {
+        "model": "Echo Dot",
+        "hw_version": "Gen2",
+    },
+    "AB72C64C86AW2": {
+        "model": "Echo Dot",
+        "hw_version": "Gen2",
+    },
     "AKNO1N0KSFN8L": {
         "model": "Echo Dot",
         "hw_version": "Gen1",
     },
-    "A3C9PE6TNYLTCH": {
-        "model": SPEAKER_GROUP_MODEL,
-        "hw_version": None,
+    "AKPGW064GI9HE": {
+        "model": " Fire TV Stick 4K",
+        "hw_version": "Gen1",
     },
-    "A1Q6UGEXJZWJQ0": {
-        "model": "Fire TV Stick",
-        "hw_version": "4K",
+    "ATNLRCEBX3W4P": {
+        "model": "Fire Tablet HD 10",
+        "hw_version": "Gen11",
     },
-    "A10A33FOX2NUBK": {
-        "model": "Echo Spot",
-        "hw_version": "Gen1",
+    "AVU7CPPF2ZRAS": {
+        "model": "Fire Tablet HD 8 Plus",
+        "hw_version": "Gen10",
     },
-    "AB72C64C86AW2": {
-        "model": "Echo Dot",
+    "G2A0V704840708AP": {
+        "model": "Echo Plus",
         "hw_version": "Gen2",
     },
 }