revert ensure_contacts and increase timeout in get_contacts

This commit is contained in:
Florent
2025-10-20 16:30:07 +02:00
parent ec4a62c9ef
commit 8f0be09f9a
3 changed files with 2 additions and 3 deletions

View File

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
[project] [project]
name = "meshcore" name = "meshcore"
version = "2.1.11" version = "2.1.12"
authors = [ authors = [
{ name="Florent de Lamotte", email="florent@frizoncorrea.fr" }, { name="Florent de Lamotte", email="florent@frizoncorrea.fr" },
{ name="Alex Wolden", email="awolden@gmail.com" }, { name="Alex Wolden", email="awolden@gmail.com" },

View File

@@ -13,7 +13,7 @@ class ContactCommands(CommandHandlerBase):
data = b"\x04" data = b"\x04"
if lastmod > 0: if lastmod > 0:
data = data + lastmod.to_bytes(4, "little") data = data + lastmod.to_bytes(4, "little")
return await self.send(data, [EventType.CONTACTS, EventType.ERROR]) return await self.send(data, [EventType.CONTACTS, EventType.ERROR], timeout=30)
async def reset_path(self, key: DestinationType) -> Event: async def reset_path(self, key: DestinationType) -> Event:
key_bytes = _validate_destination(key, prefix_length=32) key_bytes = _validate_destination(key, prefix_length=32)

View File

@@ -464,6 +464,5 @@ class MeshCore:
"""Ensure contacts are fetched""" """Ensure contacts are fetched"""
if not self._contacts or (follow and self._contacts_dirty): if not self._contacts or (follow and self._contacts_dirty):
await self.commands.get_contacts(lastmod=self._lastmod) await self.commands.get_contacts(lastmod=self._lastmod)
await self.wait_for_event(EventType.CONTACTS, timeout=30) # contact list can be huge
return True return True
return False return False