python-aidot-cameras 0.7.14__tar.gz → 0.7.15__tar.gz

{python_aidot_cameras-0.7.14/src/python_aidot_cameras.egg-info → python_aidot_cameras-0.7.15}/PKG-INFO

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-aidot-cameras"
-version = "0.7.14"
+version = "0.7.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.7.14 → python_aidot_cameras-0.7.15}/src/aidot/camera/client.py

@@ -678,6 +678,60 @@ class CameraMixin(_CameraControlsMixin):
             _LOGGER.debug("http wake failed for %s: %s", self.device_id, exc)
             return False
 
+    def _live_stream_param_request(self):
+        """Build ``(url, headers, body)`` for the liveStreamParam provision call.
+
+        Pure/deterministic - unit-tested in tests/test_live_stream_param.py.  The
+        body MUST be a JSON array of device ids (object body -> HTTP 500) and the
+        ``owner`` header is required (as on the wake endpoint).
+        """
+        headers = self._leedarson_headers()
+        headers["owner"] = (
+            self._user_info.get("owner")
+            or self._user_info.get("id")
+            or self._user_info.get("userId")
+            or str(self.user_id)
+        )
+        url = f"{self._smarthome_base}/api/ipc/liveStream/liveStreamParam"
+        return url, headers, json.dumps([self.device_id])
+
+    async def _async_fetch_live_stream_param(self) -> bool:
+        """Provision the camera's live-stream session via the cloud (app parity).
+
+        Battery cameras waking from deep sleep reject the MQTT ``livePlayReq``
+        with code ``-50019`` ("not ready") and then never run ICE - so no media
+        ever flows - unless the app's pre-connect HTTP call has armed the session
+        first.  The official app (``KVSPreConnectStrategy.fetchKvsParams``) POSTs
+        the device id to ``/api/ipc/liveStream/liveStreamParam``; the cloud
+        provisions the session (and brings the camera online) and returns AWS KVS
+        credentials.  We only need the provisioning side effect - the library
+        streams over the proprietary MQTT/SDES path, not AWS KVS - so the returned
+        credentials are ignored.
+
+        The request body is a JSON **array** of device ids (an object body returns
+        HTTP 500) and needs the ``owner`` header (like the wake endpoint).
+        Best-effort: returns True on HTTP 200, never raises.
+        """
+        import aiohttp
+
+        url, headers, body = self._live_stream_param_request()
+        try:
+            async with aiohttp.ClientSession() as session:
+                async with session.post(
+                    url, headers=headers, data=body,
+                    timeout=aiohttp.ClientTimeout(total=10),
+                ) as resp:
+                    status = resp.status
+                    data = await resp.json(content_type=None)
+            code = data.get("code") if isinstance(data, dict) else None
+            ok = status == 200 and (code in (None, 0, 200, "0", "200"))
+            _LOGGER.debug("liveStreamParam %s: status=%s code=%s ok=%s",
+                          self.device_id, status, code, ok)
+            return bool(ok)
+        except Exception as exc:
+            _LOGGER.debug("liveStreamParam failed for %s: %s", self.device_id, exc)
+            return False
+
     async def async_wake_camera(self, retries: int = 2) -> bool:
         """Wake a battery camera on demand via the cloud HTTP low-power endpoint.
 
@@ -3108,6 +3162,21 @@ class CameraMixin(_CameraControlsMixin):
 
         use_sdes = force_sdes if force_sdes is not None else self.is_sdes_camera
 
+        # 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.  Disable
+        # via AIDOT_LIVESTREAM_PARAM=0.  Validated live on L2_170 (A001513): with
+        # this call livePlay succeeds and decrypted RTP flows; without it,
+        # persistent -50019.
+        if (self.is_battery_camera
+                and os.environ.get("AIDOT_LIVESTREAM_PARAM", "1") != "0"):
+            _lsp_ok = await self._async_fetch_live_stream_param()
+            _LOGGER.debug("camera %s: liveStreamParam provisioned ok=%s",
+                          self.device_id, _lsp_ok)
+
         # AIDOT_FAST_CONNECT (default off): LAN-direct mode.  Both transports stall
         # the offer on a TURN relay allocation to the cloud TURN server before ICE
         # can even start - for DTLS, aiortc's setLocalDescription blocks until ICE

{python_aidot_cameras-0.7.14 → python_aidot_cameras-0.7.15/src/python_aidot_cameras.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-aidot-cameras
-Version: 0.7.14
+Version: 0.7.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.7.14 → python_aidot_cameras-0.7.15}/src/python_aidot_cameras.egg-info/SOURCES.txt

@@ -39,6 +39,7 @@ tests/test_backoff.py
 tests/test_go2rtc.py
 tests/test_highport_nomination.py
 tests/test_lan_control.py
+tests/test_live_stream_param.py
 tests/test_motion_poll.py
 tests/test_no_undefined_names.py
 tests/test_post_merge_hardening.py

python_aidot_cameras-0.7.15/tests/test_live_stream_param.py

@@ -0,0 +1,75 @@
+"""Unit tests for the liveStreamParam provision-request builder.
+
+Battery cameras (e.g. L2_170, A001513) must have their live-stream session
+provisioned by the cloud before MQTT signaling, or they reject livePlayReq with
+-50019 and never stream. The request shape is exact: a JSON ARRAY body of device
+ids (an object body returns HTTP 500) plus an ``owner`` header. This locks that
+format in. No network: builds the request from a bare instance.
+"""
+import json
+import os
+import sys
+
+sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "src"))
+
+import aidot.camera.client as cc
+
+# The camera mixin class that defines the builder (avoid hard-coding the name).
+_CAM = next(v for v in vars(cc).values()
+            if isinstance(v, type) and "_live_stream_param_request" in v.__dict__)
+
+
+def _stub(**over):
+    cam = _CAM.__new__(_CAM)
+    cam._user_info = over.get("user_info", {"accessToken": "TKN", "id": "owner-123"})
+    cam._region = "us"  # _smarthome_base is a property derived from _region
+    cam.device_id = over.get("device_id", "DEV1234")
+    cam.user_id = "U1"
+    return cam
+
+
+def test_url_is_livestreamparam_endpoint():
+    url, _, _ = _stub()._live_stream_param_request()
+    assert url.endswith("/api/ipc/liveStream/liveStreamParam")
+    assert url.startswith("https://")
+
+
+def test_body_is_json_array_of_device_id():
+    # MUST be a JSON array - an object body ({"deviceId": id}) returns HTTP 500.
+    _, _, body = _stub()._live_stream_param_request()
+    parsed = json.loads(body)
+    assert isinstance(parsed, list)
+    assert parsed == ["DEV1234"]
+
+
+def test_owner_header_required():
+    # The endpoint needs owner (like the wake endpoint); falls back across keys.
+    _, headers, _ = _stub()._live_stream_param_request()
+    assert headers.get("owner") == "owner-123"
+
+
+def test_owner_falls_back_to_user_id():
+    cam = _stub(user_info={"accessToken": "T"})  # no id/owner/userId
+    _, headers, _ = cam._live_stream_param_request()
+    assert headers.get("owner") == "U1"
+
+
+def test_auth_headers_carried():
+    _, headers, _ = _stub()._live_stream_param_request()
+    assert headers.get("token") == "TKN"
+    assert headers.get("terminal") == "app"
+
+
+if __name__ == "__main__":
+    import traceback
+    _fail = 0
+    for _k, _v in sorted(globals().items()):
+        if _k.startswith("test_"):
+            try:
+                _v()
+                print(f"PASS {_k}")
+            except Exception:
+                _fail += 1
+                print(f"FAIL {_k}")
+                traceback.print_exc()
+    raise SystemExit(1 if _fail else 0)