python-aidot-cameras 0.11.2__tar.gz → 0.11.5__tar.gz

{python_aidot_cameras-0.11.2/python_aidot_cameras.egg-info → python_aidot_cameras-0.11.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-aidot-cameras
-Version: 0.11.2
+Version: 0.11.5
 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
@@ -12,7 +12,7 @@ Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp>=3.9
-Requires-Dist: paho-mqtt>=2.0
+Requires-Dist: paho-mqtt>=1.6.1
 Requires-Dist: cryptography>=42.0
 Requires-Dist: pycryptodome>=3.20
 Requires-Dist: dacite>=1.8
@@ -167,7 +167,7 @@ audio, idle release, the sprop cache path) are documented in
 | `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 soaks cut SDES NO_MEDIA from ~57% to ~11-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.11.2 → python_aidot_cameras-0.11.5}/README.md

@@ -137,7 +137,7 @@ audio, idle release, the sprop cache path) are documented in
 | `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 soaks cut SDES NO_MEDIA from ~57% to ~11-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.11.2 → python_aidot_cameras-0.11.5}/aidot/__main__.py

@@ -59,6 +59,7 @@ import logging
 import os
 import signal
 import sys
+import tempfile
 
 import aiohttp
 
@@ -85,10 +86,25 @@ def _read_token_file(path: str) -> dict:
 
 
 def _write_token_file(path: str, data: dict) -> None:
-    """Blocking write of login_info to ``path`` with 0600 perms."""
-    with open(path, "w", encoding="utf-8") as fh:
-        json.dump(data, fh)
-    os.chmod(path, 0o600)
+    """Atomic, 0600-secure write of login_info to ``path``.
+
+    Serialize into a temp file in the same directory (mkstemp creates it 0600,
+    closing the world-readable window os.chmod-after-write leaves) and only then
+    os.replace it over ``path`` - so a serialization failure never truncates the
+    previously-valid token. On any error the temp file is removed and re-raised.
+    """
+    directory = os.path.dirname(path) or "."
+    fd, tmp = tempfile.mkstemp(dir=directory, prefix=".token-", suffix=".tmp")
+    try:
+        with os.fdopen(fd, "w", encoding="utf-8") as fh:
+            json.dump(data, fh)
+        os.replace(tmp, path)
+    except BaseException:
+        try:
+            os.unlink(tmp)
+        except OSError:
+            pass
+        raise
 
 
 def _install_token_cache(client: AidotClient, path: str) -> None:
@@ -133,10 +149,17 @@ async def _make_client(session: aiohttp.ClientSession) -> AidotClient:
     password = os.environ.get("AIDOT_PASSWORD")
 
     if token_file and os.path.exists(token_file):
