casambi-bt-revamped 0.3.6.dev1__py3-none-any.whl → 0.3.6.dev3__py3-none-any.whl

CasambiBt/_client.py

@@ -421,23 +421,33 @@ class CasambiClient:
         # TODO: Check incoming counter and direction flag
         self._inPacketCount += 1
         
-        # Store raw encrypted packet for reference
-        raw_packet = data[:]
+        # Store raw encrypted packet for Android parser analysis
+        raw_encrypted_packet = data[:]
+        
+        # Android parser comparison - disabled as protocols are incompatible
+        android_switch_event = None
+        # The Android parser expects a completely different packet format than what
+        # this implementation uses. Logging disabled to reduce noise.
 
         try:
-            data = self._encryptor.decryptAndVerify(data, data[:4] + self._nonce[4:])
+            decrypted_data = self._encryptor.decryptAndVerify(data, data[:4] + self._nonce[4:])
         except InvalidSignature:
             # We only drop packets with invalid signature here instead of going into an error state
             self._logger.error(f"Invalid signature for packet {b2a(data)}!")
             return
+            
+        # Protocol analysis: Current implementation vs Android
+        # Current: Encrypted packets decrypt to [packet_type][payload] format
+        # Android: Uses different structure with header/command/origin/target
+        # These are incompatible protocol formats
 
-        packetType = data[0]
-        self._logger.debug(f"Incoming data of type {packetType}: {b2a(data)}")
+        packetType = decrypted_data[0]
+        self._logger.debug(f"Incoming data of type {packetType}: {b2a(decrypted_data)}")
 
         if packetType == IncommingPacketType.UnitState:
-            self._parseUnitStates(data[1:])
+            self._parseUnitStates(decrypted_data[1:])
         elif packetType == IncommingPacketType.SwitchEvent:
-            self._parseSwitchEvent(data[1:], self._inPacketCount, raw_packet)
+            self._parseSwitchEvent(decrypted_data[1:], self._inPacketCount, raw_encrypted_packet, android_switch_event)
         elif packetType == IncommingPacketType.NetworkConfig:
             # We don't care about the config the network thinks it has.
             # We assume that cloud config and local config match.
@@ -491,23 +501,13 @@ class CasambiClient:
                 f"Ran out of data while parsing unit state! Remaining data {b2a(data[oldPos:])} in {b2a(data)}."
             )
 
-    def _parseSwitchEvent(self, data: bytes, packet_seq: int = None, raw_packet: bytes = None) -> None:
+    def _parseSwitchEvent(self, data: bytes, packet_seq: int = None, raw_packet: bytes = None, android_switch_event: dict = None) -> None:
         """Parse switch event packet which contains multiple message types"""
         self._logger.info(f"Parsing incoming switch event packet... Data: {b2a(data)}")
         
-        # Try Android parser for comparison if available
-        if AndroidPacketParser and raw_packet:
-            try:
-                # The raw_packet includes encryption, we need the decrypted version
-                # which starts after the type byte (data includes content after type byte)
-                # Reconstruct the full decrypted packet for Android parser
-                full_packet = bytes([IncommingPacketType.SwitchEvent]) + data
-                android_result = AndroidPacketParser.parse_complete_packet(full_packet)
-                if android_result.get('switch_event'):
-                    self._logger.info(f"Android parser result: {android_result['switch_event']['android_log']}")
-                    self._logger.debug(f"Android parser details: {android_result}")
-            except Exception as e:
-                self._logger.debug(f"Android parser comparison failed: {e}")
+        # Log Android parser result if available
+        if android_switch_event:
+            self._logger.info(f"Android parser comparison: {android_switch_event['android_log']}")
 
         pos = 0
         oldPos = 0
@@ -536,7 +536,7 @@ class CasambiClient:
 
                 # Process based on message type
                 if message_type == 0x08 or message_type == 0x10:  # Switch/button events
