casambi-bt-revamped 0.3.12.dev12__py3-none-any.whl → 0.3.12.dev14__py3-none-any.whl

CasambiBt/_client.py

@@ -366,6 +366,24 @@ class CasambiClient:
                     f"Classic connection hash read failed/too short (len={0 if raw_hash is None else len(raw_hash)})."
                 )
             self._classicConnHash8 = bytes(raw_hash[:8])
+
+            # Parse Android's extended connection hash fields for diagnostics.
+            # Offset 8: unitId, 9: flags_lo, 10: MTU, 11: protocolVersion, 12: flags_hi
+            if len(raw_hash) >= 13:
+                ext_unit_id = raw_hash[8]
+                ext_flags_lo = raw_hash[9]
+                ext_mtu = raw_hash[10]
+                ext_proto_ver = raw_hash[11]
+                ext_flags_hi = raw_hash[12]
+                self._logger.warning(
+                    "[CASAMBI_CLASSIC_CONN_HASH_EXT] variant=legacy unitId=%d flags=0x%04x mtu=%d protocolVersion=%d raw=%s",
+                    ext_unit_id,
+                    (ext_flags_hi << 8) | ext_flags_lo,
+                    ext_mtu,
+                    ext_proto_ver,
+                    b2a(bytes(raw_hash[:min(len(raw_hash), 20)])),
+                )
+
             # Android seeds the command divider with a random byte on startup (u1.C1751c).
             self._classicCmdDiv = int.from_bytes(os.urandom(1), "big") or 1
             self._classicTxSeq = 0
@@ -516,6 +534,24 @@ class CasambiClient:
             self._classicHeaderMode = "conformant"
             self._classicHashSource = "ca52_0001"
             self._classicConnHash8 = bytes(first[:8])
+
+            # Parse Android's extended connection hash fields for diagnostics.
+            # Offset 8: unitId, 9: flags_lo, 10: MTU, 11: protocolVersion, 12: flags_hi
+            if len(first) >= 13:
+                ext_unit_id = first[8]
+                ext_flags_lo = first[9]
+                ext_mtu = first[10]
+                ext_proto_ver = first[11]
+                ext_flags_hi = first[12]
+                self._logger.warning(
+                    "[CASAMBI_CLASSIC_CONN_HASH_EXT] variant=conformant unitId=%d flags=0x%04x mtu=%d protocolVersion=%d raw=%s",
+                    ext_unit_id,
+                    (ext_flags_hi << 8) | ext_flags_lo,
+                    ext_mtu,
+                    ext_proto_ver,
+                    b2a(bytes(first[:min(len(first), 20)])),
+                )
+
             self._classicCmdDiv = int.from_bytes(os.urandom(1), "big") or 1
             self._classicTxSeq = 0
 
@@ -1045,11 +1081,11 @@ class CasambiClient:
         else:
             return bytes([counter, unit_id & 0xFF, 1, dimmer & 0xFF])
 
-    async def _sendClassic(self, command_bytes: bytes) -> None:
+    async def _sendClassic(self, command_bytes: bytes, *, target_uuid: str | None = None) -> None:
         self._checkState(ConnectionState.AUTHENTICATED)
         if self._protocolMode != ProtocolMode.CLASSIC:
             raise ProtocolError("Classic send called while not in Classic protocol mode.")
-        tx_uuid = self._classicTxCharUuid or self._dataCharUuid
+        tx_uuid = target_uuid or self._classicTxCharUuid or self._dataCharUuid
         if not tx_uuid:
             raise ProtocolError("Classic TX characteristic UUID not set.")
         if self._classicConnHash8 is None:
@@ -1304,12 +1340,22 @@ class CasambiClient:
             if offset is not None:
                 utc_offset_minutes = int(offset.total_seconds()) // 60
 
+        # Determine time-sync target and command byte per Android AbstractC1717h.X():
+        # - Non-conformant: write to CA51, command byte 10
+        # - Conformant: write to 0002 (mapped CA51), command byte 7
+        if self._classicHeaderMode == "conformant":
+            timesync_uuid = CASA_CLASSIC_CONFORMANT_CA51_CHAR_UUID  # 0002
+            timesync_cmd = 7
+        else:
+            timesync_uuid = CASA_CLASSIC_HASH_CHAR_UUID  # CA51
+            timesync_cmd = 10
+
         # Build the time-sync payload.
-        # Format: [10][year:2BE][month:1][day:1][hour:1][min:1][sec:1]
+        # Format: [cmd][year:2BE][month:1][day:1][hour:1][min:1][sec:1]
         #         [tz_offset:2BE signed][dst_transition:4BE][dst_change:1]
         #         [timestamp1:3BE][timestamp2:3BE][zero:2][millis:3BE][extra:1]
         payload = bytearray()
-        payload.append(10)  # Classic time-sync command byte
+        payload.append(timesync_cmd)
         payload.extend(struct.pack(">H", now.year))
         payload.append(now.month)
         payload.append(now.day)
