python-aidot-cameras 0.12.10__tar.gz → 0.12.11__tar.gz

{python_aidot_cameras-0.12.10/python_aidot_cameras.egg-info → python_aidot_cameras-0.12.11}/PKG-INFO

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

@@ -2,6 +2,7 @@
 
 import json
 import logging
+from urllib.parse import urlparse
 import os
 import random
 import time
@@ -337,6 +338,22 @@ def _save_frame_as_jpeg(image_data: Any, output_path: str) -> bool:
     return False
 
 
+def _is_self_referential_source(source: str, stream_name: str) -> bool:
+    """True when registering ``source`` under ``stream_name`` would loop.
+
+    A go2rtc stream whose source is its own RTSP address becomes its own
+    producer: the stream lists a producer, nothing feeds it, and every consumer
+    gets a connection with no media.  That is exactly the shape of a PUSH URL,
+    ``rtsp://host:8554/<stream name>`` - the address the keepalive publishes to.
+    """
+    if not source or not stream_name:
+        return False
+    if not source.lower().startswith(("rtsp://", "rtsps://")):
+        return False
+    path = urlparse(source).path.strip("/")
+    return path == stream_name
+
+
 def _build_sdes_serve_cmd(
     *,
     sdp_path: str,
@@ -2763,6 +2780,18 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
         if not (self._streaming_active and self._go2rtc_url and self._keepalive_rtsp_url):
             return
         name = self._go2rtc_stream_name()
+        if _is_self_referential_source(self._keepalive_rtsp_url, name):
+            # PUSH mode: the keepalive publishes INTO go2rtc, so this URL is
+            # go2rtc's own address for this very stream.  Registering it as the
+            # stream's source makes go2rtc its own producer - a loop that yields
+            # a stream with a producer attached and no media coming out of it.
+            # In push mode the publisher already feeds the stream; there is
+            # nothing to register.
+            _LOGGER.debug(
+                "camera %s: not registering %s with go2rtc - the push URL is that "
+                "stream's own address", self.device_id, name,
+            )
+            return
         try:
             async with aiohttp.ClientSession() as _s2:
                 url = await prefer_go2rtc(

{python_aidot_cameras-0.12.10 → python_aidot_cameras-0.12.11}/pyproject.toml

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

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

@@ -98,6 +98,7 @@ tests/test_mqtt_credential_self_heal.py
 tests/test_mqtt_password_not_persisted.py
 tests/test_mqtt_session_reconnect.py
 tests/test_narrow_pc_ice.py
+tests/test_no_self_referential_go2rtc.py
 tests/test_no_undefined_names.py
 tests/test_offline_keepalive_pause.py
 tests/test_open_fail_logger.py

python_aidot_cameras-0.12.11/tests/test_no_self_referential_go2rtc.py

@@ -0,0 +1,47 @@
+"""A go2rtc stream must never be registered as its own source.
+
+In PUSH mode the keepalive publishes INTO go2rtc, so the "keepalive rtsp url" is
+go2rtc's own address for that stream. Registering it as the stream's source makes
+go2rtc its own producer: the stream lists a producer, nothing feeds it, and every
+consumer gets a connection with no media.
+
+Seen live after the integration began passing go2rtc_url: one camera's stream had
+two producers, one of them `rtsp://127.0.0.1:8554/aidot_12b144cb12da` - its own
+address - and go2rtc returned HTTP 200 with a zero-byte frame for it.
+"""
+from aidot_cameras.camera.client import _is_self_referential_source as loops
+
+
+def test_push_url_for_the_same_stream_is_self_referential():
+    assert loops("rtsp://127.0.0.1:8554/aidot_12b144cb12da",
+                 "aidot_12b144cb12da") is True
+
+
+def test_push_url_for_a_different_stream_is_fine():
+    # Publishing camera A into stream B is odd but not a loop.
+    assert loops("rtsp://127.0.0.1:8554/aidot_other", "aidot_12b144cb12da") is False
+
+
+def test_the_http_serve_url_is_a_real_source():
+    # PULL mode: go2rtc fetches from the library's own serve. Must still register.
+    assert loops("http://127.0.0.1:18931/ecf4937b640c4c96a102ffdc9b51c2a0.ts",
+                 "aidot_ecf4937b640c") is False
+
+
+def test_rtsps_is_covered_too():
+    assert loops("rtsps://127.0.0.1:8554/aidot_x", "aidot_x") is True
+
+
+def test_trailing_slash_and_case_do_not_hide_it():
+    assert loops("RTSP://127.0.0.1:8554/aidot_x/", "aidot_x") is True
+
+
+def test_missing_values_are_not_self_referential():
+    assert loops("", "aidot_x") is False
+    assert loops("rtsp://127.0.0.1:8554/aidot_x", "") is False
+
+
+def test_a_remote_go2rtc_push_url_still_counts():
+    # The host does not matter; publishing into the stream you are registering is
+    # a loop wherever go2rtc lives.
+    assert loops("rtsp://go2rtc.lan:8554/aidot_x", "aidot_x") is True