python-aidot-cameras 0.5.17__tar.gz → 0.6.1__tar.gz

{python_aidot_cameras-0.5.17/src/python_aidot_cameras.egg-info → python_aidot_cameras-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-aidot-cameras
-Version: 0.5.17
+Version: 0.6.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
@@ -15,6 +15,7 @@ Requires-Dist: aiohttp
 Requires-Dist: paho-mqtt>=2.0
 Requires-Dist: cryptography
 Requires-Dist: pycryptodome
+Requires-Dist: dacite
 Provides-Extra: webrtc
 Requires-Dist: aiortc>=1.9.0; extra == "webrtc"
 Requires-Dist: av; extra == "webrtc"

{python_aidot_cameras-0.5.17 → python_aidot_cameras-0.6.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-aidot-cameras"
-version = "0.5.17"
+version = "0.6.1"
 description = "Control AiDot/Leedarson WiFi lights and cameras (WebRTC streaming, two-way audio, PTZ, controls)"
 readme = "README.md"
 license = "MIT"
@@ -20,6 +20,7 @@ dependencies = [
     "paho-mqtt>=2.0",
     "cryptography",
     "pycryptodome",
+    "dacite",
 ]
 
 [project.optional-dependencies]

{python_aidot_cameras-0.5.17 → python_aidot_cameras-0.6.1}/src/aidot/aes_utils.py

@@ -1,25 +1,49 @@
 from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives import padding
+import json
+from typing import Any, Optional
 
 
-def aes_encrypt(plaintext: bytes, key: bytes) -> bytes:
-    """AES-ECB encrypt with raw key bytes (used for LAN discovery / TCP:10000)."""
+def aes_encrypt(plaintext, key):
     padder = padding.PKCS7(algorithms.AES.block_size).padder()
     padded_data = padder.update(plaintext) + padder.finalize()
+
     cipher = Cipher(algorithms.AES(key), modes.ECB(), backend=default_backend())
     encryptor = cipher.encryptor()
-    return encryptor.update(padded_data) + encryptor.finalize()
 
+    ciphertext = encryptor.update(padded_data) + encryptor.finalize()
+
+    return ciphertext
 
-def aes_decrypt(ciphertext: bytes, key: bytes) -> str:
-    """AES-ECB decrypt with raw key bytes; returns UTF-8 string."""
+
+def aes_decrypt(ciphertext, key):
     cipher = Cipher(algorithms.AES(key), modes.ECB(), backend=default_backend())
     decryptor = cipher.decryptor()
+
     decrypted_data = decryptor.update(ciphertext) + decryptor.finalize()
+
     unpadder = padding.PKCS7(algorithms.AES.block_size).unpadder()
     plaintext = unpadder.update(decrypted_data) + unpadder.finalize()
-    return plaintext.decode("utf-8")
+
+    return plaintext.decode()
+
+
+def aes_decrypt_to_json(ciphertext: bytes, key: Optional[bytes] = None) -> dict[str, Any]:
+    """Decrypt AES encrypted data and parse to JSON.
+    
+    Args:
+        ciphertext: AES encrypted data
+        key: AES key (optional, if None, assumes data is already decrypted)
+    
+    Returns:
+        Parsed JSON dict
+    """
+    if key:
+        decrypted_data = aes_decrypt(ciphertext, key)
+    else:
+        decrypted_data = ciphertext.decode() if isinstance(ciphertext, bytes) else ciphertext
+    return json.loads(decrypted_data)
 
 
 def _str_key_32(key_str: str) -> bytes:

python_aidot_cameras-0.6.1/src/aidot/camera/__init__.py

@@ -0,0 +1,5 @@
+"""Camera extensions for the aidot library."""
+
+from .client import CameraMixin, WebRTCSession, SdesSession
+
+__all__ = ["CameraMixin", "WebRTCSession", "SdesSession"]