python-aidot-cameras 0.7.10__tar.gz → 0.7.11__tar.gz

{python_aidot_cameras-0.7.10/src/python_aidot_cameras.egg-info → python_aidot_cameras-0.7.11}/PKG-INFO

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

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

@@ -26,6 +26,40 @@ from ..const import (
     CONF_SERVICE_MODULES,
 )
 
+# Wire/protocol constants live in constants.py; re-imported here so all
+# in-module references (and any external importers) keep resolving.
+from .constants import (
+    _LEEDARSON_APP_ID,
+    _SMARTHOME_URL_TEMPLATE,
+    _HDR_FMT,
+    _HDR_PREFIX_FMT,
+    _HDR_PREFIX_SIZE,
+    _HDR_SUFFIX_FMT,
+    _HDR_SUFFIX_SIZE,
+    _HDR_VERSION,
+    _HDR_CONTEXT,
+    _HDR_ENC_TYPE,
+    _HDR_RESULT,
+    _HDR_RESERVE,
+    _CMD_LOGIN_REQ,
+    _CMD_LOGIN_RES,
+    _CMD_HB_REQ,
+    _CMD_HB_RES,
+    _CMD_STREAM_REQ,
+    _CMD_STREAM_RES,
+    _CMD_SUBCMD,
+    _CMD_PARAM,
+    _SF_HDR_SIZE,
+    _FRAME_TYPE_P_FRAME,
+    _FRAME_TYPE_B_FRAME,
+    _FRAME_TYPE_I_FRAME,
+    _FRAME_TYPE_AUDIO,
+    _PTZ_DIR_CODES,
+    SETSTREAMCTRL_CMD,
+    GETSTREAMCTRL_CMD,  # noqa: F401 - re-exported for back-compat (public pair; unused in-module)
+    _STREAM_QUALITY,
+)
+
 _LOGGER = logging.getLogger(__name__)
 
 # Strong refs to fire-and-forget tasks: asyncio only keeps weak refs, so a
@@ -202,86 +236,6 @@ class CameraDeviceInformation(DeviceInformation):
 # Camera / Leedarson smarthome API constants
 # --------------------------------------------------------------------------- #
 
