pyezvizapi 1.0.3.6__py3-none-any.whl → 1.0.3.7__py3-none-any.whl

pyezvizapi/__main__.py

@@ -421,7 +421,7 @@ def _handle_devices_light(args: argparse.Namespace, client: EzvizClient) -> int:
 
 def _handle_pagelist(client: EzvizClient) -> int:
     """Output full pagelist (raw JSON) for exploration in editors like Notepad++."""
-    data = client._get_page_list()  # noqa: SLF001
+    data = client.get_page_list()
     _write_json(data)
     return 0
 
@@ -611,7 +611,7 @@ def main(argv: list[str] | None = None) -> int:
         return 2
     finally:
         if args.save_token and args.token_file:
-            _save_token_file(args.token_file, cast(dict[str, Any], client._token))  # noqa: SLF001
+            _save_token_file(args.token_file, client.export_token())
         client.close_session()
 
 

pyezvizapi/client.py

@@ -4398,6 +4398,16 @@ class EzvizClient:
             json_key=None,
         )
 
+    def get_page_list(self) -> Any:
+        """Return the full pagelist payload without filtering."""
+
+        return self._get_page_list()
+
+    def export_token(self) -> dict[str, Any]:
+        """Return a shallow copy of the current authentication token."""
+
+        return dict(self._token)
+
     def get_device(self) -> Any:
         """Get ezviz devices filter."""
         return self._api_get_pagelist(page_filter="CLOUD", json_key="deviceInfos")

pyezvizapi/constants.py

@@ -13,6 +13,7 @@ FEATURE_CODE = generate_unique_code()
 XOR_KEY = b"\x0c\x0eJ^X\x15@Rr"
 DEFAULT_TIMEOUT = 25
 MAX_RETRIES = 3
