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(contacts): respect manual approval + fix message delay

Browse Source 
1. Manual approval: _on_new_contact now checks self_info
   manual_add_contacts flag. When enabled, new contacts stay in
   mc.pending_contacts for UI approval instead of auto-adding to DB.

2. Message delay: disable auto_update_contacts which was triggering
   full contact list refresh (270+ records over serial) on every
   ADVERTISEMENT event, blocking message reception for seconds.
   Contact names for adverts are looked up from cached mc.contacts.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
MarekWo
2026-03-01 21:46:08 +01:00
parent db5aac084c
commit 6bb985f9c4
1 changed files with 41 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
app/device_manager.py
View File

@@ -169,8 +169,11 @@ class DeviceManager:
# Subscribe to events
await self._subscribe_events()
# Enable auto-refresh of contacts on adverts/path updates
self.mc.auto_update_contacts = True
# NOTE: Do NOT enable mc.auto_update_contacts — it triggers
# full contact list refresh (270+ records over serial) on every
# ADVERTISEMENT event, blocking message reception for seconds.
# Contact names for adverts are looked up from mc.contacts dict
# which was populated during ensure_contacts() below.
# Fetch initial contacts from device
await self.mc.ensure_contacts()
@@ -472,29 +475,47 @@ class DeviceManager:
logger.error(f"Error handling path update: {e}")
async def _on_new_contact(self, event):
"""Handle new contact discovered."""
"""Handle new contact discovered.
When manual_add_contacts is enabled on the device, new contacts
stay in mc.pending_contacts for manual approval. We should NOT
auto-add them to our DB contacts table — only log them.
When manual mode is off, the device auto-adds and we upsert to DB.
"""
try:
data = getattr(event, 'payload', {})
pubkey = data.get('public_key', '')
name = data.get('adv_name', data.get('name', ''))
if pubkey:
last_adv = data.get('last_advert')
last_advert_val = (
str(int(last_adv))
if last_adv and isinstance(last_adv, (int, float)) and last_adv > 0
else str(int(time.time()))
)
self.db.upsert_contact(
public_key=pubkey,
name=name,
type=data.get('type', data.get('adv_type', 0)),
adv_lat=data.get('adv_lat'),
adv_lon=data.get('adv_lon'),
last_advert=last_advert_val,
source='device',
)
logger.info(f"New contact: {name} ({pubkey[:8]}...)")
if not pubkey:
return
# Check if manual approval mode is active
manual_mode = False
if self._self_info:
manual_mode = self._self_info.get('manual_add_contacts', False)
if manual_mode:
# Don't add to DB — let user approve via pending contacts UI
logger.info(f"New contact (pending): {name} ({pubkey[:8]}...)")
return
last_adv = data.get('last_advert')
last_advert_val = (
str(int(last_adv))
if last_adv and isinstance(last_adv, (int, float)) and last_adv > 0
else str(int(time.time()))
)
self.db.upsert_contact(
public_key=pubkey,
name=name,
type=data.get('type', data.get('adv_type', 0)),
adv_lat=data.get('adv_lat'),
adv_lon=data.get('adv_lon'),
last_advert=last_advert_val,
source='device',
)
logger.info(f"New contact: {name} ({pubkey[:8]}...)")
except Exception as e:
logger.error(f"Error handling new contact: {e}")