iarv/pyMC_Repeater
1
0
Fork 1
mirror of https://github.com/rightup/pyMC_Repeater.git synced 2026-03-28 17:43:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add LBT metadata extraction and logging after packet transmission

Browse Source
This commit is contained in:
Lloyd
2025-12-21 21:22:49 +00:00
parent 038b4ac58d
commit 9834ae7059
1 changed files with 23 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
repeater/engine.py
View File

@@ -11,6 +11,8 @@ from pymc_core.protocol.constants import (
MAX_PATH_SIZE,
PAYLOAD_TYPE_ADVERT,
PH_ROUTE_MASK,
PH_TYPE_MASK,
PH_TYPE_SHIFT,
ROUTE_TYPE_DIRECT,
ROUTE_TYPE_FLOOD,
ROUTE_TYPE_TRANSPORT_FLOOD,
@@ -166,6 +168,24 @@ class RepeaterHandler(BaseHandler):
transmitted = True
# Schedule retransmit with delay
await self.schedule_retransmit(fwd_pkt, delay, airtime_ms)
# Extract LBT metadata after transmission
tx_metadata = getattr(fwd_pkt, '_tx_metadata', None)
lbt_attempts = 0
lbt_backoff_delays_ms = None
lbt_channel_busy = False
if tx_metadata:
lbt_attempts = tx_metadata.get('lbt_attempts', 0)
lbt_backoff_delays_ms = tx_metadata.get('lbt_backoff_delays_ms', [])
lbt_channel_busy = tx_metadata.get('lbt_channel_busy', False)
if lbt_attempts > 0:
total_lbt_delay = sum(lbt_backoff_delays_ms)
logger.info(
f"LBT: {lbt_attempts} attempts, {total_lbt_delay:.0f}ms delay, "
f"backoffs={lbt_backoff_delays_ms}"
)
else:
self.dropped_count += 1
# Determine drop reason from process_packet result
@@ -257,6 +277,9 @@ class RepeaterHandler(BaseHandler):
[f"{b:02X}" for b in forwarded_path] if forwarded_path is not None else None
),
"raw_packet": packet.write_to().hex() if hasattr(packet, "write_to") else None,
"lbt_attempts": lbt_attempts if transmitted else 0,
"lbt_backoff_delays_ms": lbt_backoff_delays_ms if transmitted and lbt_backoff_delays_ms else None,
"lbt_channel_busy": lbt_channel_busy if transmitted else False,
}
# Store packet record to persistent storage
@@ -620,57 +643,6 @@ class RepeaterHandler(BaseHandler):
try:
await self.dispatcher.send_packet(fwd_pkt, wait_for_ack=False)
tx_metadata = getattr(fwd_pkt, '_tx_metadata', None)
lbt_attempts = 0
lbt_backoff_delays_ms = []
lbt_channel_busy = False
if tx_metadata:
lbt_attempts = tx_metadata.get('lbt_attempts', 0)
lbt_backoff_delays_ms = tx_metadata.get('lbt_backoff_delays_ms', [])
lbt_channel_busy = tx_metadata.get('lbt_channel_busy', False)
if lbt_attempts > 0:
total_lbt_delay = sum(lbt_backoff_delays_ms)
logger.info(
f"LBT: {lbt_attempts} attempts, {total_lbt_delay:.0f}ms delay, "
f"backoffs={lbt_backoff_delays_ms}"
)
# Store TX packet record with LBT metrics if storage is available
if self.storage and lbt_attempts > 0:
try:
tx_record = {
"timestamp": time.time(),
"header": f"0x{fwd_pkt.header:02X}" if hasattr(fwd_pkt, "header") else None,
"payload": fwd_pkt.payload.hex() if hasattr(fwd_pkt, "payload") and fwd_pkt.payload else None,
"payload_length": len(fwd_pkt.payload) if hasattr(fwd_pkt, "payload") and fwd_pkt.payload else 0,
"type": (fwd_pkt.header >> 4) if hasattr(fwd_pkt, "header") else 0,
"route": (fwd_pkt.header & 0x07) if hasattr(fwd_pkt, "header") else 0,
"length": len(fwd_pkt.payload or b""),
"rssi": None, # TX packets don't have RSSI
"snr": None, # TX packets don't have SNR
"score": None,
"tx_delay_ms": delay * 1000.0,
"transmitted": True,
"is_duplicate": False,
"packet_hash": fwd_pkt.write_to().hex()[:16] if hasattr(fwd_pkt, "write_to") else "",
"drop_reason": None,
"path_hash": None,
"src_hash": None,
"dst_hash": None,
"original_path": None,
"forwarded_path": [f"{b:02X}" for b in fwd_pkt.path] if hasattr(fwd_pkt, "path") and fwd_pkt.path else None,
"raw_packet": fwd_pkt.write_to().hex() if hasattr(fwd_pkt, "write_to") else None,
"lbt_attempts": lbt_attempts,
"lbt_backoff_delays_ms": lbt_backoff_delays_ms,
"lbt_channel_busy": lbt_channel_busy,
}
self.storage.record_packet(tx_record, skip_letsmesh_if_invalid=False)
except Exception as e:
logger.error(f"Failed to store TX packet record with LBT metrics: {e}")
# Record airtime after successful TX
if airtime_ms > 0:
self.airtime_mgr.record_tx(airtime_ms)