casambi-bt-revamped 0.3.6.dev2__py3-none-any.whl → 0.3.6.dev4__py3-none-any.whl

CasambiBt/_client.py

@@ -424,17 +424,10 @@ class CasambiClient:
         # Store raw encrypted packet for Android parser analysis
         raw_encrypted_packet = data[:]
         
-        # Try Android parser on the raw packet BEFORE decryption
+        # Android parser comparison - disabled as protocols are incompatible
         android_switch_event = None
-        if AndroidPacketParser:
-            try:
-                # The Android parser expects unencrypted packets, but let's try anyway
-                # to see the structure
-                self._logger.debug(f"Attempting Android parser on raw packet: {b2a(raw_encrypted_packet)}")
-                android_result = AndroidPacketParser.parse_complete_packet(raw_encrypted_packet)
-                self._logger.debug(f"Android parser raw result: {android_result}")
-            except Exception as e:
-                self._logger.debug(f"Android parser on raw packet failed (expected): {e}")
+        # The Android parser expects a completely different packet format than what
+        # this implementation uses. Logging disabled to reduce noise.
 
         try:
             decrypted_data = self._encryptor.decryptAndVerify(data, data[:4] + self._nonce[4:])
@@ -443,17 +436,12 @@ class CasambiClient:
             self._logger.error(f"Invalid signature for packet {b2a(data)}!")
             return
             
-        # Now try Android parser on decrypted data
-        if AndroidPacketParser:
-            try:
-                self._logger.debug(f"Attempting Android parser on decrypted packet: {b2a(decrypted_data)}")
-                android_result = AndroidPacketParser.parse_complete_packet(decrypted_data)
-                if android_result.get('switch_event'):
-                    android_switch_event = android_result['switch_event']
-                    self._logger.info(f"Android parser found switch event: {android_switch_event['android_log']}")
-                self._logger.debug(f"Android parser decrypted result: {android_result}")
-            except Exception as e:
-                self._logger.debug(f"Android parser on decrypted packet failed: {e}")
+        # Protocol analysis: Current implementation vs Android
+        # These are fundamentally different protocols:
+        # - Current: Type 0x07 + message-based protocol (0x10/0x08 messages)
+        # - Android: Complex header with command types 29-36 for buttons
+        # No conversion possible - they're incompatible formats
+        android_switch_event = None
 
         packetType = decrypted_data[0]
         self._logger.debug(f"Incoming data of type {packetType}: {b2a(decrypted_data)}")
@@ -519,12 +507,15 @@ class CasambiClient:
         """Parse switch event packet which contains multiple message types"""
         self._logger.info(f"Parsing incoming switch event packet... Data: {b2a(data)}")
         
-        # Log Android parser result if available
-        if android_switch_event:
-            self._logger.info(f"Android parser comparison: {android_switch_event['android_log']}")
+        # Special handling for message type 0x29 - not a switch event
+        if len(data) >= 1 and data[0] == 0x29:
+            self._logger.debug(f"Ignoring message type 0x29 (not a switch event): {b2a(data)}")
+            return
 
         pos = 0
         oldPos = 0
+        switch_events_found = 0
+        
         try:
             while pos <= len(data) - 3:
                 oldPos = pos
@@ -536,6 +527,15 @@ class CasambiClient:
                 parameter = data[pos + 2] & 15
                 pos += 3
 
+                # Sanity check: message type should be reasonable
+                if message_type > 0x80:
+                    self._logger.debug(
+                        f"Skipping invalid message type 0x{message_type:02x} at position {oldPos}"
+                    )
+                    # Try to resync by looking for next valid message
+                    pos = oldPos + 1
+                    continue
+
                 # Check if we have enough data for the payload
                 if pos + length > len(data):
                     self._logger.debug(
@@ -550,11 +550,21 @@ class CasambiClient:
 
                 # Process based on message type
                 if message_type == 0x08 or message_type == 0x10:  # Switch/button events
+                    switch_events_found += 1
                     self._processSwitchMessage(message_type, flags, parameter, payload, data, oldPos, packet_seq, raw_packet, android_switch_event)
-                else:
-                    # Log other message types for now
+                elif message_type == 0x29:
+                    # This shouldn't happen due to check above, but just in case
+                    self._logger.debug(f"Ignoring embedded type 0x29 message")
+                elif message_type in [0x00, 0x06, 0x09, 0x1f, 0x2a]:
+                    # Known non-switch message types - log at debug level
                     self._logger.debug(
-                        f"Message type 0x{message_type:02x}: flags=0x{flags:02x}, "
+                        f"Non-switch message type 0x{message_type:02x}: flags=0x{flags:02x}, "
+                        f"param={parameter}, payload={b2a(payload)}"
+                    )
+                else:
+                    # Unknown message types - log at info level
+                    self._logger.info(
+                        f"Unknown message type 0x{message_type:02x}: flags=0x{flags:02x}, "
                         f"param={parameter}, payload={b2a(payload)}"
                     )
 
@@ -565,6 +575,9 @@ class CasambiClient:
                 f"Ran out of data while parsing switch event packet! "
                 f"Remaining data {b2a(data[oldPos:])} in {b2a(data)}."
             )
