python-aidot-cameras 0.11.0__tar.gz → 0.11.1__tar.gz

{python_aidot_cameras-0.11.0/python_aidot_cameras.egg-info → python_aidot_cameras-0.11.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-aidot-cameras
-Version: 0.11.0
+Version: 0.11.1
 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.11.0 → python_aidot_cameras-0.11.1}/aidot/camera/client.py

@@ -86,6 +86,13 @@ from .protocol import (  # noqa: F401 - re-exported for device_client / back-com
 
 _LOGGER = logging.getLogger(__name__)
 
+# Offline keepalive pause (see CameraMixin._backoff_or_offline_pause): while the
+# cloud explicitly reports a device offline, failed-open retries re-check the
+# flag every RECHECK seconds and only probe a real open every PROBE seconds,
+# instead of consuming an open-gate slot on the normal reconnect cadence.
+_OFFLINE_RECHECK_S = float(os.environ.get("AIDOT_OFFLINE_RECHECK_S", "30"))
+_OFFLINE_PROBE_S = float(os.environ.get("AIDOT_OFFLINE_PROBE_S", "600"))
+
 # Strong refs to fire-and-forget tasks: asyncio only keeps weak refs, so a
 # discarded task can be garbage-collected mid-flight. Discarded on completion.
 _BG_TASKS: set = set()
@@ -761,8 +768,56 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
             self.status.update_from_camera_attributes(props)
         if device.get("online") is not None:
             self.status.online = bool(device.get("online"))
+            # The cloud explicitly reported reachability - only then may the
+            # keepalive loops trust an offline flag (see
+            # _backoff_or_offline_pause; DeviceStatusData.online defaults to
+            # False, which must not read as "offline").
+            self._cloud_online_explicit = True
         return self.status
 
+    async def _backoff_or_offline_pause(self, delay: float) -> None:
+        """Sleep a reconnect backoff, extended while the device is cloud-offline.
+
+        Normal case (device online, or the cloud never reported an online
+        flag): plain ``asyncio.sleep(delay)`` - behavior unchanged.
+
+        When an open just failed AND the cloud has explicitly reported the
+        device offline (``update_status_from_device`` saw ``online: false``),
+        hold here instead of retrying on the pacer cadence: re-check the flag
+        every ``AIDOT_OFFLINE_RECHECK_S`` (default 30 s) and resume the moment
+        it flips back on, or fall through after ``AIDOT_OFFLINE_PROBE_S``
+        (default 600 s) so one probe open still runs in case the cloud flag is
+        stale.  This keeps a dead/unpowered camera from consuming an open-gate
+        slot every backoff cycle and starving live cameras' cold opens
+        (observed live: two unpowered A000088s cycling 30 s open attempts
+        pushed a healthy camera's cold open past two minutes).
+        """
+        if self.status.online or not getattr(self, "_cloud_online_explicit", False):
+            await asyncio.sleep(delay)
+            return
+        _LOGGER.info(
+            "keepalive[%s]: device is cloud-offline - pausing open retries "
+            "(recheck %.0fs, probe %.0fs)",
+            self.device_id, _OFFLINE_RECHECK_S, _OFFLINE_PROBE_S,
+        )
+        _t0 = time.monotonic()
+        while (_elapsed := time.monotonic() - _t0) < _OFFLINE_PROBE_S:
+            await asyncio.sleep(
+                min(_OFFLINE_RECHECK_S, max(0.1, _OFFLINE_PROBE_S - _elapsed))
+            )
+            if not getattr(self, "_streaming_active", False):
+                return
+            if self.status.online:
+                _LOGGER.info(
+                    "keepalive[%s]: device back online - resuming opens",
+                    self.device_id,
+                )
+                return
+        _LOGGER.debug(
+            "keepalive[%s]: offline probe interval elapsed - probing one open",
+            self.device_id,
+        )
+
     # -- Camera helpers ------------------------------------------------------ #
 
     @property
@@ -2560,7 +2615,7 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
                     self.device_id, _delay, exc,
                 )
                 try:
-                    await asyncio.sleep(_delay)
+                    await self._backoff_or_offline_pause(_delay)
                 except asyncio.CancelledError:
                     return
                 continue
@@ -2735,7 +2790,7 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
                     self.device_id, _delay, exc,
                 )
                 try:
-                    await asyncio.sleep(_delay)
+                    await self._backoff_or_offline_pause(_delay)
                 except asyncio.CancelledError:
                     return
                 continue
@@ -3231,7 +3286,7 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
                     self.device_id, _delay, exc,
                 )
                 try:
-                    await asyncio.sleep(_delay)
+                    await self._backoff_or_offline_pause(_delay)
                 except asyncio.CancelledError:
                     return
                 continue

{python_aidot_cameras-0.11.0 → python_aidot_cameras-0.11.1}/pyproject.toml

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

{python_aidot_cameras-0.11.0 → python_aidot_cameras-0.11.1/python_aidot_cameras.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-aidot-cameras
-Version: 0.11.0
+Version: 0.11.1
 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.11.0 → python_aidot_cameras-0.11.1}/python_aidot_cameras.egg-info/SOURCES.txt