-# AppKey from LDSAppOpenSDK CocoaPods docs (kLDSAppOpenSDKKey = "appa070")
-_LEEDARSON_APP_KEY = "appa070"
-
-# APP_ID sent in smarthome HTTP headers - value from MainActivity.java SharedPrefs
-# (SharePreferenceUtils.setPrefString(this, "APP_ID", "1392315867093508098")).
-_LEEDARSON_APP_ID = "1392315867093508098"
-
-# Camera-specific backend; region prefix mirrors AidotClient._base_url pattern.
-# e.g. "us" -> "https://us-smarthome.arnoo.com:443"
-_SMARTHOME_URL_TEMPLATE = "https://{region}-smarthome.arnoo.com:443"
-
-# --------------------------------------------------------------------------- #
-# Playback TCP binary framing constants
-#
-# Wire layout (all big-endian) from RecordVideoEncoder.java, verified against
-# INettyClientInitializer.java Netty params:
-#   lengthFieldOffset=14, lengthFieldLength=4, lengthAdjustment=19
-#
-# version(H2) seq(i4) cmd(H2) subcmd(H2) cmdParam(i4)  <- 14 bytes
-# payloadLen(i4)                                         <- offset 14
-# timestamp(q8) context(i4) encodeType(b1) result(h2) reserve(i4)  <- 19 bytes
-# <payload bytes>
-# Total header = 37 bytes
-# --------------------------------------------------------------------------- #
-
-_HDR_FMT         = ">HiHHiiqibhi"
-_HDR_SIZE        = struct.calcsize(_HDR_FMT)           # 37
-_HDR_PREFIX_FMT  = ">HiHHii"
-_HDR_PREFIX_SIZE = struct.calcsize(_HDR_PREFIX_FMT)    # 18
-_HDR_SUFFIX_FMT  = ">qibhi"
-_HDR_SUFFIX_SIZE = struct.calcsize(_HDR_SUFFIX_FMT)    # 19
-
-assert _HDR_SIZE        == 37
-assert _HDR_PREFIX_SIZE == 18
-assert _HDR_SUFFIX_SIZE == 19
-
-# Fixed values for all outbound request frames
-_HDR_VERSION  = 256   # 0x0100
-_HDR_CONTEXT  = 1005
-_HDR_ENC_TYPE = 1
-_HDR_RESULT   = 4
-_HDR_RESERVE  = 2
-
-# TCP command codes from AppCmd.java
-_CMD_LOGIN_REQ  = 0x0101
-_CMD_LOGIN_RES  = 0x0102
-_CMD_HB_REQ     = 0x0105
-_CMD_HB_RES     = 0x0106
-_CMD_STREAM_REQ = 0x0107
-_CMD_STREAM_RES = 0x0108
-_CMD_SUBCMD     = 0x0001
-_CMD_PARAM      = 0x00000002
-
-# Video sub-frame header size from LDSPlayer.decodeStream():
-# padding(2) frameType(1) audioCodec(1) timestamp(8) encType(1) payloadLen(4)
-_SF_HDR_SIZE = 17
-
-# Frame type values
-_FRAME_TYPE_P_FRAME = 2
-_FRAME_TYPE_B_FRAME = 3
-_FRAME_TYPE_I_FRAME = 4   # keyframe
-_FRAME_TYPE_AUDIO   = 5
-
-_AUDIO_CODEC_G711A = 1
-
-_PTZ_DIR_CODES: dict = {
-    "stop": 0, "up": 1, "down": 2, "left": 3,
-    "left_up": 4, "left_down": 5, "right": 6,
-    "right_up": 7, "right_down": 8, "auto": 9,
-    "set_point": 10, "clear_point": 11, "goto": 12,
-    "zoom_in": 23, "zoom_out": 24,
-}
-
-# Live-stream resolution (AVIOCTRL_QUALITY_*).  The official app's HD/SD toggle
-# switches between MAX(1) and MIDDLE(5) (f0.java g3() / LiveFragment d6); we
-# mirror those two.  Sent as SETSTREAMCTRL (cmd 800) over the active session,
-# payload <IB3x> = channel(0) + quality byte (SMsgAVIoctrlSetStreamCtrlReq).
-SETSTREAMCTRL_CMD = 800
-GETSTREAMCTRL_CMD = 802
-_STREAM_QUALITY: dict = {"hd": 1, "sd": 5}  # AVIOCTRL_QUALITY_MAX / _MIDDLE
 
 @dataclass
 class VideoFrame:
@@ -7794,7 +7748,7 @@ class CameraMixin:
                     certificate_digest as _rr_cert_fp,
                 )
 
-                def _rr_accept_cam_cert(self, remote_params):
+                def _accept_camera_cert(self, remote_params):
                     """Accept camera's actual DTLS cert (echo-reversal fingerprint fix)."""
                     try:
                         _cam_cert = self._ssl.get_peer_certificate(
@@ -7811,7 +7765,7 @@ class CameraMixin:
                 for _rr_tc in pc.getTransceivers():
                     _rr_tc.receiver.transport._validate_peer_identity = (
                         _types.MethodType(
-                            _rr_accept_cam_cert, _rr_tc.receiver.transport
+                            _accept_camera_cert, _rr_tc.receiver.transport
                         )
                     )
                 _status(
@@ -9108,7 +9062,7 @@ class CameraMixin:
                 _p = (-len(_v)) % 4
                 return _st_ta.pack('!HH', _t, len(_v)) + _v + b'\x00' * _p
 
-            def _mi_ta(_k, _m):
+            def _stun_message_integrity(_k, _m):
                 # Patch Length to include the MI attribute (4 hdr + 20 digest = 24)
                 _patched = _m[:2] + _st_ta.pack('!H', len(_m) - 20 + 24) + _m[4:]
                 return _hm.new(_k, _patched, _ha.sha1).digest()
@@ -9166,7 +9120,7 @@ class CameraMixin:
                 + _a(0x0019, b'\x11\x00\x00\x00')     # REQUESTED-TRANSPORT = UDP, RFC 5766 §14.7 protocol in MSB
             )
             _h2 = b'\x00\x03' + _st_ta.pack('!H', len(_b2) + 24) + _MAGIC_TA + _tid2
-            _b2 += _a(0x0008, _mi_ta(_key_ta, _h2 + _b2))  # MESSAGE-INTEGRITY
+            _b2 += _a(0x0008, _stun_message_integrity(_key_ta, _h2 + _b2))  # MESSAGE-INTEGRITY
             _r2 = b'\x00\x03' + _st_ta.pack('!H', len(_b2)) + _MAGIC_TA + _tid2 + _b2
             try:
                 _ta_sock.sendto(_r2, (_ta_host, _ta_port))
@@ -10207,12 +10161,12 @@ class CameraMixin:
                                            + _struct.pack('!H', _si_xport)
                                            + _si_xip)
 
-                                def _si_a(_t, _v):
+                                def _build_stun_attr(_t, _v):
                                     _p = (-len(_v)) % 4
                                     return (_struct.pack('!HH', _t, len(_v))
                                             + _v + b'\x00' * _p)
 
-                                _si_body = _si_a(0x0012, _si_xpa) + _si_a(0x0013, _resp)
+                                _si_body = _build_stun_attr(0x0012, _si_xpa) + _build_stun_attr(0x0013, _resp)
                                 _send_ind = (b'\x00\x16'
                                              + _struct.pack('!H', len(_si_body))
                                              + _STUN_MAGIC + os.urandom(12)
@@ -11202,14 +11156,14 @@ class CameraMixin:
                                                + _st_br.pack('!H', _br_xport2)
                                                + _br_xip2)
 
-                                    def _br_a(_t, _v):
+                                    def _build_stun_attr(_t, _v):
                                         _p = (-len(_v)) % 4
                                         return (_st_br.pack('!HH', _t, len(_v))
                                                 + _v + b'\x00' * _p)
 
                                     _br_si_body = (
-                                        _br_a(0x0012, _br_xpa)
-                                        + _br_a(0x0013, _bresp)
+                                        _build_stun_attr(0x0012, _br_xpa)
+                                        + _build_stun_attr(0x0013, _bresp)
                                     )
                                     _br_send_ind = (
                                         b'\x00\x16'
@@ -11246,7 +11200,7 @@ class CameraMixin:
                                                 (_br_ci, _br_cp),
                                             )
                                         except Exception:
