python-aidot-cameras 0.7.29__tar.gz → 0.7.31__tar.gz

{python_aidot_cameras-0.7.29/src/python_aidot_cameras.egg-info → python_aidot_cameras-0.7.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-aidot-cameras
-Version: 0.7.29
+Version: 0.7.31
 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,7 +122,7 @@ 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_PERSISTENT_MQTT` | Reuse ONE account-level persistent MQTT connection for device commands and attribute fetches (matching the official app) instead of connecting per operation, cutting cloud connect churn. Truthy value enables. The stream-open path is unaffected. | unset (off) |
+| `AIDOT_PERSISTENT_MQTT` | Reuse ONE account-level persistent MQTT connection for device commands, attribute fetches, AND stream-open signaling (matching the official app) instead of connecting per operation, cutting cloud connect churn. **On by default** (the app's behaviour; live soak cut SDES NO_MEDIA ~57%→~19%); set to `0`/`false`/`no`/`off` to disable. | enabled (on) |
 | `AIDOT_SDES_ADAPTIVE` | Adaptive fast-with-fallback for the SDES keepalive loop: try the fast path first (skip livePlay waits + TURN relay pre-alloc) and fall back to the full relay path if a fast attempt delivers no media. A per-device cache skips the fast attempt on later views once it has failed for a camera. Truthy value enables. | 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) |

{python_aidot_cameras-0.7.29 → python_aidot_cameras-0.7.31}/README.md

@@ -95,7 +95,7 @@ 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_PERSISTENT_MQTT` | Reuse ONE account-level persistent MQTT connection for device commands and attribute fetches (matching the official app) instead of connecting per operation, cutting cloud connect churn. Truthy value enables. The stream-open path is unaffected. | unset (off) |
+| `AIDOT_PERSISTENT_MQTT` | Reuse ONE account-level persistent MQTT connection for device commands, attribute fetches, AND stream-open signaling (matching the official app) instead of connecting per operation, cutting cloud connect churn. **On by default** (the app's behaviour; live soak cut SDES NO_MEDIA ~57%→~19%); set to `0`/`false`/`no`/`off` to disable. | enabled (on) |
 | `AIDOT_SDES_ADAPTIVE` | Adaptive fast-with-fallback for the SDES keepalive loop: try the fast path first (skip livePlay waits + TURN relay pre-alloc) and fall back to the full relay path if a fast attempt delivers no media. A per-device cache skips the fast attempt on later views once it has failed for a camera. Truthy value enables. | 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) |

{python_aidot_cameras-0.7.29 → python_aidot_cameras-0.7.31}/pyproject.toml

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

@@ -2682,16 +2682,21 @@ class CameraMixin(_CameraControlsMixin):
             "1", "true", "yes", "on")
 
     def _resolve_persistent_mqtt(self) -> bool:
-        """Whether commands + attribute fetches reuse ONE account-level persistent
-        MQTT connection (matching the app's LDSBaseMqttServiceImpl) instead of
-        connecting per op.  Opt-in (``AIDOT_PERSISTENT_MQTT`` env / per-camera
-        ``_persistent_mqtt_opt``), default off while it's validated.  Phase 1: the
-        stream-open path is unchanged (it uses session client_ids)."""
+        """Whether commands, attribute fetches, AND stream-open signaling reuse ONE
+        account-level persistent MQTT connection (matching the app's
+        LDSBaseMqttServiceImpl) instead of connecting per op.
+
+        **Default ON** (2026-06-17): this is exactly how the official app behaves -
+        one persistent connection per login session - and a live soak showed it
+        cuts SDES NO_MEDIA from ~57% to ~19% (no regression). It is also safer
+        than connect-per-op, which can collide on the single authorized client_id.
+        Disable via ``AIDOT_PERSISTENT_MQTT`` in {0,false,no,off} or per-camera
+        ``_persistent_mqtt_opt=False`` (the explicit opt always wins)."""
         opt = getattr(self, "_persistent_mqtt_opt", None)
         if opt is not None:
             return bool(opt)
