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

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

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

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

@@ -4093,16 +4093,40 @@ class CameraMixin(_CameraControlsMixin):
                     )
                 )
 
-        # Run MQTT in a thread executor (very long duration; stopped via
-        # outgoing_q sentinel when the caller calls WebRTCSession.stop()).
-        mqtt_fut = loop.run_in_executor(
-            None,
-            lambda: _mqtt_session_sync(
-                mqtt_url, mqtt_user, mqtt_pwd, mqtt_cid,
-                sub_topics, [], 3600.0, _on_mqtt_message,
-                "/mqtt", _on_mqtt_ready, outgoing_q,
-            ),
-        )
+        # MQTT transport for the stream signaling.  Default: a dedicated
+        # connect-per-stream session in an executor (stopped via outgoing_q
+        # sentinel on WebRTCSession.stop()).  AIDOT_PERSISTENT_MQTT (Phase 2):
+        # ride the SAME account-level persistent connection commands/attrs use
+        # (the stream's mqtt_cid IS the authorized mqttClientId, so it's the same
+        # connection) - subscribe + register a handler + drain outgoing_q through
+        # it, and DON'T tear the connection down on stop (matching the app).
+        _pm_stream = (await self._get_persistent_mqtt()
+                      if self._resolve_persistent_mqtt() else None)
+        if _pm_stream is not None:
+            await _pm_stream.subscribe(sub_topics)
+            _pm_stream.add_handler(_on_mqtt_message)
+
+            async def _pm_stream_drain():
+                try:
+                    while True:
+                        out = await loop.run_in_executor(None, outgoing_q.get)
+                        if out is None:   # stop sentinel from WebRTCSession.stop()
+                            return
+                        await _pm_stream.publish(out[0], out[1])
+                finally:
+                    _pm_stream.remove_handler(_on_mqtt_message)
+
+            mqtt_fut = asyncio.ensure_future(_pm_stream_drain())
+            _on_mqtt_ready({"connected": True, "rc": 0, "rc_str": "persistent"})
+        else:
+            mqtt_fut = loop.run_in_executor(
+                None,
+                lambda: _mqtt_session_sync(
+                    mqtt_url, mqtt_user, mqtt_pwd, mqtt_cid,
+                    sub_topics, [], 3600.0, _on_mqtt_message,
+                    "/mqtt", _on_mqtt_ready, outgoing_q,
+                ),
+            )
 
         # Wait for MQTT to be connected and subscribed before proceeding.
         # threading.Event.wait(timeout) returns True if set, False on timeout.

{python_aidot_cameras-0.7.28 → python_aidot_cameras-0.7.29}/src/aidot/camera/protocol.py

@@ -1270,6 +1270,7 @@ class _PersistentMqtt:
         self._lock = threading.Lock()
         self._subs = set()         # topics to (re)subscribe on connect
         self._collectors = []      # transient queues, each receives every msg
+        self._handlers = []        # persistent on_message callbacks (e.g. a stream)
         self._started = False
         self.connects = 0          # observability: how many times we connected
 
@@ -1330,8 +1331,14 @@ class _PersistentMqtt:
         item = (msg.topic, payload)
         with self._lock:
             cols = list(self._collectors)
+            handlers = list(self._handlers)
         for q in cols:
             q.put(item)
+        for h in handlers:                 # persistent subscribers (stream, etc.)
+            try:
+                h(msg.topic, payload)
+            except Exception:
+                _LOGGER.debug("persistent mqtt: handler raised", exc_info=True)
 
     def _ensure_started_sync(self, timeout=15.0):
         with self._lock:
@@ -1409,6 +1416,44 @@ class _PersistentMqtt:
         return await loop.run_in_executor(
             None, functools.partial(self._ensure_started_sync, timeout))
 
+    # --- persistent subscriber API (for the stream signaling, Phase 2) -------- #
+    def add_handler(self, callback):
+        """Register a persistent on_message callback ``callback(topic, payload)``
+        that receives every message for the connection's lifetime (until removed).
+        Use for a long-lived consumer like an open stream's signaling handler."""
+        with self._lock:
+            self._handlers.append(callback)
+        return callback
+
+    def remove_handler(self, callback):
+        with self._lock:
+            try:
+                self._handlers.remove(callback)
+            except ValueError:
+                pass
+
+    async def subscribe(self, topics):
+        """Ensure the connection is up and subscribe ``topics`` (tracked for replay)."""
+        import functools
+        loop = asyncio.get_running_loop()
+        await loop.run_in_executor(None, self._ensure_started_sync, 15.0)
+        await loop.run_in_executor(None, functools.partial(self._subscribe_sync, topics))
+
+    async def publish(self, topic, payload):
+        """Publish on the shared connection (ensures it's up first)."""
+        import functools
+
+        def _pub():
+            if not self._ensure_started_sync():
+                return False
+            try:
+                self._client.publish(topic, payload)
+                return True
+            except Exception:
+                return False
+        loop = asyncio.get_running_loop()
+        return await loop.run_in_executor(None, functools.partial(_pub))
+
     def close(self):
         c = self._client
         self._client = None

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

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