-                    self._processSwitchMessage(message_type, flags, parameter, payload, data, oldPos, packet_seq, raw_packet)
+                    self._processSwitchMessage(message_type, flags, parameter, payload, data, oldPos, packet_seq, raw_packet, android_switch_event)
                 else:
                     # Log other message types for now
                     self._logger.debug(
@@ -552,7 +552,7 @@ class CasambiClient:
                 f"Remaining data {b2a(data[oldPos:])} in {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) -> None:
+    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)"""
         if not payload:
             self._logger.error("Switch message has empty payload")
@@ -602,31 +602,22 @@ class CasambiClient:
             f"action={action_display} ({event_string}), flags=0x{flags:02x}"
         )
         
-        # Also try to parse with Android method if this is the full packet
+        # Include Android parser comparison if available
         android_comparison = None
-        if AndroidPacketParser and message_type == 0x07 and len(payload) >= 9:
-            try:
-                # Try to parse as Android packet structure
-                android_parsed = AndroidPacketParser.parse_complete_packet(payload)
-                if android_parsed.get('switch_event'):
-                    android_evt = android_parsed['switch_event']
-                    android_comparison = {
-                        'unit_id': android_evt['unit_id'],
-                        'button': android_evt['button'],
-                        'state': android_evt['state'],
-                        'param_p': android_evt['param_p'],
-                        'param_s': android_evt['param_s'],
-                        'android_log': android_evt['android_log']
-                    }
-                    self._logger.info(f"Android parser comparison: {android_evt['android_log']}")
-                    
-                    # Log differences
-                    if android_evt['unit_id'] != unit_id:
-                        self._logger.warning(f"Unit ID mismatch: current={unit_id}, android={android_evt['unit_id']}")
-                    if android_evt['button'] != button:
-                        self._logger.warning(f"Button mismatch: current={button}, android={android_evt['button']}")
-            except Exception as e:
-                self._logger.debug(f"Android parser comparison failed: {e}")
+        if android_switch_event:
+            android_comparison = {
+                'unit_id': android_switch_event['unit_id'],
+                'button': android_switch_event['button'],
+                'state': android_switch_event['state'],
+                'param_p': android_switch_event['param_p'],
+                'param_s': android_switch_event['param_s'],
+                'android_log': android_switch_event['android_log']
+            }
+            # Log differences
+            if android_switch_event['unit_id'] != unit_id:
+                self._logger.warning(f"Unit ID mismatch: current={unit_id}, android={android_switch_event['unit_id']}")
+            if android_switch_event['button'] != button:
+                self._logger.warning(f"Button mismatch: current={button}, android={android_switch_event['button']}")
 
         self._dataCallback(
             IncommingPacketType.SwitchEvent,

{casambi_bt_revamped-0.3.6.dev1.dist-info → casambi_bt_revamped-0.3.6.dev3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: casambi-bt-revamped
-Version: 0.3.6.dev1
+Version: 0.3.6.dev3
 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.dev1.dist-info → casambi_bt_revamped-0.3.6.dev3.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=7pdSgYYs5dW1e2XiqMycToqui3HaY4Wj-wr66-7iCMQ,26447
+CasambiBt/_client.py,sha256=iGeJ1isvX-B7VqYr0s52djE9UR1uiM5TREzaYO9k5vw,25894
 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.dev1.dist-info/licenses/LICENSE,sha256=TAIIitFxpxEDi6Iju7foW4TDQmWvC-IhLVLhl67jKmQ,11341
-casambi_bt_revamped-0.3.6.dev1.dist-info/METADATA,sha256=lOUhjWLxLPDUhpuiQX2weU0U3RP-69ha26bCNQ-5wvg,3049
-casambi_bt_revamped-0.3.6.dev1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-casambi_bt_revamped-0.3.6.dev1.dist-info/top_level.txt,sha256=uNbqLjtecFosoFzpGAC89-5icikWODKI8rOjbi8v_sA,10
-casambi_bt_revamped-0.3.6.dev1.dist-info/RECORD,,
+casambi_bt_revamped-0.3.6.dev3.dist-info/licenses/LICENSE,sha256=TAIIitFxpxEDi6Iju7foW4TDQmWvC-IhLVLhl67jKmQ,11341
+casambi_bt_revamped-0.3.6.dev3.dist-info/METADATA,sha256=sVnGlUxEcV6DpklIygo-2IXVZz0-EM85_I_-XqtBh2Y,3049
+casambi_bt_revamped-0.3.6.dev3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+casambi_bt_revamped-0.3.6.dev3.dist-info/top_level.txt,sha256=uNbqLjtecFosoFzpGAC89-5icikWODKI8rOjbi8v_sA,10
+casambi_bt_revamped-0.3.6.dev3.dist-info/RECORD,,