python-aidot-cameras 0.12.14__tar.gz → 0.12.16__tar.gz

{python_aidot_cameras-0.12.14/python_aidot_cameras.egg-info → python_aidot_cameras-0.12.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-aidot-cameras
-Version: 0.12.14
+Version: 0.12.16
 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

{python_aidot_cameras-0.12.14 → python_aidot_cameras-0.12.16}/aidot_cameras/camera/client.py

@@ -369,6 +369,7 @@ def _build_sdes_serve_cmd(
     max_seconds: Optional[float] = None,
     sdes_audio: bool = False,
     audio_gain_db: float = -8.0,
+    push_video_only: bool = False,
 ) -> list:
     """Build the ffmpeg argv for the SDES bridge serve.
 
@@ -425,8 +426,13 @@ def _build_sdes_serve_cmd(
                 rtsp_push_url,
             ]
     elif rtsp_push_url:
+        # PUSH is G.711 passthrough (-c copy) as always - EXCEPT when the audio
+        # payload type was never observed (push_video_only): announcing an
+        # un-narrowed audio line the server cannot accept kills the whole
+        # publish with 400 Bad Request, so map video only and announce clean.
         dest_args = [
-            "-c", "copy",
+            *(["-map", "0:v:0", "-c:v", "copy"] if push_video_only
+              else ["-c", "copy"]),
             *time_args,
             "-f", "rtsp", "-rtsp_transport", "tcp",
             rtsp_push_url,
@@ -2695,9 +2701,11 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
         from a Home Assistant config-entry option, since HA OS can't set env vars).
 
         ``live_stream_param`` toggles the battery-camera cloud pre-connect
-        (liveStreamParam); like ``fast_connect`` it overrides the
-        ``AIDOT_LIVESTREAM_PARAM`` env var, so an integration on HA OS (no env vars)
-        can still disable it per camera.
+        (liveStreamParam), which is **off by default**: it provisions the camera
+        toward AWS KVS and diverts an A001513's media away from the SDES bridge
+        (no video RTP arrives).  Like ``fast_connect`` it overrides the
+        ``AIDOT_LIVESTREAM_PARAM`` env var; set True only to re-enable the
+        pre-connect for a camera that needs it.
 
         ``serve_relay`` toggles the cold-start serve-port relay (holds the public
         serve port connectable through the WebRTC handshake so an eager go2rtc
@@ -3049,11 +3057,30 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
         # lifetime; an integration reload / restart re-probes the fast path.
         _fast_failed = bool(getattr(self, "_fast_path_unavailable", False))
 
+        # Reuse ONE peerid across the retries of this loop instead of minting a
+        # fresh one per attempt. A fresh peerid = a new camera-side session, and
+        # the camera frees old ones only slowly, so mint-per-retry stacks up
+        # sessions on a failing battery camera faster than they drain (measured:
+        # this is how the L2 wedged into a wake-then-sleep loop). Mirrors the
+        # official app, which resends within one session. Rotate to a fresh
+        # peerid after a session that actually delivered media (so the next view
+        # is a clean session) or after _PEERID_MAX_REUSE consecutive dead
+        # attempts (so a poisoned peerid can't wedge us permanently).
+        _PEERID_MAX_REUSE = 3
+        _loop_peer_id = self.generate_webrtc_peer_id(live_type=2, stream_id=0,
+                                                     sdes=True)
+        _peer_reuses = 0
+
         while self._streaming_active:
             if self._serve_relay is not None:
                 # Clear any stale backend from a prior session; the open below
                 # points the relay at this session's fresh internal ffmpeg port.
                 self._serve_relay.set_backend(None)
+            if _peer_reuses >= _PEERID_MAX_REUSE:
+                _loop_peer_id = self.generate_webrtc_peer_id(
+                    live_type=2, stream_id=0, sdes=True)
+                _peer_reuses = 0
+            _peer_reuses += 1
             _use_fast = self._adaptive_next_fast(_adaptive, _fast_failed)
             if _adaptive:
                 self._fast_attempt_override = _use_fast
@@ -3061,10 +3088,31 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
                 session = await self.async_open_webrtc_stream(
                     rtsp_push_url=self._keepalive_rtsp_url,
                     timeout=(_FAST_OPEN_TIMEOUT if _use_fast else 120.0),
+                    reuse_peer_id=_loop_peer_id,
                 )
             except asyncio.CancelledError:
                 self._fast_attempt_override = None
                 return
+            except AidotCameraBusy as busy:
+                # The camera itself said it has no free session (-50002 max
+                # concurrent streams / -50015). Each retry mints a NEW peerid and
+                # so registers ANOTHER camera-side session, which the camera only
+                # releases slowly - so retrying on the short backoff makes the
+                # shortage worse and can wedge a battery camera into a
+                # wake-then-sleep loop that serves nothing. Wait out the release
+                # window instead. (The DTLS loops have always done this; the SDES
+                # loop silently did not.)
+                self._fast_attempt_override = None
+                _LOGGER.warning(
+                    "SDES keepalive: camera %s refused the stream (%s) - "
+                    "backing off %.0fs so its sessions can be released",
+                    self.device_id, busy, _MAX_DELAY,
+                )
+                try:
+                    await asyncio.sleep(_MAX_DELAY)
+                except asyncio.CancelledError:
+                    return
+                continue
             except Exception as exc:
                 self._fast_attempt_override = None
                 if _use_fast:
@@ -3189,6 +3237,13 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
             # Adaptive bookkeeping: a fast attempt that never delivered media
             # latches the loop onto the full relay path for its remaining opens.
             _healthy = session.last_media_monotonic > 0.0
+            if _healthy:
+                # A session that delivered media is a real, cleanly-used session;
+                # the next open should be a fresh one rather than re-offering on a
+                # peerid the camera has already finished with.
+                _loop_peer_id = self.generate_webrtc_peer_id(
+                    live_type=2, stream_id=0, sdes=True)
+                _peer_reuses = 0
             if _use_fast and not _healthy and not _fast_failed:
                 _LOGGER.info(
                     "SDES adaptive[%s]: fast attempt delivered no media - "
@@ -3571,7 +3626,18 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
 
         Per-camera ``sdes_skip_turn`` (set via start_keepalive) wins; else the
         ``AIDOT_SDES_SKIP_TURN_PREALLOC`` env (truthy = 1/true/yes/on), default
-        off.  Only consulted for SDES cameras."""
+        off.  Only consulted for SDES cameras.
+
+        NEVER skipped for a battery camera, whatever the opt/env say: a battery
+        camera sleeps and is woken through the cloud, so it is reached over the
+        TURN relay rather than a host-direct LAN path.  Skipping the relay
+        pre-allocation there means the camera has no reachable path back and
+        sends no media at all (validated live on an A001513: with the relay it
+        streams h264 1280x960, with skip_turn it serves nothing).  The LAN-direct
+        latency win only applies to a mains camera that actually has a host
+        candidate on the HA segment."""
+        if getattr(self, "is_battery_camera", False):
+            return False
         opt = getattr(self, "_sdes_skip_turn_opt", None)
         if opt is not None:
             return bool(opt)

{python_aidot_cameras-0.12.14 → python_aidot_cameras-0.12.16}/aidot_cameras/camera/sdes_open.py

@@ -36,7 +36,9 @@ _LOGGER = logging.getLogger(__name__)
 
 # Payload types the ffmpeg SDP advertises per media line, and their alternates.
 # The SDP offers both because the camera picks one per session.
-_SDP_ALTERNATE_PT = {96: 97, 97: 96, 0: 8, 8: 0}
+# Video payloads the cameras negotiate: 96=H.264, 97/98=H.265 (two variants).
+_SDP_VIDEO_PTS = (96, 97, 98)
+_SDP_AUDIO_PTS = (0, 8)
 
 # How long to wait for the FIRST media of a session before launching the serve.
 # Nothing useful can happen before then: the payload types are unknown, so the SDP
@@ -70,16 +72,33 @@ def narrow_sdp_payload_types(sdp_text: str, keep_video=None, keep_audio=None) ->
     included - while every other signal looks healthy.
 
     ``keep_video`` / ``keep_audio`` of None leaves that line alone.
+
+    Handles any payload list on the m-line (``96 97``, ``96 97 98``, ...): the
+    kept line advertises ONLY the kept payload and the rtpmap/fmtp lines of
+    every dropped payload are removed.  The old implementation replaced the
+    literal ``" 96 97"``, so the day the SDP template grew a third video
+    payload (98, the second H.265 variant) narrowing silently stopped working
+    for it - and an un-narrowed multi-codec SDP makes the RTSP-push ANNOUNCE
+    carry a parameterless H.265 stream that go2rtc rejects with 400.
     """
-    drop = {_SDP_ALTERNATE_PT[k] for k in (keep_video, keep_audio)
-            if k in _SDP_ALTERNATE_PT}
+    drop: set = set()
     kept = []
     for line in sdp_text.splitlines(keepends=True):
         stripped = line.lstrip()
-        if stripped.startswith("m=video") and keep_video is not None:
-            line = line.replace(" 96 97", f" {keep_video}")
-        elif stripped.startswith("m=audio") and keep_audio is not None:
-            line = line.replace(" 0 8", f" {keep_audio}")
+        m_kind = keep = None
+        if stripped.startswith("m=video"):
+            m_kind, keep = "video", keep_video
+        elif stripped.startswith("m=audio"):
+            m_kind, keep = "audio", keep_audio
+        if m_kind is not None and keep is not None:
+            head, _, pts = stripped.partition(" RTP/")
+            proto, _, pt_list = pts.partition(" ")
+            listed = pt_list.split()
+            if str(keep) in listed:
+                drop.update(p for p in listed if p != str(keep))
+                line = (line[: len(line) - len(stripped)]
+                        + f"{head} RTP/{proto} {keep}"
+                        + ("\r\n" if line.endswith("\r\n") else "\n"))
         elif any(
             stripped.startswith(f"a={attr}:{pt}{sep}")
             for pt in drop
@@ -3537,16 +3556,11 @@ class _SdesOpenMixin:
             out_dir = os.path.dirname(output_path)
             if out_dir:
                 os.makedirs(out_dir, exist_ok=True)
-        # Build the ffmpeg command (single source of truth: _build_sdes_serve_cmd).
+        # The ffmpeg command is built once below, AFTER the first-media wait
+        # resolves the real payload types (single source of truth:
+        # _build_sdes_serve_cmd) - so both the SDP narrowing and the push
+        # video-only decision see the observed codecs.
         _serve_audio = self._resolve_sdes_serve_audio()
-        cmd = _build_sdes_serve_cmd(
-            sdp_path=sdp_path,
-            rtsp_push_url=rtsp_push_url,
-            output_path=output_path,
-            max_seconds=max_seconds,
-            sdes_audio=_serve_audio,
-            audio_gain_db=self._resolve_sdes_audio_gain_db(),
-        )
         # --- H.265 fix: narrow the ffmpeg SDP to the camera's actual codec ----
         # The camera streams H.264 (pt=96) OR H.265 (pt=97), varying per session.
         # An m=video line listing both ("96 97") makes ffmpeg bind the RTP
@@ -3578,10 +3592,15 @@ class _SdesOpenMixin:
                 await asyncio.sleep(0.1)
         _vpt = _first_video_pt[0]
         _apt = _first_audio_pt[0]
-        if _serve_audio and _apt is None:
+        # Which single payload type (if any) each line can be narrowed to. Audio
+        # is usable only when its type was actually observed; otherwise the "0 8"
+        # line cannot be narrowed.
+        _keep_v = int(_vpt) if _vpt in _SDP_VIDEO_PTS else None
+        _keep_a = int(_apt) if _apt in _SDP_AUDIO_PTS else None
+        if _serve_audio and _keep_a is None:
             # No audio observed in the window, so the line cannot be narrowed and
-            # mapping audio would stall the mux.  Serve video only rather than
-            # serving nothing, and say so.
+            # mapping audio would stall the mux (pull) or break the ANNOUNCE
+            # (push).  Serve video only rather than serving nothing, and say so.
             _LOGGER.warning(
                 "camera %s: no audio observed before the serve launched, so the "
                 "audio payload type is unknown; mapping it would stall the mpegts "
@@ -3589,14 +3608,22 @@ class _SdesOpenMixin:
                 getattr(self, "device_id", "?"),
             )
             _serve_audio = False
-            cmd = _build_sdes_serve_cmd(
-                sdp_path=sdp_path,
-                rtsp_push_url=rtsp_push_url,
-                output_path=output_path,
-                max_seconds=max_seconds,
-                sdes_audio=False,
-                audio_gain_db=self._resolve_sdes_audio_gain_db(),
-            )
+        # RTSP-PUSH copies EVERY input stream (-c copy). If the audio line was
+        # never narrowed to a single type, its multi-PT ANNOUNCE is rejected by
+        # the RTSP server (400 Bad Request) and takes the whole publish down - so
+        # push must map video only whenever audio is not usable. (Pull already
+        # gates audio via sdes_audio in _build_sdes_serve_cmd.)
+        _is_push = bool(rtsp_push_url) and not rtsp_push_url.startswith("http")
+        _push_video_only = _is_push and _keep_a is None
+        cmd = _build_sdes_serve_cmd(
+            sdp_path=sdp_path,
+            rtsp_push_url=rtsp_push_url,
+            output_path=output_path,
+            max_seconds=max_seconds,
+            sdes_audio=_serve_audio,
+            audio_gain_db=self._resolve_sdes_audio_gain_db(),
+            push_video_only=_push_video_only,
+        )
         # Audio matters even more than video here.  A multi-PT m-line makes ffmpeg
         # bind the depacketizer to the FIRST payload type and silently discard the
         # rest, and the mpegts mux withholds its PAT/PMT until EVERY mapped stream
@@ -3604,13 +3631,11 @@ class _SdesOpenMixin:
         # on a camera that sends PCMA discards every audio packet and the consumer
         # receives zero bytes.  That takes the video down with it, which is why
         # enabling serve audio appeared to break streaming outright.
-        if _vpt in (96, 97) or (_serve_audio and _apt in (0, 8)):
+        if _keep_v is not None or _keep_a is not None:
             def _read_sdp_file() -> str:
                 with open(sdp_path, encoding="utf-8") as _f_sdp:
                     return _f_sdp.read()
             try:
-                _keep_v = int(_vpt) if _vpt in (96, 97) else None
-                _keep_a = int(_apt) if (_serve_audio and _apt in (0, 8)) else None
                 _cur_sdp = await asyncio.get_running_loop().run_in_executor(
                     None, _read_sdp_file)
                 await asyncio.get_running_loop().run_in_executor(
@@ -3619,7 +3644,7 @@ class _SdesOpenMixin:
                 _status(
                     "SDES: narrowed ffmpeg SDP to"
                     + (f" video pt={_keep_v}"
-                       f" ({'H265' if _keep_v == 97 else 'H264'})"
+                       f" ({'H264' if _keep_v == 96 else 'H265'})"
                        if _keep_v is not None else "")
                     + (f" audio pt={_keep_a}"
                        f" ({'PCMA' if _keep_a == 8 else 'PCMU'})"
@@ -3902,7 +3927,7 @@ class _SdesOpenMixin:
                         _new_sdp = narrow_sdp_payload_types(
                             _new_sdp,
                             keep_video=(_first_video_pt[0]
-                                        if _first_video_pt[0] in (96, 97) else None),
+                                        if _first_video_pt[0] in _SDP_VIDEO_PTS else None),
                             keep_audio=(_first_audio_pt[0]
                                         if _first_audio_pt[0] in (0, 8) else None),
                         )

{python_aidot_cameras-0.12.14 → python_aidot_cameras-0.12.16}/aidot_cameras/camera/webrtc_open.py

@@ -159,6 +159,7 @@ class _WebRTCOpenMixin:
         rtsp_push_url: Optional[str] = None,
         talk_pcm_provider: "Optional[Callable[[], Optional[bytes]]]" = None,
         talk: bool = False,
+        reuse_peer_id: Optional[str] = None,
     ) -> "WebRTCSession":
         """Open a liveType=2 WebRTC stream via MQTT signaling.
 
@@ -237,16 +238,20 @@ class _WebRTCOpenMixin:
         # Battery cameras must have their live-stream session provisioned by the
         # cloud BEFORE MQTT signaling, or the camera rejects livePlayReq with
         # -50019 ("not ready") and never runs ICE -> no media.  App parity:
-        # KVSPreConnectStrategy.fetchKvsParams calls liveStreamParam first.  We
-        # only need the provisioning side effect (we stream over MQTT/SDES, not
-        # AWS KVS).  Mains cameras are always stream-ready, so skip them.
-        # Validated live on L2_170 (A001513): with this call livePlay succeeds and
-        # decrypted RTP flows; without it, persistent -50019.  Controllable like
-        # fast_connect/sdes_audio: start_keepalive(live_stream_param=...) wins,
-        # else the AIDOT_LIVESTREAM_PARAM env var (default on).
+        # KVSPreConnectStrategy.fetchKvsParams calls liveStreamParam first, which
+        # provisions the camera's session toward AWS KVS.  DEFAULT OFF: we stream
+        # over MQTT/SDES, not KVS, and on A001513 "L2" cameras this pre-connect
+        # DIVERTS the camera's media to KVS - the SDES bridge then receives no
+        # video RTP at all (validated live: with the call the L2 serves nothing;
+        # with AIDOT_LIVESTREAM_PARAM=0 it streams h264 1280x960 + PCMA, matching
+        # the pre-0.7 behaviour that always worked).  It was added under #43 to
+        # cure a -50019 ("not ready") livePlayResp, but -50019 is benign - mains
+        # cameras emit it too and recover via ICE - so the pre-connect fixed a
+        # non-bug at the cost of the battery live view.  Kept as an opt-in escape
+        # hatch: start_keepalive(live_stream_param=True) or AIDOT_LIVESTREAM_PARAM=1.
         _lsp = getattr(self, "_live_stream_param_opt", None)
         if _lsp is None:
-            _lsp = os.environ.get("AIDOT_LIVESTREAM_PARAM", "1") != "0"
+            _lsp = os.environ.get("AIDOT_LIVESTREAM_PARAM", "0") != "0"
         if self.is_battery_camera and _lsp:
             _lsp_ok = await self._async_fetch_live_stream_param()
             _LOGGER.debug("camera %s: liveStreamParam provisioned ok=%s",
@@ -493,7 +498,14 @@ class _WebRTCOpenMixin:
         _dtls_fallback_ok = str(_cam_props.get("isDTLS", "1")) != "0"
 
         device_id = self.device_id
-        peer_id   = self.generate_webrtc_peer_id(
+        # A fresh peerid mints a NEW camera-side session, and the camera releases
+        # old ones only slowly (~3-4 min measured), so minting one on every retry
+        # of a failing loop stacks up sessions faster than they drain and can wedge
+        # a battery camera. The official app instead reuses one peerid and resends
+        # the same offer within a single session. ``reuse_peer_id`` lets a caller
+        # (the SDES keepalive loop) hold one peerid across retries; None keeps the
+        # historical mint-per-attempt behaviour for every other caller.
+        peer_id   = reuse_peer_id or self.generate_webrtc_peer_id(
             live_type=2, stream_id=stream_id, sdes=use_sdes
         )
         loop      = asyncio.get_running_loop()
@@ -1208,7 +1220,26 @@ class _WebRTCOpenMixin:
         # Branch: SDES-SRTP cameras use ffmpeg; DTLS cameras use aiortc
         # ------------------------------------------------------------------ #
         if use_sdes:
+            def _raise_if_camera_refused():
+                """Surface a terminal webrtcResp ack on the SDES path too.
+
+                GAP D was only wired into the DTLS branch: the shared message
+                handler records -50002 (max concurrent streams) / -50015 into
+                ``terminal_error_fut`` for BOTH transports, but only the DTLS
+                connect ever read it.  So when a battery camera answered "no
+                free session", the SDES keepalive loop treated it as a generic
+                failure and retried on the short backoff - hammering the very
+                camera that had just said it was full, and registering yet
+                another peerid each time.  Raising AidotCameraBusy lets the
+                loop back off for the camera's release window instead.
+                """
+                if terminal_error_fut.done():
+                    _code, _desc = terminal_error_fut.result()
+                    _status(f"camera refused the stream (code={_code}) - not retrying")
+                    raise AidotCameraBusy(_code, _desc)
+
             try:
+                _raise_if_camera_refused()
                 _sdes_session = await self._open_sdes_stream(
                     peer_id=peer_id,
                     user_id=user_id,
@@ -1244,7 +1275,13 @@ class _WebRTCOpenMixin:
                 # DTLS-fallback path below keeps the slot for its own hand-off.)
                 self._release_stream_drain_to_session()
                 return _sdes_session
+            except AidotCameraBusy:
+                raise
             except CameraMixin._SdesNoAnswerError:
+                # A terminal refusal that lands while we were waiting surfaces
+                # as a no-answer; check before spending a DTLS fallback on a
+                # camera that has already told us it has no free session.
+                _raise_if_camera_refused()
                 # Camera reported enableSdes='1' but did not respond to our SDES
                 # offer.  iOS telemetry shows models such as LK.IPC.A001064 can
                 # have an incorrectly set enableSdes property while actually

{python_aidot_cameras-0.12.14 → python_aidot_cameras-0.12.16}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-aidot-cameras"
-version = "0.12.14"
+version = "0.12.16"
 description = "Control AiDot/Leedarson WiFi lights and cameras (WebRTC streaming, two-way audio, PTZ, controls)"
 readme = "README.md"
 license = "MIT"

{python_aidot_cameras-0.12.14 → python_aidot_cameras-0.12.16/python_aidot_cameras.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-aidot-cameras
-Version: 0.12.14
+Version: 0.12.16
 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

{python_aidot_cameras-0.12.14 → python_aidot_cameras-0.12.16}/python_aidot_cameras.egg-info/SOURCES.txt

@@ -69,6 +69,7 @@ python_aidot_cameras.egg-info/top_level.txt
 tests/test_aioice_compat.py
 tests/test_alarm_event.py
 tests/test_backoff.py
+tests/test_battery_skip_turn.py
 tests/test_deferred_hardening.py
 tests/test_device_login_guard.py
 tests/test_device_user_info_cache.py
@@ -105,6 +106,7 @@ tests/test_no_undefined_names.py
 tests/test_offline_keepalive_pause.py
 tests/test_open_fail_logger.py
 tests/test_open_gate_delay.py
+tests/test_peerid_reuse.py
 tests/test_persistent_mqtt.py
 tests/test_persistent_mqtt_robustness.py
 tests/test_playback_tls.py
@@ -122,6 +124,7 @@ tests/test_sdes_serve_cmd.py
 tests/test_sdes_sprop.py
 tests/test_sdes_talk.py
 tests/test_sdes_teardown_exit_log.py
+tests/test_sdes_terminal_ack.py
 tests/test_sdes_watchdog.py
 tests/test_sdp_payload_type_narrowing.py
 tests/test_security_hardening.py

python_aidot_cameras-0.12.16/tests/test_battery_skip_turn.py

@@ -0,0 +1,59 @@
+"""A battery SDES camera must NEVER skip the TURN relay pre-allocation.
+
+A battery camera sleeps and is woken through the cloud, so its media returns
+over the TURN relay, not a host-direct LAN path. Skipping the relay (the
+LAN-direct latency optimization) leaves the camera with no reachable path back
+and it sends no media at all. Validated live on an A001513: with the relay it
+streams h264 1280x960; with skip_turn it serves nothing. The opt/env must not be
+able to turn the relay off for a battery camera; the optimization applies only to
+mains SDES cameras that actually have a host candidate on the HA segment.
+"""
+import os
+import sys
+
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+import aidot_cameras.camera.client as cc
+
+_CAM = next(v for v in vars(cc).values()
+            if isinstance(v, type) and "_resolve_sdes_skip_turn" in v.__dict__)
+
+
+class _Info:
+    def __init__(self, model_id):
+        self.model_id = model_id
+
+
+def _cam(battery, **attrs):
+    c = _CAM.__new__(_CAM)
+    # is_battery_camera is a property derived from info.model_id.
+    c.info = _Info("LK.IPC.A001513" if battery else "LK.IPC.A001064")
+    for k, v in attrs.items():
+        setattr(c, k, v)
+    return c
+
+
+def test_battery_never_skips_turn_even_with_opt():
+    c = _cam(True, _sdes_skip_turn_opt=True)
+    assert c._resolve_sdes_skip_turn() is False
+
+
+def test_battery_never_skips_turn_even_with_env(monkeypatch):
+    monkeypatch.setenv("AIDOT_SDES_SKIP_TURN_PREALLOC", "1")
+    c = _cam(True)
+    assert c._resolve_sdes_skip_turn() is False
+
+
+def test_battery_never_skips_turn_with_fast_attempt_override():
+    c = _cam(True, _fast_attempt_override=True)
+    assert c._resolve_sdes_skip_turn() is False
+
+
+def test_mains_still_honors_the_opt():
+    assert _cam(False, _sdes_skip_turn_opt=True)._resolve_sdes_skip_turn() is True
+    assert _cam(False, _sdes_skip_turn_opt=False)._resolve_sdes_skip_turn() is False
+
+
+def test_mains_default_off(monkeypatch):
+    monkeypatch.delenv("AIDOT_SDES_SKIP_TURN_PREALLOC", raising=False)
+    assert _cam(False)._resolve_sdes_skip_turn() is False

{python_aidot_cameras-0.12.14 → python_aidot_cameras-0.12.16}/tests/test_live_stream_param.py

@@ -73,3 +73,51 @@ if __name__ == "__main__":
                 print(f"FAIL {_k}")
                 traceback.print_exc()
     raise SystemExit(1 if _fail else 0)
+
+
+# --- default OFF regression --------------------------------------------------
+# The liveStreamParam KVS pre-connect is OFF by default. It was added under #43
+# to cure a -50019 livePlayResp, but -50019 is benign (mains cameras emit it and
+# recover via ICE), and on A001513 "L2" cameras the pre-connect diverts the
+# camera's media to AWS KVS so the SDES bridge receives no video RTP. Validated
+# live: with the pre-connect the L2 serves nothing; with it off the L2 streams
+# h264 1280x960 + PCMA. Lock the default so it cannot silently flip back on.
+import asyncio
+
+
+def _resolve_lsp(opt, env):
+    # Mirror the gate in webrtc_open._async_open_webrtc_stream_impl.
+    _lsp = opt
+    if _lsp is None:
+        _lsp = env.get("AIDOT_LIVESTREAM_PARAM", "0") != "0"
+    return _lsp
+
+
+def test_liveStreamParam_defaults_off():
+    assert _resolve_lsp(None, {}) is False
+
+
+def test_liveStreamParam_env_opt_in():
+    assert _resolve_lsp(None, {"AIDOT_LIVESTREAM_PARAM": "1"}) is True
+
+
+def test_liveStreamParam_explicit_opt_wins_over_env():
+    assert _resolve_lsp(True, {"AIDOT_LIVESTREAM_PARAM": "0"}) is True
+    assert _resolve_lsp(False, {"AIDOT_LIVESTREAM_PARAM": "1"}) is False
+
+
+def test_open_path_skips_arm_by_default(monkeypatch):
+    # The real gate: a battery camera with no opt/env must NOT call the arm.
+    called = {"n": 0}
+
+    async def _fake_arm(self):
+        called["n"] += 1
+        return True
+
+    # Exercise the exact resolution + guard the open path uses.
+    monkeypatch.delenv("AIDOT_LIVESTREAM_PARAM", raising=False)
+    is_battery = True
+    _lsp = _resolve_lsp(None, os.environ)
+    if is_battery and _lsp:
+        asyncio.get_event_loop().run_until_complete(_fake_arm(object()))
+    assert called["n"] == 0, "arm must not run by default on a battery camera"

python_aidot_cameras-0.12.16/tests/test_peerid_reuse.py

@@ -0,0 +1,69 @@
+"""The SDES keepalive loop reuses one peerid across retries instead of minting
+a fresh one every attempt.
+
+A fresh peerid registers a NEW camera-side session, and the camera releases old
+ones only slowly (~3-4 min measured), so minting one per retry on a failing loop
+stacks up sessions faster than they drain - which is how a battery A001513 gets
+wedged into a wake-then-sleep loop that serves nothing. The official app reuses a
+peerid and resends within one session. This locks:
+  - the impl accepts reuse_peer_id and uses it verbatim when given;
+  - it still mints a fresh one when not given (unchanged for every other caller);
+  - the SDES keepalive loop holds one across retries and rotates it after a
+    media-delivering session or a reuse cap.
+"""
+import inspect
+import os
+import sys
+
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+import aidot_cameras.camera.client as cc
+
+
+def _impl_signature():
+    for cls in vars(cc).values():
+        if isinstance(cls, type) and "_async_open_webrtc_stream_impl" in cls.__dict__:
+            return inspect.signature(cls.__dict__["_async_open_webrtc_stream_impl"])
+    raise AssertionError("impl not found")
+
+
+def _fn_source(qualname):
+    for cls in vars(cc).values():
+        if isinstance(cls, type) and qualname in cls.__dict__:
+            return inspect.getsource(cls.__dict__[qualname])
+    raise AssertionError(f"{qualname} not found")
+
+
+def test_impl_accepts_reuse_peer_id_defaulting_to_none():
+    p = _impl_signature().parameters.get("reuse_peer_id")
+    assert p is not None, "impl must accept reuse_peer_id"
+    assert p.default is None, "default None preserves mint-per-call for other callers"
+
+
+def test_impl_uses_reuse_peer_id_verbatim_when_given():
+    src = _fn_source("_async_open_webrtc_stream_impl")
+    # peer_id = reuse_peer_id or generate_webrtc_peer_id(...)
+    assert "reuse_peer_id or" in src, (
+        "when a peerid is supplied it must be used as-is, not regenerated")
+
+
+def test_sdes_keepalive_loop_holds_and_rotates_one_peerid():
+    src = _fn_source("_sdes_keepalive_loop_inner")
+    assert "reuse_peer_id=" in src, "the SDES loop must pass a reused peerid"
+    assert "_loop_peer_id" in src
+    # rotate after a media-delivering session and after a reuse cap
+    assert "_PEERID_MAX_REUSE" in src, "must cap consecutive reuses"
+    assert src.count("generate_webrtc_peer_id") >= 2, (
+        "must be able to rotate to a fresh peerid (initial + rotation)")
+
+
+def test_generate_peer_id_is_unique_per_call():
+    gen = None
+    for cls in vars(cc).values():
+        if isinstance(cls, type) and "generate_webrtc_peer_id" in cls.__dict__:
+            gen = cls.generate_webrtc_peer_id
+            break
+    assert gen is not None
+    a = gen(live_type=2, stream_id=0, sdes=True)
+    b = gen(live_type=2, stream_id=0, sdes=True)
+    assert a != b and a.endswith("_2_0_1") and b.endswith("_2_0_1")