-        token = await loop.run_in_executor(None, _read_token_file, token_file)
-        client = AidotClient(session=session, token=token)
-        _install_token_cache(client, token_file)
-        return client
+        try:
+            token = await loop.run_in_executor(None, _read_token_file, token_file)
+        except (OSError, ValueError) as exc:
+            # ValueError covers json.JSONDecodeError (empty/partial/corrupt
+            # cache). Fall through to the username/password path rather than
+            # crash CLI startup.
+            _LOGGER.warning("ignoring unreadable token cache %s: %s", token_file, exc)
+        else:
+            client = AidotClient(session=session, token=token)
+            _install_token_cache(client, token_file)
+            return client
 
     if not username or not password:
         sys.exit(

{python_aidot_cameras-0.11.2 → python_aidot_cameras-0.11.5}/aidot/camera/client.py

@@ -565,6 +565,14 @@ def _get_stream_slots() -> "asyncio.Semaphore":
 
 
 
+# Battery cameras re-sleep on their own low-power timer ~25 s after the last
+# keep-alive, even mid-view. Renew setKeepAliveTime INSIDE that window so there
+# is no sleep gap (the official app renews every 30 s, which leaves a ~5 s gap
+# against the 25 s window). See CameraMixin._keepalive_renew_loop.
+_KEEPALIVE_WINDOW_S = 25
+_KEEPALIVE_RENEW_S = 20
+
+
 class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
     """All camera/streaming methods, mixed into DeviceClient via inheritance."""
 
@@ -695,7 +703,9 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
         self._motion_active: bool = False
         self._motion_cb: Optional[Callable] = None
         self._motion_task: Optional["asyncio.Task[None]"] = None
-        self._motion_seen: set = set()
+        # Insertion-ordered set (dict keys) so the memory-bound trim can evict
+        # the OLDEST uids deterministically rather than arbitrary ones.
+        self._motion_seen: dict = {}
         self._motion_interval: float = 30.0
 
     # -- Pre-0.6 core API, kept for existing consumers ----------------------- #
@@ -1020,9 +1030,12 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
             if not mqtt_host:
                 # Fall back to the regional MQTT broker URL known to work from
                 # the AiDot web client: wss://{region}-mqtt.arnoo.com:8443/mqtt
+                # Redacted: `data`/`body` carries mqttPassword; log only the
+                # non-sensitive key names present, mirroring the hasPwd-style
+                # redaction of the debug log below.
                 _LOGGER.warning(
                     "getServerUrlConfig returned no mqttServerUrl; "
-                    "using regional fallback. body=%s", body
+                    "using regional fallback. keys=%s", sorted(data)
                 )
                 mqtt_host = f"wss://{self._region}-mqtt.arnoo.com:8443/mqtt"
 
@@ -2116,11 +2129,16 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
                     return
             frame_event.set()
 
-        session = await self.async_open_webrtc_stream(
-            on_frame=_on_frame,
-            timeout=timeout,
-            status_callback=status_callback,
-        )
+        try:
+            session = await self.async_open_webrtc_stream(
+                on_frame=_on_frame,
+                timeout=timeout,
+                status_callback=status_callback,
+            )
+        except Exception as _snap_exc:
+            _LOGGER.error(
+                "async_snapshot DTLS failed for %s: %s", self.device_id, _snap_exc)
+            return False
         try:
             try:
                 await _asyncio.wait_for(frame_event.wait(), timeout=timeout)
@@ -2159,6 +2177,7 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
         if self._stream_task is not None and not self._stream_task.done():
             return
         self._streaming_active = True
+        self._start_keepalive_renew()   # battery: renew keep-alive on this path too
         self._stream_task = asyncio.ensure_future(self._streaming_loop())
 
     async def async_stop_streaming(self) -> None:
@@ -2186,6 +2205,13 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
                 await task
             except (asyncio.CancelledError, Exception):
                 _LOGGER.debug("camera %s: swallowed exception in %s", getattr(self, "device_id", "?"), 'async_stop_streaming', exc_info=True)
+        ka_task, self._keepalive_task = getattr(self, "_keepalive_task", None), None
+        if ka_task is not None and not ka_task.done():
+            ka_task.cancel()
+            try:
+                await ka_task
+            except (asyncio.CancelledError, Exception):
+                _LOGGER.debug("camera %s: swallowed exception in %s", getattr(self, "device_id", "?"), 'async_stop_streaming', exc_info=True)
         # Reap a persistent-MQTT stream drain that no session stopped (e.g. an
         # open cancelled mid-handshake) so its handler is removed from the shared
         # connection and its blocked executor thread is released.
@@ -2243,7 +2269,7 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
         if self._motion_task is not None and not self._motion_task.done():
             return
         self._motion_active = True
-        self._motion_seen = set()
+        self._motion_seen = {}
         self._motion_task = asyncio.ensure_future(self._motion_poll_loop(lookback_s))
 
     async def async_stop_motion_polling(self) -> None:
@@ -2273,7 +2299,7 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
                     uid = it.get("eventUuid") or it.get("eventId") or it.get("recordId")
                     if not uid or uid in self._motion_seen:
                         continue
-                    self._motion_seen.add(uid)
+                    self._motion_seen[uid] = None
                     fresh.append(it)
                 if primed and fresh and self._motion_cb is not None:
                     for it in sorted(fresh, key=lambda x: x.get("eventTime") or 0):
@@ -2285,7 +2311,9 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
                             _LOGGER.debug("motion callback raised", exc_info=True)
                 primed = True
                 if len(self._motion_seen) > 1000:  # bound memory
-                    self._motion_seen = set(list(self._motion_seen)[-400:])
+                    # Keep the 400 most-recent uids (insertion order), evicting
+                    # the oldest so still-in-window events stay deduplicated.
+                    self._motion_seen = dict.fromkeys(list(self._motion_seen)[-400:])
             except asyncio.CancelledError:
                 return
             except Exception as exc:
@@ -2295,6 +2323,65 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
             except asyncio.CancelledError:
                 return
 
+    async def _async_set_keep_alive(self, keep_alive_s: int = _KEEPALIVE_WINDOW_S) -> None:
+        """POST setKeepAliveTime so a battery camera stays awake for keep_alive_s
+        seconds. Best-effort (errors swallowed). Wire format matches the app
+        (n.java: keepAliveTime=25)."""
+        try:
+            import aiohttp as _aiohttp
+            async with _aiohttp.ClientSession() as _s:
+                async with _s.post(
+                    f"{self._aidot_v32_base}/devices/{self.device_id}/setKeepAliveTime",
+                    json={"keepAliveTime": keep_alive_s},
+                    headers=self._aidot_headers(),
+                    timeout=_aiohttp.ClientTimeout(total=8),
+                ) as _r:
+                    _LOGGER.debug(
+                        "setKeepAliveTime HTTP %d for %s", _r.status, self.device_id
+                    )
+        except Exception as _exc:
+            _LOGGER.debug(
+                "setKeepAliveTime HTTP failed for %s: %s", self.device_id, _exc
+            )
+
+    def _start_keepalive_renew(self) -> None:
+        """Start the battery keep-alive renew loop - battery-only and
+        single-instance: cancel any prior loop first so a re-view within the
+        renew sleep window can't orphan one (an orphan keeps POSTing
+        setKeepAliveTime until _streaming_active next clears). No-op for mains
+        cameras, which never sleep."""
+        if not self.is_battery_camera:
+            return
+        prev = getattr(self, "_keepalive_task", None)
+        if prev is not None and not prev.done():
+            prev.cancel()
+        self._keepalive_task = asyncio.ensure_future(self._keepalive_renew_loop())
+
+    def _cancel_keepalive_renew(self) -> None:
+        """Cancel the battery keep-alive renew loop if running (fire-and-forget)."""
+        task, self._keepalive_task = getattr(self, "_keepalive_task", None), None
+        if task is not None and not task.done():
+            task.cancel()
+
+    async def _keepalive_renew_loop(self) -> None:
+        """Renew setKeepAliveTime while a BATTERY camera is streaming (app parity).
+
+        The camera's own low-power timer returns it to sleep ~25 s after the last
+        keep-alive even mid-view, so a one-shot keep-alive at open lets the stream
+        drop partway through. The official app renews it throughout a live view;
+        we renew every _KEEPALIVE_RENEW_S seconds (inside the 25 s window, so no
+        sleep gap). Mains cameras never sleep, so this is battery-only."""
+        if not self.is_battery_camera:
+            return
+        try:
+            while self._streaming_active:
+                await asyncio.sleep(_KEEPALIVE_RENEW_S)
+                if not self._streaming_active:
+                    break
+                await self._async_set_keep_alive()
+        except asyncio.CancelledError:
+            pass
+
     async def start_keepalive(
         self,
         rtsp_push_url: Optional[str] = None,
@@ -2369,6 +2456,10 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
         self._keepalive_rtsp_url = rtsp_push_url
         self._go2rtc_url = go2rtc_url
         self._streaming_active = True
+        # App parity: keep a battery camera awake for the whole view (mains cams
+        # never sleep, so this is a no-op there). Single-instance; cancelled in
+        # stop / idle-release.
+        self._start_keepalive_renew()
         if self.is_sdes_camera:
             self._stream_task = asyncio.ensure_future(self._sdes_keepalive_loop())
         elif rtsp_push_url and rtsp_push_url.startswith("http"):
@@ -2691,6 +2782,7 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
                 except Exception:
                     _LOGGER.debug("camera %s: swallowed exception in %s", getattr(self, "device_id", "?"), '_sdes_keepalive_loop', exc_info=True)
                 self._streaming_active = False
+                self._cancel_keepalive_renew()
                 self._keepalive_rtsp_url = None
                 self._serve_ready.clear()
                 _LOGGER.debug(
@@ -3478,6 +3570,7 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
                 # No viewer - go dormant; camera.stream_source() restarts us when
                 # someone opens the live view again.
                 self._streaming_active = False
+                self._cancel_keepalive_renew()
                 self._keepalive_rtsp_url = None
                 self._serve_ready.clear()
                 _LOGGER.debug(

{python_aidot_cameras-0.11.2 → python_aidot_cameras-0.11.5}/aidot/camera/lan_control.py

@@ -309,6 +309,10 @@ class CameraLanClient:
                                      "attr": [], "channel": "tcp", "ascNumber": asc},
                          "tst": int(time.time() * 1000), "deviceId": self.device_id})]
         replies = await self._session(build)
