mirror of
https://github.com/meshcore-dev/meshcore_py.git
synced 2026-04-20 22:13:49 +00:00
feat: Refactor binary commands and apply BLE fixes
Refactored the BinaryCommandHandler to align with the other command handlers, inheriting from CommandHandlerBase. This resolves an AttributeError and simplifies the command structure. Moved binary_commands.py into the commands module. Applied fixes to the BLE connection handler based on feedback, improving reliability on macOS and ensuring the device address is correctly handled.
This commit is contained in:
Ventz Petkov
parent
c19fd166f8
commit
36727f4ea3
22 changed files with 1603 additions and 1206 deletions
|
|
@ -1,8 +1,6 @@
|
|||
import sys
|
||||
import logging
|
||||
import asyncio
|
||||
import json
|
||||
from typing import Any, Optional, Dict
|
||||
from typing import Any, Dict
|
||||
from .events import Event, EventType, EventDispatcher
|
||||
from .packets import PacketType
|
||||
from cayennelpp import LppFrame, LppData
|
||||
|
|
@ -18,35 +16,37 @@ class MessageReader:
|
|||
# before events are dispatched
|
||||
self.contacts = {} # Temporary storage during contact list building
|
||||
self.contact_nb = 0 # Used for contact processing
|
||||
|
||||
|
||||
async def handle_rx(self, data: bytearray):
|
||||
packet_type_value = data[0]
|
||||
logger.debug(f"Received data: {data.hex()}")
|
||||
|
||||
|
||||
# Handle command responses
|
||||
if packet_type_value == PacketType.OK.value:
|
||||
result: Dict[str, Any] = {}
|
||||
if len(data) == 5:
|
||||
result["value"] = int.from_bytes(data[1:5], byteorder='little')
|
||||
|
||||
result["value"] = int.from_bytes(data[1:5], byteorder="little")
|
||||
|
||||
# Dispatch event for the OK response
|
||||
await self.dispatcher.dispatch(Event(EventType.OK, result))
|
||||
|
||||
|
||||
elif packet_type_value == PacketType.ERROR.value:
|
||||
if len(data) > 1:
|
||||
result = {"error_code": data[1]}
|
||||
else:
|
||||
result = {}
|
||||
|
||||
|
||||
# Dispatch event for the ERROR response
|
||||
await self.dispatcher.dispatch(Event(EventType.ERROR, result))
|
||||
|
||||
|
||||
elif packet_type_value == PacketType.CONTACT_START.value:
|
||||
self.contact_nb = int.from_bytes(data[1:5], byteorder='little')
|
||||
self.contact_nb = int.from_bytes(data[1:5], byteorder="little")
|
||||
self.contacts = {}
|
||||
|
||||
elif packet_type_value == PacketType.CONTACT.value or\
|
||||
packet_type_value == PacketType.PUSH_CODE_NEW_ADVERT.value:
|
||||
|
||||
elif (
|
||||
packet_type_value == PacketType.CONTACT.value
|
||||
or packet_type_value == PacketType.PUSH_CODE_NEW_ADVERT.value
|
||||
):
|
||||
c = {}
|
||||
c["public_key"] = data[1:33].hex()
|
||||
c["type"] = data[33]
|
||||
|
|
@ -55,195 +55,215 @@ class MessageReader:
|
|||
plen = int.from_bytes(data[35:36], signed=True)
|
||||
if plen == -1:
|
||||
plen = 0
|
||||
c["out_path"] = data[36:36+plen].hex()
|
||||
c["adv_name"] = data[100:132].decode('utf-8', 'ignore').replace("\0","")
|
||||
c["last_advert"] = int.from_bytes(data[132:136], byteorder='little')
|
||||
c["adv_lat"] = int.from_bytes(data[136:140], byteorder='little',signed=True)/1e6
|
||||
c["adv_lon"] = int.from_bytes(data[140:144], byteorder='little',signed=True)/1e6
|
||||
c["lastmod"] = int.from_bytes(data[144:148], byteorder='little')
|
||||
c["out_path"] = data[36 : 36 + plen].hex()
|
||||
c["adv_name"] = data[100:132].decode("utf-8", "ignore").replace("\0", "")
|
||||
c["last_advert"] = int.from_bytes(data[132:136], byteorder="little")
|
||||
c["adv_lat"] = (
|
||||
int.from_bytes(data[136:140], byteorder="little", signed=True) / 1e6
|
||||
)
|
||||
c["adv_lon"] = (
|
||||
int.from_bytes(data[140:144], byteorder="little", signed=True) / 1e6
|
||||
)
|
||||
c["lastmod"] = int.from_bytes(data[144:148], byteorder="little")
|
||||
|
||||
if packet_type_value == PacketType.PUSH_CODE_NEW_ADVERT.value :
|
||||
if packet_type_value == PacketType.PUSH_CODE_NEW_ADVERT.value:
|
||||
await self.dispatcher.dispatch(Event(EventType.NEW_CONTACT, c))
|
||||
else:
|
||||
self.contacts[c["public_key"]] = c
|
||||
|
||||
|
||||
elif packet_type_value == PacketType.CONTACT_END.value:
|
||||
lastmod = int.from_bytes(data[1:5], byteorder='little')
|
||||
lastmod = int.from_bytes(data[1:5], byteorder="little")
|
||||
attributes = {
|
||||
"lastmod": lastmod,
|
||||
}
|
||||
await self.dispatcher.dispatch(Event(EventType.CONTACTS, self.contacts, attributes))
|
||||
|
||||
await self.dispatcher.dispatch(
|
||||
Event(EventType.CONTACTS, self.contacts, attributes)
|
||||
)
|
||||
|
||||
elif packet_type_value == PacketType.SELF_INFO.value:
|
||||
self_info = {}
|
||||
self_info["adv_type"] = data[1]
|
||||
self_info["tx_power"] = data[2]
|
||||
self_info["max_tx_power"] = data[3]
|
||||
self_info["public_key"] = data[4:36].hex()
|
||||
self_info["adv_lat"] = int.from_bytes(data[36:40], byteorder='little', signed=True)/1e6
|
||||
self_info["adv_lon"] = int.from_bytes(data[40:44], byteorder='little', signed=True)/1e6
|
||||
self_info["adv_lat"] = (
|
||||
int.from_bytes(data[36:40], byteorder="little", signed=True) / 1e6
|
||||
)
|
||||
self_info["adv_lon"] = (
|
||||
int.from_bytes(data[40:44], byteorder="little", signed=True) / 1e6
|
||||
)
|
||||
self_info["adv_loc_policy"] = data[45]
|
||||
self_info["telemetry_mode_env"] = (data[46] >> 4) & 0b11
|
||||
self_info["telemetry_mode_loc"] = (data[46] >> 2) & 0b11
|
||||
self_info["telemetry_mode_base"] = (data[46]) & 0b11
|
||||
self_info["manual_add_contacts"] = data[47] > 0
|
||||
self_info["radio_freq"] = int.from_bytes(data[48:52], byteorder='little') / 1000
|
||||
self_info["radio_bw"] = int.from_bytes(data[52:56], byteorder='little') / 1000
|
||||
self_info["radio_freq"] = (
|
||||
int.from_bytes(data[48:52], byteorder="little") / 1000
|
||||
)
|
||||
self_info["radio_bw"] = (
|
||||
int.from_bytes(data[52:56], byteorder="little") / 1000
|
||||
)
|
||||
self_info["radio_sf"] = data[56]
|
||||
self_info["radio_cr"] = data[57]
|
||||
self_info["name"] = data[58:].decode('utf-8', 'ignore')
|
||||
self_info["name"] = data[58:].decode("utf-8", "ignore")
|
||||
await self.dispatcher.dispatch(Event(EventType.SELF_INFO, self_info))
|
||||
|
||||
|
||||
elif packet_type_value == PacketType.MSG_SENT.value:
|
||||
res = {}
|
||||
res["type"] = data[1]
|
||||
res["expected_ack"] = bytes(data[2:6])
|
||||
res["suggested_timeout"] = int.from_bytes(data[6:10], byteorder='little')
|
||||
|
||||
res["suggested_timeout"] = int.from_bytes(data[6:10], byteorder="little")
|
||||
|
||||
attributes = {
|
||||
"type": res["type"],
|
||||
"expected_ack": res["expected_ack"].hex()
|
||||
"expected_ack": res["expected_ack"].hex(),
|
||||
}
|
||||
|
||||
|
||||
await self.dispatcher.dispatch(Event(EventType.MSG_SENT, res, attributes))
|
||||
|
||||
|
||||
elif packet_type_value == PacketType.CONTACT_MSG_RECV.value:
|
||||
res = {}
|
||||
res["type"] = "PRIV"
|
||||
res["pubkey_prefix"] = data[1:7].hex()
|
||||
res["path_len"] = data[7]
|
||||
res["txt_type"] = data[8]
|
||||
res["sender_timestamp"] = int.from_bytes(data[9:13], byteorder='little')
|
||||
res["sender_timestamp"] = int.from_bytes(data[9:13], byteorder="little")
|
||||
if data[8] == 2:
|
||||
res["signature"] = data[13:17].hex()
|
||||
res["text"] = data[17:].decode('utf-8', 'ignore')
|
||||
res["text"] = data[17:].decode("utf-8", "ignore")
|
||||
else:
|
||||
res["text"] = data[13:].decode('utf-8', 'ignore')
|
||||
|
||||
res["text"] = data[13:].decode("utf-8", "ignore")
|
||||
|
||||
attributes = {
|
||||
"pubkey_prefix": res["pubkey_prefix"],
|
||||
"txt_type": res["txt_type"]
|
||||
"txt_type": res["txt_type"],
|
||||
}
|
||||
|
||||
|
||||
evt_type = EventType.CONTACT_MSG_RECV
|
||||
|
||||
await self.dispatcher.dispatch(Event(evt_type, res, attributes))
|
||||
|
||||
|
||||
elif packet_type_value == 16: # A reply to CMD_SYNC_NEXT_MESSAGE (ver >= 3)
|
||||
res = {}
|
||||
res["type"] = "PRIV"
|
||||
res["SNR"] = int.from_bytes(data[1:2], byteorder='little', signed=True) / 4
|
||||
res["SNR"] = int.from_bytes(data[1:2], byteorder="little", signed=True) / 4
|
||||
res["pubkey_prefix"] = data[4:10].hex()
|
||||
res["path_len"] = data[10]
|
||||
res["txt_type"] = data[11]
|
||||
res["sender_timestamp"] = int.from_bytes(data[12:16], byteorder='little')
|
||||
res["sender_timestamp"] = int.from_bytes(data[12:16], byteorder="little")
|
||||
if data[11] == 2:
|
||||
res["signature"] = data[16:20].hex()
|
||||
res["text"] = data[20:].decode('utf-8', 'ignore')
|
||||
res["text"] = data[20:].decode("utf-8", "ignore")
|
||||
else:
|
||||
res["text"] = data[16:].decode('utf-8', 'ignore')
|
||||
|
||||
res["text"] = data[16:].decode("utf-8", "ignore")
|
||||
|
||||
attributes = {
|
||||
"pubkey_prefix": res["pubkey_prefix"],
|
||||
"txt_type": res["txt_type"]
|
||||
"txt_type": res["txt_type"],
|
||||
}
|
||||
|
||||
await self.dispatcher.dispatch(Event(EventType.CONTACT_MSG_RECV, res, attributes))
|
||||
|
||||
|
||||
await self.dispatcher.dispatch(
|
||||
Event(EventType.CONTACT_MSG_RECV, res, attributes)
|
||||
)
|
||||
|
||||
elif packet_type_value == PacketType.CHANNEL_MSG_RECV.value:
|
||||
res = {}
|
||||
res["type"] = "CHAN"
|
||||
res["channel_idx"] = data[1]
|
||||
res["path_len"] = data[2]
|
||||
res["txt_type"] = data[3]
|
||||
res["sender_timestamp"] = int.from_bytes(data[4:8], byteorder='little')
|
||||
res["text"] = data[8:].decode('utf-8', 'ignore')
|
||||
|
||||
res["sender_timestamp"] = int.from_bytes(data[4:8], byteorder="little")
|
||||
res["text"] = data[8:].decode("utf-8", "ignore")
|
||||
|
||||
attributes = {
|
||||
"channel_idx": res["channel_idx"],
|
||||
"txt_type": res["txt_type"]
|
||||
"txt_type": res["txt_type"],
|
||||
}
|
||||
|
||||
await self.dispatcher.dispatch(Event(EventType.CHANNEL_MSG_RECV, res, attributes))
|
||||
|
||||
|
||||
await self.dispatcher.dispatch(
|
||||
Event(EventType.CHANNEL_MSG_RECV, res, attributes)
|
||||
)
|
||||
|
||||
elif packet_type_value == 17: # A reply to CMD_SYNC_NEXT_MESSAGE (ver >= 3)
|
||||
res = {}
|
||||
res["type"] = "CHAN"
|
||||
res["SNR"] = int.from_bytes(data[1:2], byteorder='little', signed=True) / 4
|
||||
res["SNR"] = int.from_bytes(data[1:2], byteorder="little", signed=True) / 4
|
||||
res["channel_idx"] = data[4]
|
||||
res["path_len"] = data[5]
|
||||
res["txt_type"] = data[6]
|
||||
res["sender_timestamp"] = int.from_bytes(data[7:11], byteorder='little')
|
||||
res["text"] = data[11:].decode('utf-8', 'ignore')
|
||||
|
||||
res["sender_timestamp"] = int.from_bytes(data[7:11], byteorder="little")
|
||||
res["text"] = data[11:].decode("utf-8", "ignore")
|
||||
|
||||
attributes = {
|
||||
"channel_idx": res["channel_idx"],
|
||||
"txt_type": res["txt_type"]
|
||||
"txt_type": res["txt_type"],
|
||||
}
|
||||
|
||||
await self.dispatcher.dispatch(Event(EventType.CHANNEL_MSG_RECV, res, attributes))
|
||||
|
||||
|
||||
await self.dispatcher.dispatch(
|
||||
Event(EventType.CHANNEL_MSG_RECV, res, attributes)
|
||||
)
|
||||
|
||||
elif packet_type_value == PacketType.CURRENT_TIME.value:
|
||||
time_value = int.from_bytes(data[1:5], byteorder='little')
|
||||
time_value = int.from_bytes(data[1:5], byteorder="little")
|
||||
result = {"time": time_value}
|
||||
await self.dispatcher.dispatch(Event(EventType.CURRENT_TIME, result))
|
||||
|
||||
|
||||
elif packet_type_value == PacketType.NO_MORE_MSGS.value:
|
||||
result = {"messages_available": False}
|
||||
await self.dispatcher.dispatch(Event(EventType.NO_MORE_MSGS, result))
|
||||
|
||||
|
||||
elif packet_type_value == PacketType.CONTACT_URI.value:
|
||||
contact_uri = "meshcore://" + data[1:].hex()
|
||||
result = {"uri": contact_uri}
|
||||
await self.dispatcher.dispatch(Event(EventType.CONTACT_URI, result))
|
||||
|
||||
|
||||
elif packet_type_value == PacketType.BATTERY.value:
|
||||
battery_level = int.from_bytes(data[1:3], byteorder='little')
|
||||
battery_level = int.from_bytes(data[1:3], byteorder="little")
|
||||
result = {"level": battery_level}
|
||||
if len(data) > 3 : # has storage info as well
|
||||
result["used_kb"] = int.from_bytes(data[3:7], byteorder='little')
|
||||
result["total_kb"] = int.from_bytes(data[7:11], byteorder='little')
|
||||
if len(data) > 3: # has storage info as well
|
||||
result["used_kb"] = int.from_bytes(data[3:7], byteorder="little")
|
||||
result["total_kb"] = int.from_bytes(data[7:11], byteorder="little")
|
||||
await self.dispatcher.dispatch(Event(EventType.BATTERY, result))
|
||||
|
||||
|
||||
elif packet_type_value == PacketType.DEVICE_INFO.value:
|
||||
res = {}
|
||||
res["fw ver"] = data[1]
|
||||
if data[1] >= 3:
|
||||
res["max_contacts"] = data[2] * 2
|
||||
res["max_channels"] = data[3]
|
||||
res["ble_pin"] = int.from_bytes(data[4:8], byteorder='little')
|
||||
res["fw_build"] = data[8:20].decode('utf-8', 'ignore').replace("\0","")
|
||||
res["model"] = data[20:60].decode('utf-8', 'ignore').replace("\0","")
|
||||
res["ver"] = data[60:80].decode('utf-8', 'ignore').replace("\0","")
|
||||
res["ble_pin"] = int.from_bytes(data[4:8], byteorder="little")
|
||||
res["fw_build"] = data[8:20].decode("utf-8", "ignore").replace("\0", "")
|
||||
res["model"] = data[20:60].decode("utf-8", "ignore").replace("\0", "")
|
||||
res["ver"] = data[60:80].decode("utf-8", "ignore").replace("\0", "")
|
||||
await self.dispatcher.dispatch(Event(EventType.DEVICE_INFO, res))
|
||||
|
||||
|
||||
elif packet_type_value == PacketType.CUSTOM_VARS.value:
|
||||
logger.debug(f"received custom vars response: {data.hex()}")
|
||||
res = {}
|
||||
rawdata = data[1:].decode('utf-8', 'ignore')
|
||||
if not rawdata == "" :
|
||||
rawdata = data[1:].decode("utf-8", "ignore")
|
||||
if not rawdata == "":
|
||||
pairs = rawdata.split(",")
|
||||
for p in pairs :
|
||||
for p in pairs:
|
||||
psplit = p.split(":")
|
||||
res[psplit[0]] = psplit[1]
|
||||
logger.debug(f"got custom vars : {res}")
|
||||
await self.dispatcher.dispatch(Event(EventType.CUSTOM_VARS, res))
|
||||
|
||||
|
||||
elif packet_type_value == PacketType.CHANNEL_INFO.value:
|
||||
logger.debug(f"received channel info response: {data.hex()}")
|
||||
res = {}
|
||||
res["channel_idx"] = data[1]
|
||||
|
||||
|
||||
# Channel name is null-terminated, so find the first null byte
|
||||
name_bytes = data[2:34]
|
||||
null_pos = name_bytes.find(0)
|
||||
if null_pos >= 0:
|
||||
res["channel_name"] = name_bytes[:null_pos].decode('utf-8', 'ignore')
|
||||
res["channel_name"] = name_bytes[:null_pos].decode("utf-8", "ignore")
|
||||
else:
|
||||
res["channel_name"] = name_bytes.decode('utf-8', 'ignore')
|
||||
|
||||
res["channel_name"] = name_bytes.decode("utf-8", "ignore")
|
||||
|
||||
res["channel_secret"] = data[34:50]
|
||||
await self.dispatcher.dispatch(Event(EventType.CHANNEL_INFO, res, res))
|
||||
await self.dispatcher.dispatch(Event(EventType.CHANNEL_INFO, res, res))
|
||||
|
||||
# Push notifications
|
||||
elif packet_type_value == PacketType.ADVERTISEMENT.value:
|
||||
|
|
@ -251,30 +271,28 @@ class MessageReader:
|
|||
res = {}
|
||||
res["public_key"] = data[1:33].hex()
|
||||
await self.dispatcher.dispatch(Event(EventType.ADVERTISEMENT, res, res))
|
||||
|
||||
|
||||
elif packet_type_value == PacketType.PATH_UPDATE.value:
|
||||
logger.debug("Code path update")
|
||||
res = {}
|
||||
res["public_key"] = data[1:33].hex()
|
||||
await self.dispatcher.dispatch(Event(EventType.PATH_UPDATE, res, res))
|
||||
|
||||
|
||||
elif packet_type_value == PacketType.ACK.value:
|
||||
logger.debug("Received ACK")
|
||||
ack_data = {}
|
||||
|
||||
|
||||
if len(data) >= 5:
|
||||
ack_data["code"] = bytes(data[1:5]).hex()
|
||||
|
||||
attributes = {
|
||||
"code": ack_data.get("code", "")
|
||||
}
|
||||
|
||||
|
||||
attributes = {"code": ack_data.get("code", "")}
|
||||
|
||||
await self.dispatcher.dispatch(Event(EventType.ACK, ack_data, attributes))
|
||||
|
||||
|
||||
elif packet_type_value == PacketType.MESSAGES_WAITING.value:
|
||||
logger.debug("Msgs are waiting")
|
||||
await self.dispatcher.dispatch(Event(EventType.MESSAGES_WAITING, {}))
|
||||
|
||||
|
||||
elif packet_type_value == PacketType.RAW_DATA.value:
|
||||
res = {}
|
||||
res["SNR"] = data[1] / 4
|
||||
|
|
@ -283,145 +301,161 @@ class MessageReader:
|
|||
logger.debug("Received raw data")
|
||||
print(res)
|
||||
await self.dispatcher.dispatch(Event(EventType.RAW_DATA, res))
|
||||
|
||||
|
||||
elif packet_type_value == PacketType.LOGIN_SUCCESS.value:
|
||||
res = {}
|
||||
if len(data) > 1:
|
||||
res["permissions"] = data[1]
|
||||
res["is_admin"] = (data[1] & 1) == 1 # Check if admin bit is set
|
||||
|
||||
|
||||
if len(data) > 7:
|
||||
res["pubkey_prefix"] = data[2:8].hex()
|
||||
|
||||
attributes = {
|
||||
"pubkey_prefix": res.get("pubkey_prefix")
|
||||
}
|
||||
|
||||
await self.dispatcher.dispatch(Event(EventType.LOGIN_SUCCESS, res, attributes))
|
||||
|
||||
|
||||
attributes = {"pubkey_prefix": res.get("pubkey_prefix")}
|
||||
|
||||
await self.dispatcher.dispatch(
|
||||
Event(EventType.LOGIN_SUCCESS, res, attributes)
|
||||
)
|
||||
|
||||
elif packet_type_value == PacketType.LOGIN_FAILED.value:
|
||||
res = {}
|
||||
|
||||
|
||||
if len(data) > 7:
|
||||
res["pubkey_prefix"] = data[2:8].hex()
|
||||
|
||||
attributes = {
|
||||
"pubkey_prefix": res.get("pubkey_prefix")
|
||||
}
|
||||
|
||||
await self.dispatcher.dispatch(Event(EventType.LOGIN_FAILED, res, attributes))
|
||||
|
||||
|
||||
attributes = {"pubkey_prefix": res.get("pubkey_prefix")}
|
||||
|
||||
await self.dispatcher.dispatch(
|
||||
Event(EventType.LOGIN_FAILED, res, attributes)
|
||||
)
|
||||
|
||||
elif packet_type_value == PacketType.STATUS_RESPONSE.value:
|
||||
res = {}
|
||||
res["pubkey_pre"] = data[2:8].hex()
|
||||
res["bat"] = int.from_bytes(data[8:10], byteorder='little')
|
||||
res["tx_queue_len"] = int.from_bytes(data[10:12], byteorder='little')
|
||||
res["noise_floor"] = int.from_bytes(data[12:14], byteorder='little', signed=True)
|
||||
res["last_rssi"] = int.from_bytes(data[14:16], byteorder='little', signed=True)
|
||||
res["nb_recv"] = int.from_bytes(data[16:20], byteorder='little', signed=False)
|
||||
res["nb_sent"] = int.from_bytes(data[20:24], byteorder='little', signed=False)
|
||||
res["airtime"] = int.from_bytes(data[24:28], byteorder='little')
|
||||
res["uptime"] = int.from_bytes(data[28:32], byteorder='little')
|
||||
res["sent_flood"] = int.from_bytes(data[32:36], byteorder='little')
|
||||
res["sent_direct"] = int.from_bytes(data[36:40], byteorder='little')
|
||||
res["recv_flood"] = int.from_bytes(data[40:44], byteorder='little')
|
||||
res["recv_direct"] = int.from_bytes(data[44:48], byteorder='little')
|
||||
res["full_evts"] = int.from_bytes(data[48:50], byteorder='little')
|
||||
res["last_snr"] = int.from_bytes(data[50:52], byteorder='little', signed=True) / 4
|
||||
res["direct_dups"] = int.from_bytes(data[52:54], byteorder='little')
|
||||
res["flood_dups"] = int.from_bytes(data[54:56], byteorder='little')
|
||||
res["rx_airtime"] = int.from_bytes(data[56:60], byteorder='little')
|
||||
res["bat"] = int.from_bytes(data[8:10], byteorder="little")
|
||||
res["tx_queue_len"] = int.from_bytes(data[10:12], byteorder="little")
|
||||
res["noise_floor"] = int.from_bytes(
|
||||
data[12:14], byteorder="little", signed=True
|
||||
)
|
||||
res["last_rssi"] = int.from_bytes(
|
||||
data[14:16], byteorder="little", signed=True
|
||||
)
|
||||
res["nb_recv"] = int.from_bytes(
|
||||
data[16:20], byteorder="little", signed=False
|
||||
)
|
||||
res["nb_sent"] = int.from_bytes(
|
||||
data[20:24], byteorder="little", signed=False
|
||||
)
|
||||
res["airtime"] = int.from_bytes(data[24:28], byteorder="little")
|
||||
res["uptime"] = int.from_bytes(data[28:32], byteorder="little")
|
||||
res["sent_flood"] = int.from_bytes(data[32:36], byteorder="little")
|
||||
res["sent_direct"] = int.from_bytes(data[36:40], byteorder="little")
|
||||
res["recv_flood"] = int.from_bytes(data[40:44], byteorder="little")
|
||||
res["recv_direct"] = int.from_bytes(data[44:48], byteorder="little")
|
||||
res["full_evts"] = int.from_bytes(data[48:50], byteorder="little")
|
||||
res["last_snr"] = (
|
||||
int.from_bytes(data[50:52], byteorder="little", signed=True) / 4
|
||||
)
|
||||
res["direct_dups"] = int.from_bytes(data[52:54], byteorder="little")
|
||||
res["flood_dups"] = int.from_bytes(data[54:56], byteorder="little")
|
||||
res["rx_airtime"] = int.from_bytes(data[56:60], byteorder="little")
|
||||
|
||||
data_hex = data[8:].hex()
|
||||
logger.debug(f"Status response: {data_hex}")
|
||||
|
||||
|
||||
attributes = {
|
||||
"pubkey_prefix": res["pubkey_pre"],
|
||||
}
|
||||
await self.dispatcher.dispatch(Event(EventType.STATUS_RESPONSE, res, attributes))
|
||||
|
||||
await self.dispatcher.dispatch(
|
||||
Event(EventType.STATUS_RESPONSE, res, attributes)
|
||||
)
|
||||
|
||||
elif packet_type_value == PacketType.LOG_DATA.value:
|
||||
logger.debug(f"Received RF log data: {data.hex()}")
|
||||
|
||||
|
||||
# Parse as raw RX data
|
||||
log_data: Dict[str, Any] = {
|
||||
"raw_hex": data[1:].hex()
|
||||
}
|
||||
|
||||
log_data: Dict[str, Any] = {"raw_hex": data[1:].hex()}
|
||||
|
||||
# First byte is SNR (signed byte, multiplied by 4)
|
||||
if len(data) > 1:
|
||||
snr_byte = data[1]
|
||||
# Convert to signed value
|
||||
snr = (snr_byte if snr_byte < 128 else snr_byte - 256) / 4.0
|
||||
log_data["snr"] = snr
|
||||
|
||||
|
||||
# Second byte is RSSI (signed byte)
|
||||
if len(data) > 2:
|
||||
rssi_byte = data[2]
|
||||
# Convert to signed value
|
||||
rssi = rssi_byte if rssi_byte < 128 else rssi_byte - 256
|
||||
log_data["rssi"] = rssi
|
||||
|
||||
|
||||
# Remaining bytes are the raw data payload
|
||||
if len(data) > 3:
|
||||
log_data["payload"] = data[3:].hex()
|
||||
log_data["payload_length"] = len(data) - 3
|
||||
|
||||
|
||||
attributes = {
|
||||
"pubkey_prefix": log_data["raw_hex"],
|
||||
}
|
||||
|
||||
|
||||
# Dispatch as RF log data
|
||||
await self.dispatcher.dispatch(Event(EventType.RX_LOG_DATA, log_data, attributes))
|
||||
|
||||
await self.dispatcher.dispatch(
|
||||
Event(EventType.RX_LOG_DATA, log_data, attributes)
|
||||
)
|
||||
|
||||
elif packet_type_value == PacketType.TRACE_DATA.value:
|
||||
logger.debug(f"Received trace data: {data.hex()}")
|
||||
res = {}
|
||||
|
||||
|
||||
# According to the source, format is:
|
||||
# 0x89, reserved(0), path_len, flags, tag(4), auth(4), path_hashes[], path_snrs[], final_snr
|
||||
|
||||
reserved = data[1]
|
||||
|
||||
path_len = data[2]
|
||||
flags = data[3]
|
||||
tag = int.from_bytes(data[4:8], byteorder='little')
|
||||
auth_code = int.from_bytes(data[8:12], byteorder='little')
|
||||
|
||||
tag = int.from_bytes(data[4:8], byteorder="little")
|
||||
auth_code = int.from_bytes(data[8:12], byteorder="little")
|
||||
|
||||
# Initialize result
|
||||
res["tag"] = tag
|
||||
res["auth"] = auth_code
|
||||
res["flags"] = flags
|
||||
res["path_len"] = path_len
|
||||
|
||||
|
||||
# Process path as array of objects with hash and SNR
|
||||
path_nodes = []
|
||||
|
||||
if path_len > 0 and len(data) >= 12 + path_len*2 + 1:
|
||||
|
||||
if path_len > 0 and len(data) >= 12 + path_len * 2 + 1:
|
||||
# Extract path with hash and SNR pairs
|
||||
for i in range(path_len):
|
||||
node = {
|
||||
"hash": f"{data[12+i]:02x}",
|
||||
# SNR is stored as a signed byte representing SNR * 4
|
||||
"snr": (data[12+path_len+i] if data[12+path_len+i] < 128 else data[12+path_len+i] - 256) / 4.0
|
||||
"snr": (
|
||||
data[12 + path_len + i]
|
||||
if data[12 + path_len + i] < 128
|
||||
else data[12 + path_len + i] - 256
|
||||
)
|
||||
/ 4.0,
|
||||
}
|
||||
path_nodes.append(node)
|
||||
|
||||
|
||||
# Add the final node (our device) with its SNR
|
||||
final_snr_byte = data[12+path_len*2]
|
||||
final_snr = (final_snr_byte if final_snr_byte < 128 else final_snr_byte - 256) / 4.0
|
||||
path_nodes.append({
|
||||
"snr": final_snr
|
||||
})
|
||||
|
||||
final_snr_byte = data[12 + path_len * 2]
|
||||
final_snr = (
|
||||
final_snr_byte if final_snr_byte < 128 else final_snr_byte - 256
|
||||
) / 4.0
|
||||
path_nodes.append({"snr": final_snr})
|
||||
|
||||
res["path"] = path_nodes
|
||||
|
||||
|
||||
logger.debug(f"Parsed trace data: {res}")
|
||||
|
||||
|
||||
attributes = {
|
||||
"tag": res["tag"],
|
||||
"auth_code": res["auth"],
|
||||
}
|
||||
|
||||
|
||||
await self.dispatcher.dispatch(Event(EventType.TRACE_DATA, res, attributes))
|
||||
|
||||
elif packet_type_value == PacketType.TELEMETRY_RESPONSE.value:
|
||||
|
|
@ -439,15 +473,19 @@ class MessageReader:
|
|||
lpp_data_list.append(lppdata)
|
||||
i = i + len(lppdata)
|
||||
|
||||
lpp = json.loads(json.dumps(LppFrame(lpp_data_list), default=lpp_json_encoder))
|
||||
lpp = json.loads(
|
||||
json.dumps(LppFrame(lpp_data_list), default=lpp_json_encoder)
|
||||
)
|
||||
|
||||
res["lpp"] = lpp
|
||||
|
||||
attributes = {
|
||||
"raw" : buf.hex(),
|
||||
"raw": buf.hex(),
|
||||
}
|
||||
|
||||
await self.dispatcher.dispatch(Event(EventType.TELEMETRY_RESPONSE, res, attributes))
|
||||
|
||||
await self.dispatcher.dispatch(
|
||||
Event(EventType.TELEMETRY_RESPONSE, res, attributes)
|
||||
)
|
||||
|
||||
elif packet_type_value == PacketType.BINARY_RESPONSE.value:
|
||||
logger.debug(f"Received binary data: {data.hex()}")
|
||||
|
|
@ -456,11 +494,11 @@ class MessageReader:
|
|||
res["tag"] = data[2:6].hex()
|
||||
res["data"] = data[6:].hex()
|
||||
|
||||
attributes = {
|
||||
"tag" : res["tag"]
|
||||
}
|
||||
attributes = {"tag": res["tag"]}
|
||||
|
||||
await self.dispatcher.dispatch(Event(EventType.BINARY_RESPONSE, res, attributes))
|
||||
await self.dispatcher.dispatch(
|
||||
Event(EventType.BINARY_RESPONSE, res, attributes)
|
||||
)
|
||||
|
||||
elif packet_type_value == PacketType.PATH_DISCOVERY_RESPONSE.value:
|
||||
logger.debug(f"Received path discovery response: {data.hex()}")
|
||||
|
|
@ -468,18 +506,17 @@ class MessageReader:
|
|||
res["pubkey_pre"] = data[2:8].hex()
|
||||
opl = data[8]
|
||||
res["out_path_len"] = opl
|
||||
res["out_path"] = data[9:9+opl].hex()
|
||||
ipl = data[9+opl]
|
||||
res["out_path"] = data[9 : 9 + opl].hex()
|
||||
ipl = data[9 + opl]
|
||||
res["in_path_len"] = ipl
|
||||
res["in_path"] = data[10+opl:10+opl+ipl].hex()
|
||||
res["in_path"] = data[10 + opl : 10 + opl + ipl].hex()
|
||||
|
||||
attributes = {
|
||||
"pubkey_pre" : res["pubkey_pre"]
|
||||
}
|
||||
attributes = {"pubkey_pre": res["pubkey_pre"]}
|
||||
|
||||
await self.dispatcher.dispatch(Event(EventType.PATH_RESPONSE, res, attributes))
|
||||
await self.dispatcher.dispatch(
|
||||
Event(EventType.PATH_RESPONSE, res, attributes)
|
||||
)
|
||||
|
||||
else:
|
||||
logger.debug(f"Unhandled data received {data}")
|
||||
logger.debug(f"Unhandled packet type: {packet_type_value}")
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue