python-aidot-cameras 0.5.13__tar.gz → 0.5.15__tar.gz

{python_aidot_cameras-0.5.13/src/python_aidot_cameras.egg-info → python_aidot_cameras-0.5.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-aidot-cameras
-Version: 0.5.13
+Version: 0.5.15
 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.5.13 → python_aidot_cameras-0.5.15}/pyproject.toml

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

{python_aidot_cameras-0.5.13 → python_aidot_cameras-0.5.15}/src/aidot/device_client.py

@@ -3799,21 +3799,20 @@ class DeviceClient(object):
         """
         import aiohttp
 
-        await self._async_get_smarthome_auth()
+        _body = {
+            "deviceIds": [self.device_id],
+            "pageNum":   page,
+            "pageSize":  page_size,
+            "recordSta": start_ts,
+            "recordEnd": end_ts,
+        }
+        _LOGGER.debug("eventRecordingList request for %s: %s", self.device_id, _body)
         async def _fetch():
             async with aiohttp.ClientSession() as session:
                 async with session.post(
-                    f"{self._smarthome_base}/api/ipc/playback/eventRecordingList",
-                    json={
-                        "deviceIds":  [self.device_id],
-                        "eventCodes": [],
-                        "areaIds":    [],
-                        "pageNum":    page,
-                        "pageSize":   page_size,
-                        "recordSta":  start_ts,
-                        "recordEnd":  end_ts,
-                    },
-                    headers=self._leedarson_headers(),
+                    f"{self._aidot_v32_base}/playback/eventRecordingList",
+                    json=_body,
+                    headers=self._aidot_headers(),
                     timeout=aiohttp.ClientTimeout(total=30),
                 ) as resp:
                     return await resp.json(content_type=None)
@@ -3845,33 +3844,40 @@ class DeviceClient(object):
             )
             return []
 
-    async def async_get_event_video_url(self, event_uuid: str) -> Optional[str]:
-        """Return a direct playback URL (MP4 or M3U8) for a specific recording.
+    async def async_get_event_video_media(
+        self, event_uuid: str
+    ) -> Optional[tuple[str, str]]:
+        """Return (url, mime_type) for a specific cloud recording.
 
-        event_uuid: the eventUuid field from an async_get_cloud_recordings() item.
-        Returns the first video URL from getEventVideoUrl, or None on error.
+        Prefers MP4 (type=1) over M3U8 (type=2) because HA's media player and
+        most browsers handle direct MP4 more reliably than HLS with signed CDN
+        segments.  Falls back to whatever is available.
 
         From CloudPlaybackFragment.java / EventListRepos.java:
           POST /api/ipc/playback/getEventVideoUrl
           body: {deviceId, eventList: [{eventUuid}]}
-          response: data.eventUrlList[0].videoUrlList[0].url
-          type 1 = MP4, type 2 = M3U8
+          response: data.eventUrlList[0].videoUrlList[]
+          each item: {url, type}  (type 1=MP4, type 2=M3U8)
         """
         import aiohttp
 
+        _MIME = {1: "video/mp4", 2: "application/x-mpegURL"}
+
         try:
             async with aiohttp.ClientSession() as session:
                 async with session.post(
-                    f"{self._smarthome_base}/api/ipc/playback/getEventVideoUrl",
+                    f"{self._aidot_v32_base}/playback/getEventVideoUrl",
                     json={
                         "deviceId":  self.device_id,
                         "eventList": [{"eventUuid": event_uuid}],
                     },
-                    headers=self._leedarson_headers(),
+                    headers=self._aidot_headers(),
                     timeout=aiohttp.ClientTimeout(total=15),
                 ) as resp:
                     body = await resp.json(content_type=None)
 
+            _LOGGER.debug("getEventVideoUrl raw for %s uuid=%s: %s", self.device_id, event_uuid, body)
+
             if body.get("code") != 200:
                 _LOGGER.warning(
                     "getEventVideoUrl code=%s for %s uuid=%s: %s",
@@ -3885,15 +3891,35 @@ class DeviceClient(object):
             video_url_list = (event_url_list[0] or {}).get("videoUrlList") or []
             if not video_url_list:
                 return None
-            return video_url_list[0].get("url") or None
+
+            # Prefer MP4 (type=1), fall back to first available entry
+            mp4 = next((v for v in video_url_list if v.get("type") == 1), None)
+            entry = mp4 or video_url_list[0]
+            url = entry.get("url")
+            if not url:
+                return None
+            mime = _MIME.get(entry.get("type"), "video/mp4")
+            _LOGGER.debug(
+                "getEventVideoUrl resolved for %s: type=%s mime=%s url=%s",
+                self.device_id, entry.get("type"), mime, url,
+            )
+            return url, mime
 
         except Exception as exc:
             _LOGGER.error(
-                "async_get_event_video_url failed for %s uuid=%s: %s",
+                "async_get_event_video_media failed for %s uuid=%s: %s",
                 self.device_id, event_uuid, exc,
             )
             return None
 
+    async def async_get_event_video_url(self, event_uuid: str) -> Optional[str]:
+        """Return the video URL for a cloud recording (URL only, no MIME type).
+
+        Prefer async_get_event_video_media() when you also need the MIME type.
+        """
+        result = await self.async_get_event_video_media(event_uuid)
+        return result[0] if result else None
+
     async def async_get_latest_thumbnail(self) -> Optional[str]:
         """Return the URL of the most recent event/motion thumbnail for this camera.
 
@@ -3905,24 +3931,21 @@ class DeviceClient(object):
         """
         import aiohttp, time
 
-        await self._async_get_smarthome_auth()
         end_ts = int(time.time() * 1000)
         start_ts = end_ts - 30 * 86_400_000  # look back 30 days
 
         try:
             async with aiohttp.ClientSession() as session:
                 async with session.post(
-                    f"{self._smarthome_base}/api/ipc/playback/eventRecordingList",
+                    f"{self._aidot_v32_base}/playback/eventRecordingList",
                     json={
-                        "deviceIds":  [self.device_id],
-                        "eventCodes": [],
-                        "areaIds":    [],
-                        "pageNum":    1,
-                        "pageSize":   1,
-                        "recordSta":  start_ts,
-                        "recordEnd":  end_ts,
+                        "deviceIds": [self.device_id],
+                        "pageNum":   1,
+                        "pageSize":  1,
+                        "recordSta": start_ts,
+                        "recordEnd": end_ts,
                     },
-                    headers=self._leedarson_headers(),
+                    headers=self._aidot_headers(),
                     timeout=aiohttp.ClientTimeout(total=15),
                 ) as resp:
                     body = await resp.json(content_type=None)

{python_aidot_cameras-0.5.13 → python_aidot_cameras-0.5.15/src/python_aidot_cameras.egg-info}/PKG-INFO

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