casambi-bt-revamped 0.3.6.dev1__tar.gz → 0.3.6.dev2__tar.gz

{casambi_bt_revamped-0.3.6.dev1/src/casambi_bt_revamped.egg-info → casambi_bt_revamped-0.3.6.dev2}/PKG-INFO

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

@@ -1,6 +1,6 @@
 [metadata]
 name = casambi-bt-revamped
-version = 0.3.6.dev1
+version = 0.3.6.dev2
 author = rankjie
 author_email = rankjie@gmail.com
 description = Enhanced Casambi Bluetooth client library with switch event support

{casambi_bt_revamped-0.3.6.dev1 → casambi_bt_revamped-0.3.6.dev2}/src/CasambiBt/_client.py

@@ -421,23 +421,47 @@ 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[:]
+        
+        # Try Android parser on the raw packet BEFORE decryption
+        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}")
 
         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
+            
+        # 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}")
 
-        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 +515,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 +550,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 +566,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 +616,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 → casambi_bt_revamped-0.3.6.dev2/src/casambi_bt_revamped.egg-info}/PKG-INFO

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