@@ -1337,13 +1383,16 @@ class CasambiClient:
         payload.append((ts1 >> 24) & 0xFF)  # writeByte(iK0 >> 24)
 
         self._logger.warning(
-            "[CASAMBI_CLASSIC_INIT] sending time-sync len=%d hex=%s",
+            "[CASAMBI_CLASSIC_INIT] sending time-sync len=%d cmd=%d target_uuid=%s header_mode=%s hex=%s",
             len(payload),
+            timesync_cmd,
+            timesync_uuid,
+            self._classicHeaderMode,
             b2a(bytes(payload)),
         )
 
         try:
-            await self._sendClassic(bytes(payload))
+            await self._sendClassic(bytes(payload), target_uuid=timesync_uuid)
             self._logger.warning("[CASAMBI_CLASSIC_INIT] time-sync sent successfully")
         except Exception:
             self._logger.warning(

CasambiBt/_network.py

@@ -1,7 +1,7 @@
 import json
 import logging
-import platform
 import pickle
+import random
 from dataclasses import dataclass
 from datetime import datetime, timedelta
 from typing import Any, Final, cast
@@ -13,7 +13,6 @@ from ._cache import Cache
 from ._constants import DEVICE_NAME
 from ._keystore import KeyStore
 from ._unit import Group, Scene, Unit, UnitControl, UnitControlType, UnitType
-from ._version import __version__
 from .errors import (
     AuthenticationError,
     NetworkNotFoundError,
@@ -66,29 +65,49 @@ class Network:
 
         self._cache = cache
 
-        # Android always includes a "token" (and typically "clientInfo") in cloud requests.
-        # We keep these stable for the process lifetime to make tester logs comparable.
-        self._token: str = self._make_token()
-        self._clientInfo: dict[str, Any] = self._make_client_info()
-
-    @staticmethod
-    def _make_token() -> str:
-        # Ground truth: casambi-android `w1.o.p(...)` sends `token` for session requests.
-        #
-        # Keep this structured (Android uses "brand/model/device/cpu/unknown") but avoid hostnames/PII.
-        sys = platform.system().lower() or "unknown"
-        machine = platform.machine().lower() or "unknown"
-        return f"python/{sys}/{machine}/unknown/unknown"
-
-    @staticmethod
-    def _make_client_info() -> dict[str, Any]:
-        # Ground truth: casambi-android `w1.o.g(...)` includes `clientInfo`.
-        return {
-            "name": "casambi-bt-revamped",
-            "version": __version__,
-            "python": platform.python_version(),
-            "platform": platform.platform(),
-        }
+        # Android sends "fb:<FCM_token>" — we have no push token, use empty string
+        # to match the field type without leaking platform info.
+        self._token: str = ""
+        # Android: "{flavor}/{version} {manufacturer}_{model}/{os_release}"
+        _app_version = random.choice((
+            "3.19.0", "3.18.2", "3.18.1", "3.18.0",
+            "3.17.4", "3.17.3", "3.17.2", "3.17.1", "3.17.0",
+            "3.16.5", "3.16.4", "3.16.3", "3.16.1", "3.16.0",
+            "3.15.3", "3.15.2", "3.15.1", "3.15.0",
+            "3.14.2", "3.14.1", "3.14.0",
+            "3.13.2", "3.13.1", "3.13.0",
+            "3.12.4", "3.12.3", "3.12.1", "3.12.0",
+            "3.11.2", "3.11.1",
+        ))
+        _device = random.choice((
+            # Samsung Galaxy S series
+            "samsung_SM-S928B/15",   # S24 Ultra
+            "samsung_SM-S926B/15",   # S24+
+            "samsung_SM-S921B/15",   # S24
+            "samsung_SM-S918B/14",   # S23 Ultra
+            "samsung_SM-S916B/14",   # S23+
+            "samsung_SM-S911B/14",   # S23
+            "samsung_SM-S908B/14",   # S22 Ultra
+            "samsung_SM-S906B/14",   # S22+
+            "samsung_SM-S901B/14",   # S22
+            "samsung_SM-G998B/13",   # S21 Ultra
+            "samsung_SM-G996B/13",   # S21+
+            "samsung_SM-G991B/13",   # S21
+            # Samsung Galaxy A series
+            "samsung_SM-A556B/14",   # A55
+            "samsung_SM-A546B/14",   # A54
+            "samsung_SM-A346B/14",   # A34
+            "samsung_SM-A536B/13",   # A53
+            # Google Pixel
+            "Google_Pixel 8 Pro/14",
+            "Google_Pixel 8/14",
+            "Google_Pixel 7 Pro/14",
+            "Google_Pixel 7/14",
+            # OnePlus
+            "OnePlus_IN2023/14",     # 12
+            "OnePlus_CPH2449/14",    # 11
+        ))
+        self._clientInfo: str = f"Casambi/{_app_version} {_device}"
 
     async def load(self) -> None:
         self._keystore = KeyStore(self._cache)

CasambiBt/_version.py

@@ -7,4 +7,4 @@ Avoid using importlib.metadata in hot paths by providing a static version string
 __all__ = ["__version__"]
 
 # NOTE: Must match `casambi-bt/setup.cfg` [metadata] version.
-__version__ = "0.3.12.dev12"
+__version__ = "0.3.12.dev14"

{casambi_bt_revamped-0.3.12.dev12.dist-info → casambi_bt_revamped-0.3.12.dev14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: casambi-bt-revamped
-Version: 0.3.12.dev12
+Version: 0.3.12.dev14
 Summary: Forked Casambi Bluetooth client library with switch event support, use original if no special need. https://github.com/lkempf/casambi-bt
 Home-page: https://github.com/rankjie/casambi-bt
 Author: rankjie

{casambi_bt_revamped-0.3.12.dev12.dist-info → casambi_bt_revamped-0.3.12.dev14.dist-info}/RECORD

@@ -2,21 +2,21 @@ CasambiBt/__init__.py,sha256=iJdTF4oeXfj5d5gfGxQkacqUjtnQo0IW-zFPJvFjWWk,336
 CasambiBt/_cache.py,sha256=3bQil8vhSy4f4sf9JusMfEdQC7d3cJuva9qHhyKro-0,3808
 CasambiBt/_casambi.py,sha256=dAZZ0S2-t2ShLbW78AE9lOLBzOmhBOTTXJky-6khdkE,41981
 CasambiBt/_classic_crypto.py,sha256=XIp3JBaeY8hIUv5kB0ygVG_eRx9AgHHF4ts2--CFm78,4973
-CasambiBt/_client.py,sha256=a257JmcbYvdP0gSy-W1t3oqunA78dvhXMx-L_TMhr8o,95405
+CasambiBt/_client.py,sha256=lLbLp1rVZjQOgVzbKqQVb9vEkMwwyAH4XwD-0RPLrHU,97684
 CasambiBt/_constants.py,sha256=86heoDdb5iPaRrPmK2DIIl-4uSxbFFcnCo9zlCvTLww,1290
 CasambiBt/_discover.py,sha256=jLc6H69JddrCURgtANZEjws6_UbSzXJtvJkbKTaIUHY,1849
 CasambiBt/_encryption.py,sha256=CLcoOOrggQqhJbnr_emBnEnkizpWDvb_0yFnitq4_FM,3831
 CasambiBt/_invocation.py,sha256=fkG4R0Gv5_amFfD_P6DKuIEe3oKWZW0v8RSU8zDjPdI,2985
 CasambiBt/_keystore.py,sha256=Jdiq0zMPDmhfpheSojKY6sTUpmVrvX_qOyO7yCYd3kw,2788
-CasambiBt/_network.py,sha256=ai1o3EybsAhjyPohSOxeE0cWoFvEqdcc3PE3uFDaTfE,21346
+CasambiBt/_network.py,sha256=3ZUedQlHzzuHHiG5KxDLnK0AIz0TjzG1_vwg0UGsO9U,22132
 CasambiBt/_operation.py,sha256=Q5UccsrtNp_B_wWqwH_3eLFW_yF6A55FMmfUKDk2WrI,1059
 CasambiBt/_switch_events.py,sha256=S8OD0dBcw5T4J2C7qfmOQMnTJ7omIXRUYv4PqDOB87E,13137
 CasambiBt/_unit.py,sha256=nxbg_8UCCVB9WI8dUS21g2JrGyPKcefqKMSusMOhLOo,18721
-CasambiBt/_version.py,sha256=BO8IqQymoBlsw14NOEBxAwMuuwVph3QNtmoRlFXHAXI,338
+CasambiBt/_version.py,sha256=aa33jTV294g_KxSqvh0EMBOt5gdfPne-teLPH7wAnIk,338
 CasambiBt/errors.py,sha256=1L_Q8og_N_BRYEKizghAQXr6tihlHykFgtcCHUDcBas,1961
 CasambiBt/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-casambi_bt_revamped-0.3.12.dev12.dist-info/licenses/LICENSE,sha256=TAIIitFxpxEDi6Iju7foW4TDQmWvC-IhLVLhl67jKmQ,11341
-casambi_bt_revamped-0.3.12.dev12.dist-info/METADATA,sha256=xjFFDZYZ1zgTbiYSSelRo2BaT2pzSkmTlIBcpOG_qxY,5878
-casambi_bt_revamped-0.3.12.dev12.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-casambi_bt_revamped-0.3.12.dev12.dist-info/top_level.txt,sha256=uNbqLjtecFosoFzpGAC89-5icikWODKI8rOjbi8v_sA,10
-casambi_bt_revamped-0.3.12.dev12.dist-info/RECORD,,
+casambi_bt_revamped-0.3.12.dev14.dist-info/licenses/LICENSE,sha256=TAIIitFxpxEDi6Iju7foW4TDQmWvC-IhLVLhl67jKmQ,11341
+casambi_bt_revamped-0.3.12.dev14.dist-info/METADATA,sha256=3FFHkPqIBRm6slGUWcvXxT522fyErxH0dP8ywQrjM4E,5878
+casambi_bt_revamped-0.3.12.dev14.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+casambi_bt_revamped-0.3.12.dev14.dist-info/top_level.txt,sha256=uNbqLjtecFosoFzpGAC89-5icikWODKI8rOjbi8v_sA,10
+casambi_bt_revamped-0.3.12.dev14.dist-info/RECORD,,