python-aidot-cameras 0.7.24__tar.gz → 0.7.26__tar.gz

{python_aidot_cameras-0.7.24/src/python_aidot_cameras.egg-info → python_aidot_cameras-0.7.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-aidot-cameras
-Version: 0.7.24
+Version: 0.7.26
 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
@@ -122,6 +122,8 @@ chosen to work out of the box; override only when tuning.
 | `AIDOT_SPROP_DIR` | Directory where captured SPS/PPS (sprop) parameter sets are cached. Set this to a writable path (e.g. for Home Assistant) if the default location is read-only. | `<package dir>` |
 | `AIDOT_DISABLE_HIGHPORT_FIX` | If set (any value), disables the DTLS high-port `USE-CANDIDATE` nomination fix and falls back to upstream aioice behavior (used to measure the baseline connect rate). | unset (fix enabled) |
 | `AIDOT_FAST_CONNECT` | Enables LAN-direct "fast connect" mode (STUN-only, skips several cloud signaling waits) when set to a truthy value. | unset (off) |
+| `AIDOT_SDES_FAST_LIVEPLAY` | Truthy value skips the `livePlayResp` blocking wait for eligible SDES cameras (~4.5 s faster cold start), while keeping the full ICE/SCTP handshake. Role-reversal models (A001064 PTZ) are always excluded. Soak-validated; opt-in. | unset (off) |
+| `AIDOT_SERVE_RELAY` | Holds the public stream port via an internal relay that proxies to ffmpeg, so the first (cold) view connects instead of failing while ffmpeg can't pre-bind the port. Set to `0` to serve ffmpeg directly. | `1` (enabled) |
 | `AIDOT_MAX_CONCURRENT_OPENS` | Caps how many stream opens run concurrently. | `2` |
 | `AIDOT_MAX_CONCURRENT_STREAMS` | Caps how many cameras stream at once. | `3` |
 | `AIDOT_STREAM_IDLE_S` | Seconds of stream idle before an idle release. | `120` |
@@ -131,6 +133,7 @@ chosen to work out of the box; override only when tuning.
 | `AIDOT_BUSY_RETRY_S` | Delay, in seconds, before retrying when a camera reports busy. | `45` |
 | `AIDOT_LIVESTREAM_PARAM` | Set to `0` to skip the cloud `liveStreamParam` pre-connect that provisions battery cameras' live-stream sessions before signaling (without it, battery cameras like the L2 models reject streaming with `-50019`). | `1` (enabled) |
 | `AIDOT_GOP_PLI_S` | Interval, in seconds, between PLI (keyframe) requests. | `2.0` |
+| `AIDOT_SDES_PLI_GAPS` | Comma-separated second offsets for the early PLI (keyframe-request) burst on SDES cameras, to pull the first keyframe in faster on cold start. | `0,1.5,2,3` |
 | `AIDOT_AUDIO_TARGET_DBFS` | Target loudness (dBFS) for two-way audio normalization. | `-15` |
 | `AIDOT_AUDIO_MAXGAIN_DB` | Maximum gain (dB) applied by the audio normalizer. | `30` |
 | `AIDOT_AUDIO_MINGAIN_DB` | Minimum gain (dB) applied by the audio normalizer. | `-12` |

{python_aidot_cameras-0.7.24 → python_aidot_cameras-0.7.26}/README.md

@@ -95,6 +95,8 @@ chosen to work out of the box; override only when tuning.
 | `AIDOT_SPROP_DIR` | Directory where captured SPS/PPS (sprop) parameter sets are cached. Set this to a writable path (e.g. for Home Assistant) if the default location is read-only. | `<package dir>` |
 | `AIDOT_DISABLE_HIGHPORT_FIX` | If set (any value), disables the DTLS high-port `USE-CANDIDATE` nomination fix and falls back to upstream aioice behavior (used to measure the baseline connect rate). | unset (fix enabled) |
 | `AIDOT_FAST_CONNECT` | Enables LAN-direct "fast connect" mode (STUN-only, skips several cloud signaling waits) when set to a truthy value. | unset (off) |
+| `AIDOT_SDES_FAST_LIVEPLAY` | Truthy value skips the `livePlayResp` blocking wait for eligible SDES cameras (~4.5 s faster cold start), while keeping the full ICE/SCTP handshake. Role-reversal models (A001064 PTZ) are always excluded. Soak-validated; opt-in. | unset (off) |
+| `AIDOT_SERVE_RELAY` | Holds the public stream port via an internal relay that proxies to ffmpeg, so the first (cold) view connects instead of failing while ffmpeg can't pre-bind the port. Set to `0` to serve ffmpeg directly. | `1` (enabled) |
 | `AIDOT_MAX_CONCURRENT_OPENS` | Caps how many stream opens run concurrently. | `2` |
 | `AIDOT_MAX_CONCURRENT_STREAMS` | Caps how many cameras stream at once. | `3` |
 | `AIDOT_STREAM_IDLE_S` | Seconds of stream idle before an idle release. | `120` |
@@ -104,6 +106,7 @@ chosen to work out of the box; override only when tuning.
 | `AIDOT_BUSY_RETRY_S` | Delay, in seconds, before retrying when a camera reports busy. | `45` |
 | `AIDOT_LIVESTREAM_PARAM` | Set to `0` to skip the cloud `liveStreamParam` pre-connect that provisions battery cameras' live-stream sessions before signaling (without it, battery cameras like the L2 models reject streaming with `-50019`). | `1` (enabled) |
 | `AIDOT_GOP_PLI_S` | Interval, in seconds, between PLI (keyframe) requests. | `2.0` |
+| `AIDOT_SDES_PLI_GAPS` | Comma-separated second offsets for the early PLI (keyframe-request) burst on SDES cameras, to pull the first keyframe in faster on cold start. | `0,1.5,2,3` |
 | `AIDOT_AUDIO_TARGET_DBFS` | Target loudness (dBFS) for two-way audio normalization. | `-15` |
 | `AIDOT_AUDIO_MAXGAIN_DB` | Maximum gain (dB) applied by the audio normalizer. | `30` |
 | `AIDOT_AUDIO_MINGAIN_DB` | Minimum gain (dB) applied by the audio normalizer. | `-12` |

{python_aidot_cameras-0.7.24 → python_aidot_cameras-0.7.26}/pyproject.toml

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

@@ -2559,6 +2559,30 @@ class CameraMixin(_CameraControlsMixin):
         return os.environ.get("AIDOT_SDES_FAST_LIVEPLAY", "").strip().lower() in (
             "1", "true", "yes", "on")
 
+    def _resolve_sdes_skip_turn(self) -> bool:
+        """EXPERIMENTAL (opt-in, default off): skip the blocking SDES TURN relay
+        pre-allocation, for cameras reachable LAN-direct.
+
+        Before building the offer the SDES path does two synchronous RFC-5766
+        Allocate round-trips (audio + video) to the cloud TURN server so the
+        offer's c=/m= can carry a relay address - ~2-3 s of pure cold-start
+        latency.  On a LAN the camera's host candidate wins and that relay is
+        never used, so skipping it shaves the latency - at the cost of no relay
+        fallback for a camera on a different segment / behind strict NAT (the
+        same trade-off ``AIDOT_FAST_CONNECT`` already makes for DTLS, and which
+        is force-disabled for SDES because it *also* skips the SCTP-arming
+        waits; this flag skips ONLY the relay pre-allocation, leaving the rest
+        of the SDES handshake intact).
+
+        Per-camera ``sdes_skip_turn`` (set via start_keepalive) wins; else the
+        ``AIDOT_SDES_SKIP_TURN_PREALLOC`` env (truthy = 1/true/yes/on), default
+        off.  Only consulted for SDES cameras."""
+        opt = getattr(self, "_sdes_skip_turn_opt", None)
+        if opt is not None:
+            return bool(opt)
+        return os.environ.get("AIDOT_SDES_SKIP_TURN_PREALLOC", "").strip().lower() in (
+            "1", "true", "yes", "on")
+
     def _maybe_start_serve_relay(self, serve_url: Optional[str]) -> "Optional[_ServeRelay]":
         """Hold the public serve port via a _ServeRelay so an eager go2rtc pull
         connects-and-waits instead of hitting ECONNREFUSED during the ~16-25s
@@ -3720,7 +3744,14 @@ class CameraMixin(_CameraControlsMixin):
                     or msg.get("devId") == device_id):
                 loop.call_soon_threadsafe(camera_ready_ev.set)
             # livePlayResp: explicit camera ack/nack for start-play command.
-            if method == "livePlayResp" and inner.get("devId") == device_id:
+            # The camera echoes our peer_id (verified live); its payload has NO
+            # devId, so the old devId-only match never fired and this future never
+            # resolved (the wait always timed out).  Match on the echoed peer_id
+            # (per-open, precise); keep devId as a fallback for any camera that
+            # does send it.  dstAddr is the account-wide userId - too loose to use.
+            if method == "livePlayResp" and (
+                    inner.get("peerid") == peer_id
+                    or inner.get("devId") == device_id):
                 if not liveplay_resp_fut.done():
                     loop.call_soon_threadsafe(liveplay_resp_fut.set_result, inner)
             # livePlayReq echo: broker/camera confirmed delivery of our livePlayReq.
@@ -4186,9 +4217,19 @@ class CameraMixin(_CameraControlsMixin):
                     _lp_arrived = True
                     _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:
+                    # Fast-fail only on an unambiguous refusal (livePlay=0).
+                    # Other non-OK codes (incl. -50019 "not ready") are
+                    # transient on battery cameras and recover via ICE; abort
+                    # there would spuriously kill otherwise-good streams.
+                    if _lp_on == 0:
                         raise RuntimeError(
-                            f"livePlay rejected by camera (code={_lp_code}, livePlay={_lp_on})"
+                            f"livePlay refused by camera (livePlay=0, code={_lp_code})"
+                        )
+                    elif _lp_code not in (0, 200):
+                        _status(
+                            f"livePlayResp: non-OK code {_lp_code}"
+                            f"{' (not ready, transient)' if _lp_code == -50019 else ''}"
+                            " - proceeding"
                         )
                 except TimeoutError:
                     pass
@@ -4231,9 +4272,15 @@ class CameraMixin(_CameraControlsMixin):
                     _lp_resp2 = liveplay_resp_fut.result()
                     _lp_code2 = int(_lp_resp2.get("code", 200))
                     _lp_on2   = int(_lp_resp2.get("livePlay", 1))
-                    if _lp_code2 not in (0, 200) or _lp_on2 == 0:
+                    if _lp_on2 == 0:
                         raise RuntimeError(
-                            f"livePlay rejected by camera (code={_lp_code2}, livePlay={_lp_on2})"
+                            f"livePlay refused by camera (livePlay=0, code={_lp_code2})"
+                        )
+                    elif _lp_code2 not in (0, 200):
+                        _status(
+                            f"livePlayResp: non-OK code {_lp_code2}"
+                            f"{' (not ready, transient)' if _lp_code2 == -50019 else ''}"
+                            " - proceeding"
                         )
                 except RuntimeError:
                     raise
@@ -6795,7 +6842,15 @@ class CameraMixin(_CameraControlsMixin):
         # AIDOT_FAST_CONNECT skips this blocking pre-allocation (LAN-direct mode):
         # the offer goes out immediately with host/srflx candidates and the LAN
         # path connects without waiting on a cloud TURN Allocate round-trip.
-        if _sdes_turn_entries and not _fast_connect:
+        # AIDOT_SDES_SKIP_TURN_PREALLOC (experimental, opt-in) does the same skip
+        # for SDES specifically, where _fast_connect is force-off (see
+        # _resolve_sdes_skip_turn).  Either way the cost is instrumented below so
+        # the saving is measurable: grep ``signaling-wait[`` for sdes-turn-prealloc.
+        _skip_turn_prealloc = self._resolve_sdes_skip_turn()
+        _turn_t0 = time.monotonic()
+        _turn_did = False
+        if _sdes_turn_entries and not _fast_connect and not _skip_turn_prealloc:
+            _turn_did = True
             try:
                 import re as _re_pre
                 import hashlib as _hlk_pre
@@ -6832,6 +6887,16 @@ class CameraMixin(_CameraControlsMixin):
                             )
             except Exception as _pre_exc:
                 _LOGGER.warning("TURN pre-allocation error: %s", _pre_exc)
+        if _skip_turn_prealloc and _sdes_turn_entries:
+            _status(
+                "AIDOT_SDES_SKIP_TURN_PREALLOC: skipping TURN relay"
+                " pre-allocation (~2-3s) - host/srflx candidates only, LAN-direct"
+            )
+        _LOGGER.info(
+            "signaling-wait[%s] sdes-turn-prealloc elapsed=%dms allocated=%d skipped=%s",
+            self.device_id,
+            int((time.monotonic() - _turn_t0) * 1000),
+            len(_relay_addrs), bool(_skip_turn_prealloc))
 
         # --- DTLS certificate for m=application probe ----------------------- #
         # PreCon cameras (sptPreconn=1) need SESSION_MODE_REQ via SCTP datachannel.
@@ -7100,10 +7165,18 @@ class CameraMixin(_CameraControlsMixin):
                 _lp_arrived = True
                 _lp_code_sdes = int(_lp_resp_sdes.get("code", 200))
                 _lp_on_sdes = int(_lp_resp_sdes.get("livePlay", 1))
-                if _lp_code_sdes not in (0, 200) or _lp_on_sdes == 0:
+                # Only an explicit livePlay=0 is an unambiguous refusal (fast-fail).
+                # Numeric codes (e.g. -50019 "not ready" on a waking battery cam)
+                # are transient - the camera recovers and streams - so log and
+                # proceed rather than abort on a code we can't classify as terminal
+                # (genuine terminal rejects are still caught on the webrtcResp ack).
+                if _lp_on_sdes == 0:
                     raise RuntimeError(
-                        f"livePlay rejected by camera (code={_lp_code_sdes}, livePlay={_lp_on_sdes})"
-                    )
+                        f"livePlay refused by camera (livePlay=0, code={_lp_code_sdes})")
+                elif _lp_code_sdes not in (0, 200):
+                    _status(f"livePlayResp: non-OK code {_lp_code_sdes}"
+                            f"{' (not ready, transient)' if _lp_code_sdes == -50019 else ''}"
+                            " - proceeding")
             except TimeoutError:
                 pass
             _LOGGER.info(

{python_aidot_cameras-0.7.24 → python_aidot_cameras-0.7.26/src/python_aidot_cameras.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-aidot-cameras
-Version: 0.7.24
+Version: 0.7.26
 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
@@ -122,6 +122,8 @@ chosen to work out of the box; override only when tuning.
 | `AIDOT_SPROP_DIR` | Directory where captured SPS/PPS (sprop) parameter sets are cached. Set this to a writable path (e.g. for Home Assistant) if the default location is read-only. | `<package dir>` |
 | `AIDOT_DISABLE_HIGHPORT_FIX` | If set (any value), disables the DTLS high-port `USE-CANDIDATE` nomination fix and falls back to upstream aioice behavior (used to measure the baseline connect rate). | unset (fix enabled) |
 | `AIDOT_FAST_CONNECT` | Enables LAN-direct "fast connect" mode (STUN-only, skips several cloud signaling waits) when set to a truthy value. | unset (off) |
+| `AIDOT_SDES_FAST_LIVEPLAY` | Truthy value skips the `livePlayResp` blocking wait for eligible SDES cameras (~4.5 s faster cold start), while keeping the full ICE/SCTP handshake. Role-reversal models (A001064 PTZ) are always excluded. Soak-validated; opt-in. | unset (off) |
+| `AIDOT_SERVE_RELAY` | Holds the public stream port via an internal relay that proxies to ffmpeg, so the first (cold) view connects instead of failing while ffmpeg can't pre-bind the port. Set to `0` to serve ffmpeg directly. | `1` (enabled) |
 | `AIDOT_MAX_CONCURRENT_OPENS` | Caps how many stream opens run concurrently. | `2` |
 | `AIDOT_MAX_CONCURRENT_STREAMS` | Caps how many cameras stream at once. | `3` |
 | `AIDOT_STREAM_IDLE_S` | Seconds of stream idle before an idle release. | `120` |
@@ -131,6 +133,7 @@ chosen to work out of the box; override only when tuning.
 | `AIDOT_BUSY_RETRY_S` | Delay, in seconds, before retrying when a camera reports busy. | `45` |
 | `AIDOT_LIVESTREAM_PARAM` | Set to `0` to skip the cloud `liveStreamParam` pre-connect that provisions battery cameras' live-stream sessions before signaling (without it, battery cameras like the L2 models reject streaming with `-50019`). | `1` (enabled) |
 | `AIDOT_GOP_PLI_S` | Interval, in seconds, between PLI (keyframe) requests. | `2.0` |
+| `AIDOT_SDES_PLI_GAPS` | Comma-separated second offsets for the early PLI (keyframe-request) burst on SDES cameras, to pull the first keyframe in faster on cold start. | `0,1.5,2,3` |
 | `AIDOT_AUDIO_TARGET_DBFS` | Target loudness (dBFS) for two-way audio normalization. | `-15` |
 | `AIDOT_AUDIO_MAXGAIN_DB` | Maximum gain (dB) applied by the audio normalizer. | `30` |
 | `AIDOT_AUDIO_MINGAIN_DB` | Minimum gain (dB) applied by the audio normalizer. | `-12` |