aioamazondevices 0.7.1__py3-none-any.whl → 0.7.3__py3-none-any.whl

aioamazondevices/__init__.py

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

aioamazondevices/api.py

@@ -2,6 +2,7 @@
 
 import base64
 import hashlib
+import json
 import mimetypes
 import secrets
 import uuid
@@ -9,7 +10,7 @@ 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
@@ -30,6 +31,7 @@ from .const import (
     DOMAIN_BY_COUNTRY,
     HTML_EXTENSION,
     JSON_EXTENSION,
+    SAVE_PATH,
     URI_QUERIES,
 )
 from .exceptions import CannotAuthenticate, CannotRegisterDevice
@@ -78,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)
@@ -216,7 +232,7 @@ class AmazonEchoApi:
         raw_data: str | dict,
         url: str,
         extension: str = HTML_EXTENSION,
-        output_path: str = "out",
+        output_path: str = SAVE_PATH,
     ) -> None:
         """Save response data to disk."""
         if not self._save_html:

aioamazondevices/const.py

@@ -53,5 +53,6 @@ AMAZON_DEVICE_TYPE = "A2IVLV5VM2W81"
 AMAZON_CLIENT_OS = "16.6"
 
 # File extensions
+SAVE_PATH = "out"
 HTML_EXTENSION = ".html"
 JSON_EXTENSION = ".json"

{aioamazondevices-0.7.1.dist-info → aioamazondevices-0.7.3.dist-info}/METADATA

@@ -1,15 +1,15 @@
 Metadata-Version: 2.1
 Name: aioamazondevices
-Version: 0.7.1
+Version: 0.7.3
 Summary: Python library to control Amazon devices
 Home-page: https://github.com/chemelli74/aioamazondevices
-License: Apache Software License 2.0
+License: Apache-2.0
 Author: Simone Chemelli
 Author-email: simone.chemelli@gmail.com
 Requires-Python: >=3.11,<4.0
 Classifier: Development Status :: 2 - Pre-Alpha
 Classifier: Intended Audience :: Developers
-Classifier: License :: Other/Proprietary License
+Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3

aioamazondevices-0.7.3.dist-info/RECORD

@@ -0,0 +1,9 @@
+aioamazondevices/__init__.py,sha256=43R_n8z8MnmFxV1nrDOdsTWDjs61LdB_GbYMBmN1YTU,276
+aioamazondevices/api.py,sha256=3eagygo9Kx1Qx2v602wZW6MyCTuA5Tmq545TmGX6zWc,16518
+aioamazondevices/const.py,sha256=BnA9rU9S9vH9mmmE-In443PECLUmGll9-iWu-oETo4s,1348
+aioamazondevices/exceptions.py,sha256=yQ9nL4UwBdHNXvdRj8TRemed6PXBmExP8lbHaAp04vY,546
+aioamazondevices/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+aioamazondevices-0.7.3.dist-info/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
+aioamazondevices-0.7.3.dist-info/METADATA,sha256=u9bchAmH6hMggC3zHTUDMR7phel-64dmrv9ptUdp0vE,4752
+aioamazondevices-0.7.3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+aioamazondevices-0.7.3.dist-info/RECORD,,

aioamazondevices-0.7.1.dist-info/RECORD

@@ -1,9 +0,0 @@
-aioamazondevices/__init__.py,sha256=IxGu-Lv8_pSEPCQnjhVi-_VdJGmh9WI0NOELkRSSVjQ,276
-aioamazondevices/api.py,sha256=3Gshun5XSEbD47aDs-hyQkZ_zVYuQ3OMwXIaZA13lmo,15902
-aioamazondevices/const.py,sha256=CQFuM-4gFrzveQcBMsH6noI8PN69J4ogV-P46uYhcTQ,1330
-aioamazondevices/exceptions.py,sha256=yQ9nL4UwBdHNXvdRj8TRemed6PXBmExP8lbHaAp04vY,546
-aioamazondevices/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-aioamazondevices-0.7.1.dist-info/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
-aioamazondevices-0.7.1.dist-info/METADATA,sha256=Eq-0torKLJNk79WSTqq2I4pnPqAM-VsQ3u8ibrVytUo,4755
-aioamazondevices-0.7.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-aioamazondevices-0.7.1.dist-info/RECORD,,