meshcore 2.1.12__tar.gz → 2.1.14__tar.gz

{meshcore-2.1.12 → meshcore-2.1.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshcore
-Version: 2.1.12
+Version: 2.1.14
 Summary: Base classes for communicating with meshcore companion radios
 Project-URL: Homepage, https://github.com/fdlamotte/meshcore_py
 Project-URL: Issues, https://github.com/fdlamotte/meshcore_py/issues

{meshcore-2.1.12 → meshcore-2.1.14}/pyproject.toml

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

{meshcore-2.1.12 → meshcore-2.1.14}/src/meshcore/commands/base.py

@@ -80,6 +80,53 @@ class CommandHandlerBase:
         )-> None:
         self._get_contact_by_prefix = func
 
+    async def wait_for_events(
+        self,
+        expected_events: Optional[Union[EventType, List[EventType]]] = None,
+        timeout: Optional[float] = None,
+    ) -> Event:
+        try:
+            # Convert single event to list if needed
+            if not isinstance(expected_events, list):
+                expected_events = [expected_events]
+
+            logger.debug(f"Waiting for events {expected_events}, timeout={timeout}")
+
+            # Create futures for all expected events
+            futures = []
+            for event_type in expected_events:
+                future = asyncio.create_task(
+                    self.dispatcher.wait_for_event(event_type, {}, timeout)
+                )
+                futures.append(future)
+
+            # Wait for the first event to complete or all to timeout
+            done, pending = await asyncio.wait(
+                futures, timeout=timeout, return_when=asyncio.FIRST_COMPLETED
+            )
+
+            # Cancel all pending futures
+            for future in pending:
+                future.cancel()
+
+            # Check if any future completed successfully
+            for future in done:
+                event = await future
+                if event:
+                    return event
+
+            # Create an error event when no event is received
+            return Event(EventType.ERROR, {"reason": "no_event_received"})
+        except asyncio.TimeoutError:
+            logger.debug(f"Command timed out {data}")
+            return Event(EventType.ERROR, {"reason": "timeout"})
+        except Exception as e:
+            logger.debug(f"Command error: {e}")
+            return Event(EventType.ERROR, {"error": str(e)})
+
+        return Event(EventType.ERROR, {})
+
+
     async def send(
         self,
         data: bytes,
@@ -110,45 +157,9 @@ class CommandHandlerBase:
             await self._sender_func(data)
 
         if expected_events:
-            try:
-                # Convert single event to list if needed
-                if not isinstance(expected_events, list):
-                    expected_events = [expected_events]
-
-                logger.debug(f"Waiting for events {expected_events}, timeout={timeout}")
-
-                # Create futures for all expected events
-                futures = []
-                for event_type in expected_events:
-                    future = asyncio.create_task(
-                        self.dispatcher.wait_for_event(event_type, {}, timeout)
-                    )
-                    futures.append(future)
-
-                # Wait for the first event to complete or all to timeout
-                done, pending = await asyncio.wait(
-                    futures, timeout=timeout, return_when=asyncio.FIRST_COMPLETED
-                )
-
-                # Cancel all pending futures
-                for future in pending:
-                    future.cancel()
-
-                # Check if any future completed successfully
-                for future in done:
-                    event = await future
-                    if event:
-                        return event
-
-                # Create an error event when no event is received
-                return Event(EventType.ERROR, {"reason": "no_event_received"})
-            except asyncio.TimeoutError:
-                logger.debug(f"Command timed out {data}")
-                return Event(EventType.ERROR, {"reason": "timeout"})
-            except Exception as e:
-                logger.debug(f"Command error: {e}")
-                return Event(EventType.ERROR, {"error": str(e)})
         # For commands that don't expect events, return a success event
+            return await self.wait_for_events(expected_events, timeout)
+
         return Event(EventType.OK, {})
 
     # attached at base because its a common method

{meshcore-2.1.12 → meshcore-2.1.14}/src/meshcore/commands/contact.py

@@ -1,19 +1,82 @@
 import logging
+import asyncio
 from typing import Optional
 
-from ..events import Event, EventType
+from ..events import Event, EventDispatcher, EventType
 from .base import CommandHandlerBase, DestinationType, _validate_destination
 
 logger = logging.getLogger("meshcore")
 
 
 class ContactCommands(CommandHandlerBase):
-    async def get_contacts(self, lastmod=0) -> Event:
+    async def get_contacts(self, lastmod=0, anim=False) -> Event:
         logger.debug("Getting contacts")
         data = b"\x04"
         if lastmod > 0:
             data = data + lastmod.to_bytes(4, "little")
-        return await self.send(data, [EventType.CONTACTS, EventType.ERROR], timeout=30)
+        if anim:
+            print("Fetching contacts ", end="", flush=True)
+        # wait first event
+        res = await self.send(data)
+        timeout = 5
+        # Inline wait for events to continue waiting for CONTACTS event 
+        # while receiving NEXT_CONTACTs (or it might be missed over serial)
+        try:
+            # Create futures for all expected events
+            futures = []
+            for event_type in [EventType.ERROR, EventType.NEXT_CONTACT, EventType.CONTACTS] :
+                future = asyncio.create_task(
+                    self.dispatcher.wait_for_event(event_type, {}, timeout)
+                )
+                futures.append(future)
+
+            while True:
+    
+                # Wait for the first event to complete or all to timeout
+                done, pending = await asyncio.wait(
+                    futures, timeout=timeout, return_when=asyncio.FIRST_COMPLETED
+                )
+    
+                # Check if any future completed successfully
+                if len(done) == 0:
+                    print(" Timeout")
+                    for future in pending: # cancel all futures
+                        future.cancel()
+                    return None
+
+                for future in done:
+                    event = await future
+
+                    if event:
+                        if event.type == EventType.NEXT_CONTACT:
+                            if anim:
+                                print(".", end="", flush=True)
+                        else: # Done or Error ... cancel pending and return
+                            if anim:
+                                print(" Done" if event.type == EventType.CONTACTS else " Error")
+                            for future in pending:
+                                future.cancel()
+                            return event
+
+                futures = []
+                for future in pending: # put back pending
+                    futures.append(future)
+
+                future = asyncio.create_task( # and recreate NEXT_CONTACT
+                        self.dispatcher.wait_for_event(EventType.NEXT_CONTACT, {}, timeout)
+                    )
+                futures.append(future)
+    
+        except asyncio.TimeoutError:
+            logger.debug(f"Timeout receiving contacts")
+            if anim:
+                print(" Timeout")
+            return None
+        except Exception as e:
+            logger.debug(f"Command error: {e}")
+            if anim:
+                print(" Error")
+            return Event(EventType.ERROR, {"error": str(e)})
 
     async def reset_path(self, key: DestinationType) -> Event:
         key_bytes = _validate_destination(key, prefix_length=32)

{meshcore-2.1.12 → meshcore-2.1.14}/src/meshcore/events.py

@@ -21,6 +21,7 @@ class EventType(Enum):
     DEVICE_INFO = "device_info"
     MSG_SENT = "message_sent"
     NEW_CONTACT = "new_contact"
+    NEXT_CONTACT = "next_contact"
 
     # Push notifications
     ADVERTISEMENT = "advertisement"

{meshcore-2.1.12 → meshcore-2.1.14}/src/meshcore/reader.py

@@ -99,6 +99,7 @@ class MessageReader:
             if packet_type_value == PacketType.PUSH_CODE_NEW_ADVERT.value:
                 await self.dispatcher.dispatch(Event(EventType.NEW_CONTACT, c))
             else:
+                await self.dispatcher.dispatch(Event(EventType.NEXT_CONTACT, c))
                 self.contacts[c["public_key"]] = c
 
         elif packet_type_value == PacketType.CONTACT_END.value: