casambi-bt-revamped 0.3.7.dev13__py3-none-any.whl → 0.3.8.dev1__py3-none-any.whl

CasambiBt/_client.py

@@ -418,6 +418,13 @@ class CasambiClient:
         # Store raw encrypted packet for reference
         raw_encrypted_packet = data[:]
 
+        # Extract the device-provided 4-byte little-endian counter from the
+        # encrypted header. This is the true per-session packet sequence.
+        try:
+            device_sequence = int.from_bytes(data[:4], byteorder="little", signed=False)
+        except Exception:
+            device_sequence = None
+
         try:
             decrypted_data = self._encryptor.decryptAndVerify(
                 data, data[:4] + self._nonce[4:]
@@ -433,8 +440,11 @@ class CasambiClient:
         if packetType == IncommingPacketType.UnitState:
             self._parseUnitStates(decrypted_data[1:])
         elif packetType == IncommingPacketType.SwitchEvent:
+            # Pass the device sequence as the packet sequence for consumers,
+            # and still include the raw encrypted packet for diagnostics.
+            seq_for_consumer = device_sequence if device_sequence is not None else self._inPacketCount
             self._parseSwitchEvent(
-                decrypted_data[1:], self._inPacketCount, raw_encrypted_packet
+                decrypted_data[1:], seq_for_consumer, raw_encrypted_packet
             )
         elif packetType == IncommingPacketType.NetworkConfig:
             # We don't care about the config the network thinks it has.
@@ -733,7 +743,11 @@ class CasambiClient:
                 "event": event_string,
                 "flags": flags,
                 "extra_data": extra_data,
+                # packet_sequence is the device-provided sequence number when available
+                # (true 32-bit counter from the BLE header), otherwise the local arrival index.
                 "packet_sequence": packet_seq,
+                # Include the local arrival index for debugging and correlation.
+                "arrival_sequence": self._inPacketCount,
                 "raw_packet": b2a(raw_packet) if raw_packet else None,
                 "decrypted_data": b2a(full_data),
                 "message_position": start_pos,

{casambi_bt_revamped-0.3.7.dev13.dist-info → casambi_bt_revamped-0.3.8.dev1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: casambi-bt-revamped
-Version: 0.3.7.dev13
+Version: 0.3.8.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.7.dev13.dist-info → casambi_bt_revamped-0.3.8.dev1.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=AfyuzEU2ylJOGLmZ87Qft-aNXI_JK8Ng9Tfk4fWYOwo,34345
-CasambiBt/_client.py,sha256=2rcwBQ6fuFsM9Zlp8tO_relirwMi5lJq7NDmsQ72HFo,30249
+CasambiBt/_client.py,sha256=k2VQbmWpH6kOmGxF4zFvN0exFmWyKafgGEK3zORFTmc,31136
 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 +11,8 @@ CasambiBt/_operation.py,sha256=Q5UccsrtNp_B_wWqwH_3eLFW_yF6A55FMmfUKDk2WrI,1059
 CasambiBt/_unit.py,sha256=M-Q8-Xd3qjJSUEvsFtic8E4xDc_gtWYakbTGyoIA-P8,16377
 CasambiBt/errors.py,sha256=0JgDjaKlAKDes0poWzA8nrTUYQ8qdNfBb8dfaqqzCRA,1664
 CasambiBt/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-casambi_bt_revamped-0.3.7.dev13.dist-info/licenses/LICENSE,sha256=TAIIitFxpxEDi6Iju7foW4TDQmWvC-IhLVLhl67jKmQ,11341
-casambi_bt_revamped-0.3.7.dev13.dist-info/METADATA,sha256=-xP_7qA_GzrD9o_QkzHoKIZmPCF963yjYqh92VmVkCA,3049
-casambi_bt_revamped-0.3.7.dev13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-casambi_bt_revamped-0.3.7.dev13.dist-info/top_level.txt,sha256=uNbqLjtecFosoFzpGAC89-5icikWODKI8rOjbi8v_sA,10
-casambi_bt_revamped-0.3.7.dev13.dist-info/RECORD,,
+casambi_bt_revamped-0.3.8.dev1.dist-info/licenses/LICENSE,sha256=TAIIitFxpxEDi6Iju7foW4TDQmWvC-IhLVLhl67jKmQ,11341
+casambi_bt_revamped-0.3.8.dev1.dist-info/METADATA,sha256=JVgVrFaryIi0V5MUG7VHTZrrDYTrW3MuosTTc2Zy3QA,3048
+casambi_bt_revamped-0.3.8.dev1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+casambi_bt_revamped-0.3.8.dev1.dist-info/top_level.txt,sha256=uNbqLjtecFosoFzpGAC89-5icikWODKI8rOjbi8v_sA,10
+casambi_bt_revamped-0.3.8.dev1.dist-info/RECORD,,