casambi-bt-revamped 0.3.12.dev15__tar.gz → 0.4.0__tar.gz

{casambi_bt_revamped-0.3.12.dev15/src/casambi_bt_revamped.egg-info → casambi_bt_revamped-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: casambi-bt-revamped
-Version: 0.3.12.dev15
+Version: 0.4.0
 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.dev15 → casambi_bt_revamped-0.4.0}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = casambi-bt-revamped
-version = 0.3.12.dev15
+version = 0.4.0
 author = rankjie
 author_email = rankjie@gmail.com
 description = Forked Casambi Bluetooth client library with switch event support, use original if no special need. https://github.com/lkempf/casambi-bt

{casambi_bt_revamped-0.3.12.dev15 → casambi_bt_revamped-0.4.0}/src/CasambiBt/_client.py

@@ -1386,7 +1386,7 @@ class CasambiClient:
                     # Android n0():998 uses WRITE_TYPE_NO_RESPONSE for classic.
                     response=False,
                 )
-                self._logger.warning("[CASAMBI_CLASSIC_INIT] version sent successfully")
+                self._logger.debug("[CASAMBI_CLASSIC_INIT] version sent successfully")
             except Exception:
                 self._logger.warning(
                     "[CASAMBI_CLASSIC_INIT] version send failed (continuing with time-sync)",
@@ -1486,7 +1486,7 @@ class CasambiClient:
                 # Android X():314 uses WRITE_TYPE_DEFAULT (2) = with-response.
                 response=True,
             )
-            self._logger.warning("[CASAMBI_CLASSIC_INIT] time-sync sent successfully")
+            self._logger.debug("[CASAMBI_CLASSIC_INIT] time-sync sent successfully")
         except Exception:
             self._logger.warning(
                 "[CASAMBI_CLASSIC_INIT] time-sync send failed",
@@ -1601,7 +1601,7 @@ class CasambiClient:
         except Exception:
             handle_uuid = "unknown"
 
-        self._logger.warning(
+        self._logger.debug(
             "[CLASSIC_DIAG_RX] #%d handle=%s len=%d hex=%s",
             self._classicRxFrames,
             handle_uuid,
@@ -1618,12 +1618,45 @@ class CasambiClient:
 
         if self._classicConnHash8 is None:
             if self._logLimiter.allow("classic_rx_no_hash", burst=5, window_s=60.0):
-                self._logger.warning("[CASAMBI_CLASSIC_RX] missing_connection_hash len=%d", len(raw))
+                self._logger.debug("[CASAMBI_CLASSIC_RX] missing_connection_hash len=%d", len(raw))
             return
 
         visitor_key = self._network.classicVisitorKey()
         manager_key = self._network.classicManagerKey()
 
+        def _walk_classic_records(data: bytes) -> bool:
+            """Check if data is a plausible Classic unit state record stream.
+
+            Walks the same record structure as _parseClassicUnitStates:
+            - unit_id(1) + flags(1) + optional extras + state(state_len)
+            - unit_id 0xF0 is a command response (no extras, state_len bytes consumed)
+            Accepts if >=1 record parsed AND pos ends exactly at len(data).
+            """
+            pos = 0
+            count = 0
+            while pos + 3 <= len(data):  # Match Android available()>=3
+                unit_id = data[pos]
+                flags = data[pos + 1]
+                state_len = flags & 0x0F
+                # 0 and 255 are Classic control bytes, not valid unit records
+                # inside a record stream (handled at dispatch level).
+                if unit_id == 0 or unit_id == 255:
+                    return False
+                pos += 2
+                if unit_id == 0xF0:
+                    # Command response: cmd_id(1) + seq(1) + payload(state_len-2).
+                    if state_len < 2:
+                        return False
+                    pos += state_len
+                else:
+                    has_extra1 = (flags & 0x20) != 0
+                    has_extra2 = (flags & 0x40) != 0
+                    pos += int(has_extra1) + int(has_extra2) + state_len
+                if pos > len(data):
+                    return False
+                count += 1
+            return count >= 1 and pos == len(data)
+
         def _plausible_payload(payload: bytes) -> bool:
             if not payload:
                 return False
@@ -1638,6 +1671,12 @@ class CasambiClient:
                 rec_len = (payload[0] - 239) & 0xFF
                 if 2 <= rec_len <= len(payload):
                     return True
+            # Classic unit state record stream or control byte.
+            if self._protocolMode == ProtocolMode.CLASSIC:
+                if payload[0] in (0, 255):
+                    return True
+                if _walk_classic_records(payload):
+                    return True
             return False
 
         def _score(verified: bool | None, payload: bytes) -> int:
@@ -1784,7 +1823,7 @@ class CasambiClient:
         if not parsed_candidates:
             self._classicRxParseFail += 1
             if self._logLimiter.allow("classic_rx_parse_fail", burst=5, window_s=60.0):
-                self._logger.warning(
+                self._logger.debug(
                     "[CASAMBI_CLASSIC_RX_PARSE_FAIL] len=%d prefix=%s",
                     len(raw),
                     b2a(raw[: min(len(raw), 32)]),
@@ -1808,7 +1847,7 @@ class CasambiClient:
         if best["score"] == 0:
             self._classicRxParseFail += 1
             if self._logLimiter.allow("classic_rx_unplausible", burst=5, window_s=60.0):
-                self._logger.warning(
+                self._logger.debug(
                     "[CASAMBI_CLASSIC_RX_UNPLAUSIBLE] preferred=%s len=%d prefix=%s",
                     preferred,
                     len(raw),
@@ -1842,7 +1881,7 @@ class CasambiClient:
             self._classicRxHistory = self._classicRxHistory[-self._classicDiagMaxHistory:]
 
         # Enhanced RX parse result log
-        self._logger.warning(
+        self._logger.debug(
             "[CLASSIC_DIAG_RX_PARSE] mode=%s verified=%s auth=%s sig_len=%d seq=%s score=%d payload_len=%d",
             best["mode"],
             verified,
@@ -1858,7 +1897,7 @@ class CasambiClient:
         if best["mode"] != preferred and best["mode"] in ("conformant", "legacy"):
             # Only switch if we got a stronger signal (verified or plausible payload with fewer assumptions).
             if best["score"] >= 50 and self._logLimiter.allow("classic_rx_mode_switch", burst=3, window_s=3600.0):
-                self._logger.warning(
+                self._logger.debug(
                     "[CASAMBI_CLASSIC_RX_MODE] switching %s -> %s (score=%d verified=%s sig_len=%d)",
                     preferred,
                     best["mode"],
@@ -1870,7 +1909,7 @@ class CasambiClient:
 
         # Sample RX logs (limited) + periodic stats (limited).
         if self._logLimiter.allow("classic_rx_sample", burst=10, window_s=60.0):
-            self._logger.warning(
+            self._logger.debug(
                 "[CASAMBI_CLASSIC_RX] header=%s verified=%s auth=%s sig_len=%d seq=%s payload_prefix=%s",
                 best["mode"],
                 verified,
@@ -1884,7 +1923,7 @@ class CasambiClient:
             "classic_rx_stats", burst=2, window_s=60.0
         ):
             self._classicRxLastStatsTs = now
-            self._logger.warning(
+            self._logger.debug(
                 "[CASAMBI_CLASSIC_RX_STATS] frames=%d verified=%d unverifiable=%d parse_fail=%d header=%s "
                 "type6=%d type7=%d type9=%d cmdstream=%d unknown=%d classic_states=%d",
                 self._classicRxFrames,
@@ -2000,7 +2039,7 @@ class CasambiClient:
 
         if self._classicRxKindSamples.get(kind, 0) < 3:
             self._classicRxKindSamples[kind] = self._classicRxKindSamples.get(kind, 0) + 1
-            self._logger.warning(
+            self._logger.debug(
                 "[CASAMBI_CLASSIC_RX_KIND] kind=%s header=%s verified=%s sig_len=%d seq=%s payload_prefix=%s",
                 kind,
                 best["mode"],
@@ -2033,7 +2072,7 @@ class CasambiClient:
 
         # Log full payload for the first 10 Classic payloads regardless of type.
         if self._classicRxClassicStates < 10:
-            self._logger.warning(
+            self._logger.debug(
                 "[CASAMBI_CLASSIC_DISPATCH] #%d type_byte=%d len=%d hex=%s",
                 self._classicRxClassicStates,
                 first_byte,
@@ -2121,7 +2160,7 @@ class CasambiClient:
 
                 # Log the first few parsed records at WARNING level for tester visibility.
                 if records_parsed <= 10 or self._logger.isEnabledFor(logging.DEBUG):
-                    self._logger.warning(
+                    self._logger.debug(
                         "[CASAMBI_CLASSIC_STATE_PARSED] unit=%d flags=0x%02x state_len=%d "
                         "online=%s extra1=%d extra2=%d state=%s",
                         unit_id,

{casambi_bt_revamped-0.3.12.dev15 → casambi_bt_revamped-0.4.0}/src/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.dev15"
+__version__ = "0.4.0"

{casambi_bt_revamped-0.3.12.dev15 → casambi_bt_revamped-0.4.0/src/casambi_bt_revamped.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: casambi-bt-revamped
-Version: 0.3.12.dev15
+Version: 0.4.0
 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