+        if not replies:
+            raise CameraLanError(
+                f"{self.device_id}: no reply to attribute query"
+            )
         return (replies[0].get("payload") or {}).get("attr") or {}
 
     async def async_set_attributes(self, attr: dict) -> bool:

{python_aidot_cameras-0.11.2 → python_aidot_cameras-0.11.5}/aidot/camera/playback.py

@@ -193,15 +193,18 @@ class CloudPlaybackSession:
             )
         except TimeoutError:
             _LOGGER.error("Cloud playback: login response timed out")
+            await self._cleanup()
             return False
         except Exception as exc:
             _LOGGER.error("Cloud playback: login read error: %s", exc)
+            await self._cleanup()
             return False
 
         if hdr["cmd"] != _CMD_LOGIN_RES:
             _LOGGER.error(
                 "Cloud playback: unexpected login response cmd=0x%04x", hdr["cmd"]
             )
+            await self._cleanup()
             return False
 
         try:
@@ -211,6 +214,7 @@ class CloudPlaybackSession:
                     "Cloud playback: login rejected code=%s body=%s",
                     body_obj.get("code"), body_obj,
                 )
+                await self._cleanup()
                 return False
         except (json.JSONDecodeError, ValueError):
             pass  # some firmware sends no JSON body - treat as success
