meshcore-dev/meshcore_py
1
0
Fork 0
mirror of https://github.com/meshcore-dev/meshcore_py.git synced 2026-04-20 22:13:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

now works when contacts have not been retreived

Browse source
This commit is contained in:
Florent 2025-09-06 15:01:45 +02:00
parent b644bd12d9
commit 00e56c0d15
1 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/meshcore/commands/messaging.py
View file

@ -81,28 +81,36 @@ class MessagingCommands(CommandHandlerBase):
async def send_msg_with_retry (
self, dst: DestinationType, msg: str, timestamp: Optional[int] = None,
max_attempts=3, flood_after=2, timeout=0
max_attempts=3, max_flood_attempts=2, flood_after=2, timeout=0
) -> Event:
dst_bytes = _validate_destination(dst)
contact = self._get_contact_by_prefix(dst_bytes.hex())
attempts = 0
flood_attempts = 0
if not contact is None :
flood = contact["out_path_len"] == -1
else:
flood = False
res = None
while attempts < max_attempts and res is None:
while attempts < max_attempts and res is None \
and (not flood or flood_attempts < max_flood_attempts):
if attempts == flood_after : # change path to flood
logger.info("Resetting path")
rp_res = await self.reset_path(contact)
rp_res = await self.reset_path(dst)
if rp_res.type == EventType.ERROR:
logger.error(f"Couldn't reset path {rp_res} continuing ...")
else:
contact["out_path"] = ""
contact["out_path_len"] = -1
flood = True
if not contact is None:
contact["out_path"] = ""
contact["out_path_len"] = -1
if attempts > 0:
logger.info(f"Retry sending msg: {attempts + 1}")
result = await self.send_msg(contact, msg, timestamp, attempt=attempts)
result = await self.send_msg(dst, msg, timestamp, attempt=attempts)
if result.type == EventType.ERROR:
logger.error(f"⚠️ Failed to send message: {result.payload}")
@ -113,6 +121,8 @@ class MessagingCommands(CommandHandlerBase):
timeout=timeout)
attempts = attempts + 1
if flood :
flood_attempts = flood_attempts + 1
return None if res is None else result