Mirrors/meshcore_py
1
0
Fork 0
mirror of https://github.com/meshcore-dev/meshcore_py.git synced 2026-06-11 11:56:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

G3: F03 — restructure _attempt_reconnect from tail-recursion to loop

Browse Source 
_attempt_reconnect previously tail-recursed via asyncio.create_task,
re-assigning self._reconnect_task from inside the running coroutine.
This orphaned the current task — disconnect() cancelled only the
newest pointer, leaving previous-generation attempts in flight.  Those
orphaned tasks could set _is_connected = True after the caller thought
the session was closed.

Fix: replace with a single iterative while loop that holds one
persistent task for the entire reconnect session.  The task is created
once in handle_disconnect and torn down only on success, max attempts
exhausted, or disconnect() cancellation.

Refs: Forensics report finding F03
This commit is contained in:
Matthew Wolter
2026-04-11 19:47:12 -07:00
parent 115a402ac2
commit ab4c27dcae
1 changed files with 31 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/meshcore/connection_manager.py
View File

@@ -118,45 +118,41 @@ class ConnectionManager:
) )
async def _attempt_reconnect(self): async def _attempt_reconnect(self):
"""Attempt to reconnect with flat delay.""" """Attempt to reconnect using an iterative loop.
logger.debug(
f"Attempting reconnection ({self._reconnect_attempts + 1}/{self.max_reconnect_attempts})"
)
self._reconnect_attempts += 1
# Flat 1 second delay for all attempts Runs as a single persistent task for the entire reconnect session.
await asyncio.sleep(1) Previous implementation used tail-recursion via create_task which
orphaned the running task reference — disconnect() could only cancel
the newest pointer, leaving earlier attempts in flight (F03).
"""
while self._reconnect_attempts < self.max_reconnect_attempts:
self._reconnect_attempts += 1
logger.debug(
f"Attempting reconnection ({self._reconnect_attempts}/{self.max_reconnect_attempts})"
)
try: # Flat 1 second delay for all attempts
result = await self.connection.connect() await asyncio.sleep(1)
if result is not None:
self._is_connected = True try:
self._reconnect_attempts = 0 result = await self.connection.connect()
await self._emit_event( if result is not None:
EventType.CONNECTED, self._is_connected = True
{"connection_info": result, "reconnected": True}, self._reconnect_attempts = 0
)
logger.debug("Reconnected successfully")
else:
# Reconnection failed, try again if we haven't exceeded max attempts
if self._reconnect_attempts < self.max_reconnect_attempts:
self._reconnect_task = asyncio.create_task(
self._attempt_reconnect()
)
else:
await self._emit_event( await self._emit_event(
EventType.DISCONNECTED, EventType.CONNECTED,
{"reason": "reconnect_failed", "max_attempts_exceeded": True}, {"connection_info": result, "reconnected": True},
) )
except Exception as e: logger.debug("Reconnected successfully")
logger.debug(f"Reconnection attempt failed: {e}") return
if self._reconnect_attempts < self.max_reconnect_attempts: except Exception as e:
self._reconnect_task = asyncio.create_task(self._attempt_reconnect()) logger.debug(f"Reconnection attempt failed: {e}")
else:
await self._emit_event( # All attempts exhausted
EventType.DISCONNECTED, await self._emit_event(
{"reason": f"reconnect_error: {e}", "max_attempts_exceeded": True}, EventType.DISCONNECTED,
) {"reason": "reconnect_failed", "max_attempts_exceeded": True},
)
async def _emit_event(self, event_type: EventType, payload: dict): async def _emit_event(self, event_type: EventType, payload: dict):
"""Emit connection events if dispatcher is available.""" """Emit connection events if dispatcher is available."""