iarv/mc-webui
1
0
Fork 1
mirror of https://github.com/MarekWo/mc-webui.git synced 2026-03-28 17:42:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(console): fix node_discover display using correct payload fields

Browse Source 
The DISCOVER_RESPONSE payload uses 'pubkey' and 'node_type', not
'public_key'/'name'/'adv_name'. Now shows pubkey prefix, resolved
contact name, node type, SNR, and RSSI. Also rename CLI->COM type.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
MarekWo
2026-03-24 14:17:42 +01:00
parent 2c73e20775
commit d54d8f58dd
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/device_manager.py
View File

@@ -2335,7 +2335,7 @@ class DeviceManager:
from meshcore.events import EventType
types = 0xFF # all types
if type_filter:
type_map = {'cli': 1, 'rep': 2, 'room': 3, 'sensor': 4, 'sens': 4}
type_map = {'com': 1, 'rep': 2, 'room': 3, 'sensor': 4, 'sens': 4}
t = type_map.get(type_filter.lower())
if t:
types = t

24
app/main.py
View File

@@ -1104,12 +1104,30 @@ def _execute_console_command(args: list) -> str:
data = result['data']
if not data:
return "No nodes discovered"
type_names = ["NONE", "COM", "REP", "ROOM", "SENS"]
lines = [f"Discovered nodes ({len(data)}):"]
for node in data:
if isinstance(node, dict):
name = node.get('adv_name', node.get('name', '?'))
pk = node.get('public_key', '')[:12]
lines.append(f" {name} ({pk}...)")
pk = node.get('pubkey', '')
# Try to resolve name from contacts
name = None
if pk and device_manager.mc:
try:
contact = device_manager.mc.get_contact_by_key_prefix(pk)
if contact:
name = contact.get('adv_name', '')
except Exception:
pass
if name:
label = f"{pk[:6]} {name}"
else:
label = pk[:16] or '?'
nt = node.get('node_type', 0)
type_str = type_names[nt] if nt < len(type_names) else f"t:{nt}"
snr_in = node.get('SNR_in', 0)
snr = node.get('SNR', 0)
rssi = node.get('RSSI', 0)
lines.append(f" {label:28} {type_str:>4} SNR: {snr_in:6.2f}->{snr:6.2f} RSSI: {rssi}")
else:
lines.append(f" {node}")
return "\n".join(lines)