meshcore 2.1.12__py3-none-any.whl → 2.1.14__py3-none-any.whl

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/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/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/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:

{meshcore-2.1.12.dist-info → meshcore-2.1.14.dist-info}/METADATA

@@ -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.dist-info → meshcore-2.1.14.dist-info}/RECORD

@@ -1,21 +1,22 @@
 meshcore/__init__.py,sha256=55PdT8gZ9Lf727s7BdSuCt3lIBlAhRzX28A8i0DHaRc,602
 meshcore/ble_cx.py,sha256=GSMRFbgiluCbukx_xs6THx77bgIxH3l2DWPZ7TKY7JM,6591
 meshcore/connection_manager.py,sha256=3U0TWuHDvL5FfwEwXRy5HjlCyV3nsWhhrEC7TVxFzZI,5899
-meshcore/events.py,sha256=bSldqCicLENGuu5AhUN1-QYi9qn3kOBYULNKm6YaJfI,7980
+meshcore/events.py,sha256=ZaVy2cCjujM3--xUDoUZqHZTq09R1rR8y3-_rLL8-fQ,8014
 meshcore/lpp_json_encoder.py,sha256=vyn7z3VYWOo_B9xmCzqblh5xCa0QKWKcMi2eOqw18RE,1875
 meshcore/meshcore.py,sha256=bQ6PIMfu3rJ1hrewyKFeKUyNvdUJlyTHD5tz_e5xgT0,16069
 meshcore/packets.py,sha256=2soo3H6FEbVdYk-ZQANIM3YpyCwsaIOrB4QIEJLLw0c,1072
 meshcore/parsing.py,sha256=48PQkig-sqvsRlkF9zkvWhJoSq6ERCbGb_aRuCND5NI,4044
-meshcore/reader.py,sha256=nr-obnx-XVjnRpwVT2q0kr-D3rI4NEdCR2q_oCc8yKk,24703
+meshcore/reader.py,sha256=mIewSrfsgt-qe-acoxGQncHZhEhRr_3CEZuN1afnr7E,24784
 meshcore/serial_cx.py,sha256=-kaqnqk7Ydufu2DECFfPDv4Xs-7gHUBuz8v0xf8fvvE,3969
 meshcore/tcp_cx.py,sha256=05YRVMnjY5aVBTJcHa0uG4VfFKGbV6hQ1pPIsJg4CDI,4227
+meshcore/commands/.contact.py.swp,sha256=ukLHeYjDX9dKOGMyuN3BNJCFrTvgD5y1X0vj1Lp0j5U,24576
 meshcore/commands/__init__.py,sha256=NNmkTEcL-DLyuwKLUagEzpqe3C6ui2tETbu_mUd4p-I,441
-meshcore/commands/base.py,sha256=23fKZZtG9ScWUQWruZZbre-_t5fqJsSemh-pffRNniY,6928
+meshcore/commands/base.py,sha256=0bDHcNGlKoej03xJqzo_wL5ctoPQU5kcK1Ca5sZh1pk,7097
 meshcore/commands/binary.py,sha256=MVKXrT4pFSlzFkVFLBX988Eh57tRwunw4XPKBumbQNU,4890
-meshcore/commands/contact.py,sha256=FUXYWBGAJQxwXNLKRcY2c3b5JCdL0D9UjvH1yA8chdk,3761
+meshcore/commands/contact.py,sha256=fmOW3CrDZFuvDHhqP7WpZT_vps7PK9LUvra2CYm0El8,6273
 meshcore/commands/device.py,sha256=vstyy1crvhGbDgCAtyCWyjj3X8F2CpMw1LFTOwoHh6M,8273
 meshcore/commands/messaging.py,sha256=MIVGM5G8J16qimKjCHdrlEiVJ4g_MsBaZKPvRJHJcLU,8306
-meshcore-2.1.12.dist-info/METADATA,sha256=WzrhwW5Sc9fRwPHRpmRfH0B9saQvniZvHs8M5P4k65Y,25317
-meshcore-2.1.12.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-meshcore-2.1.12.dist-info/licenses/LICENSE,sha256=o62-JWT_C-ZqEtzb1Gl_PPtPr0pVT8KDmgji_Y_bejI,1075
-meshcore-2.1.12.dist-info/RECORD,,
+meshcore-2.1.14.dist-info/METADATA,sha256=e_MjaWO0VyG1-ZTsL-hj8vWfvm6gIzUIVu42dhPHOAc,25317
+meshcore-2.1.14.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+meshcore-2.1.14.dist-info/licenses/LICENSE,sha256=o62-JWT_C-ZqEtzb1Gl_PPtPr0pVT8KDmgji_Y_bejI,1075
+meshcore-2.1.14.dist-info/RECORD,,