@@ -292,6 +296,13 @@ class CloudPlaybackSession:
             else:
                 _LOGGER.warning("Cloud playback: unexpected stream result=%d", result)
 
+        # Loop exited on end-of-stream or a receive error/timeout (not via an
+        # external stop(), which cancels this task and owns its own teardown).
+        # Tear down here so the heartbeat loop wakes to a closed writer and
+        # exits, and the socket is not left open until stop() is called.
+        self._running = False
+        await self._cleanup()
+
     async def start(self) -> bool:
         self._running = True
         if not await self._connect_and_login():
@@ -326,12 +337,19 @@ class CloudPlaybackSession:
                     pass
         self._hb_task = None
         self._rx_task = None
+        await self._cleanup()
+
+    async def _cleanup(self) -> None:
+        # Close the TCP writer and drop the reader/writer refs. Nulling the
+        # writer makes a subsequent stop() (or a second call) a safe no-op, so
+        # this is the single teardown path shared by the login-failure returns,
+        # the receive-loop exit, and stop().
         if self._writer is not None:
             try:
                 self._writer.close()
                 await self._writer.wait_closed()
             except Exception:
-                _LOGGER.debug("swallowed exception in %s", 'stop', exc_info=True)
+                _LOGGER.debug("swallowed exception in %s", '_cleanup', exc_info=True)
             self._writer = None
             self._reader = None
 

{python_aidot_cameras-0.11.2 → python_aidot_cameras-0.11.5}/aidot/camera/protocol.py

@@ -1219,7 +1219,12 @@ def _mqtt_session_sync(
                    else str(msg.payload))
         msg_q.put((msg.topic, payload))
 
-    def _on_disconnect(c, ud, disconnect_flags=None, reason_code=None, props=None):
+    def _on_disconnect(c, ud, *args):
+        # paho >=2 calls (disconnect_flags, reason_code, properties); paho <2
+        # calls (rc,).  Pull the reason code from whichever slot it lands in so
+        # the log is truthful on both (a fixed 5-arg signature put paho 1.x's rc
+        # in disconnect_flags and logged reason_code as None).
+        reason_code = args[1] if len(args) >= 2 else (args[0] if args else None)
         # If _on_connect was never fired (WebSocket upgrade failed, auth refused
         # at TCP level, etc.) signal conn_ev now so the caller doesn't time out.
         if not conn_ev.is_set():

