python-aidot-cameras 0.5.5__tar.gz → 0.5.7__tar.gz

{python_aidot_cameras-0.5.5/src/python_aidot_cameras.egg-info → python_aidot_cameras-0.5.7}/PKG-INFO

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-aidot-cameras"
-version = "0.5.5"
+version = "0.5.7"
 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.5 → python_aidot_cameras-0.5.7}/src/aidot/device_client.py

@@ -4042,7 +4042,11 @@ class DeviceClient(object):
             except asyncio.CancelledError:
                 return
 
-    async def start_keepalive(self, rtsp_push_url: Optional[str] = None) -> None:
+    async def start_keepalive(
+        self,
+        rtsp_push_url: Optional[str] = None,
+        fast_connect: Optional[bool] = None,
+    ) -> None:
         """Start a persistent stream that keeps the camera session alive.
 
         For SDES cameras (A001064/A001513): opens an indefinite ffmpeg stream and
@@ -4054,8 +4058,15 @@ class DeviceClient(object):
         pulls (real play/pause video, no decode/re-encode). Without a serve URL
         it falls back to the on_frame keepalive loop (latest_jpeg / MJPEG).
 
+        ``fast_connect`` enables LAN-direct mode (skip the ~2.5s livePlay/ICE-config
+        waits + TURN relay; see _async_open_webrtc_stream_impl).  ``None`` leaves it
+        to the ``AIDOT_FAST_CONNECT`` env var; ``True``/``False`` override it (e.g.
+        from a Home Assistant config-entry option, since HA OS can't set env vars).
+
         Safe to call multiple times - does nothing if already running.
         """
+        if fast_connect is not None:
+            self._fast_connect_opt = fast_connect
         if self._stream_task is not None and not self._stream_task.done():
             return
         self._keepalive_rtsp_url = rtsp_push_url
@@ -5164,9 +5175,13 @@ class DeviceClient(object):
         # LAN host candidate connects in ~1 s.  TRADE-OFF: no relay means cameras
         # on a different network segment / behind strict NAT cannot connect, so
         # this is opt-in and off by default.
-        _fast_connect = os.environ.get("AIDOT_FAST_CONNECT", "").strip().lower() in (
-            "1", "true", "yes", "on",
-        )
+        # Prefer an explicit per-camera setting (e.g. HA config-entry option via
+        # start_keepalive(fast_connect=...)); fall back to the env var otherwise.
+        _fast_connect = getattr(self, "_fast_connect_opt", None)
+        if _fast_connect is None:
+            _fast_connect = os.environ.get("AIDOT_FAST_CONNECT", "").strip().lower() in (
+                "1", "true", "yes", "on",
+            )
 
         # Wake battery cameras via the cloud HTTP low-power endpoint before the
         # handshake (matches the app, which fires the HTTP wake so a sleeping camera
@@ -5938,25 +5953,40 @@ class DeviceClient(object):
             _status(f"livePlayReq sent  peerid={peer_id}")
             # Wait for the broker to echo livePlayReq back (confirms delivery).
             # Proceed as soon as the echo arrives; fall through after 0.5 s.
-            try:
-                await asyncio.wait_for(liveplay_echo_ev.wait(), timeout=0.5)
-            except asyncio.TimeoutError:
-                pass
+            # AIDOT_FAST_CONNECT skips this too (the echo often just times out,
+            # costing a flat 0.5 s); we proceed straight to SDP/ICE.
+            if not _fast_connect:
+                try:
+                    await asyncio.wait_for(liveplay_echo_ev.wait(), timeout=0.5)
+                except asyncio.TimeoutError:
+                    pass
             # livePlayResp carries camera-side accept/reject.  If the camera
             # rejects start-play, continuing to SDP/ICE causes large STUN churn
             # but no media.  Fail fast with the concrete code.
-            try:
-                _lp_resp = await asyncio.wait_for(
-                    asyncio.shield(liveplay_resp_fut), timeout=2.0
-                )
-                _lp_code = int(_lp_resp.get("code", 200))
-                _lp_on = int(_lp_resp.get("livePlay", 1))
-                if _lp_code not in (0, 200) or _lp_on == 0:
-                    raise RuntimeError(
-                        f"livePlay rejected by camera (code={_lp_code}, livePlay={_lp_on})"
+            # MEASURED (2026-06-07, live A/B): this up-to-2 s wait is the DOMINANT
+            # cold-start cost (camera-awake → ICE-servers ≈ 2.5 s = 0.5 s echo +
+            # 2.0 s here).  The official app does NOT wait for/parse livePlayResp
+            # (parity-confirmed).  AIDOT_FAST_CONNECT skips it and proceeds to
+            # SDP/ICE immediately — losing fast-fail on rejection (rare; ICE then
+            # fails instead) in exchange for ~2 s off every LAN connect.
+            if not _fast_connect:
+                try:
+                    _lp_resp = await asyncio.wait_for(
+                        asyncio.shield(liveplay_resp_fut), timeout=2.0
                     )
-            except asyncio.TimeoutError:
-                pass
+                    _lp_code = int(_lp_resp.get("code", 200))
+                    _lp_on = int(_lp_resp.get("livePlay", 1))
+                    if _lp_code not in (0, 200) or _lp_on == 0:
+                        raise RuntimeError(
+                            f"livePlay rejected by camera (code={_lp_code}, livePlay={_lp_on})"
+                        )
+                except asyncio.TimeoutError:
+                    pass
+            else:
+                _status(
+                    "AIDOT_FAST_CONNECT: skipping livePlayResp wait (~2s) -"
+                    " proceeding to SDP/ICE (app-parity, no fast-fail on reject)"
+                )
             # Short extra wait for getIceConfigResp - the server may only respond
             # once a live camera session is active (i.e. after livePlayReq).
             # Waiting here ensures TURN credentials arrive before RTCPeerConnection
@@ -8614,6 +8644,17 @@ class DeviceClient(object):
         import tempfile
         import json
 
+        # _open_sdes_stream runs in its own scope, so recompute the fast-connect
+        # flag here (same precedence as the parent open path: explicit per-camera
+        # option set via start_keepalive, else the AIDOT_FAST_CONNECT env var).
+        # Without this the SDES path NameErrors on every open (regression fixed
+        # 2026-06-07: the SDES TURN-skip gates reference _fast_connect).
+        _fast_connect = getattr(self, "_fast_connect_opt", None)
+        if _fast_connect is None:
+            _fast_connect = os.environ.get("AIDOT_FAST_CONNECT", "").strip().lower() in (
+                "1", "true", "yes", "on",
+            )
+
         user_id = user_id or str(self.user_id)
 
         # Models confirmed (2026-05-02) to send TUTK-framed data instead of

{python_aidot_cameras-0.5.5 → python_aidot_cameras-0.5.7/src/python_aidot_cameras.egg-info}/PKG-INFO

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