meshcore 2.3.3__tar.gz → 2.3.5__tar.gz

{meshcore-2.3.3 → meshcore-2.3.5}/PKG-INFO

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

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

{meshcore-2.3.3 → meshcore-2.3.5}/src/meshcore/commands/binary.py

@@ -225,6 +225,7 @@ class BinaryCommandHandler(CommandHandlerBase):
 
         del res["tag"]
 
+        tries = 0
         while results_count < neighbours_count:
             #await asyncio.sleep(2) # wait 2s before next fetch
             next_res = await self.req_neighbours_sync(contact,
@@ -233,15 +234,18 @@ class BinaryCommandHandler(CommandHandlerBase):
                 order_by=order_by,
                 pubkey_prefix_length=pubkey_prefix_length,
                 timeout=timeout,
-                min_timeout=min_timeout+5) # requests are close, so let's have some more timeout
-
+                min_timeout=min_timeout+25) # requests are close and responses big, 
+                                            #so let's have some more timeout for duty cycle
             if next_res is None :
-                return res # caller should check it has everything
-
-            results_count = results_count + next_res["results_count"]
-
-            res["results_count"] = results_count
-            res["neighbours"] += next_res["neighbours"]
+                if tries > 0:
+                    return res # caller should check it has everything
+                else:
+                    tries += 1
+            else:
+                tries = 0
+                results_count += next_res["results_count"]
+                res["results_count"] = results_count
+                res["neighbours"] += next_res["neighbours"]
 
         return res
 

{meshcore-2.3.3 → meshcore-2.3.5}/src/meshcore/meshcore_parser.py

@@ -108,17 +108,14 @@ class MeshcorePacketParser:
                         channel = c
                         break
 
-            chan_name = ""
-
-            if channel is None :
-                chan_name = chan_hash
-            else:
-                chan_name = channel["channel_name"]
-
             log_data["chan_hash"] = chan_hash
             log_data["cipher_mac"] = cipher_mac.hex()
             log_data["crypted"] = msg.hex()
-            log_data["chan_name"] = chan_name
+
+            chan_name = ""
+            if not channel is None :
+                chan_name = channel["channel_name"]
+                log_data["chan_name"] = chan_name
 
             if not channel is None and self.decrypt_channels: