python-aidot-cameras 0.10.0__tar.gz → 0.10.2__tar.gz

python_aidot_cameras-0.10.2/MANIFEST.in

@@ -0,0 +1 @@
+include aidot/py.typed

{python_aidot_cameras-0.10.0/src/python_aidot_cameras.egg-info → python_aidot_cameras-0.10.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-aidot-cameras
-Version: 0.10.0
+Version: 0.10.2
 Summary: Control AiDot/Leedarson WiFi lights and cameras (WebRTC streaming, two-way audio, PTZ, controls)
 Author-email: cbrightly <chris.brightly@gmail.com>
 License-Expression: MIT
@@ -49,9 +49,9 @@ on this library.
 
 The streaming transport is auto-selected per camera from its model id:
 
-- **A000088** (M3 Pro) — DTLS-SRTP, wired/mains.
-- **A001513** ("L2") — SDES-SRTP, **battery** (woken on demand; validated end-to-end).
-- **A001064** (PTZ) — SDES-SRTP, wired/mains (role-reversal handshake).
+- **A000088** (M3 Pro) - DTLS-SRTP, wired/mains.
+- **A001513** ("L2") - SDES-SRTP, **battery** (woken on demand; validated end-to-end).
+- **A001064** (PTZ) - SDES-SRTP, wired/mains (role-reversal handshake).
 
 Other battery models (A001108, A001360) are recognized in code with the same
 battery handling. See [`docs/CAMERAS.md`](docs/CAMERAS.md#supported-cameras) for
@@ -68,7 +68,7 @@ pip install python-aidot-cameras
 pip install python-aidot-cameras[webrtc]
 ```
 
-`[webrtc]` pulls in the extra dependencies (aiortc, av, …) needed for live
+`[webrtc]` pulls in the extra dependencies (aiortc, av, ...) needed for live
 streaming, snapshots, and two-way audio. Without it you still get lights plus
 the camera cloud/control APIs, but not live media.
 
@@ -132,7 +132,7 @@ The library reads the following environment variables.
 ### Credentials
 
 Used by the credential helper (`aidot.credentials`); they take priority over any
-stored credentials file. See [`src/aidot/credentials.py`](src/aidot/credentials.py).
+stored credentials file. See [`aidot/credentials.py`](aidot/credentials.py).
 
 | Variable | Purpose | Default |
 | --- | --- | --- |
@@ -152,12 +152,12 @@ audio, idle release, the sprop cache path) are documented in
 | --- | --- | --- |
 | `AIDOT_MAX_CONCURRENT_OPENS` | Caps how many stream opens run concurrently across all cameras. | `2` |
 | `AIDOT_MAX_CONCURRENT_STREAMS` | Caps how many cameras stream at once. | `3` |
-| `AIDOT_FAST_CONNECT` | Enable LAN-direct "fast connect" (STUN-only, skips several cloud signaling waits) when truthy. On-LAN only — off-subnet/strict-NAT viewers must leave it off. | unset (off) |
-| `AIDOT_SDES_SKIP_TURN_PREALLOC` | Skip the SDES TURN relay pre-allocation (~2–3 s of cold-start latency) so signaling goes straight out with the host candidate. Faster on a LAN, at the cost of no relay fallback for a camera on a different segment / behind strict NAT. Experimental, opt-in (truthy = `1`/`true`/`yes`/`on`). | unset (off) |
+| `AIDOT_FAST_CONNECT` | Enable LAN-direct "fast connect" (STUN-only, skips several cloud signaling waits) when truthy. On-LAN only - off-subnet/strict-NAT viewers must leave it off. | unset (off) |
+| `AIDOT_SDES_SKIP_TURN_PREALLOC` | Skip the SDES TURN relay pre-allocation (~2-3 s of cold-start latency) so signaling goes straight out with the host candidate. Faster on a LAN, at the cost of no relay fallback for a camera on a different segment / behind strict NAT. Experimental, opt-in (truthy = `1`/`true`/`yes`/`on`). | unset (off) |
 | `AIDOT_SDES_ADAPTIVE` | Adaptive fast-with-fallback for the SDES keepalive loop: try the fast path first and fall back to the full relay path if a fast attempt delivers no media. A per-device cache skips the fast attempt on later views once it has failed. Truthy value enables. | unset (off) |
 | `AIDOT_SDES_FAST_LIVEPLAY` | Don't block on the `livePlayResp` wait for eligible SDES cameras (~4.5 s faster cold start). Role-reversal models (A001064 PTZ) always excluded for correctness. **On by default**; set to `0`/`false`/`no`/`off` to disable. | enabled (on) |
 | `AIDOT_DTLS_FAST_LIVEPLAY` | The DTLS (A000088) analogue: skip the `livePlayReq`-echo and `livePlayResp` waits (the dominant LAN cold-start cost) while keeping the full ICE/TURN/DTLS handshake, so remote/relay viewing is unaffected. **On by default**; set to `0`/`false`/`no`/`off` to disable. | enabled (on) |
-| `AIDOT_PERSISTENT_MQTT` | Reuse ONE account-level persistent MQTT connection for commands, attribute fetches, and stream-open signaling (matching the official app) instead of connecting per operation. **On by default** (live soak cut SDES NO_MEDIA ~57%→~19%); set to `0`/`false`/`no`/`off` to disable. | enabled (on) |
+| `AIDOT_PERSISTENT_MQTT` | Reuse ONE account-level persistent MQTT connection for commands, attribute fetches, and stream-open signaling (matching the official app) instead of connecting per operation. **On by default** (live soak cut SDES NO_MEDIA ~57%->~19%); set to `0`/`false`/`no`/`off` to disable. | enabled (on) |
 | `AIDOT_SERVE_RELAY` | Hold the public stream port via an internal relay that proxies to ffmpeg, so the first (cold) view connects instead of failing while ffmpeg can't pre-bind the port. Set to `0` to serve ffmpeg directly. | `1` (enabled) |
 | `AIDOT_LIVESTREAM_PARAM` | Set to `0` to skip the cloud `liveStreamParam` pre-connect that provisions battery cameras' live-stream sessions before signaling (without it, battery cameras like the L2 models reject streaming with `-50019`). | `1` (enabled) |
 

{python_aidot_cameras-0.10.0 → python_aidot_cameras-0.10.2}/README.md

@@ -21,9 +21,9 @@ on this library.
 
 The streaming transport is auto-selected per camera from its model id:
 
-- **A000088** (M3 Pro) — DTLS-SRTP, wired/mains.
-- **A001513** ("L2") — SDES-SRTP, **battery** (woken on demand; validated end-to-end).
-- **A001064** (PTZ) — SDES-SRTP, wired/mains (role-reversal handshake).
+- **A000088** (M3 Pro) - DTLS-SRTP, wired/mains.
+- **A001513** ("L2") - SDES-SRTP, **battery** (woken on demand; validated end-to-end).
+- **A001064** (PTZ) - SDES-SRTP, wired/mains (role-reversal handshake).
 
 Other battery models (A001108, A001360) are recognized in code with the same
 battery handling. See [`docs/CAMERAS.md`](docs/CAMERAS.md#supported-cameras) for
@@ -40,7 +40,7 @@ pip install python-aidot-cameras
 pip install python-aidot-cameras[webrtc]
 ```
 
-`[webrtc]` pulls in the extra dependencies (aiortc, av, …) needed for live
+`[webrtc]` pulls in the extra dependencies (aiortc, av, ...) needed for live
 streaming, snapshots, and two-way audio. Without it you still get lights plus
 the camera cloud/control APIs, but not live media.
 
@@ -104,7 +104,7 @@ The library reads the following environment variables.
 ### Credentials
 
 Used by the credential helper (`aidot.credentials`); they take priority over any
-stored credentials file. See [`src/aidot/credentials.py`](src/aidot/credentials.py).
+stored credentials file. See [`aidot/credentials.py`](aidot/credentials.py).
 
 | Variable | Purpose | Default |
 | --- | --- | --- |
@@ -124,12 +124,12 @@ audio, idle release, the sprop cache path) are documented in
 | --- | --- | --- |
 | `AIDOT_MAX_CONCURRENT_OPENS` | Caps how many stream opens run concurrently across all cameras. | `2` |
 | `AIDOT_MAX_CONCURRENT_STREAMS` | Caps how many cameras stream at once. | `3` |
-| `AIDOT_FAST_CONNECT` | Enable LAN-direct "fast connect" (STUN-only, skips several cloud signaling waits) when truthy. On-LAN only — off-subnet/strict-NAT viewers must leave it off. | unset (off) |
-| `AIDOT_SDES_SKIP_TURN_PREALLOC` | Skip the SDES TURN relay pre-allocation (~2–3 s of cold-start latency) so signaling goes straight out with the host candidate. Faster on a LAN, at the cost of no relay fallback for a camera on a different segment / behind strict NAT. Experimental, opt-in (truthy = `1`/`true`/`yes`/`on`). | unset (off) |
+| `AIDOT_FAST_CONNECT` | Enable LAN-direct "fast connect" (STUN-only, skips several cloud signaling waits) when truthy. On-LAN only - off-subnet/strict-NAT viewers must leave it off. | unset (off) |
+| `AIDOT_SDES_SKIP_TURN_PREALLOC` | Skip the SDES TURN relay pre-allocation (~2-3 s of cold-start latency) so signaling goes straight out with the host candidate. Faster on a LAN, at the cost of no relay fallback for a camera on a different segment / behind strict NAT. Experimental, opt-in (truthy = `1`/`true`/`yes`/`on`). | unset (off) |
 | `AIDOT_SDES_ADAPTIVE` | Adaptive fast-with-fallback for the SDES keepalive loop: try the fast path first and fall back to the full relay path if a fast attempt delivers no media. A per-device cache skips the fast attempt on later views once it has failed. Truthy value enables. | unset (off) |
 | `AIDOT_SDES_FAST_LIVEPLAY` | Don't block on the `livePlayResp` wait for eligible SDES cameras (~4.5 s faster cold start). Role-reversal models (A001064 PTZ) always excluded for correctness. **On by default**; set to `0`/`false`/`no`/`off` to disable. | enabled (on) |
 | `AIDOT_DTLS_FAST_LIVEPLAY` | The DTLS (A000088) analogue: skip the `livePlayReq`-echo and `livePlayResp` waits (the dominant LAN cold-start cost) while keeping the full ICE/TURN/DTLS handshake, so remote/relay viewing is unaffected. **On by default**; set to `0`/`false`/`no`/`off` to disable. | enabled (on) |
-| `AIDOT_PERSISTENT_MQTT` | Reuse ONE account-level persistent MQTT connection for commands, attribute fetches, and stream-open signaling (matching the official app) instead of connecting per operation. **On by default** (live soak cut SDES NO_MEDIA ~57%→~19%); set to `0`/`false`/`no`/`off` to disable. | enabled (on) |
+| `AIDOT_PERSISTENT_MQTT` | Reuse ONE account-level persistent MQTT connection for commands, attribute fetches, and stream-open signaling (matching the official app) instead of connecting per operation. **On by default** (live soak cut SDES NO_MEDIA ~57%->~19%); set to `0`/`false`/`no`/`off` to disable. | enabled (on) |
 | `AIDOT_SERVE_RELAY` | Hold the public stream port via an internal relay that proxies to ffmpeg, so the first (cold) view connects instead of failing while ffmpeg can't pre-bind the port. Set to `0` to serve ffmpeg directly. | `1` (enabled) |
 | `AIDOT_LIVESTREAM_PARAM` | Set to `0` to skip the cloud `liveStreamParam` pre-connect that provisions battery cameras' live-stream sessions before signaling (without it, battery cameras like the L2 models reject streaming with `-50019`). | `1` (enabled) |
 

{python_aidot_cameras-0.10.0/src → python_aidot_cameras-0.10.2}/aidot/camera/client.py

@@ -213,6 +213,7 @@ def _save_frame_as_jpeg(image_data: Any, output_path: str) -> bool:
                 ],
                 input=image_data.tobytes(),
                 capture_output=True,
