casambi-bt-revamped 0.3.5__py3-none-any.whl → 0.3.6.dev2__py3-none-any.whl

CasambiBt/_client.py

@@ -33,6 +33,12 @@ from .errors import (  # noqa: E402
     UnsupportedProtocolVersion,
 )
 
+# Import Android parser for comparison
+try:
+    from ._client_android_parser import AndroidPacketParser
+except ImportError:
+    AndroidPacketParser = None
+
 
 @unique
 class IncommingPacketType(IntEnum):
@@ -415,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
-
-        packetType = data[0]
-        self._logger.debug(f"Incoming data of type {packetType}: {b2a(data)}")
+            
+        # 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 = 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.
@@ -485,9 +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)}")
+        
+        # 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
@@ -516,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(
@@ -532,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")
@@ -581,6 +615,23 @@ class CasambiClient:
             f"Switch event (type 0x{message_type:02x}): button={button}, unit_id={unit_id}, "
             f"action={action_display} ({event_string}), flags=0x{flags:02x}"
         )
+        
+        # Include Android parser comparison if available
+        android_comparison = None
+        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,
@@ -597,6 +648,7 @@ class CasambiClient:
                 "decrypted_data": b2a(full_data),
                 "message_position": start_pos,
                 "payload_hex": b2a(payload),
+                "android_comparison": android_comparison,
             },
         )
 

CasambiBt/_client_android_parser.py

@@ -0,0 +1,215 @@
+"""
+Android App Compatible Parser for Casambi Switch Events
+
+This module implements the exact parsing logic from the decompiled Android app
+to compare with our current implementation.
+"""
+
+import struct
+from typing import Dict, Any, Optional, Tuple
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+class AndroidPacketParser:
+    """Parser that follows the exact Android app implementation"""
+    
+    @staticmethod
+    def parse_packet_header(data: bytes, pos: int = 0) -> Tuple[Dict[str, Any], int]:
+        """
+        Parse packet header according to Android app C1775b.Q method (lines 230-243)
+        
+        Returns: (header_dict, new_position)
+        """
+        if len(data) - pos < 9:
+            raise ValueError("Insufficient data for packet header")
+            
+        # Read header (2 bytes)
+        unsigned_short = struct.unpack_from('>H', data, pos)[0]
+        pos += 2
+        
+        # Extract flags from header
+        has_origin_handle = (unsigned_short & 64) != 0    # bit 6
+        is_unique = (unsigned_short & 128) != 0           # bit 7
+        has_session = (unsigned_short & 256) != 0         # bit 8
+        has_origin_handle_alt = (unsigned_short & 512) != 0  # bit 9
+        flag_1024 = (unsigned_short & 1024) != 0         # bit 10
+        
+        # Read command type (1 byte) - this is the EnumC1777d ordinal
+        command_type = data[pos] & 0xFF
+        pos += 1
+        
+        # Read origin (2 bytes)
+        origin = struct.unpack_from('>H', data, pos)[0]
+        pos += 2
+        
+        # Read target (2 bytes)
+        target = struct.unpack_from('>H', data, pos)[0]
+        pos += 2
+        
+        # Extract lifetime from header bits 11-14
+        lifetime = (unsigned_short >> 11) & 15
+        
+        # Read age (2 bytes)
+        age = struct.unpack_from('>H', data, pos)[0]
+        pos += 2
+        
+        # Read optional origin handle if flag is set
+        origin_handle = None
+        if has_origin_handle_alt:
+            origin_handle = data[pos] & 0xFF
+            pos += 1
+            
+        # Extract payload length from header bits 0-5
+        payload_length = unsigned_short & 63
+        
+        header = {
+            'header_raw': unsigned_short,
+            'command_type': command_type,
+            'origin': origin,
+            'target': target,
+            'lifetime': lifetime,
+            'age': age,
+            'origin_handle': origin_handle,
+            'payload_length': payload_length,
+            'flags': {
+                'has_origin_handle': has_origin_handle,
+                'is_unique': is_unique,
+                'has_session': has_session,
+                'has_origin_handle_alt': has_origin_handle_alt,
+                'flag_1024': flag_1024
+            }
+        }
+        
+        return header, pos
+    
+    @staticmethod
+    def parse_switch_event(header: Dict[str, Any], payload: bytes) -> Optional[Dict[str, Any]]:
+        """
+        Parse switch event according to Android app logic (lines 271-280)
+        
+        The Android app checks:
+        - target & 0xFF == 6 (lower byte of target must be 6)
+        - command_type ordinal must be between 29-36 (FunctionButtonEvent0-7)
+        - payload must have at least 3 bytes
+        """
+        target_type = header['target'] & 0xFF
+        target_unit_id = header['target'] >> 8
+        command_type = header['command_type']
+        
+        # Check if this is a switch event
+        if target_type != 6:
+            return None
+            
+        # Check if command type is in range for button events (29-36)
+        if command_type < 29 or command_type > 36:
+            return None
+            
+        # Check payload length
+        if len(payload) < 3:
+            logger.warning(f"Switch event payload too short: {len(payload)} bytes")
+            return None
+            
+        # Parse according to Android logic
+        first_byte = payload[0]
+        button_index = command_type - 29  # 0-7
+        
+        # Extract parameters from first byte
+        param_p = (first_byte >> 3) & 15  # bits 3-6
+        param_s = first_byte & 7          # bits 0-2
+        state = 1 if (first_byte & 128) else 0  # bit 7
+        
+        return {
+            'unit_id': target_unit_id,
+            'button': button_index,
+            'state': state,  # 1 = pressed, 0 = released
+            'param_p': param_p,
+            'param_s': param_s,
+            'target_type': target_type,
+            'command_type': command_type,
+            'payload_hex': payload.hex(),
+            'android_log': f"Unit {target_unit_id} Switch event: #{button_index} (P{param_p} S{param_s}) = {state}"
+        }
+    
+    @staticmethod
+    def parse_complete_packet(data: bytes) -> Dict[str, Any]:
+        """Parse a complete packet and extract switch events if present"""
+        try:
+            header, payload_start = AndroidPacketParser.parse_packet_header(data)
+            
+            # Read payload
+            payload_length = header['payload_length']
+            if len(data) - payload_start < payload_length:
+                raise ValueError(f"Insufficient data for payload: need {payload_length}, have {len(data) - payload_start}")
+                
+            payload = data[payload_start:payload_start + payload_length]
+            
+            # Try to parse as switch event
+            switch_event = AndroidPacketParser.parse_switch_event(header, payload)
+            
+            return {
+                'header': header,
+                'payload': payload.hex(),
+                'switch_event': switch_event
+            }
+            
+        except Exception as e:
+            logger.error(f"Failed to parse packet: {e}")
+            return {'error': str(e), 'data': data.hex()}
+
+
+# Command type constants from EnumC1777d
+class FunctionType:
+    """Function type constants from Android app"""
+    BUTTON_EVENT_0 = 29
+    BUTTON_EVENT_1 = 30
+    BUTTON_EVENT_2 = 31
+    BUTTON_EVENT_3 = 32
+    BUTTON_EVENT_4 = 33
+    BUTTON_EVENT_5 = 34
+    BUTTON_EVENT_6 = 35
+    BUTTON_EVENT_7 = 36
+
+
+def compare_with_current_parser(data: bytes, current_parser_result: Dict[str, Any]) -> Dict[str, Any]:
+    """Compare Android parser results with current implementation"""
+    android_result = AndroidPacketParser.parse_complete_packet(data)
+    
+    comparison = {
+        'android_parser': android_result,
+        'current_parser': current_parser_result,
+        'differences': []
+    }
+    
+    # Compare results
+    if android_result.get('switch_event') and current_parser_result:
+        android_evt = android_result['switch_event']
+        
+        # Check unit_id
+        if android_evt['unit_id'] != current_parser_result.get('unit_id'):
+            comparison['differences'].append({
+                'field': 'unit_id',
+                'android': android_evt['unit_id'],
+                'current': current_parser_result.get('unit_id')
+            })
+            
+        # Check button
+        if android_evt['button'] != current_parser_result.get('button'):
+            comparison['differences'].append({
+                'field': 'button',
+                'android': android_evt['button'],
+                'current': current_parser_result.get('button')
+            })
+            
+        # Map Android state to current event names
+        android_event = 'button_press' if android_evt['state'] == 1 else 'button_release'
+        if android_event != current_parser_result.get('event'):
+            comparison['differences'].append({
+                'field': 'event',
+                'android': android_event,
+                'current': current_parser_result.get('event'),
+                'note': 'Android only has press/release, no hold detection'
+            })
+    
+    return comparison

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: casambi-bt-revamped
-Version: 0.3.5
+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.5.dist-info → casambi_bt_revamped-0.3.6.dev2.dist-info}/RECORD

