meshcore 2.1.15__tar.gz → 2.1.17__tar.gz

{meshcore-2.1.15 → meshcore-2.1.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshcore
-Version: 2.1.15
+Version: 2.1.17
 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.15 → meshcore-2.1.17}/pyproject.toml

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

{meshcore-2.1.15 → meshcore-2.1.17}/src/meshcore/ble_cx.py

@@ -18,7 +18,6 @@ UART_SERVICE_UUID = "6E400001-B5A3-F393-E0A9-E50E24DCCA9E"
 UART_RX_CHAR_UUID = "6E400002-B5A3-F393-E0A9-E50E24DCCA9E"
 UART_TX_CHAR_UUID = "6E400003-B5A3-F393-E0A9-E50E24DCCA9E"
 
-
 class BLEConnection:
     def __init__(self, address=None, device=None, client=None, pin=None):
         """
@@ -113,7 +112,14 @@ class BLEConnection:
         except TimeoutError:
             return None
 
-        await self.client.start_notify(UART_TX_CHAR_UUID, self.handle_rx)
+        try:
+            await self.client.start_notify(UART_TX_CHAR_UUID, self.handle_rx)
+        except AttributeError :
+            if self.client :
+                await self.client.disconnect()
+            logger.info("Connection is not established, need to restart it")
+            logger.debug("in ble_cx.connect()")
+            return None
 
         nus = self.client.services.get_service(UART_SERVICE_UUID)
         if nus is None:

{meshcore-2.1.15 → meshcore-2.1.17}/src/meshcore/commands/contact.py

@@ -9,17 +9,17 @@ logger = logging.getLogger("meshcore")
 
 
 class ContactCommands(CommandHandlerBase):
-    async def get_contacts(self, lastmod=0, anim=False) -> Event:
+    async def get_contacts_async(self, lastmod=0) :
         logger.debug("Getting contacts")
         data = b"\x04"
         if lastmod > 0:
             data = data + lastmod.to_bytes(4, "little")
-        if anim:
-            print("Fetching contacts ", end="", flush=True)
         # wait first event
-        res = await self.send(data)
-        timeout = 5
-        contact_nb = 0
+        await self.send(data)
+
+    async def get_contacts(self, lastmod=0, timeout=5) -> Event:
+        await self.get_contacts_async(lastmod)
+
         # Inline wait for events to continue waiting for CONTACTS event 
         # while receiving NEXT_CONTACTs (or it might be missed over serial)
         try:
@@ -40,30 +40,20 @@ class ContactCommands(CommandHandlerBase):
     
                 # Check if any future completed successfully
                 if len(done) == 0:
-                    print(" Timeout")
+                    logger.debug("Timeout while getting contacts")
                     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:
-                                contact_nb = contact_nb+1
-                                print(".", end="", flush=True)
-                        else: # Done or Error ... cancel pending and return
-                            if anim:
-                                if event.type == EventType.CONTACTS:
-                                    print ((len(event.payload)-contact_nb)*"." + " Done")
-                                else : 
-                                    print(" Error")
-                            for future in pending:
-                                future.cancel()
-                            return event
+                    if event is None or event.type != EventType.NEXT_CONTACT:
+                        for future in pending:
+                            future.cancel()
+                        return event
 
                 futures = []
+
                 for future in pending: # put back pending
                     futures.append(future)
 
@@ -74,13 +64,9 @@ class ContactCommands(CommandHandlerBase):
     
         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:

{meshcore-2.1.15 → meshcore-2.1.17}/src/meshcore/meshcore.py

@@ -165,6 +165,7 @@ class MeshCore:
         await self.dispatcher.start()
         result = await self.connection_manager.connect()
         if result is None:
+            await self.dispatcher.stop()
             raise ConnectionError("Failed to connect to device")
         return await self.commands.send_appstart()