+HIK_ENCRYPTION_HEADER = b"hikencodepicture"
 REQUEST_HEADER = {
     "featureCode": FEATURE_CODE,
     "clientType": "3",

pyezvizapi/feature.py

@@ -5,22 +5,18 @@ from __future__ import annotations
 from collections.abc import Iterable, Iterator, Mapping, MutableMapping
 from typing import Any, cast
 
-from .utils import coerce_int, decode_json
+from .utils import WILDCARD_STEP, coerce_int, decode_json, first_nested
 
 
 def _feature_video_section(camera_data: Mapping[str, Any]) -> dict[str, Any]:
     """Return the nested Video feature section from feature info payload."""
 
-    feature = camera_data.get("FEATURE_INFO")
-    if not isinstance(feature, Mapping):
-        return {}
-
-    for group in feature.values():
-        if isinstance(group, Mapping):
-            video = group.get("Video")
-            if isinstance(video, MutableMapping):
-                return cast(dict[str, Any], video)
-
+    video = first_nested(
+        camera_data,
+        ("FEATURE_INFO", WILDCARD_STEP, "Video"),
+    )
+    if isinstance(video, MutableMapping):
+        return cast(dict[str, Any], video)
     return {}
 
 

pyezvizapi/mqtt.py

@@ -247,7 +247,7 @@ class MQTTClient:
                 # Stop background thread and disconnect
                 self.mqtt_client.loop_stop()
                 self.mqtt_client.disconnect()
-            except Exception as err:  # noqa: BLE001
+            except (OSError, ValueError, RuntimeError) as err:
                 _LOGGER.debug("MQTT disconnect failed: %s", err)
         # Always attempt to stop push on server side
         self._stop_ezviz_push()

pyezvizapi/test_mqtt.py

@@ -125,7 +125,7 @@ def main(argv: list[str] | None = None) -> int:
         print("Stopped.")
 
     if args.save_token and args.token_file:
-        _save_token_file(args.token_file, cast(dict[str, Any], client._token))  # noqa: SLF001
+        _save_token_file(args.token_file, client.export_token())
 
     return 0
 

pyezvizapi/utils.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+from collections.abc import Iterable, Iterator
 import datetime
 from hashlib import md5
 import json
@@ -13,6 +14,7 @@ from zoneinfo import ZoneInfo, ZoneInfoNotFoundError
 
 from Crypto.Cipher import AES
 
+from .constants import HIK_ENCRYPTION_HEADER
 from .exceptions import PyEzvizError
 
 _LOGGER = logging.getLogger(__name__)
@@ -74,6 +76,49 @@ def string_to_list(data: Any, separator: str = ",") -> Any:
     return data
 
 
+PathComponent = str | int
+WILDCARD_STEP = "*"
+_MISSING = object()
+
+
+def iter_nested(data: Any, path: Iterable[PathComponent]) -> Iterator[Any]:
+    """Yield values reachable by following a dotted path with optional wildcards."""
+
+    current: list[Any] = [data]
+
+    for step in path:
+        next_level: list[Any] = []
+        for candidate in current:
+            if step == WILDCARD_STEP:
+                if isinstance(candidate, dict):
+                    next_level.extend(candidate.values())
+                elif isinstance(candidate, (list, tuple)):
+                    next_level.extend(candidate)
+                continue
+
+            if isinstance(candidate, dict) and step in candidate:
+                next_level.append(candidate[step])
+                continue
+
+            if isinstance(candidate, (list, tuple)) and isinstance(step, int):
+                if -len(candidate) <= step < len(candidate):
+                    next_level.append(candidate[step])
+
+        current = next_level
+        if not current:
+            break
+
+    yield from current
+
+
+def first_nested(
+    data: Any, path: Iterable[PathComponent], default: Any = None
+) -> Any:
+    """Return the first value produced by iter_nested or ``default``."""
+
+    return next(iter_nested(data, path), default)
+
+
 def fetch_nested_value(data: Any, keys: list, default_value: Any = None) -> Any:
     """Fetch the value corresponding to the given nested keys in a dictionary.
 
@@ -88,14 +133,8 @@ def fetch_nested_value(data: Any, keys: list, default_value: Any = None) -> Any:
         The value corresponding to the nested keys or the default value.
 
     """
-    try:
-        for key in keys:
-            data = data[key]
-
-    except (KeyError, TypeError):
-        return default_value
-
-    return data
+    value = first_nested(data, keys, _MISSING)
+    return default_value if value is _MISSING else value
 
 
 def decrypt_image(input_data: bytes, password: str) -> bytes:
@@ -116,8 +155,10 @@ def decrypt_image(input_data: bytes, password: str) -> bytes:
         raise PyEzvizError("Invalid image data")
 
     # check header
-    if input_data[:16] != b"hikencodepicture":
-        _LOGGER.debug("Image header doesn't contain 'hikencodepicture'")
+    header_len = len(HIK_ENCRYPTION_HEADER)
+
+    if input_data[:header_len] != HIK_ENCRYPTION_HEADER:
+        _LOGGER.debug("Image header doesn't contain %s", HIK_ENCRYPTION_HEADER)
         return input_data
 
     file_hash = input_data[16:48]
@@ -132,7 +173,7 @@ def decrypt_image(input_data: bytes, password: str) -> bytes:
     next_chunk = b""
     output_data = b""
     finished = False
-    i = 48  # offset hikencodepicture + hash
+    i = 48  # offset HIK header + hash
     chunk_size = 1024 * AES.block_size
     while not finished:
         chunk, next_chunk = next_chunk, cipher.decrypt(input_data[i : i + chunk_size])

{pyezvizapi-1.0.3.6.dist-info → pyezvizapi-1.0.3.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyezvizapi
-Version: 1.0.3.6
+Version: 1.0.3.7
 Summary: Pilot your Ezviz cameras
 Home-page: https://github.com/RenierM26/pyEzvizApi/
 Author: Renier Moorcroft

pyezvizapi-1.0.3.7.dist-info/RECORD

@@ -0,0 +1,22 @@
+pyezvizapi/__init__.py,sha256=-OxHqxA9h0JZQW__GoZd1aByGquIHawCnNdeNlIg2Qo,3382
+pyezvizapi/__main__.py,sha256=6vFvkh8gCD-Mo4CXd1deZfDeaaHR-Kc8pOu9vkUjQf4,20878
+pyezvizapi/api_endpoints.py,sha256=2M5Vs4YB1VWZGcowT-4Fj2hhRNjFh976LT3jtRrqvrc,5754
+pyezvizapi/camera.py,sha256=Pl5oIEdrFcv1Hz5sQI1IyyJIDCMjOjQdtExgKzmLoK8,22102
+pyezvizapi/cas.py,sha256=3zHe-_a0KchCmGeAj1of-pV6oMPRUmSCIiDqBFsTK8A,6025
+pyezvizapi/client.py,sha256=CKSK7hdQFmJAD0p1GPgEaqw7QAtqyhqLN8soR_VmSeA,142146
+pyezvizapi/constants.py,sha256=4aoo2jKV88quLIPRwRAH0xW7yCuQfsU9tNtSxq7Xnnk,12854
+pyezvizapi/exceptions.py,sha256=8rmxEUQdrziqMe-M1SeeRd0HtP2IDQ2xpJVj7wvOQyo,976
+pyezvizapi/feature.py,sha256=TwQDAVFXqrpe5s0rXyJSqsHCnQsw1MNSTsUGhb61EzI,15886
+pyezvizapi/light_bulb.py,sha256=9wgycG3dTvBbrsxQjQnXal-GA8VXPsIN1m-CTtRh8i0,7797
+pyezvizapi/models.py,sha256=NQzwTP0yEe2IWU-Vc6nAn87xulpTuo0MX2Rcf0WxifA,4176
+pyezvizapi/mqtt.py,sha256=_JHklUsqqwrgKk3k8RyBgo3bp1utEOr5KSBe8Oz92qg,22375
+pyezvizapi/test_cam_rtsp.py,sha256=O9NHh-vcNFfnzNw8jbuhM9a_5TWfNZIMXaJP7Lmkaj4,5162
+pyezvizapi/test_mqtt.py,sha256=-0L621V4nzm6x0oLgurAgkJZopVZ5Os7n1hLVMh3qIc,4117
+pyezvizapi/utils.py,sha256=Gmn6Ljuo7SUSt1nFN-JmuoWAJGKqUYqur4SBESlhjKI,14153
+pyezvizapi-1.0.3.7.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pyezvizapi-1.0.3.7.dist-info/licenses/LICENSE.md,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pyezvizapi-1.0.3.7.dist-info/METADATA,sha256=UYwabH3pFMA4UryJZ8h9Pu-alu2TuG1ee-enZQ2j8bU,695
+pyezvizapi-1.0.3.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pyezvizapi-1.0.3.7.dist-info/entry_points.txt,sha256=_BSJ3eNb2H_AZkRdsv1s4mojqWn3N7m503ujvg1SudA,56
+pyezvizapi-1.0.3.7.dist-info/top_level.txt,sha256=gMZTelIi8z7pXyTCQLLaIkxVRrDQ_lS2NEv0WgfHrHs,11
+pyezvizapi-1.0.3.7.dist-info/RECORD,,

pyezvizapi-1.0.3.6.dist-info/RECORD

@@ -1,22 +0,0 @@
-pyezvizapi/__init__.py,sha256=-OxHqxA9h0JZQW__GoZd1aByGquIHawCnNdeNlIg2Qo,3382
-pyezvizapi/__main__.py,sha256=9uttTuOfO22tzyomJIV8ebFJ-G-YUNDYOadZ_0AgdNA,20925
-pyezvizapi/api_endpoints.py,sha256=2M5Vs4YB1VWZGcowT-4Fj2hhRNjFh976LT3jtRrqvrc,5754
-pyezvizapi/camera.py,sha256=Pl5oIEdrFcv1Hz5sQI1IyyJIDCMjOjQdtExgKzmLoK8,22102
-pyezvizapi/cas.py,sha256=3zHe-_a0KchCmGeAj1of-pV6oMPRUmSCIiDqBFsTK8A,6025
-pyezvizapi/client.py,sha256=LroaR4h_wYu8HB74l4_X6Vjq7rTiL88Idf18elUBj4A,141851
-pyezvizapi/constants.py,sha256=5AxJYfof6NvebBcFvPkoKI6xinpkwmCnaauUvhvBMDY,12810
-pyezvizapi/exceptions.py,sha256=8rmxEUQdrziqMe-M1SeeRd0HtP2IDQ2xpJVj7wvOQyo,976
-pyezvizapi/feature.py,sha256=inqqk14Jgo3HOzml2GRUgz-hxbne4kT5iJ3L6SJhU8s,15990
-pyezvizapi/light_bulb.py,sha256=9wgycG3dTvBbrsxQjQnXal-GA8VXPsIN1m-CTtRh8i0,7797
-pyezvizapi/models.py,sha256=NQzwTP0yEe2IWU-Vc6nAn87xulpTuo0MX2Rcf0WxifA,4176
-pyezvizapi/mqtt.py,sha256=aOL-gexZgYvCCaNQ03M4vZan91d5p2Fl_qsFykn9NW4,22365
-pyezvizapi/test_cam_rtsp.py,sha256=O9NHh-vcNFfnzNw8jbuhM9a_5TWfNZIMXaJP7Lmkaj4,5162
-pyezvizapi/test_mqtt.py,sha256=Orn-fwZPJIE4G5KROMX0MRAkLwU6nLb9LUtXyb2ZCQs,4147
-pyezvizapi/utils.py,sha256=ozGncEyaIJJ8VYw8f-xfM2OBmqR8eNYLq728FFvbvr8,12757
-pyezvizapi-1.0.3.6.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pyezvizapi-1.0.3.6.dist-info/licenses/LICENSE.md,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pyezvizapi-1.0.3.6.dist-info/METADATA,sha256=jp0jUC6j-BihBfzY79Qo_bdmk_yT6Db5wiJdlTHolmQ,695
-pyezvizapi-1.0.3.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pyezvizapi-1.0.3.6.dist-info/entry_points.txt,sha256=_BSJ3eNb2H_AZkRdsv1s4mojqWn3N7m503ujvg1SudA,56
-pyezvizapi-1.0.3.6.dist-info/top_level.txt,sha256=gMZTelIi8z7pXyTCQLLaIkxVRrDQ_lS2NEv0WgfHrHs,11
-pyezvizapi-1.0.3.6.dist-info/RECORD,,