@@ -91,6 +91,7 @@ tests/test_live_stream_param.py
 tests/test_motion_poll.py
 tests/test_narrow_pc_ice.py
 tests/test_no_undefined_names.py
+tests/test_offline_keepalive_pause.py
 tests/test_open_gate_delay.py
 tests/test_persistent_mqtt.py
 tests/test_persistent_mqtt_robustness.py

python_aidot_cameras-0.11.1/tests/test_offline_keepalive_pause.py

@@ -0,0 +1,112 @@
+"""Offline keepalive pause: failed-open retries hold while the device is
+cloud-offline (CameraMixin._backoff_or_offline_pause) instead of consuming an
+open-gate slot on the normal reconnect cadence."""
+
+import asyncio
+import time
+from types import SimpleNamespace
+
+import aidot.camera.client as camera_client
+from aidot.camera.client import CameraMixin
+from aidot.device_client import DeviceStatusData
+
+
+def _stub(online: bool, explicit: bool, streaming: bool = True) -> SimpleNamespace:
+    s = SimpleNamespace(
+        status=DeviceStatusData(),
+        device_id="test-device",
+        _streaming_active=streaming,
+    )
+    s.status.online = online
+    if explicit:
+        s._cloud_online_explicit = True
+    return s
+
+
+def _run(coro):
+    return asyncio.run(coro)
+
+
+def test_online_device_sleeps_plain_delay():
+    stub = _stub(online=True, explicit=True)
+    t0 = time.monotonic()
+    _run(CameraMixin._backoff_or_offline_pause(stub, 0.05))
+    took = time.monotonic() - t0
+    assert 0.04 <= took < 1.0
+
+
+def test_unreported_online_state_never_pauses(monkeypatch):
+    # DeviceStatusData.online defaults to False; without the explicit marker
+    # that must NOT read as "offline" (a long pause here would slow every
+    # camera whose device dict was never merged).
+    monkeypatch.setattr(camera_client, "_OFFLINE_PROBE_S", 60.0)
+    stub = _stub(online=False, explicit=False)
+    t0 = time.monotonic()
+    _run(CameraMixin._backoff_or_offline_pause(stub, 0.05))
+    took = time.monotonic() - t0
+    assert took < 1.0
+
+
+def test_offline_device_holds_then_probes(monkeypatch):
+    # Explicitly offline: the pause holds past the plain delay and falls
+    # through after the probe interval so one probe open still runs.
+    monkeypatch.setattr(camera_client, "_OFFLINE_RECHECK_S", 0.05)
+    monkeypatch.setattr(camera_client, "_OFFLINE_PROBE_S", 0.3)
+    stub = _stub(online=False, explicit=True)
+    t0 = time.monotonic()
+    _run(CameraMixin._backoff_or_offline_pause(stub, 0.01))
+    took = time.monotonic() - t0
+    assert took >= 0.3  # held for the whole probe interval
+    assert took < 2.0
+
+
+def test_offline_device_resumes_when_back_online(monkeypatch):
+    monkeypatch.setattr(camera_client, "_OFFLINE_RECHECK_S", 0.05)
+    monkeypatch.setattr(camera_client, "_OFFLINE_PROBE_S", 30.0)
+    stub = _stub(online=False, explicit=True)
+
+    async def scenario():
+        async def flip():
+            await asyncio.sleep(0.15)
+            stub.status.online = True
+
+        t0 = time.monotonic()
+        await asyncio.gather(
+            CameraMixin._backoff_or_offline_pause(stub, 0.01), flip()
+        )
+        return time.monotonic() - t0
+
+    took = _run(scenario())
+    # resumed within a couple of recheck ticks of the flip, far short of PROBE
+    assert 0.15 <= took < 2.0
+
+
+def test_offline_pause_exits_when_streaming_stops(monkeypatch):
+    monkeypatch.setattr(camera_client, "_OFFLINE_RECHECK_S", 0.05)
+    monkeypatch.setattr(camera_client, "_OFFLINE_PROBE_S", 30.0)
+    stub = _stub(online=False, explicit=True)
+
+    async def scenario():
+        async def stop():
+            await asyncio.sleep(0.15)
+            stub._streaming_active = False
+
+        t0 = time.monotonic()
+        await asyncio.gather(
+            CameraMixin._backoff_or_offline_pause(stub, 0.01), stop()
+        )
+        return time.monotonic() - t0
+
+    took = _run(scenario())
+    assert took < 2.0
+
+
+def test_update_status_sets_explicit_marker():
+    stub = SimpleNamespace(status=DeviceStatusData())
+    CameraMixin.update_status_from_device(stub, {"online": False})
+    assert stub.status.online is False
+    assert getattr(stub, "_cloud_online_explicit", False) is True
+
+    stub2 = SimpleNamespace(status=DeviceStatusData())
+    CameraMixin.update_status_from_device(stub2, {"name": "no online key"})
+    assert getattr(stub2, "_cloud_online_explicit", False) is False