-        return os.environ.get("AIDOT_PERSISTENT_MQTT", "").strip().lower() in (
-            "1", "true", "yes", "on")
+        return os.environ.get("AIDOT_PERSISTENT_MQTT", "").strip().lower() not in (
+            "0", "false", "no", "off")
 
     async def _get_persistent_mqtt(self):
         """Get-or-create the account-shared ``_PersistentMqtt`` (one per account,

{python_aidot_cameras-0.7.29 → python_aidot_cameras-0.7.31}/src/aidot/camera/sdes.py

@@ -173,6 +173,11 @@ class SdesSession:
                     if not self._talk_state.get("speaker_on"):
                         break
                     await asyncio.sleep(0.02)
+                # speaker_on flips once the bridge SENDS SPEAKERSTOP(849); give the
+                # camera a brief window to PROCESS it over the still-live SCTP before
+                # we tear down, so its talk channel is actually freed (avoids the
+                # next session getting 851 "mic occupied").
+                await asyncio.sleep(0.3)
             self._talk_state["stop"] = True
             self._talk_state["provider"] = None
         self._proc.terminate()

{python_aidot_cameras-0.7.29 → python_aidot_cameras-0.7.31}/src/aidot/camera/webrtc.py

@@ -91,6 +91,7 @@ class WebRTCSession:
             return False
         # IOTYPE_USER_IPCAM_SPEAKERSTART = 848 (AVIOCTRLDEFs.java), 8-byte channel=0 payload.
         self._avio_cmd(848, b"\x00" * 8)
+        self._talk_holder["was_active"] = True  # ensure stop() releases the speaker
         return True
 
     async def async_stop_talk(self) -> bool:
@@ -111,6 +112,22 @@ class WebRTCSession:
 
     async def stop(self) -> None:
         """Tear down the stream: close peer connection and MQTT session."""
+        # If two-way talk was active this session, RELEASE the camera speaker
+        # before closing the PeerConnection: send SPEAKERSTOP(849), idle the track,
+        # and give the SCTP DataChannel a brief flush window so the camera actually
+        # processes the release.  Otherwise the camera keeps its talk channel bound
+        # to this (now-dead) connection and the next app/HA push-to-talk gets 851
+        # "mic occupied".  Idempotent (harmless if the speaker was already closed).
+        if self.talk_supported and self._talk_holder.get("was_active"):
+            try:
+                self._avio_cmd(849, b"\x00" * 8)
+                if self._audio_sender is not None:
+                    self._audio_sender.replaceTrack(None)
+                self._talk_holder["provider"] = None
+                self._talk_holder["was_active"] = False
+                await asyncio.sleep(0.4)   # let the DataChannel deliver SPEAKERSTOP
+            except Exception:
+                _LOGGER.debug("camera %s: swallowed exception", 'stop', exc_info=True)
         for task in self._track_tasks:
             task.cancel()
         if self._recorder is not None:

{python_aidot_cameras-0.7.29 → python_aidot_cameras-0.7.31/src/python_aidot_cameras.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-aidot-cameras
-Version: 0.7.29
+Version: 0.7.31
 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,7 +122,7 @@ 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_PERSISTENT_MQTT` | Reuse ONE account-level persistent MQTT connection for device commands and attribute fetches (matching the official app) instead of connecting per operation, cutting cloud connect churn. Truthy value enables. The stream-open path is unaffected. | unset (off) |
+| `AIDOT_PERSISTENT_MQTT` | Reuse ONE account-level persistent MQTT connection for device commands, attribute fetches, AND stream-open signaling (matching the official app) instead of connecting per operation, cutting cloud connect churn. **On by default** (the app's behaviour; live soak cut SDES NO_MEDIA ~57%→~19%); set to `0`/`false`/`no`/`off` to disable. | enabled (on) |
 | `AIDOT_SDES_ADAPTIVE` | Adaptive fast-with-fallback for the SDES keepalive loop: try the fast path first (skip livePlay waits + TURN relay pre-alloc) and fall back to the full relay path if a fast attempt delivers no media. A per-device cache skips the fast attempt on later views once it has failed for a camera. Truthy value enables. | 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) |

{python_aidot_cameras-0.7.29 → python_aidot_cameras-0.7.31}/tests/test_persistent_mqtt.py

@@ -21,25 +21,27 @@ def _cam():
     return _CAM.__new__(_CAM)
 
 
-def test_default_off(monkeypatch):
+def test_default_on(monkeypatch):
+    # default ON (matches the app's single persistent connection)
     monkeypatch.delenv("AIDOT_PERSISTENT_MQTT", raising=False)
-    assert _cam()._resolve_persistent_mqtt() is False
+    assert _cam()._resolve_persistent_mqtt() is True
 
 
-def test_env_enables(monkeypatch):
-    for val in ("1", "true", "TRUE", "yes", "on", " On "):
+def test_env_disables(monkeypatch):
+    for val in ("0", "false", "FALSE", "no", "off", " Off "):
         monkeypatch.setenv("AIDOT_PERSISTENT_MQTT", val)
-        assert _cam()._resolve_persistent_mqtt() is True, val
+        assert _cam()._resolve_persistent_mqtt() is False, val
 
 
-def test_env_falsey_stays_off(monkeypatch):
-    for val in ("0", "false", "no", "off", "", "anything"):
+def test_env_truthy_or_unknown_stays_on(monkeypatch):
+    for val in ("1", "true", "yes", "on", "anything"):
         monkeypatch.setenv("AIDOT_PERSISTENT_MQTT", val)
-        assert _cam()._resolve_persistent_mqtt() is False, val
+        assert _cam()._resolve_persistent_mqtt() is True, val
 
 
-def test_kwarg_wins_over_env(monkeypatch):
-    monkeypatch.setenv("AIDOT_PERSISTENT_MQTT", "1")
+def test_kwarg_off_wins_over_default(monkeypatch):
+    # an explicit opt=False (e.g. user turned the HA toggle off) overrides default-on
+    monkeypatch.delenv("AIDOT_PERSISTENT_MQTT", raising=False)
     cam = _cam()
     cam._persistent_mqtt_opt = False
     assert cam._resolve_persistent_mqtt() is False