{python_aidot_cameras-0.11.2 → python_aidot_cameras-0.11.5}/aidot/camera/sdes_open.py

@@ -672,6 +672,15 @@ class _SdesOpenMixin:
                 # proceed rather than abort on a code we can't classify as terminal
                 # (genuine terminal rejects are still caught on the webrtcResp ack).
                 if _lp_on_sdes == 0:
+                    # Match the sibling raises: close the reserved sockets and
+                    # signal the MQTT thread before propagating.  (No sdp_path
+                    # unlink here - it is not created until later, below.)
+                    for _rsock in (_audio_sock, _video_sock):
+                        try:
+                            _rsock.close()
+                        except Exception:
+                            _LOGGER.debug("camera %s: swallowed exception in %s", getattr(self, "device_id", "?"), '_bridge_fn', exc_info=True)
+                    outgoing_q.put_nowait(None)   # stop MQTT thread
                     raise RuntimeError(
                         f"livePlay refused by camera (livePlay=0, code={_lp_code_sdes})")
                 elif _lp_code_sdes not in (0, 200):
@@ -3604,6 +3613,12 @@ class _SdesOpenMixin:
                             stdout=subprocess.DEVNULL,
                             stderr=subprocess.PIPE,
                         )
+                        # Point the shared holder at the live proc immediately.
+                        # The bridge thread polls _proc_holder[0]; if it still
+                        # sees the terminated old proc it logs "stream ended",
+                        # breaks, and closes the loopback sockets - starving the
+                        # restarted ffmpeg (0-frame stream).
+                        _proc_holder[0] = proc
                         _status("ffmpeg restarted with camera's SRTP keys")
         except TimeoutError:
             if _cam_echo_received:

{python_aidot_cameras-0.11.2 → python_aidot_cameras-0.11.5}/aidot/camera/webrtc_open.py

@@ -1000,32 +1000,13 @@ class _WebRTCOpenMixin:
                         "lowPowerActiveState HTTP failed for %s: %s", device_id, _we
                     )
 
-            async def _http_keepalive() -> None:
-                # setKeepAliveTime keeps the camera in active state for 25 s
-                # after wake (n.java:224 - keepAliveTime=25, not 20).
-                # Without this call the camera's built-in timer may return it
-                # to sleep before SCTP + LIVING completes (~10-15 s).
-                try:
-                    import aiohttp as _aiohttp_k
-                    async with _aiohttp_k.ClientSession() as _ks:
-                        async with _ks.post(
-                            f"{self._aidot_v32_base}/devices/{device_id}"
-                            "/setKeepAliveTime",
-                            json={"keepAliveTime": 25},
-                            headers=self._aidot_headers(),
-                            timeout=_aiohttp_k.ClientTimeout(total=8),
-                        ) as _kr:
-                            _LOGGER.debug(
-                                "setKeepAliveTime HTTP %d for %s",
-                                _kr.status, device_id,
-                            )
-                except Exception as _ke:
-                    _LOGGER.debug(
-                        "setKeepAliveTime HTTP failed for %s: %s", device_id, _ke
-                    )
-
             _spawn_bg(_http_wake())
