casambi-bt-revamped 0.3.12.dev11__py3-none-any.whl → 0.3.12.dev13__py3-none-any.whl

CasambiBt/_client.py

@@ -438,6 +438,7 @@ class CasambiClient:
                     self._network.classicManagerKey() is not None,
                     getattr(self._network, "isManager", lambda: False)(),
                 )
+                await self._classicEnumerateAndSubscribeGatt(notify_kwargs)
                 _log_probe_summary("CLASSIC", classic_variant="ca52_legacy")
                 # Emit a warning if we never see Classic RX frames; this is a common failure mode.
                 self._classicNoRxTask = asyncio.create_task(self._classic_no_rx_watchdog(30.0))
@@ -593,6 +594,7 @@ class CasambiClient:
                 self._network.classicManagerKey() is not None,
                 getattr(self._network, "isManager", lambda: False)(),
             )
+            await self._classicEnumerateAndSubscribeGatt(notify_kwargs)
             _log_probe_summary("CLASSIC", classic_variant="auth_uuid_conformant")
             self._classicNoRxTask = asyncio.create_task(self._classic_no_rx_watchdog(30.0))
             return
@@ -1223,6 +1225,58 @@ class CasambiClient:
                 len(pkt),
             )
 
+    async def _classicEnumerateAndSubscribeGatt(
+        self, notify_kwargs: dict[str, Any]
+    ) -> None:
+        """Enumerate all GATT characteristics and subscribe to any notifiable ones.
+
+        This discovers characteristics beyond the manually-probed CA51/CA52/CA53
+        UUIDs and subscribes to any that support notify or indicate, which may be
+        needed for receiving Classic state/config notifications.
+        """
+        try:
+            total_chars = 0
+            for svc in self._gattClient.services:
+                for char in svc.characteristics:
+                    total_chars += 1
+                    char_uuid = str(char.uuid).lower()
+                    props = char.properties
+                    self._logger.warning(
+                        "[CASAMBI_CLASSIC_GATT_CHAR] uuid=%s props=%s handle=%d",
+                        char_uuid,
+                        props,
+                        char.handle,
+                    )
+                    if char_uuid not in self._classicNotifyCharUuids:
+                        if "notify" in props or "indicate" in props:
+                            try:
+                                await self._gattClient.start_notify(
+                                    char.uuid,
+                                    self._queueCallback,
+                                    **notify_kwargs,
+                                )
+                                self._classicNotifyCharUuids.add(char_uuid)
+                                self._logger.warning(
+                                    "[CASAMBI_CLASSIC_GATT_SUB] subscribed uuid=%s",
+                                    char_uuid,
+                                )
+                            except Exception as e:
+                                self._logger.warning(
+                                    "[CASAMBI_CLASSIC_GATT_SUB] failed uuid=%s err=%s",
+                                    char_uuid,
+                                    type(e).__name__,
+                                )
+            self._logger.warning(
+                "[CASAMBI_CLASSIC_GATT_ENUM] total_chars=%d subscribed_uuids=%s",
+                total_chars,
+                sorted(self._classicNotifyCharUuids),
+            )
+        except Exception as e:
+            self._logger.warning(
+                "[CASAMBI_CLASSIC_GATT_ENUM] services enumeration unavailable: %s",
+                type(e).__name__,
+            )
+
     async def classicSendInit(self) -> None:
         """Send Classic post-connection initialization (time-sync).
 
@@ -1253,7 +1307,7 @@ class CasambiClient:
         # Build the time-sync payload.
         # Format: [10][year:2BE][month:1][day:1][hour:1][min:1][sec:1]
         #         [tz_offset:2BE signed][dst_transition:4BE][dst_change:1]
-        #         [timestamp1:4BE][timestamp2:4BE][zero:2][millis:3BE]
+        #         [timestamp1:3BE][timestamp2:3BE][zero:2][millis:3BE][extra:1]
         payload = bytearray()
         payload.append(10)  # Classic time-sync command byte
         payload.extend(struct.pack(">H", now.year))
@@ -1266,16 +1320,21 @@ class CasambiClient:
         # DST transition data and change minutes (0 = no DST info).
         payload.extend(struct.pack(">I", 0))
         payload.append(0)
-        # Classic extra bytes: timestamps, zero short, millis.
-        # Start with zeros - refine after tester feedback if needed.
-        payload.extend(struct.pack(">I", 0))  # timestamp1
-        payload.extend(struct.pack(">I", 0))  # timestamp2
-        payload.extend(struct.pack(">H", 0))  # zero
-        # j() in Android is a 3-byte big-endian write.
+        # Classic extra bytes: timestamps, zero short, millis, trailing byte.
+        # Android AbstractC1717h.X() lines 323-328: j() = 3-byte big-endian write
+        # (Q2.t.java:59-63), NOT 4-byte. Plus trailing writeByte(iK0 >> 24).
+        ts1 = 0  # Q2.r.K0(network.V) — start with 0
+        ts2 = 0  # Q2.r.K0(network.W) — start with 0
+        for ts in (ts1, ts2):
+            payload.append((ts >> 16) & 0xFF)
+            payload.append((ts >> 8) & 0xFF)
+            payload.append(ts & 0xFF)
+        payload.extend(struct.pack(">H", 0))  # writeShort(0)
         millis_val = now.microsecond // 1000 * 1000
         payload.append((millis_val >> 16) & 0xFF)
         payload.append((millis_val >> 8) & 0xFF)
         payload.append(millis_val & 0xFF)
+        payload.append((ts1 >> 24) & 0xFF)  # writeByte(iK0 >> 24)
 
         self._logger.warning(
             "[CASAMBI_CLASSIC_INIT] sending time-sync len=%d hex=%s",

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.dev10"
+__version__ = "0.3.12.dev13"

{casambi_bt_revamped-0.3.12.dev11.dist-info → casambi_bt_revamped-0.3.12.dev13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: casambi-bt-revamped
-Version: 0.3.12.dev11
+Version: 0.3.12.dev13
 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.dev11.dist-info → casambi_bt_revamped-0.3.12.dev13.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=-C1WfIa8IOTB5R9-nGSKJwE6yLtJC5Meo5FKUq9_XEw,92546
+CasambiBt/_client.py,sha256=a257JmcbYvdP0gSy-W1t3oqunA78dvhXMx-L_TMhr8o,95405
 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=KfDHVZ0HvUoCJCQD90I4l0PCSgOKne4pUVo8Y_Hv5Xk,338
+CasambiBt/_version.py,sha256=kFYpR3yK4UmQAWNKE7Jrv9E0CGPotgTEUKIRF5GnzU8,338
 CasambiBt/errors.py,sha256=1L_Q8og_N_BRYEKizghAQXr6tihlHykFgtcCHUDcBas,1961
 CasambiBt/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-casambi_bt_revamped-0.3.12.dev11.dist-info/licenses/LICENSE,sha256=TAIIitFxpxEDi6Iju7foW4TDQmWvC-IhLVLhl67jKmQ,11341
-casambi_bt_revamped-0.3.12.dev11.dist-info/METADATA,sha256=fTNunmvIZDbzGByz_OJPXkDf2Jstu7y2Rp5DCxZ62IY,5878
-casambi_bt_revamped-0.3.12.dev11.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-casambi_bt_revamped-0.3.12.dev11.dist-info/top_level.txt,sha256=uNbqLjtecFosoFzpGAC89-5icikWODKI8rOjbi8v_sA,10
-casambi_bt_revamped-0.3.12.dev11.dist-info/RECORD,,
+casambi_bt_revamped-0.3.12.dev13.dist-info/licenses/LICENSE,sha256=TAIIitFxpxEDi6Iju7foW4TDQmWvC-IhLVLhl67jKmQ,11341
+casambi_bt_revamped-0.3.12.dev13.dist-info/METADATA,sha256=9LeLoHYkt4Hp8qzq6MzABk_ww_369Gmky5-FZtEKhe0,5878
+casambi_bt_revamped-0.3.12.dev13.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+casambi_bt_revamped-0.3.12.dev13.dist-info/top_level.txt,sha256=uNbqLjtecFosoFzpGAC89-5icikWODKI8rOjbi8v_sA,10
+casambi_bt_revamped-0.3.12.dev13.dist-info/RECORD,,