+                timeout=15,  # bound the hang; a wedged ffmpeg must not block forever
             )
             return r.returncode == 0
     except Exception as exc:
@@ -362,10 +363,10 @@ def _build_sdes_serve_cmd(
 # Use DeviceClient.async_open_live_stream() to obtain an instance.
 #
 # Protocol source: classes.jar.decompiled.zip / TutkManager.java
-#   IOTC_Connect_ByUID_Parallel(uid, sid) → nSID
-#   avClientStart2(nSID, "admin", "admin123", ...) → avIndex
-#   avSendIOCtrl(avIndex, 511, ...) → start video (IOTYPE_USER_IPCAM_START)
-#   avRecvFrameData2(avIndex, ...) → frame data loop
+#   IOTC_Connect_ByUID_Parallel(uid, sid) -> nSID
+#   avClientStart2(nSID, "admin", "admin123", ...) -> avIndex
+#   avSendIOCtrl(avIndex, 511, ...) -> start video (IOTYPE_USER_IPCAM_START)
+#   avRecvFrameData2(avIndex, ...) -> frame data loop
 #
 # Requires: libIOTCAPIs.so + libAVAPIs.so from the TUTK SDK.
 # Obtain them from the TUTK SDK distribution or an extracted AiDot APK.
@@ -379,7 +380,7 @@ def _build_sdes_serve_cmd(
 # Manages a single live-stream TCP session for a Leedarson/AiDot camera.
 # Use DeviceClient.async_open_live_stream() to obtain an instance.
 #
-# Protocol source: iOS LDSXplayer startRealPlay → LDSTCPManager
+# Protocol source: iOS LDSXplayer startRealPlay -> LDSTCPManager
 #   connectHost:port:sessionId:aesKey:heartbeat:msg:cmd:subCmd:cmdParam:tls:
 #
 # Wire format: same 37-byte header + payload as CloudPlaybackSession, but:
@@ -595,7 +596,7 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
         self._raw_device: dict = device
 
         # Seed camera/diagnostic status from the cloud device "properties" payload
-        # (Battery_remaining, Occupancy, SDcardStatus, MotionDetection_*, …).  This
+        # (Battery_remaining, Occupancy, SDcardStatus, MotionDetection_*, ...).  This
         # is the authoritative, always-current source the official app itself reads
         # - cameras do not push these reliably over MQTT - so sensors populate
         # immediately on load, before any poll.  No-op for devices without it.
@@ -722,7 +723,7 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
 
         The device-list payload carries every camera attribute under
         ``properties`` (battery, SD-card, occupancy, motion/night-vision
-        settings, …) plus a top-level ``online`` flag.  This is the reliable,
+        settings, ...) plus a top-level ``online`` flag.  This is the reliable,
         always-current source the official app reads, so HA populates camera
         sensors and control-entity states from it instead of an MQTT push the
         camera never sends.  Returns the updated status.
@@ -1248,7 +1249,7 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
 
         Tries several sources in order:
           1. POST /v21/devices/batchGetDeviceUserInfo       (AiDot platform API)
-          2. POST /v5/deviceController/getP2pId?deviceId=…  (Leedarson smarthome)
+          2. POST /v5/deviceController/getP2pId?deviceId=...  (Leedarson smarthome)
           3. AiDot v32 IPC device detail                    (fallback)
         """
         import aiohttp
@@ -1516,7 +1517,7 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
             "payload": inner,
         })
         pub_topic = f"iot/v1/c/{device_id}/device/setDevAttrReq"
-        _LOGGER.info("setDevAttrReq: %s=%s → %s  seq=%s", attr, value, device_id, seq)
+        _LOGGER.info("setDevAttrReq: %s=%s -> %s  seq=%s", attr, value, device_id, seq)
         ok = await self._mqtt_device_cmd(
             pub_topic, payload, timeout=timeout, ack_keyword="setDevAttr")
         if ok:
@@ -1561,7 +1562,7 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
             },
         })
         pub_topic = f"iot/v1/s/{user_id}/device/devActionReq"
-        _LOGGER.info("devActionReq: %s %s → %s", action, params, device_id)
+        _LOGGER.info("devActionReq: %s %s -> %s", action, params, device_id)
         return await self._mqtt_device_cmd(
             pub_topic, payload, timeout=timeout, ack_keyword="devAction")
 
@@ -1926,10 +1927,9 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
         """
         import asyncio as _asyncio
 
-        # ── SDES path: stream briefly to a temp TS file, extract one JPEG ──── #
+        # -- SDES path: stream briefly to a temp TS file, extract one JPEG ---- #
         if self.is_sdes_camera:
             import os as _os
-            import subprocess as _sp
             import tempfile as _tf
 
             with _tf.NamedTemporaryFile(suffix=".ts", delete=False) as _tmpf:
@@ -1970,17 +1970,33 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
                 if _ffmpeg_path() is None:
                     _LOGGER.error("async_snapshot SDES: %s", _FFMPEG_MISSING_MSG)
                     return False
-                _ffmpeg_snap = _sp.run(
-                    ["ffmpeg", "-y", "-i", _tmp_ts,
-                     "-frames:v", "1", "-f", "image2", output_path],
-                    capture_output=True, timeout=15,
+                # Async subprocess (not subprocess.run): a synchronous ffmpeg
+                # here blocks the whole event loop - every camera, keepalive and
+                # MQTT drain - for up to the timeout.
+                _snap_proc = await _asyncio.create_subprocess_exec(
+                    "ffmpeg", "-y", "-i", _tmp_ts,
+                    "-frames:v", "1", "-f", "image2", output_path,
+                    stdout=_asyncio.subprocess.DEVNULL,
+                    stderr=_asyncio.subprocess.PIPE,
                 )
-                if _ffmpeg_snap.returncode == 0 and _os.path.exists(output_path):
+                try:
+                    _, _snap_err = await _asyncio.wait_for(
+                        _snap_proc.communicate(), timeout=15
+                    )
+                except TimeoutError:
+                    _snap_proc.kill()
+                    await _snap_proc.communicate()
+                    _LOGGER.warning(
+                        "async_snapshot SDES: ffmpeg frame extract timed out for %s",
+                        self.device_id,
+                    )
+                    return False
+                if _snap_proc.returncode == 0 and _os.path.exists(output_path):
                     return True
                 _LOGGER.warning(
                     "async_snapshot SDES: ffmpeg frame extract failed for %s: %s",
                     self.device_id,
-                    _ffmpeg_snap.stderr.decode(errors="replace")[-200:],
+                    (_snap_err or b"").decode(errors="replace")[-200:],
                 )
                 return False
             except Exception as _snap_exc:
@@ -1993,7 +2009,7 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
                 except Exception:
                     _LOGGER.debug("camera %s: swallowed exception in %s", getattr(self, "device_id", "?"), 'async_snapshot', exc_info=True)
 
-        # ── DTLS path: on_frame callback delivers frames from aiortc ─────── #
+        # -- DTLS path: on_frame callback delivers frames from aiortc ------- #
         frame_event = _asyncio.Event()
         captured: list = [None]  # stores PIL Image or ndarray once decoded
 
@@ -2032,7 +2048,11 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
 
         if captured[0] is None:
             return False
-        return _save_frame_as_jpeg(captured[0], output_path)
+        # _save_frame_as_jpeg does a blocking PIL encode (or a blocking ffmpeg
+        # fallback); run it off the event loop so it can't stall other cameras.
+        return await _asyncio.get_running_loop().run_in_executor(
+            None, _save_frame_as_jpeg, captured[0], output_path
+        )
 
     async def async_start_streaming(self) -> None:
         """Start a persistent background WebRTC stream that updates latest_jpeg.
@@ -2362,7 +2382,7 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
         open_timeout: float = 30.0,
         retries: int = 3,
     ) -> bool:
-        """Play viewer→camera (push-to-talk / announce) audio through the speaker.
+        """Play viewer->camera (push-to-talk / announce) audio through the speaker.
 
         ``pcm_provider()`` is polled every 20 ms and must return 320 bytes of s16le
         PCM @ 8 kHz mono (a short/empty frame is padded to silence) and ``None``
@@ -2558,13 +2578,13 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
                         break
                     if _idle_on and _serve_port is not None:
                         _present = self._sdes_serve_consumer_present(_serve_port)
-                        if _present:  # True → a viewer is pulling; stay alive
+                        if _present:  # True -> a viewer is pulling; stay alive
                             _last_consumer = time.monotonic()
                         elif _idle_release_due(_present, _last_consumer,
                                                time.monotonic(), _idle_secs):
                             _idle_release = True
                             break
-                        # _present is None (unreadable table) → don't release
+                        # _present is None (unreadable table) -> don't release
             except asyncio.CancelledError:
                 _done.cancel()
                 self._stream_session = None
@@ -2816,7 +2836,7 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
         """Serve idle-release window (seconds). A per-camera ``stream_idle_s``
         (set via start_keepalive) overrides the ``AIDOT_STREAM_IDLE_S`` env
         default of 120 s.  <= 0 means *never* idle-release (keep the warm session
-        for instant re-views — sensible for mains cameras, which have no battery
+        for instant re-views - sensible for mains cameras, which have no battery
         cost; note it holds a concurrent-stream slot for the camera's lifetime)."""
         opt = getattr(self, "_stream_idle_opt", None)
         if opt is not None:
@@ -3104,7 +3124,7 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
         import queue as _queue
         serve_url = self._keepalive_rtsp_url
         # APK parity: the official app gates re-connects to ~15 s (f0.java I1=15000)
-        # and never hammers.  We previously floored at 5 s and a partial-success →
+        # and never hammers.  We previously floored at 5 s and a partial-success ->
         # reset path could drop the effective spacing even lower, pounding a flaky
         # A000088 camera fast enough to wedge its DTLS stack (ICE completes but DTLS
         # never fires until a power-cycle).  Floor the backoff at the 15 s gate and,
@@ -3213,7 +3233,7 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
                     elif _t - _disc_since[0] >= _DISC_DEBOUNCE:
                         return True
                 else:
-                    _disc_since[0] = None  # connected/connecting → reset debounce
+                    _disc_since[0] = None  # connected/connecting -> reset debounce
                 return False
 
             for _ in range(40):  # ~12s for the receiver/track(s) to exist
@@ -3416,7 +3436,7 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
             _LOGGER.warning("DTLS serve: ffmpeg launch failed: %s", exc)
             return None
 
-    # ── PTZ physical pan/tilt (A001064) ─────────────────────────────────── #
+    # -- PTZ physical pan/tilt (A001064) ----------------------------------- #
     # Uses IOCtrl cmd=4097 (IOTYPE_USER_IPCAM_PTZ_COMMAND) - NOT MQTT.
     # DTLS path: sent via WebRTC DataChannel. SDES path: sent via encrypted
     # SCTP cmd_chan. Requires an active stream session (_stream_session).
@@ -3553,11 +3573,11 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
         # Returns a running TutkStreamSession, or None on failure.
         #
         # Protocol: TUTK IOTC P2P (confirmed from classes.jar.decompiled.zip).
-        #   p2pId (TUTK UID) ← POST /v21/devices/batchGetDeviceUserInfo
-        #   IOTC_Connect_ByUID_Parallel(uid) → nSID
-        #   avClientStart2(nSID, "admin", "admin123") → avIndex
-        #   avSendIOCtrl(avIndex, 511, ...) → start video stream
-        #   avRecvFrameData2(avIndex, ...) → frame loop
+        #   p2pId (TUTK UID) <- POST /v21/devices/batchGetDeviceUserInfo
+        #   IOTC_Connect_ByUID_Parallel(uid) -> nSID
+        #   avClientStart2(nSID, "admin", "admin123") -> avIndex
+        #   avSendIOCtrl(avIndex, 511, ...) -> start video stream
+        #   avRecvFrameData2(avIndex, ...) -> frame loop
         #
         # Requires libIOTCAPIs.so + libAVAPIs.so from the TUTK SDK.
 

{python_aidot_cameras-0.10.0/src → python_aidot_cameras-0.10.2}/aidot/camera/controls.py

@@ -19,7 +19,7 @@ class _CameraControlsMixin:
 
     async def async_set_motion_detection(self, enabled: bool) -> bool:
         """Enable or disable the camera's motion detection."""
-        # MotionDetection_Enable is read as getString() in IpcServiceImpl → use str
+        # MotionDetection_Enable is read as getString() in IpcServiceImpl -> use str
         return await self.async_set_device_attribute(
             "MotionDetection_Enable", "1" if enabled else "0")
 
@@ -108,7 +108,7 @@ class _CameraControlsMixin:
         speed:     0-255, default 4 (matches app default)
         preset:    preset slot for "goto" command
 
-        Source: a.java d1() / f0.java A2() → avSendIOCtrl(4097, 8B payload)
+        Source: a.java d1() / f0.java A2() -> avSendIOCtrl(4097, 8B payload)
         Payload: [direction_code, speed, preset, 0, 0, 0, 0, 0]
 
         Direction codes (AVIOCTRLDEFs.java):
@@ -128,7 +128,7 @@ class _CameraControlsMixin:
             return False
         ok = session._avio_cmd(4097, payload)
         _LOGGER.debug(
-            "PTZ %s (code=%d speed=%d preset=%d) → %s",
+            "PTZ %s (code=%d speed=%d preset=%d) -> %s",
             direction, code, speed, preset, "sent" if ok else "no channel yet",
         )
         return ok
@@ -144,7 +144,7 @@ class _CameraControlsMixin:
         mirroring the official app's HD/SD toggle.  Rides the active stream
         session (SETSTREAMCTRL=800), so the camera must be streaming.
 
-        Source: f0.java g3() → X2(800, SetStreamCtrlReq.parseContent(0, quality)).
+        Source: f0.java g3() -> X2(800, SetStreamCtrlReq.parseContent(0, quality)).
         Payload <IB3x> = channel(0) + quality byte + 3 reserved.
         """
         q = _STREAM_QUALITY.get(quality.lower())
@@ -158,7 +158,7 @@ class _CameraControlsMixin:
             return False
         ok = session._avio_cmd(SETSTREAMCTRL_CMD, payload)
         _LOGGER.debug(
-            "set resolution %s (quality=%d) → %s",
+            "set resolution %s (quality=%d) -> %s",
             quality, q, "sent" if ok else "no channel yet",
         )
         return ok

{python_aidot_cameras-0.10.0/src → python_aidot_cameras-0.10.2}/aidot/camera/lan_control.py

@@ -11,7 +11,7 @@ Design constraints (validated against LK.IPC.A000088 firmware):
   AES-ECB-encrypted JSON body, keyed by the device's 16-char ``aesKey``.
 * It is **single-session**: a second ``loginReq`` evicts the first.  So this client
   never holds a socket open - every operation is a short-lived
-  *connect → login → command(s) → close*, serialized by a per-camera lock.
+  *connect -> login -> command(s) -> close*, serialized by a per-camera lock.
 * The camera acks changes with ``setDevAttrResp`` but emits no ``setDevAttrNotif``,
   so there is no push; status is obtained by polling :meth:`async_get_attributes`.
 * Only cameras that advertise ``localCtrFlag == 1`` on unicast discovery AND are
@@ -59,6 +59,11 @@ ATTR_KEYS = {
 }
 
 
+# Control-channel bodies are small JSON; reject anything wildly larger than that
+# so a hostile/broken LAN peer can't drive memory exhaustion via the size field.
+_MAX_FRAME_BODY = 1024 * 1024  # 1 MiB
+
+
 def _pack(msgtype: int, body: bytes) -> bytes:
     return struct.pack(">Hhi", _MAGIC, msgtype, len(body)) + body
 
@@ -69,6 +74,12 @@ async def _read_frame(reader: asyncio.StreamReader, timeout: float) -> bytes:
     The caller decrypts and parses the JSON (the AES key lives on the client)."""
     header = await asyncio.wait_for(reader.readexactly(8), timeout)
     _magic, _mtype, bodysize = struct.unpack(">HHI", header)
+    # Cap the server-supplied body size: `bodysize` is an unsigned 32-bit field
+    # (up to ~4 GiB) from a LAN host, and control-channel bodies are small JSON.
+    # Reject an implausibly large frame instead of allocating on a malicious or
+    # malfunctioning peer (mirrors the 4 MiB cap in playback._read_frame).
+    if bodysize > _MAX_FRAME_BODY:
+        raise ValueError(f"LAN control frame body too large: {bodysize} bytes")
     body = await asyncio.wait_for(reader.readexactly(bodysize), timeout)
     return body  # caller decrypts (key is on the client)
 
@@ -78,7 +89,7 @@ async def discover_unicast(ip: str, timeout: float = 2.0) -> Optional[dict]:
 
     Cameras ignore the broadcast sweep but answer a unicast probe.  Returns the
     ``payload`` dict (``devId``, ``mac``, ``productModel``, ``lanMode``,
-    ``localCtrFlag`` …) or ``None`` if nothing answered.
+    ``localCtrFlag`` ...) or ``None`` if nothing answered.
     """
     msg = {
         "protocolVer": "2.0.0",

{python_aidot_cameras-0.10.0/src → python_aidot_cameras-0.10.2}/aidot/camera/models.py

@@ -30,6 +30,24 @@ from .constants import (
 _LOGGER = logging.getLogger(__name__)
 
 
+def _as_int(v: Any) -> Optional[int]:
+    """Coerce a cloud-supplied attr value to int, or None if not numeric.
+
+    Cloud/device attributes are untrusted: a non-numeric value must be skipped,
+    not raise ValueError/TypeError out of the status-refresh path.
+    """
+    try:
+        return int(v)
+    except (ValueError, TypeError):
+        return None
+
+
+def _as_bool(v: Any) -> Optional[bool]:
+    """Coerce a 0/1 (int or numeric string) attr to bool, or None if not numeric."""
+    i = _as_int(v)
+    return None if i is None else bool(i)
+
+
 class CameraStatusData(DeviceStatusData):
     """Core status plus camera fields; accepts both typed-model and dict updates."""
 
@@ -74,44 +92,41 @@ class CameraStatusData(DeviceStatusData):
         # feeders either strip them (update_from_camera_attributes) or have
         # already applied them via the model (receive_data raw-dict pass).
         # Camera attributes
-        if (v := attr.get("MotionDetection_Enable")) is not None:
-            self.motion_detection = bool(int(v))
-        if (v := attr.get("MotionDetection_Sen")) is not None:
-            self.motion_sensitivity = int(v)
-        if (v := attr.get("LedOnOff")) is not None:
-            self.status_led = bool(int(v))
-        if (v := attr.get("micEnable")) is not None:
-            self.microphone = bool(int(v))
+        # Every conversion goes through _as_int/_as_bool so a malformed value
+        # from the cloud (e.g. "on" where 0/1 is expected) is skipped rather than
+        # raising out of update() and aborting the whole status refresh.
+        if (b := _as_bool(attr.get("MotionDetection_Enable"))) is not None:
+            self.motion_detection = b
+        if (i := _as_int(attr.get("MotionDetection_Sen"))) is not None:
+            self.motion_sensitivity = i
+        if (b := _as_bool(attr.get("LedOnOff"))) is not None:
+            self.status_led = b
+        if (b := _as_bool(attr.get("micEnable"))) is not None:
+            self.microphone = b
         if (v := attr.get("nightVisionMode")) is not None:
-            try:
-                nv = int(v)
+            nv = _as_int(v)
+            if nv is not None:
                 self.night_vision_mode = {0: "auto", 1: "on", 2: "off"}.get(nv, str(nv))
-            except (ValueError, TypeError):
+            else:
                 # Camera may send string "on"/"off"/"auto" instead of 0/1/2
                 self.night_vision_mode = str(v)
-        if (v := attr.get("nightVisionIRLight")) is not None:
-            self.ir_light = bool(int(v))
-        if (v := attr.get("LightOnOff")) is not None:
-            self.floodlight = bool(int(v))
-        if (v := attr.get("trackingMode")) is not None:
-            self.ptz_tracking = bool(int(v))
-        if (v := attr.get("SoundLevel")) is not None:
-            self.speaker_volume = int(v)
+        if (b := _as_bool(attr.get("nightVisionIRLight"))) is not None:
+            self.ir_light = b
+        if (b := _as_bool(attr.get("LightOnOff"))) is not None:
+            self.floodlight = b
+        if (b := _as_bool(attr.get("trackingMode"))) is not None:
+            self.ptz_tracking = b
+        if (i := _as_int(attr.get("SoundLevel"))) is not None:
+            self.speaker_volume = i
         # Diagnostic / read-only
-        if (v := attr.get("Battery_remaining")) is not None:
-            try:
-                self.battery_remaining = int(v)
-            except (ValueError, TypeError):
-                _LOGGER.debug("swallowed exception in %s", 'update', exc_info=True)
-        if (v := attr.get("Occupancy")) is not None:
-            self.occupancy = bool(int(v))
+        if (i := _as_int(attr.get("Battery_remaining"))) is not None:
+            self.battery_remaining = i
+        if (b := _as_bool(attr.get("Occupancy"))) is not None:
+            self.occupancy = b
         if (v := attr.get("SDcardStatus")) is not None:
             self.sd_card_status = str(v)
-        if (v := attr.get("networkRssi")) is not None:
-            try:
-                self.wifi_rssi = int(v)
-            except (ValueError, TypeError):
-                _LOGGER.debug("swallowed exception in %s", 'update', exc_info=True)
+        if (i := _as_int(attr.get("networkRssi"))) is not None:
+            self.wifi_rssi = i
 
     # Cloud "properties" keys that belong to lights, not cameras.  A camera's
     # image "Dimming" must not be read as a light brightness (and could TypeError
@@ -123,7 +138,7 @@ class CameraStatusData(DeviceStatusData):
 
         Accepts either a setDevAttrNotif ``attr`` dict or a cloud device
         ``properties`` dict - both share the same camera attribute keys
-        (Battery_remaining, Occupancy, SDcardStatus, MotionDetection_*, …).
+        (Battery_remaining, Occupancy, SDcardStatus, MotionDetection_*, ...).
         """
         self.update({
             k: v for k, v in attrs.items()

{python_aidot_cameras-0.10.0/src → python_aidot_cameras-0.10.2}/aidot/camera/protocol.py

@@ -8,11 +8,13 @@ imports client.py -- the import edge is one-way (client -> protocol).
 """
 
 import asyncio
+import hashlib
 import ipaddress
 import json
 import logging
 import os
 import random
+import re
 import select
 import socket
 import struct
@@ -326,7 +328,7 @@ def _compress_sdp_for_camera(sdp: str) -> str:
 
 
 def _make_talk_audio_track(pcm_provider: Callable[[], "Optional[bytes]"]):
-    """Build an aiortc MediaStreamTrack that emits viewer→camera talk audio.
+    """Build an aiortc MediaStreamTrack that emits viewer->camera talk audio.
 
     Mirrors the official app (f0.java:695): a real audio track is present on the
     PeerConnection from the start, so the camera sees a genuine sender.  The
@@ -552,7 +554,14 @@ def _build_sprop(sps: bytes, pps: bytes) -> str:
 
 
 def _sprop_cache_path(devid: str) -> str:
-    return os.path.join(_SPROP_DIR, f"{devid}.sprop")
+    # `devid` originates from the cloud/device and is interpolated into a
+    # filesystem path, so a value containing "/", "\\", ".." or an absolute path
+    # could escape _SPROP_DIR (arbitrary read/write). Reduce it to a safe,
+    # collision-resistant filename component.
+    safe = re.sub(r"[^A-Za-z0-9_-]", "_", devid or "")
+    if not safe or len(devid or "") > 128:
+        safe = hashlib.sha256((devid or "").encode("utf-8", "replace")).hexdigest()
+    return os.path.join(_SPROP_DIR, f"{safe}.sprop")
 
 
 def _load_sprop(devid: str) -> "Optional[str]":
@@ -1176,7 +1185,7 @@ def _mqtt_session_sync(
     conn_ev = threading.Event()
     status  = {"connected": False, "rc": None, "rc_str": "", "error": None, "log": []}
 
-    # Build client - handle paho ≥2.0 (VERSION2) and <2.0
+    # Build client - handle paho >=2.0 (VERSION2) and <2.0
     try:
         client = _paho.Client(
             callback_api_version=_paho.CallbackAPIVersion.VERSION2,
@@ -1194,7 +1203,7 @@ def _mqtt_session_sync(
         client.tls_set_context(ctx)
 
     def _on_connect(c, ud, flags, reason_code, props=None):
-        # paho ≥2 passes ReasonCode; paho <2 passes int
+        # paho >=2 passes ReasonCode; paho <2 passes int
         try:
             rc = int(reason_code)
         except (TypeError, ValueError):
@@ -1733,7 +1742,7 @@ def _upgrade_sctp(sdp: str) -> str:
     RFC 8841 (and cameras / modern browsers) expect:
         m=application 9 UDP/DTLS/SCTP webrtc-datachannel
         a=sctp-port:5000
-        a=max-message-size:65536   ← required by RFC 8841 §4.3.1
+        a=max-message-size:65536   <- required by RFC 8841 section 4.3.1
     """
     import re as _re
     out = []
@@ -1750,7 +1759,7 @@ def _upgrade_sctp(sdp: str) -> str:
 def _normalize_bundle_ice_credentials(sdp: str) -> str:
     """Unify all m-section ICE credentials to match the BUNDLE master (mid:0).
 
-    RFC 8843 §7.1.3 requires all bundled m-sections to carry the same
+    RFC 8843 section 7.1.3 requires all bundled m-sections to carry the same
     ice-ufrag and ice-pwd.  aiortc generates a separate ICETransport per
     transceiver, giving each a unique credential pair.  Cameras that
     validate this requirement silently reject offers with mismatched