@@ -1,7 +1,8 @@
 CasambiBt/__init__.py,sha256=TW445xSu5PV3TyMjJfwaA1JoWvQQ8LXhZgGdDTfWf3s,302
 CasambiBt/_cache.py,sha256=KZ2xbiHAHXUPa8Gw_75Nw9NL4QSY_sTWHbyYXYUDaB0,3865
 CasambiBt/_casambi.py,sha256=gLLkhEcObgapqTx5Mk7WRClyG29UyfZYZCCIhhOg4H4,23101
-CasambiBt/_client.py,sha256=UxxOaITSt_I-sK-nL8AE0YNstieY5iPwd9oc5DGtWRE,23808
+CasambiBt/_client.py,sha256=PzZTdku7H7majU8j1EnGQBBTTQwP0b3HMEaXNFUabqg,26801
+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
 CasambiBt/_encryption.py,sha256=CLcoOOrggQqhJbnr_emBnEnkizpWDvb_0yFnitq4_FM,3831
@@ -11,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.5.dist-info/licenses/LICENSE,sha256=TAIIitFxpxEDi6Iju7foW4TDQmWvC-IhLVLhl67jKmQ,11341
-casambi_bt_revamped-0.3.5.dist-info/METADATA,sha256=HdYylYAhcjnRamJwi0i4JZFeinLCwn9Uuiqn8lwCeA4,3044
-casambi_bt_revamped-0.3.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-casambi_bt_revamped-0.3.5.dist-info/top_level.txt,sha256=uNbqLjtecFosoFzpGAC89-5icikWODKI8rOjbi8v_sA,10
-casambi_bt_revamped-0.3.5.dist-info/RECORD,,
+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,,