python-aidot-cameras 0.12.12__tar.gz → 0.12.13__tar.gz

{python_aidot_cameras-0.12.12/python_aidot_cameras.egg-info → python_aidot_cameras-0.12.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-aidot-cameras
-Version: 0.12.12
+Version: 0.12.13
 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.12 → python_aidot_cameras-0.12.13}/aidot_cameras/camera/client.py

@@ -3155,6 +3155,19 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
                 self._cancel_keepalive_renew()
                 self._keepalive_rtsp_url = None
                 self._serve_ready.clear()
+                # Take the stream out of go2rtc too. Leaving it registered
+                # points go2rtc at a source that no longer exists, so a viewer
+                # attaching while the camera is dormant gets a hard refusal
+                # ("connection refused" on the serve port) instead of a clean
+                # "no such stream" - and in push mode that source was never
+                # dialable in the first place. stream_source() re-registers on
+                # the next view.
+                try:
+                    await self._deregister_go2rtc()
+                except Exception:
+                    _LOGGER.debug("camera %s: swallowed exception in %s",
+                                  getattr(self, "device_id", "?"),
+                                  "_deregister_go2rtc", exc_info=True)
                 _LOGGER.debug(
                     "SDES serve: %s idle (no viewer) - released until next view",
                     self.device_id,
@@ -4116,6 +4129,14 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
                 self._cancel_keepalive_renew()
                 self._keepalive_rtsp_url = None
                 self._serve_ready.clear()
+                # Same as the SDES path: do not leave go2rtc holding a stream
+                # whose source no longer exists.
+                try:
+                    await self._deregister_go2rtc()
+                except Exception:
+                    _LOGGER.debug("camera %s: swallowed exception in %s",
+                                  getattr(self, "device_id", "?"),
+                                  "_deregister_go2rtc", exc_info=True)
                 _LOGGER.debug(
                     "DTLS serve: %s idle (no viewer) - released until next view",
                     self.device_id,

{python_aidot_cameras-0.12.12 → python_aidot_cameras-0.12.13}/aidot_cameras/camera/sdes_open.py

@@ -102,6 +102,11 @@ def _sdes_echo_wait_timeout(skip_liveplay: bool) -> float:
     return 0.0 if skip_liveplay else 2.0
 
 
+# ffmpeg returns AVERROR(EPIPE) = -32 when its output consumer disappears, and a
+# process exit status is truncated to an unsigned byte: -32 & 0xFF = 224.
+_FFMPEG_EXIT_EPIPE = 224
+
+
 def _classify_ffmpeg_exit(rc: int, teardown_requested: bool) -> int:
     """Log level for the bridge observe loop's "ffmpeg exited" line.
 
@@ -116,6 +121,12 @@ def _classify_ffmpeg_exit(rc: int, teardown_requested: bool) -> int:
     """
     if rc < 0 and teardown_requested:
         return logging.DEBUG
+    if rc == _FFMPEG_EXIT_EPIPE:
+        # Broken pipe: the consumer went away. That is the NORMAL end of a
+        # `-listen 1` serve - go2rtc disconnects and ffmpeg exits - so warning
+        # about it trains the reader to ignore real failures. A process exit
+        # status is an unsigned byte, so AVERROR(EPIPE) = -32 surfaces as 224.
+        return logging.DEBUG
     return logging.WARNING
 
 

{python_aidot_cameras-0.12.12 → python_aidot_cameras-0.12.13}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-aidot-cameras"
-version = "0.12.12"
+version = "0.12.13"
 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.12 → python_aidot_cameras-0.12.13/python_aidot_cameras.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-aidot-cameras
-Version: 0.12.12
+Version: 0.12.13
 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.12 → python_aidot_cameras-0.12.13}/python_aidot_cameras.egg-info/SOURCES.txt

@@ -72,6 +72,7 @@ tests/test_backoff.py
 tests/test_deferred_hardening.py
 tests/test_device_login_guard.py
 tests/test_device_user_info_cache.py
+tests/test_dormant_camera_cleanup.py
 tests/test_dtls_not_ready_burst.py
 tests/test_dtls_pinning.py
 tests/test_dtls_serve_decode_skip.py

python_aidot_cameras-0.12.13/tests/test_dormant_camera_cleanup.py

@@ -0,0 +1,65 @@
+"""A dormant camera must not leave a dead stream registered in go2rtc.
+
+Idle-release stops the serve but used to leave the go2rtc stream in place,
+pointing at a source that no longer exists. A viewer attaching then gets a hard
+"connection refused" on the serve port rather than a clean miss - and in PUSH mode
+that source was never dialable at all, because the keepalive publishes INTO go2rtc
+rather than serving over HTTP.
+
+Observed live: four go2rtc streams registered against serve ports with nothing
+listening, and go2rtc reporting
+`dial tcp 127.0.0.1:18981: connect: connection refused`.
+"""
+import inspect
+
+import aidot_cameras.camera.client as cc
+from aidot_cameras.camera.sdes_open import (
+    _FFMPEG_EXIT_EPIPE,
+    _classify_ffmpeg_exit,
+)
+import logging
+
+
+def _src(name):
+    return inspect.getsource(getattr(cc.CameraMixin, name))
+
+
+def test_sdes_idle_release_deregisters_from_go2rtc():
+    src = _src("_sdes_keepalive_loop_inner")
+    idle = src[src.index("if _idle_release:"):]
+    assert "_deregister_go2rtc" in idle
+
+
+def test_dtls_idle_release_deregisters_from_go2rtc():
+    src = _src("_dtls_serve_loop_inner")
+    idle = src[src.index("if idle_release:"):]
+    assert "_deregister_go2rtc" in idle
+
+
+def test_deregistration_failure_cannot_break_the_release():
+    # Going dormant must still complete if go2rtc is unreachable.
+    for name, marker in (("_sdes_keepalive_loop_inner", "if _idle_release:"),
+                         ("_dtls_serve_loop_inner", "if idle_release:")):
+        idle = _src(name)
+        idle = idle[idle.index(marker):]
+        block = idle[idle.index("_deregister_go2rtc") - 200:
+                     idle.index("_deregister_go2rtc") + 300]
+        assert "try:" in block and "except Exception" in block
+
+
+def test_consumer_disconnect_is_not_logged_as_a_failure():
+    # ffmpeg returns AVERROR(EPIPE) = -32 when its consumer goes away, and an exit
+    # status is an unsigned byte, so it surfaces as 224. That is the normal end of
+    # a `-listen 1` serve, not a fault.
+    assert _FFMPEG_EXIT_EPIPE == 224
+    assert _classify_ffmpeg_exit(224, teardown_requested=False) == logging.DEBUG
+    assert _classify_ffmpeg_exit(224, teardown_requested=True) == logging.DEBUG
+
+
+def test_real_failures_still_warn():
+    assert _classify_ffmpeg_exit(1, teardown_requested=False) == logging.WARNING
+    assert _classify_ffmpeg_exit(255, teardown_requested=False) == logging.WARNING
+    # A signal death with no teardown in flight is still unexpected.
+    assert _classify_ffmpeg_exit(-9, teardown_requested=False) == logging.WARNING
+    # ...but an expected teardown is quiet.
+    assert _classify_ffmpeg_exit(-9, teardown_requested=True) == logging.DEBUG

{python_aidot_cameras-0.12.12 → python_aidot_cameras-0.12.13}/tests/test_viewer_check_throttle.py

@@ -8,7 +8,6 @@ anywhere. Idle release is measured in minutes, so a few seconds of staleness in
 the answer costs nothing.
 """
 import asyncio
-import time
 
 import aidot_cameras.camera.client as cc
 from aidot_cameras.device_client import CameraDeviceClient