-                                            _LOGGER.debug("camera %s: swallowed exception", '_br_a', exc_info=True)
+                                            _LOGGER.debug("camera %s: swallowed exception", '_bridge_fn', exc_info=True)
                                     _status(
                                         f"bridge: late USE-CANDIDATE sent to"
                                         f" {len(_bridge_uc_info['cands'])} camera candidate(s)"

python_aidot_cameras-0.7.11/src/aidot/camera/constants.py

@@ -0,0 +1,88 @@
+"""Wire/protocol constants for the AiDot camera client.
+
+Extracted verbatim from client.py (behavior-preserving). client.py
+re-imports these names, so the public/runtime surface is unchanged.
+"""
+
+import struct
+
+# AppKey from LDSAppOpenSDK CocoaPods docs (kLDSAppOpenSDKKey = "appa070")
+_LEEDARSON_APP_KEY = "appa070"
+
+# APP_ID sent in smarthome HTTP headers - value from MainActivity.java SharedPrefs
+# (SharePreferenceUtils.setPrefString(this, "APP_ID", "1392315867093508098")).
+_LEEDARSON_APP_ID = "1392315867093508098"
+
+# Camera-specific backend; region prefix mirrors AidotClient._base_url pattern.
+# e.g. "us" -> "https://us-smarthome.arnoo.com:443"
+_SMARTHOME_URL_TEMPLATE = "https://{region}-smarthome.arnoo.com:443"
+
+# --------------------------------------------------------------------------- #
+# Playback TCP binary framing constants
+#
+# Wire layout (all big-endian) from RecordVideoEncoder.java, verified against
+# INettyClientInitializer.java Netty params:
+#   lengthFieldOffset=14, lengthFieldLength=4, lengthAdjustment=19
+#
+# version(H2) seq(i4) cmd(H2) subcmd(H2) cmdParam(i4)  <- 14 bytes
+# payloadLen(i4)                                         <- offset 14
+# timestamp(q8) context(i4) encodeType(b1) result(h2) reserve(i4)  <- 19 bytes
+# <payload bytes>
+# Total header = 37 bytes
+# --------------------------------------------------------------------------- #
+
+_HDR_FMT         = ">HiHHiiqibhi"
+_HDR_SIZE        = struct.calcsize(_HDR_FMT)           # 37
+_HDR_PREFIX_FMT  = ">HiHHii"
+_HDR_PREFIX_SIZE = struct.calcsize(_HDR_PREFIX_FMT)    # 18
+_HDR_SUFFIX_FMT  = ">qibhi"
+_HDR_SUFFIX_SIZE = struct.calcsize(_HDR_SUFFIX_FMT)    # 19
+
+assert _HDR_SIZE        == 37
+assert _HDR_PREFIX_SIZE == 18
+assert _HDR_SUFFIX_SIZE == 19
+
+# Fixed values for all outbound request frames
+_HDR_VERSION  = 256   # 0x0100
+_HDR_CONTEXT  = 1005
+_HDR_ENC_TYPE = 1
+_HDR_RESULT   = 4
+_HDR_RESERVE  = 2
+
+# TCP command codes from AppCmd.java
+_CMD_LOGIN_REQ  = 0x0101
+_CMD_LOGIN_RES  = 0x0102
+_CMD_HB_REQ     = 0x0105
+_CMD_HB_RES     = 0x0106
+_CMD_STREAM_REQ = 0x0107
+_CMD_STREAM_RES = 0x0108
+_CMD_SUBCMD     = 0x0001
+_CMD_PARAM      = 0x00000002
+
+# Video sub-frame header size from LDSPlayer.decodeStream():
+# padding(2) frameType(1) audioCodec(1) timestamp(8) encType(1) payloadLen(4)
+_SF_HDR_SIZE = 17
+
+# Frame type values
+_FRAME_TYPE_P_FRAME = 2
+_FRAME_TYPE_B_FRAME = 3
+_FRAME_TYPE_I_FRAME = 4   # keyframe
+_FRAME_TYPE_AUDIO   = 5
+
+_AUDIO_CODEC_G711A = 1
+
+_PTZ_DIR_CODES: dict = {
+    "stop": 0, "up": 1, "down": 2, "left": 3,
+    "left_up": 4, "left_down": 5, "right": 6,
+    "right_up": 7, "right_down": 8, "auto": 9,
+    "set_point": 10, "clear_point": 11, "goto": 12,
+    "zoom_in": 23, "zoom_out": 24,
+}
+
+# Live-stream resolution (AVIOCTRL_QUALITY_*).  The official app's HD/SD toggle
+# switches between MAX(1) and MIDDLE(5) (f0.java g3() / LiveFragment d6); we
+# mirror those two.  Sent as SETSTREAMCTRL (cmd 800) over the active session,
+# payload <IB3x> = channel(0) + quality byte (SMsgAVIoctrlSetStreamCtrlReq).
+SETSTREAMCTRL_CMD = 800
+GETSTREAMCTRL_CMD = 802
+_STREAM_QUALITY: dict = {"hd": 1, "sd": 5}  # AVIOCTRL_QUALITY_MAX / _MIDDLE

{python_aidot_cameras-0.7.10 → python_aidot_cameras-0.7.11/src/python_aidot_cameras.egg-info}/PKG-INFO

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

@@ -15,6 +15,7 @@ src/aidot/login_const.py
 src/aidot/py.typed
 src/aidot/camera/__init__.py
 src/aidot/camera/client.py
+src/aidot/camera/constants.py
 src/aidot/camera/lan_control.py
 src/aidot/models/__init__.py
 src/aidot/models/device_client_model.py