+            
+        if switch_events_found == 0:
+            self._logger.debug(f"No switch events found in packet: {b2a(data)}")
 
     def _processSwitchMessage(self, message_type: int, flags: int, button: int, payload: bytes, full_data: bytes, start_pos: int, packet_seq: int = None, raw_packet: bytes = None, android_switch_event: dict = None) -> None:
         """Process a switch/button message (types 0x08 or 0x10)"""
@@ -581,6 +594,14 @@ class CasambiClient:
         extra_data = b''
         if len(payload) > 2:
             extra_data = payload[2:]
+            
+            # Validate extra data for type 0x10
+            if message_type == 0x10 and len(extra_data) >= 3:
+                # Expected pattern: [unit_id_echo][0x12 or similar][0x00]
+                if extra_data[0] != unit_id:
+                    self._logger.warning(
+                        f"Extra data validation failed: unit_id_echo {extra_data[0]} != unit_id {unit_id}"
+                    )
 
         event_string = "unknown"
         

{casambi_bt_revamped-0.3.6.dev2.dist-info → casambi_bt_revamped-0.3.6.dev4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: casambi-bt-revamped
-Version: 0.3.6.dev2
+Version: 0.3.6.dev4
 Summary: Enhanced Casambi Bluetooth client library with switch event support
 Home-page: https://github.com/rankjie/casambi-bt
 Author: rankjie

{casambi_bt_revamped-0.3.6.dev2.dist-info → casambi_bt_revamped-0.3.6.dev4.dist-info}/RECORD

@@ -1,7 +1,7 @@
 CasambiBt/__init__.py,sha256=TW445xSu5PV3TyMjJfwaA1JoWvQQ8LXhZgGdDTfWf3s,302
 CasambiBt/_cache.py,sha256=KZ2xbiHAHXUPa8Gw_75Nw9NL4QSY_sTWHbyYXYUDaB0,3865
 CasambiBt/_casambi.py,sha256=gLLkhEcObgapqTx5Mk7WRClyG29UyfZYZCCIhhOg4H4,23101
-CasambiBt/_client.py,sha256=PzZTdku7H7majU8j1EnGQBBTTQwP0b3HMEaXNFUabqg,26801
+CasambiBt/_client.py,sha256=sYK0PpgzhqRc164Q6E2miPK0pNtQmPLoXiZ69-Wxgxk,27667
 CasambiBt/_client_android_parser.py,sha256=1lVkVYMO0Nhh9_nkNwgb68hlCS_uD8WxYQDir5hOdHs,7744
 CasambiBt/_constants.py,sha256=_AxkG7Btxl4VeS6mO7GJW5Kc9dFs3s9sDmtJ83ZEKNw,359
 CasambiBt/_discover.py,sha256=H7HpiFYIy9ELvmPXXd_ck-5O5invJf15dDIRk-vO5IE,1696
@@ -12,8 +12,8 @@ CasambiBt/_operation.py,sha256=-BuC1Bvtg-G-zSN_b_0JMvXdHZaR6LbTw0S425jg96c,842
 CasambiBt/_unit.py,sha256=YiQWoHmMDWHHo4XAjtW8rHsBqIqpmp9MVdv1Mbu2xw4,17043
 CasambiBt/errors.py,sha256=0JgDjaKlAKDes0poWzA8nrTUYQ8qdNfBb8dfaqqzCRA,1664
 CasambiBt/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-casambi_bt_revamped-0.3.6.dev2.dist-info/licenses/LICENSE,sha256=TAIIitFxpxEDi6Iju7foW4TDQmWvC-IhLVLhl67jKmQ,11341
-casambi_bt_revamped-0.3.6.dev2.dist-info/METADATA,sha256=3mfGXPkIVbHgcjRW1SAKCwW6GC71ap5-4Cdv_C_tyQU,3049
-casambi_bt_revamped-0.3.6.dev2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-casambi_bt_revamped-0.3.6.dev2.dist-info/top_level.txt,sha256=uNbqLjtecFosoFzpGAC89-5icikWODKI8rOjbi8v_sA,10
-casambi_bt_revamped-0.3.6.dev2.dist-info/RECORD,,
+casambi_bt_revamped-0.3.6.dev4.dist-info/licenses/LICENSE,sha256=TAIIitFxpxEDi6Iju7foW4TDQmWvC-IhLVLhl67jKmQ,11341
+casambi_bt_revamped-0.3.6.dev4.dist-info/METADATA,sha256=IvmEQbo-l6PRaDjjfmO5CyG2jFsXRYsCL2JCZLOBHrU,3049
+casambi_bt_revamped-0.3.6.dev4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+casambi_bt_revamped-0.3.6.dev4.dist-info/top_level.txt,sha256=uNbqLjtecFosoFzpGAC89-5icikWODKI8rOjbi8v_sA,10
+casambi_bt_revamped-0.3.6.dev4.dist-info/RECORD,,