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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (24) hide show
  1. {casambi_bt_revamped-0.3.6.dev2/src/casambi_bt_revamped.egg-info → casambi_bt_revamped-0.3.6.dev3}/PKG-INFO +1 -1
  2. {casambi_bt_revamped-0.3.6.dev2 → casambi_bt_revamped-0.3.6.dev3}/setup.cfg +1 -1
  3. {casambi_bt_revamped-0.3.6.dev2 → casambi_bt_revamped-0.3.6.dev3}/src/CasambiBt/_client.py +7 -21
  4. {casambi_bt_revamped-0.3.6.dev2 → casambi_bt_revamped-0.3.6.dev3/src/casambi_bt_revamped.egg-info}/PKG-INFO +1 -1
  5. {casambi_bt_revamped-0.3.6.dev2 → casambi_bt_revamped-0.3.6.dev3}/LICENSE +0 -0
  6. {casambi_bt_revamped-0.3.6.dev2 → casambi_bt_revamped-0.3.6.dev3}/README.md +0 -0
  7. {casambi_bt_revamped-0.3.6.dev2 → casambi_bt_revamped-0.3.6.dev3}/pyproject.toml +0 -0
  8. {casambi_bt_revamped-0.3.6.dev2 → casambi_bt_revamped-0.3.6.dev3}/src/CasambiBt/__init__.py +0 -0
  9. {casambi_bt_revamped-0.3.6.dev2 → casambi_bt_revamped-0.3.6.dev3}/src/CasambiBt/_cache.py +0 -0
  10. {casambi_bt_revamped-0.3.6.dev2 → casambi_bt_revamped-0.3.6.dev3}/src/CasambiBt/_casambi.py +0 -0
  11. {casambi_bt_revamped-0.3.6.dev2 → casambi_bt_revamped-0.3.6.dev3}/src/CasambiBt/_client_android_parser.py +0 -0
  12. {casambi_bt_revamped-0.3.6.dev2 → casambi_bt_revamped-0.3.6.dev3}/src/CasambiBt/_constants.py +0 -0
  13. {casambi_bt_revamped-0.3.6.dev2 → casambi_bt_revamped-0.3.6.dev3}/src/CasambiBt/_discover.py +0 -0
  14. {casambi_bt_revamped-0.3.6.dev2 → casambi_bt_revamped-0.3.6.dev3}/src/CasambiBt/_encryption.py +0 -0
  15. {casambi_bt_revamped-0.3.6.dev2 → casambi_bt_revamped-0.3.6.dev3}/src/CasambiBt/_keystore.py +0 -0
  16. {casambi_bt_revamped-0.3.6.dev2 → casambi_bt_revamped-0.3.6.dev3}/src/CasambiBt/_network.py +0 -0
  17. {casambi_bt_revamped-0.3.6.dev2 → casambi_bt_revamped-0.3.6.dev3}/src/CasambiBt/_operation.py +0 -0
  18. {casambi_bt_revamped-0.3.6.dev2 → casambi_bt_revamped-0.3.6.dev3}/src/CasambiBt/_unit.py +0 -0
  19. {casambi_bt_revamped-0.3.6.dev2 → casambi_bt_revamped-0.3.6.dev3}/src/CasambiBt/errors.py +0 -0
  20. {casambi_bt_revamped-0.3.6.dev2 → casambi_bt_revamped-0.3.6.dev3}/src/CasambiBt/py.typed +0 -0
  21. {casambi_bt_revamped-0.3.6.dev2 → casambi_bt_revamped-0.3.6.dev3}/src/casambi_bt_revamped.egg-info/SOURCES.txt +0 -0
  22. {casambi_bt_revamped-0.3.6.dev2 → casambi_bt_revamped-0.3.6.dev3}/src/casambi_bt_revamped.egg-info/dependency_links.txt +0 -0
  23. {casambi_bt_revamped-0.3.6.dev2 → casambi_bt_revamped-0.3.6.dev3}/src/casambi_bt_revamped.egg-info/requires.txt +0 -0
  24. {casambi_bt_revamped-0.3.6.dev2 → casambi_bt_revamped-0.3.6.dev3}/src/casambi_bt_revamped.egg-info/top_level.txt +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: casambi-bt-revamped
3
- Version: 0.3.6.dev2
3
+ Version: 0.3.6.dev3
4
4
  Summary: Enhanced Casambi Bluetooth client library with switch event support
5
5
  Home-page: https://github.com/rankjie/casambi-bt
6
6
  Author: rankjie
@@ -1,6 +1,6 @@
1
1
  [metadata]
2
2
  name = casambi-bt-revamped
3
- version = 0.3.6.dev2
3
+ version = 0.3.6.dev3
4
4
  author = rankjie
5
5
  author_email = rankjie@gmail.com
6
6
  description = Enhanced Casambi Bluetooth client library with switch event support
@@ -424,17 +424,10 @@ class CasambiClient:
424
424
  # Store raw encrypted packet for Android parser analysis
425
425
  raw_encrypted_packet = data[:]
426
426
 
427
- # Try Android parser on the raw packet BEFORE decryption
427
+ # Android parser comparison - disabled as protocols are incompatible
428
428
  android_switch_event = None
429
- if AndroidPacketParser:
430
- try:
431
- # The Android parser expects unencrypted packets, but let's try anyway
432
- # to see the structure
433
- self._logger.debug(f"Attempting Android parser on raw packet: {b2a(raw_encrypted_packet)}")
434
- android_result = AndroidPacketParser.parse_complete_packet(raw_encrypted_packet)
435
- self._logger.debug(f"Android parser raw result: {android_result}")
436
- except Exception as e:
437
- self._logger.debug(f"Android parser on raw packet failed (expected): {e}")
429
+ # The Android parser expects a completely different packet format than what
430
+ # this implementation uses. Logging disabled to reduce noise.
438
431
 
439
432
  try:
440
433
  decrypted_data = self._encryptor.decryptAndVerify(data, data[:4] + self._nonce[4:])
@@ -443,17 +436,10 @@ class CasambiClient:
443
436
  self._logger.error(f"Invalid signature for packet {b2a(data)}!")
444
437
  return
445
438
 
446
- # Now try Android parser on decrypted data
447
- if AndroidPacketParser:
448
- try:
449
- self._logger.debug(f"Attempting Android parser on decrypted packet: {b2a(decrypted_data)}")
450
- android_result = AndroidPacketParser.parse_complete_packet(decrypted_data)
451
- if android_result.get('switch_event'):
452
- android_switch_event = android_result['switch_event']
453
- self._logger.info(f"Android parser found switch event: {android_switch_event['android_log']}")
454
- self._logger.debug(f"Android parser decrypted result: {android_result}")
455
- except Exception as e:
456
- self._logger.debug(f"Android parser on decrypted packet failed: {e}")
439
+ # Protocol analysis: Current implementation vs Android
440
+ # Current: Encrypted packets decrypt to [packet_type][payload] format
441
+ # Android: Uses different structure with header/command/origin/target
442
+ # These are incompatible protocol formats
457
443
 
458
444
  packetType = decrypted_data[0]
459
445
  self._logger.debug(f"Incoming data of type {packetType}: {b2a(decrypted_data)}")
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: casambi-bt-revamped
3
- Version: 0.3.6.dev2
3
+ Version: 0.3.6.dev3
4
4
  Summary: Enhanced Casambi Bluetooth client library with switch event support
5
5
  Home-page: https://github.com/rankjie/casambi-bt
6
6
  Author: rankjie