python-aidot-cameras 0.5.0__tar.gz → 0.5.1__tar.gz

{python_aidot_cameras-0.5.0/src/python_aidot_cameras.egg-info → python_aidot_cameras-0.5.1}/PKG-INFO

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-aidot-cameras"
-version = "0.5.0"
+version = "0.5.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.5.0 → python_aidot_cameras-0.5.1}/src/aidot/__init__.py

@@ -6,6 +6,7 @@ from .discover import Discover
 from .exceptions import (
     AidotAuthFailed,
     AidotAuthTokenExpired,
+    AidotCameraBusy,
     AidotError,
     AidotNotLogin,
     AidotOSError,
@@ -19,6 +20,7 @@ __all__ = [
     "AidotClient",
     "DeviceClient",
     "Discover",
+    "AidotCameraBusy",
     "AidotError",
     "AidotAuthFailed",
     "AidotAuthTokenExpired",

{python_aidot_cameras-0.5.0 → python_aidot_cameras-0.5.1}/src/aidot/client.py

@@ -1,7 +1,6 @@
 """The aidot integration."""
 
 import asyncio
-import hashlib
 import json
 import logging
 import base64
@@ -54,10 +53,6 @@ def rsa_password_encrypt(message: str) -> str:
     return base64.b64encode(encrypted).decode("utf-8")
 
 
-def md5_password(message: str) -> str:
-    """MD5 hex digest of the password (for /users/login web-app flow)."""
-    return hashlib.md5(message.encode("utf-8")).hexdigest()
-
 
 class AidotClient:
     _base_url: str = BASE_URL
@@ -128,7 +123,7 @@ class AidotClient:
         try:
             response = await self.session.post(url, headers=headers, json=data)
             response_data = await response.json(content_type=None)
-            _LOGGER.debug("async_post_login HTTP=%d response: %s", response.status, response_data)
+            _LOGGER.debug("async_post_login HTTP=%d code=%s", response.status, response_data.get(CONF_CODE))
             app_code = response_data.get(CONF_CODE)
             if app_code == ServerErrorCode.USER_PWD_INCORRECT:
                 raise AidotUserOrPassIncorrect
@@ -183,7 +178,7 @@ class AidotClient:
             async with self.session.get(url, headers=headers,
                                         timeout=aiohttp.ClientTimeout(total=10)) as resp:
                 body = await resp.json(content_type=None)
-            _LOGGER.debug("userConfig response: %s", body)
+            _LOGGER.debug("userConfig response keys=%s", list(body.keys()) if isinstance(body, dict) else type(body).__name__)
             # The MQTT password field may be named mqttPassword or similar.
             # Store the full response data alongside login_info for DeviceClient.
             data = body if isinstance(body, dict) else {}
@@ -253,7 +248,7 @@ class AidotClient:
         inflight = self._ensure_token_inflight
         if inflight is not None and not inflight.done():
             return await inflight
-        fut = asyncio.get_event_loop().create_future()
+        fut = asyncio.get_running_loop().create_future()
         self._ensure_token_inflight = fut
         try:
             result = await self._do_ensure_token()
@@ -342,26 +337,23 @@ class AidotClient:
 
     async def async_get_all_device(self) -> dict[str, Any]:
         final_device_list: list[dict[str, Any]] = []
-        try:
-            houses = await self.async_get_houses()
-            for house in houses:
-                if house.get(CONF_IS_OWNER) is False:
-                    continue
-                # get device_list
-                device_list = await self.async_get_devices(house[CONF_ID])
-                if device_list:
-                    final_device_list.extend(device_list)
-
-            # get product_list
-            productIds = ",".join([item[CONF_PRODUCT_ID] for item in final_device_list])
-            product_list = await self.async_get_products(productIds)
-
-            for product in product_list:
-                for device in final_device_list:
-                    if device[CONF_PRODUCT_ID] == product[CONF_ID]:
-                        device[CONF_PRODUCT] = product
-        except Exception:
-            raise
+        houses = await self.async_get_houses()
+        for house in houses:
+            if house.get(CONF_IS_OWNER) is False:
+                continue
+            # get device_list
+            device_list = await self.async_get_devices(house[CONF_ID])
+            if device_list:
+                final_device_list.extend(device_list)
+
+        # get product_list
+        productIds = ",".join([item[CONF_PRODUCT_ID] for item in final_device_list])
+        product_list = await self.async_get_products(productIds)
+
+        for product in product_list:
+            for device in final_device_list:
+                if device[CONF_PRODUCT_ID] == product[CONF_ID]:
+                    device[CONF_PRODUCT] = product
 
         # Share the full device ID list with every DeviceClient so that
         # batchGetDeviceUserInfo is called with all IDs (the server may return

{python_aidot_cameras-0.5.0 → python_aidot_cameras-0.5.1}/src/aidot/device_client.py

@@ -992,7 +992,7 @@ class TutkStreamSession:
 
     async def start(self) -> bool:
         """Load native libs, connect P2P, and start the frame-receive thread."""
-        return await asyncio.get_event_loop().run_in_executor(
+        return await asyncio.get_running_loop().run_in_executor(
             None, self._start_sync)
 
     def _start_sync(self) -> bool:
@@ -1211,7 +1211,7 @@ class TutkStreamSession:
         """Signal the receive thread to stop and wait for it."""
         self._stop_event.set()
         if self._thread is not None:
-            await asyncio.get_event_loop().run_in_executor(
+            await asyncio.get_running_loop().run_in_executor(
                 None, lambda: self._thread.join(timeout=5.0)
             )
 
@@ -1328,7 +1328,7 @@ class LiveStreamSession:
             return False
 
         # Start background receive/heartbeat task.
-        self._task = asyncio.get_event_loop().create_task(self._receive_loop())
+        self._task = asyncio.get_running_loop().create_task(self._receive_loop())
         return True
 
     async def stop(self) -> None:
@@ -4248,7 +4248,7 @@ class DeviceClient(object):
                 buf = _io.BytesIO()
                 pil_img.save(buf, "JPEG")
                 self.latest_jpeg = buf.getvalue()
-                self._last_frame_time = asyncio.get_event_loop().time()
+                self._last_frame_time = asyncio.get_running_loop().time()
             except Exception as enc_exc:
                 _LOGGER.debug("Streaming encode failed for %s: %s", self.device_id, enc_exc)
 
@@ -4287,7 +4287,7 @@ class DeviceClient(object):
             try:
                 while self._streaming_active:
                     await asyncio.sleep(5.0)
-                    elapsed = asyncio.get_event_loop().time() - self._last_frame_time
+                    elapsed = asyncio.get_running_loop().time() - self._last_frame_time
                     if self._last_frame_time > 0 and elapsed > _WATCHDOG:
                         _LOGGER.warning(
                             "No frames from %s in %.0fs - restarting stream",
@@ -4417,7 +4417,7 @@ class DeviceClient(object):
         serve_url = self._keepalive_rtsp_url
         _MIN_DELAY, _MAX_DELAY = 5.0, 300.0
         retry_delay = _MIN_DELAY
-        loop = asyncio.get_event_loop()
+        loop = asyncio.get_running_loop()
         while self._streaming_active:
             # Thread-safe queues: taps run on the loop, the A/V mux in a thread.
             vq: "_queue.Queue" = _queue.Queue(maxsize=600)
@@ -7162,10 +7162,10 @@ class DeviceClient(object):
         # the camera silently ignores the original request and we time out.
         _init_done: set = set()
         _init_pending: set = {answer_fut, camera_offer_fut, webrtc_req_echo_fut}
-        _init_deadline = asyncio.get_event_loop().time() + timeout
+        _init_deadline = asyncio.get_running_loop().time() + timeout
         _init_reconnect_resends = 0
-        while asyncio.get_event_loop().time() < _init_deadline:
-            _init_remaining = _init_deadline - asyncio.get_event_loop().time()
+        while asyncio.get_running_loop().time() < _init_deadline:
+            _init_remaining = _init_deadline - asyncio.get_running_loop().time()
             _init_done, _init_pending = await asyncio.wait(
                 _init_pending,
                 timeout=min(1.0, max(0.01, _init_remaining)),
@@ -7201,12 +7201,12 @@ class DeviceClient(object):
                 and camera_offer_fut not in _rr_done):
             _status("webrtcReq echo received - waiting for camera webrtcResp...")
             _rr_secondary_limit = 20.0
-            _rr_secondary_deadline = asyncio.get_event_loop().time() + _rr_secondary_limit
+            _rr_secondary_deadline = asyncio.get_running_loop().time() + _rr_secondary_limit
             _rr_done2: set = set()
             _rr_pending2 = _rr_pending   # {answer_fut, camera_offer_fut}
             _rr_reconnect_resends = 0
-            while asyncio.get_event_loop().time() < _rr_secondary_deadline:
-                _remaining = _rr_secondary_deadline - asyncio.get_event_loop().time()
+            while asyncio.get_running_loop().time() < _rr_secondary_deadline:
+                _remaining = _rr_secondary_deadline - asyncio.get_running_loop().time()
                 _rr_done2, _rr_pending2 = await asyncio.wait(
                     _rr_pending2,
                     timeout=min(1.0, max(0.01, _remaining)),
@@ -7246,11 +7246,11 @@ class DeviceClient(object):
                     outgoing_q.put_nowait(_di_p)
 
                 _rr_ext_limit    = 20.0
-                _rr_ext_deadline = asyncio.get_event_loop().time() + _rr_ext_limit
+                _rr_ext_deadline = asyncio.get_running_loop().time() + _rr_ext_limit
                 _rr_done3: set   = set()
                 _rr_reconnect_ext = 0
-                while asyncio.get_event_loop().time() < _rr_ext_deadline:
-                    _ext_rem = _rr_ext_deadline - asyncio.get_event_loop().time()
+                while asyncio.get_running_loop().time() < _rr_ext_deadline:
+                    _ext_rem = _rr_ext_deadline - asyncio.get_running_loop().time()
                     _rr_done3, _rr_pending2 = await asyncio.wait(
                         _rr_pending2,
                         timeout=min(1.0, max(0.01, _ext_rem)),

{python_aidot_cameras-0.5.0 → python_aidot_cameras-0.5.1}/src/aidot/discover.py

@@ -93,7 +93,7 @@ class BroadcastProtocol:
             "service": "device",
             "method": "devDiscoveryReq",
             "seq": seq,
-            "srcAddr": f"0.{self.user_id}]",
+            "srcAddr": f"0.{self.user_id}",
             "tst": current_timestamp_milliseconds,
             "payload": {
                 "extends": {},
@@ -166,7 +166,7 @@ class Discover:
                 self._discover_callback, user_id, broadcast_addr=broadcast_ip
             )
             try:
-                await asyncio.get_event_loop().create_datagram_endpoint(
+                await asyncio.get_running_loop().create_datagram_endpoint(
                     lambda p=protocol: p,
                     local_addr=(bind_ip, 0),
                 )
@@ -183,7 +183,7 @@ class Discover:
             # Last-resort fallback
             protocol = BroadcastProtocol(self._discover_callback, user_id)
             try:
-                await asyncio.get_event_loop().create_datagram_endpoint(
+                await asyncio.get_running_loop().create_datagram_endpoint(
                     lambda: protocol,
                     local_addr=("0.0.0.0", 0),
                 )

{python_aidot_cameras-0.5.0 → python_aidot_cameras-0.5.1/src/python_aidot_cameras.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-aidot-cameras
-Version: 0.5.0
+Version: 0.5.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.5.0 → python_aidot_cameras-0.5.1}/src/python_aidot_cameras.egg-info/SOURCES.txt

@@ -10,7 +10,6 @@ src/aidot/device_client.py
 src/aidot/discover.py
 src/aidot/exceptions.py
 src/aidot/g711.py
-src/aidot/login_const.py
 src/python_aidot_cameras.egg-info/PKG-INFO
 src/python_aidot_cameras.egg-info/SOURCES.txt
 src/python_aidot_cameras.egg-info/dependency_links.txt

python_aidot_cameras-0.5.0/src/aidot/login_const.py

@@ -1,13 +0,0 @@
-"""Constants for the aidot integration."""
-
-APP_ID = "1383974540041977857"
-BASE_URL = "https://prod-us-api.arnoo.com/v17"
-
-PUBLIC_KEY_PEM = b"""
------BEGIN PUBLIC KEY-----
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCtQAnPCi8ksPnS1Du6z96PsKfN
-p2Gp/f/bHwlrAdplbX3p7/TnGpnbJGkLq8uRxf6cw+vOthTsZjkPCF7CatRvRnTj
-c9fcy7yE0oXa5TloYyXD6GkxgftBbN/movkJJGQCc7gFavuYoAdTRBOyQoXBtm0m
-kXMSjXOldI/290b9BQIDAQAB
------END PUBLIC KEY-----
-"""