-            _spawn_bg(_http_keepalive())
+            # setKeepAliveTime keeps the camera active for ~25 s after wake so the
+            # SCTP + LIVING handshake can complete. For BATTERY cameras a renewal
+            # loop (CameraMixin._keepalive_renew_loop, started by start_keepalive)
+            # then re-issues it every 20 s for the whole view - app parity so the
+            # camera doesn't return to sleep mid-stream.
+            _spawn_bg(self._async_set_keep_alive())
 
             outgoing_q.put_nowait(
                 (f"iot/v1/s/{user_id}/IPC/getIceConfigReq", _ice_req_payload)
@@ -1156,6 +1137,7 @@ class _WebRTCOpenMixin:
                     # transient on battery cameras and recover via ICE; abort
                     # there would spuriously kill otherwise-good streams.
                     if _lp_on == 0:
+                        outgoing_q.put_nowait(None)   # stop MQTT thread (avoid orphan)
                         raise RuntimeError(
                             f"livePlay refused by camera (livePlay=0, code={_lp_code})"
                         )
@@ -1207,6 +1189,7 @@ class _WebRTCOpenMixin:
                     _lp_code2 = int(_lp_resp2.get("code", 200))
                     _lp_on2   = int(_lp_resp2.get("livePlay", 1))
                     if _lp_on2 == 0:
+                        outgoing_q.put_nowait(None)   # stop MQTT thread (avoid orphan)
                         raise RuntimeError(
                             f"livePlay refused by camera (livePlay=0, code={_lp_code2})"
                         )
@@ -3210,6 +3193,7 @@ class _WebRTCOpenMixin:
                 # encoder is still cold.  Tear down and raise so the serve loop
                 # fast-retries in a bounded burst instead of letting DTLS
                 # co-fail into the full 15s-gated generic retry.
+                outgoing_q.put_nowait(None)   # stop MQTT thread (avoid orphan)
                 try:
                     await pc.close()
                 except Exception:

{python_aidot_cameras-0.11.2 → python_aidot_cameras-0.11.5}/aidot/client.py

@@ -38,6 +38,8 @@ from .const import (
     SUPPORTED_COUNTRYS,
     DEFAULT_COUNTRY_CODE,
     CONF_IS_OWNER,
+    LOGIN_INFO_PERSISTENT_MQTT_KEY,
+    LOGIN_INFO_PERSISTENT_MQTT_LOCK_KEY,
     RUNTIME_ONLY_LOGIN_INFO_KEYS,
     ServerErrorCode,
 )
@@ -567,7 +569,12 @@ class AidotClient:
         # Close the account-shared persistent MQTT connection, if one was opened
         # (AIDOT_PERSISTENT_MQTT). Stored on the shared login_info by the camera
         # command/attr paths; closing here stops its background paho loop.
-        pm = self.login_info.pop("_persistent_mqtt", None) if isinstance(self.login_info, dict) else None
+        pm = None
+        if isinstance(self.login_info, dict):
+            pm = self.login_info.pop(LOGIN_INFO_PERSISTENT_MQTT_KEY, None)
+            # Also drop the lock so the asyncio.Lock does not linger on the
+            # account-shared login_info after close.
+            self.login_info.pop(LOGIN_INFO_PERSISTENT_MQTT_LOCK_KEY, None)
         if pm is not None:
             try:
                 pm.close()

{python_aidot_cameras-0.11.2 → python_aidot_cameras-0.11.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-aidot-cameras"
-version = "0.11.2"
+version = "0.11.5"
 description = "Control AiDot/Leedarson WiFi lights and cameras (WebRTC streaming, two-way audio, PTZ, controls)"
 readme = "README.md"
 license = "MIT"
@@ -22,7 +22,7 @@ classifiers = [
 # after re-validating against it.
 dependencies = [
     "aiohttp>=3.9",
-    "paho-mqtt>=2.0",
+    "paho-mqtt>=1.6.1",
     "cryptography>=42.0",
     "pycryptodome>=3.20",
     "dacite>=1.8",

{python_aidot_cameras-0.11.2 → python_aidot_cameras-0.11.5/python_aidot_cameras.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-aidot-cameras
-Version: 0.11.2
+Version: 0.11.5
 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
@@ -12,7 +12,7 @@ Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp>=3.9
-Requires-Dist: paho-mqtt>=2.0
+Requires-Dist: paho-mqtt>=1.6.1
 Requires-Dist: cryptography>=42.0
 Requires-Dist: pycryptodome>=3.20
 Requires-Dist: dacite>=1.8
@@ -167,7 +167,7 @@ audio, idle release, the sprop cache path) are documented in
 | `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 soaks cut SDES NO_MEDIA from ~57% to ~11-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.11.2 → python_aidot_cameras-0.11.5}/python_aidot_cameras.egg-info/SOURCES.txt

@@ -85,6 +85,7 @@ tests/test_go2rtc.py
 tests/test_go2rtc_cli.py
 tests/test_highport_nomination.py
 tests/test_ice_config_cache.py
+tests/test_keepalive_renew.py
 tests/test_keyframe_prompter.py
 tests/test_lan_control.py
 tests/test_live_stream_param.py
@@ -117,5 +118,6 @@ tests/test_stream_idle.py
 tests/test_stream_teardown.py
 tests/test_talk.py
 tests/test_terminal_ack.py
+tests/test_token_file_robustness.py
 tests/test_token_refresh.py
 tests/test_wait_or_event.py

{python_aidot_cameras-0.11.2 → python_aidot_cameras-0.11.5}/python_aidot_cameras.egg-info/requires.txt

@@ -1,5 +1,5 @@
 aiohttp>=3.9
-paho-mqtt>=2.0
+paho-mqtt>=1.6.1
 cryptography>=42.0
 pycryptodome>=3.20
 dacite>=1.8

python_aidot_cameras-0.11.5/tests/test_keepalive_renew.py

@@ -0,0 +1,119 @@
+"""Battery-camera setKeepAliveTime renewal during streaming (app parity).
+
+The official app re-issues setKeepAliveTime throughout a live view so a battery
+camera's low-power timer doesn't return it to sleep mid-stream. We renew inside
+the 25 s window; mains cameras never sleep and are skipped.
+"""
+import asyncio
+from unittest.mock import AsyncMock, MagicMock, patch
+
+from aidot.camera.client import CameraMixin
+
+
+def _obj(battery=True, streaming=True):
+    o = MagicMock()
+    o.is_battery_camera = battery
+    o._streaming_active = streaming
+    o.device_id = "cam1"
+    o._async_set_keep_alive = AsyncMock()
+    return o
+
+
+def test_renew_loop_skips_mains_cameras():
+    o = _obj(battery=False)
+    asyncio.run(CameraMixin._keepalive_renew_loop(o))
+    o._async_set_keep_alive.assert_not_awaited()
+
+
+def test_renew_loop_renews_battery_until_stream_stops():
+    o = _obj(battery=True)
+    n = {"i": 0}
+
+    async def fake_sleep(_s):
+        n["i"] += 1
+        if n["i"] >= 3:
+            o._streaming_active = False   # stop after the 3rd sleep
+
+    with patch("aidot.camera.client.asyncio.sleep", fake_sleep):
+        asyncio.run(CameraMixin._keepalive_renew_loop(o))
+    # sleep(renew), sleep(renew), sleep(stop -> break): 2 renewals
+    assert o._async_set_keep_alive.await_count == 2
+
+
+def test_renew_loop_swallows_cancel():
+    o = _obj(battery=True)
+
+    async def _run():
+        t = asyncio.ensure_future(CameraMixin._keepalive_renew_loop(o))
+        await asyncio.sleep(0)   # let it reach the first (real) sleep
+        t.cancel()               # cancel interrupts the sleep immediately
+        await t                  # CancelledError is swallowed inside the loop
+
+    asyncio.run(_run())
+    o._async_set_keep_alive.assert_not_awaited()
+
+
+def test_start_renew_is_noop_for_mains_cameras():
+    # Mains cameras never sleep - no throwaway task should be scheduled.
+    o = _obj(battery=False)
+    with patch("aidot.camera.client.asyncio.ensure_future") as ef:
+        CameraMixin._start_keepalive_renew(o)
+    ef.assert_not_called()
+
+
+def test_start_renew_cancels_a_still_running_prior_loop():
+    # Re-view within the renew sleep window must not orphan the prior loop.
+    o = _obj(battery=True)
+    prior = MagicMock()
+    prior.done.return_value = False
+    o._keepalive_task = prior
+    with patch("aidot.camera.client.asyncio.ensure_future", return_value="new") as ef:
+        CameraMixin._start_keepalive_renew(o)
+    prior.cancel.assert_called_once()   # old loop stopped
+    ef.assert_called_once()             # exactly one new loop
+    assert o._keepalive_task == "new"
+
+
+def test_cancel_renew_stops_the_loop_and_clears_the_ref():
+    o = _obj(battery=True)
+    task = MagicMock()
+    task.done.return_value = False
+    o._keepalive_task = task
+    CameraMixin._cancel_keepalive_renew(o)
+    task.cancel.assert_called_once()
+    assert o._keepalive_task is None
+
+
+def test_set_keep_alive_posts_expected_request():
+    o = MagicMock()
+    o.device_id = "cam1"
+    o._aidot_v32_base = "https://api.example/v3.2"
+    o._aidot_headers = MagicMock(return_value={"Authorization": "x"})
+    cap = {}
+
+    class _Resp:
+        status = 200
+
+        async def __aenter__(self):
+            return self
+
+        async def __aexit__(self, *a):
+            return False
+
+    class _Sess:
+        async def __aenter__(self):
+            return self
+
+        async def __aexit__(self, *a):
+            return False
+
+        def post(self, url, json=None, headers=None, timeout=None):
+            cap.update(url=url, json=json, headers=headers)
+            return _Resp()
+
+    with patch("aiohttp.ClientSession", lambda: _Sess()):
+        asyncio.run(CameraMixin._async_set_keep_alive(o))
+
+    assert cap["url"] == "https://api.example/v3.2/devices/cam1/setKeepAliveTime"
+    assert cap["json"] == {"keepAliveTime": 25}
+    assert cap["headers"] == {"Authorization": "x"}

{python_aidot_cameras-0.11.2 → python_aidot_cameras-0.11.5}/tests/test_lan_control.py

@@ -80,3 +80,23 @@ def test_network_helpers_are_callable():
     assert inspect.iscoroutinefunction(discover_subnet)
     sig = inspect.signature(discover_subnet)
     assert list(sig.parameters) == ["cidr24", "timeout", "concurrency"]
+
+
+def test_get_attributes_empty_replies_raises_lanerror():
+    # If the camera accepts login but never answers getDevAttrReq (read timeout),
+    # _session returns [] - async_get_attributes must raise CameraLanError (the
+    # contract callers rely on for cloud fallback), not an unguarded IndexError.
+    import asyncio
+
+    c = CameraLanClient(DEVICE, USER, ip="192.0.2.10")
+
+    async def _empty(_build):
+        return []
+
+    c._session = _empty
+
+    async def _go():
+        with pytest.raises(CameraLanError):
+            await c.async_get_attributes()
+
+    asyncio.run(_go())

{python_aidot_cameras-0.11.2 → python_aidot_cameras-0.11.5}/tests/test_motion_poll.py

@@ -24,7 +24,7 @@ class _FakeDC:
         self._call = 0
         self._motion_active = True
         self._motion_cb = None
-        self._motion_seen = set()
+        self._motion_seen: dict = {}  # insertion-ordered set (dict keys); see CameraMixin
         self._motion_interval = 0.01  # fast for the test
 
     async def async_get_cloud_recordings(self, *a, **k):

python_aidot_cameras-0.11.5/tests/test_token_file_robustness.py

@@ -0,0 +1,43 @@
+"""Tests for the standalone CLI's token-cache read/write robustness.
+
+Covers the 0.11.3 fixes: the token file is written atomically at 0600 (a
+serialization failure must not truncate a previously-valid token), and a
+corrupt/partial cache is a caught ValueError (so _make_client can fall back
+to username/password login instead of crashing).
+"""
+import os
+import stat
+
+import pytest
+
+from aidot.__main__ import _read_token_file, _write_token_file
+
+
+def test_write_token_file_round_trips_and_is_0600(tmp_path):
+    p = tmp_path / "token.json"
+    _write_token_file(str(p), {"accessToken": "abc", "id": "u1"})
+    assert _read_token_file(str(p)) == {"accessToken": "abc", "id": "u1"}
+    assert stat.S_IMODE(os.stat(p).st_mode) == 0o600
+
+
+def test_write_token_file_preserves_previous_on_serialization_failure(tmp_path):
+    p = tmp_path / "token.json"
+    _write_token_file(str(p), {"accessToken": "good"})  # seed a valid token
+
+    # A set is not JSON-serializable, so json.dump raises mid-write. The atomic
+    # temp-then-replace write must leave the previously-valid token untouched.
+    with pytest.raises(TypeError):
+        _write_token_file(str(p), {"broken": {1, 2, 3}})
+
+    assert _read_token_file(str(p)) == {"accessToken": "good"}
+    # And it must not leave a stray temp file behind.
+    assert [f for f in os.listdir(tmp_path) if f.startswith(".token-")] == []
+
+
+def test_read_token_file_raises_valueerror_on_corrupt(tmp_path):
+    p = tmp_path / "token.json"
+    p.write_text("{ not valid json", encoding="utf-8")
+    # json.JSONDecodeError is a subclass of ValueError - the exact type
+    # _make_client catches to fall back to password login rather than crash.
+    with pytest.raises(ValueError):
+        _read_token_file(str(p))