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): repeater req_* return value check

Browse Source 
meshcore _sync methods return dict (data) or None (error/timeout),
not Event objects. hasattr(dict, 'payload') is always False, causing
instant "timeout" errors. Changed to check `result is not None`.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
MarekWo
2026-03-19 12:08:11 +01:00
parent fe7c67ee9a
commit 3f9b6e54c8
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app/device_manager.py
View File

@@ -1630,12 +1630,12 @@ class DeviceManager:
try:
# Pass timeout=0 to let library use device's suggested_timeout
contact_timeout = contact.get('timeout', 0) or 0
event = self.execute(
result = self.execute(
self.mc.commands.req_status_sync(contact, contact_timeout),
timeout=120
)
if event and hasattr(event, 'payload'):
return {'success': True, 'data': event.payload}
if result is not None:
return {'success': True, 'data': result}
return {'success': False, 'error': 'No status response (timeout)'}
except Exception as e:
logger.error(f"req_status failed: {e}")
@@ -1650,12 +1650,12 @@ class DeviceManager:
return {'success': False, 'error': f"Contact not found: {name_or_key}"}
try:
contact_timeout = contact.get('timeout', 0) or 0
event = self.execute(
result = self.execute(
self.mc.commands.req_regions_sync(contact, contact_timeout),
timeout=120
)
if event and hasattr(event, 'payload'):
return {'success': True, 'data': event.payload}
if result is not None:
return {'success': True, 'data': result}
return {'success': False, 'error': 'No regions response (timeout)'}
except Exception as e:
logger.error(f"req_regions failed: {e}")
@@ -1670,12 +1670,12 @@ class DeviceManager:
return {'success': False, 'error': f"Contact not found: {name_or_key}"}
try:
contact_timeout = contact.get('timeout', 0) or 0
event = self.execute(
result = self.execute(
self.mc.commands.req_owner_sync(contact, contact_timeout),
timeout=120
)
if event and hasattr(event, 'payload'):
return {'success': True, 'data': event.payload}
if result is not None:
return {'success': True, 'data': result}
return {'success': False, 'error': 'No owner response (timeout)'}
except Exception as e:
logger.error(f"req_owner failed: {e}")
@@ -1690,12 +1690,12 @@ class DeviceManager:
return {'success': False, 'error': f"Contact not found: {name_or_key}"}
try:
contact_timeout = contact.get('timeout', 0) or 0
event = self.execute(
result = self.execute(
self.mc.commands.req_acl_sync(contact, contact_timeout),
timeout=120
)
if event and hasattr(event, 'payload'):
return {'success': True, 'data': event.payload}
if result is not None:
return {'success': True, 'data': result}
return {'success': False, 'error': 'No ACL response (timeout)'}
except Exception as e:
logger.error(f"req_acl failed: {e}")
@@ -1710,12 +1710,12 @@ class DeviceManager:
return {'success': False, 'error': f"Contact not found: {name_or_key}"}
try:
contact_timeout = contact.get('timeout', 0) or 0
event = self.execute(
result = self.execute(
self.mc.commands.req_basic_sync(contact, contact_timeout),
timeout=120
)
if event and hasattr(event, 'payload'):
return {'success': True, 'data': event.payload}
if result is not None:
return {'success': True, 'data': result}
return {'success': False, 'error': 'No clock response (timeout)'}
except Exception as e:
logger.error(f"req_clock failed: {e}")
@@ -1730,12 +1730,12 @@ class DeviceManager:
return {'success': False, 'error': f"Contact not found: {name_or_key}"}
try:
contact_timeout = contact.get('timeout', 0) or 0
event = self.execute(
result = self.execute(
self.mc.commands.req_mma_sync(contact, from_secs, to_secs, contact_timeout),
timeout=120
)
if event and hasattr(event, 'payload'):
return {'success': True, 'data': event.payload}
if result is not None:
return {'success': True, 'data': result}
return {'success': False, 'error': 'No MMA response (timeout)'}
except Exception as e:
logger.error(f"req_mma failed: {e}")