feat: add support for fetching the rtsp url without srtp (#261)

uilibs · Nov 4, 2024 · 7d0cfd3 · 7d0cfd3
1 parent cd46006
commit 7d0cfd3
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 8 deletions.
diff --git a/src/uiprotect/data/devices.py b/src/uiprotect/data/devices.py
@@ -273,6 +273,7 @@ class CameraChannel(ProtectBaseObject):
 
     _rtsp_url: str | None = PrivateAttr(None)
     _rtsps_url: str | None = PrivateAttr(None)
+    _rtsps_no_srtp_url: str | None = PrivateAttr(None)
 
     @property
     def rtsp_url(self) -> str | None:
@@ -294,6 +295,16 @@ def rtsps_url(self) -> str | None:
         self._rtsps_url = f"rtsps://{self._api.connection_host}:{self._api.bootstrap.nvr.ports.rtsps}/{self.rtsp_alias}?enableSrtp"
         return self._rtsps_url
 
+    @property
+    def rtsps_no_srtp_url(self) -> str | None:
+        if not self.is_rtsp_enabled or self.rtsp_alias is None:
+            return None
+
+        if self._rtsps_no_srtp_url is not None:
+            return self._rtsps_no_srtp_url
+        self._rtsps_no_srtp_url = f"rtsps://{self._api.connection_host}:{self._api.bootstrap.nvr.ports.rtsps}/{self.rtsp_alias}"
+        return self._rtsps_no_srtp_url
+
     @property
     def is_package(self) -> bool:
         return self.fps <= 2

diff --git a/tests/test_api.py b/tests/test_api.py
@@ -81,14 +81,19 @@ async def check_camera(camera: Camera):
 
     for channel in camera.channels:
         if channel.is_rtsp_enabled:
-            assert (
-                channel.rtsp_url
-                == f"rtsp://{camera.api.connection_host}:7447/{channel.rtsp_alias}"
-            )
-            assert (
-                channel.rtsps_url
-                == f"rtsps://{camera.api.connection_host}:7441/{channel.rtsp_alias}?enableSrtp"
-            )
+            for _ in range(2):
+                assert (
+                    channel.rtsp_url
+                    == f"rtsp://{camera.api.connection_host}:7447/{channel.rtsp_alias}"
+                )
+                assert (
+                    channel.rtsps_url
+                    == f"rtsps://{camera.api.connection_host}:7441/{channel.rtsp_alias}?enableSrtp"
+                )
+                assert (
+                    channel.rtsps_no_srtp_url
+                    == f"rtsps://{camera.api.connection_host}:7441/{channel.rtsp_alias}"
+                )
 
     if VideoMode.HIGH_FPS in camera.feature_flags.video_modes:
         assert camera.feature_flags.has_highfps