casambi-bt-revamped 0.3.0.dev2__tar.gz → 0.3.2.dev1__tar.gz

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

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

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

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

@@ -414,6 +414,9 @@ class CasambiClient:
     ) -> None:
         # TODO: Check incoming counter and direction flag
         self._inPacketCount += 1
+        
+        # Store raw encrypted packet for reference
+        raw_packet = data[:]
 
         try:
             data = self._encryptor.decryptAndVerify(data, data[:4] + self._nonce[4:])
@@ -428,7 +431,7 @@ class CasambiClient:
         if packetType == IncommingPacketType.UnitState:
             self._parseUnitStates(data[1:])
         elif packetType == IncommingPacketType.SwitchEvent:
-            self._parseSwitchEvent(data[1:])
+            self._parseSwitchEvent(data[1:], self._inPacketCount, raw_packet)
         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.
@@ -482,7 +485,7 @@ class CasambiClient:
                 f"Ran out of data while parsing unit state! Remaining data {b2a(data[oldPos:])} in {b2a(data)}."
             )
 
-    def _parseSwitchEvent(self, data: bytes) -> None:
+    def _parseSwitchEvent(self, data: bytes, packet_seq: int = None, raw_packet: bytes = None) -> None:
         """Parse switch event packet which contains multiple message types"""
         self._logger.info(f"Parsing incoming switch event packet... Data: {b2a(data)}")
 
@@ -513,7 +516,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)
+                    self._processSwitchMessage(message_type, flags, parameter, payload, data, oldPos, packet_seq, raw_packet)
                 else:
                     # Log other message types for now
                     self._logger.debug(
@@ -529,7 +532,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) -> 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) -> None:
         """Process a switch/button message (types 0x08 or 0x10)"""
         if not payload:
             self._logger.error("Switch message has empty payload")
@@ -563,6 +566,10 @@ class CasambiClient:
                     event_string = "button_press"
                 elif state_byte == 0x02:
                     event_string = "button_release"
+                elif state_byte == 0x09:
+                    event_string = "button_hold"
+                elif state_byte == 0x0c:
+                    event_string = "button_release_after_hold"
                 else:
                     self._logger.warning(f"Unknown state byte: 0x{state_byte:02x}")
             else:
@@ -585,6 +592,11 @@ class CasambiClient:
                 "event": event_string,
                 "flags": flags,
                 "extra_data": extra_data,
+                "packet_sequence": packet_seq,
+                "raw_packet": b2a(raw_packet) if raw_packet else None,
+                "decrypted_data": b2a(full_data),
+                "message_position": start_pos,
+                "payload_hex": b2a(payload),
             },
         )
 

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

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