elo-node 0.4.3__tar.gz → 0.4.5__tar.gz

{elo_node-0.4.3 → elo_node-0.4.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: elo-node
-Version: 0.4.3
+Version: 0.4.5
 Summary: Elo — malha P2P de mensagens para agentes de IA. Zero infraestrutura.
 Author: Elo Contributors
 License: MIT

{elo_node-0.4.3 → elo_node-0.4.5}/elo/__init__.py

@@ -26,4 +26,4 @@ __all__ = [
     "Node", "Task", "Result", "Event", "NodeInfo", "Capabilities",
     "EphemeralIdentity", "generate_and_save_identity", "load_identity",
 ]
-__version__ = "0.4.3"
+__version__ = "0.4.4"

{elo_node-0.4.3 → elo_node-0.4.5}/elo/node.py

@@ -78,7 +78,7 @@ class Node:
         peers: list[str] | None = None,
         tracker: str = "public",
         allowlist: list[str] | None = None,
-        version: str = "0.4.3",
+        version: str = "0.4.5",
         identity: EphemeralIdentity | None = None,
         verify_peers: bool = True,
         heartbeat_interval_s: int = 30,
@@ -110,7 +110,7 @@ class Node:
         self._task_handler: Callable[[Task], Awaitable[dict[str, Any]]] | None = None
         self._shutdown_event = asyncio.Event()
         self._pending_results: dict[str, asyncio.Future] = {}
-        self._pending_queries: dict[str, tuple[asyncio.Future, float]] = {}
+        self._pending_queries: dict[str, tuple[list[dict[str, Any]], asyncio.Event, float]] = {}
 
         # Cache de pubkeys para verificação de assinatura
         self._pubkey_cache: dict[str, tuple[Any, float]] = {}
@@ -253,6 +253,10 @@ class Node:
             except Exception as e:
                 return Result.make_error(task_id, "SEND_ERROR", str(e))
 
+        # Bug 2: Fallback via tracker antes de desistir
+        if not peer:
+            return await self.send_task_via_tracker("", target_node, capability, payload, ttl_s=ttl_s)
+
         return Result.make_error(task_id, "NO_PEER", f"No peer for: {capability}")
 
     async def send_task_async(self, target_node: str, capability: str,
@@ -292,10 +296,11 @@ class Node:
 
     # ── descoberta ─────────────────────────────────────────────
 
-    async def discover_peers(self) -> list[dict[str, Any]]:
-        """Return all known peers with capabilities.
+    async def get_known_peers_local(self) -> list[dict[str, Any]]:
+        """Return all locally-known peers with capabilities (no network discovery).
 
         Merges data from TCP connections (live) and InterestTable (registered).
+        Does NOT perform any network queries — only returns what's already known.
         """
         result: dict[str, dict[str, Any]] = {}
 
@@ -314,6 +319,63 @@ class Node:
 
         return list(result.values())
 
+    # Alias de compatibilidade — o método anterior chamava-se discover_peers()
+    async def discover_peers(self) -> list[dict[str, Any]]:
+        """[DEPRECATED] Use get_known_peers_local() ou discover_peers_network().
+
+        Este método apenas consolida peers localmente conhecidos (TCP + InterestTable).
+        Não faz descoberta ativa de rede. Prefira discover_peers_network() para
+        descoberta via broadcast, ou get_known_peers() para peers com handshake completo.
+        """
+        return await self.get_known_peers_local()
+
+    async def discover_peers_network(self, timeout: float = 5.0) -> list[dict[str, Any]]:
+        """Discover peers on the network via QUERY broadcast.
+
+        Envia QUERY com capability vazia e agrega todas as respostas
+        dentro do timeout. Modelo BitTorrent: o tracker retorna todos
+        os peers conhecidos, não só quem matcha a capability.
+        """
+        query_id = str(uuid.uuid4())[:8]
+        collected: list[dict[str, Any]] = []
+        event = asyncio.Event()
+        self._pending_queries[query_id] = (collected, event, time.time())
+        discovered: dict[str, dict[str, Any]] = {}
+
+        # Broadcast QUERY for any capability
+        await self._tcp.broadcast(query_msg("", query_id, ttl=3))
+
+        try:
+            await asyncio.wait_for(event.wait(), timeout=timeout)
+        except asyncio.TimeoutError:
+            pass
+        finally:
+            self._pending_queries.pop(query_id, None)
+
+        # Merge collected peers from all responses
+        known_addrs: set[str] = set()
+        for entry in collected:
+            addr = entry.get("addr", "")
+            if addr and addr not in discovered:
+                discovered[addr] = {
+                    "addr": addr,
+                    "caps": entry.get("caps", []),
+                    "connected": False,
+                    "via": "network",
+                }
+                known_addrs.add(addr)
+
+        # Merge with locally known peers
+        local = await self.get_known_peers_local()
+        for entry in local:
+            addr = entry["addr"]
+            if addr not in discovered:
+                discovered[addr] = entry
+            else:
+                discovered[addr].update(entry)
+
+        return list(discovered.values())
+
     def get_known_peers(self) -> list[dict[str, Any]]:
         """Return peers registered in InterestTable (completed HELLO handshake).
 
@@ -355,6 +417,18 @@ class Node:
             await self._on_hello(peer_addr, msg)
         elif msg_type == MessageType.HELLO_ACK:
             await self._on_hello(peer_addr, msg)
+            # Bug 1: Se HELLO_ACK contém known_peers, conectar-se a eles
+            known_peers = msg.get("known_peers")
+            if known_peers:
+                hello = hello_msg(self._node_id, self._tracker.get_public_caps(),
+                                  list(self._routing.local_interests),
+                                  self._tracker.visibility, self._version)
+                for peer_info in known_peers:
+                    addr = peer_info.get("addr", "")
+                    if addr and addr != peer_addr and addr not in self._tcp.peer_addresses:
+                        asyncio.create_task(
+                            self._tcp.connect_to_peer(addr, hello_payload=hello)
+                        )
         elif msg_type == MessageType.QUERY:
             await self._on_query(peer_addr, msg)
         elif msg_type == MessageType.QUERY_RESP:
@@ -376,8 +450,14 @@ class Node:
         interests = msg.get("interests", [])
         self._routing.register_peer(peer_addr, caps, interests)
 
+        # Se for tracker (public/private), inclui peers conhecidos no ACK
+        known_peers = None
+        if msg.get("type") == MessageType.HELLO and self._tracker.visibility in ("public", "private"):
+            known_peers = self.get_known_peers()
+
         ack = hello_ack_msg(self._node_id, self._tracker.get_caps_for_peer(node_id),
-                            list(self._routing.local_interests), self._tracker.visibility)
+                            list(self._routing.local_interests), self._tracker.visibility,
+                            known_peers=known_peers)
         try:
             await self._tcp.send_to(peer_addr, ack)
         except Exception:
@@ -387,12 +467,23 @@ class Node:
         capability = msg.get("capability", "")
         query_id = msg.get("id", "")
         ttl = msg.get("ttl", 5)
-        nodes = []
+        nodes: list[dict[str, Any]] = []
+
+        # Modelo BitTorrent: tracker retorna SEMPRE todos os peers conhecidos,
+        # não só quem matcha a capability. Isso permite que qualquer nó
+        # descubra a mesh completa com discover_peers_network().
+        for addr in self._routing.known_peers:
+            info = self._routing.get_peer_caps(addr)
+            if addr != peer_addr:
+                nodes.append({
+                    "addr": addr,
+                    "caps": list(info.get("caps", set())),
+                })
+
         if self._tracker.has_capability(capability):
             # Usa peer_addr (addr real do TCP) em vez de localhost — necessário para WAN/Tailscale
             nodes.append({"node_id": self._node_id[:12], "addr": peer_addr})
-        for p in self._routing.find_all_peers_for(capability):
-            nodes.append({"addr": p})
+
         if nodes:
             try:
                 await self._tcp.send_to(peer_addr, query_resp_msg(query_id, nodes))
@@ -404,10 +495,11 @@ class Node:
     async def _on_query_resp(self, peer_addr: str, msg: dict) -> None:
         query_id = msg.get("id", "")
         if query_id in self._pending_queries:
-            future, _ = self._pending_queries[query_id]
+            collected, event, _ts = self._pending_queries[query_id]
             nodes = msg.get("nodes", [])
-            if nodes and not future.done():
-                future.set_result(nodes[0].get("addr", ""))
+            if nodes:
+                collected.extend(nodes)
+                event.set()
 
     async def _on_interest_update(self, peer_addr: str, msg: dict) -> None:
         existing = self._routing.get_peer_caps(peer_addr)
@@ -536,15 +628,19 @@ class Node:
     async def _query_capability(self, capability: str, ttl: int = 5,
                                 timeout: float = 5.0) -> str | None:
         query_id = str(uuid.uuid4())[:8]
-        future: asyncio.Future = asyncio.get_event_loop().create_future()
-        self._pending_queries[query_id] = (future, time.time())
+        collected: list[dict[str, Any]] = []
+        event = asyncio.Event()
+        self._pending_queries[query_id] = (collected, event, time.time())
         await self._tcp.broadcast(query_msg(capability, query_id, ttl))
         try:
-            return await asyncio.wait_for(future, timeout=timeout)
+            await asyncio.wait_for(event.wait(), timeout=timeout)
         except asyncio.TimeoutError:
-            return None
+            pass
         finally:
             self._pending_queries.pop(query_id, None)
+        if collected:
+            return collected[0].get("addr", None)
+        return None
 
     async def _get_caller_pubkey(self, node_id: str) -> Any | None:
         now = time.time()

{elo_node-0.4.3 → elo_node-0.4.5}/elo/transport/protocol.py

@@ -89,14 +89,18 @@ def hello_msg(node_id: str, caps: dict, interests: list[str],
 
 
 def hello_ack_msg(node_id: str, caps: dict, interests: list[str],
-                  tracker: str = "public") -> dict:
-    return {
+                  tracker: str = "public",
+                  known_peers: list[dict] | None = None) -> dict:
+    msg: dict[str, Any] = {
         "type": MessageType.HELLO_ACK,
         "node_id": node_id,
         "caps": caps,
         "interests": interests,
         "tracker": tracker,
     }
+    if known_peers is not None:
+        msg["known_peers"] = known_peers
+    return msg
 
 
 def query_msg(capability: str, query_id: str, ttl: int = 5) -> dict:

{elo_node-0.4.3 → elo_node-0.4.5}/elo_node.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: elo-node
-Version: 0.4.3
+Version: 0.4.5
 Summary: Elo — malha P2P de mensagens para agentes de IA. Zero infraestrutura.
 Author: Elo Contributors
 License: MIT

{elo_node-0.4.3 → elo_node-0.4.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "elo-node"
-version = "0.4.3"
+version = "0.4.5"
 description = "Elo — malha P2P de mensagens para agentes de IA. Zero infraestrutura."
 readme = "README.md"
 license = {text = "MIT"}

{elo_node-0.4.3 → elo_node-0.4.5}/tests/test_unit.py

@@ -136,7 +136,7 @@ class TestNodeConstruction:
         node = Node("test-node")
         assert node._name == "test-node"
         assert node._port == 7878
-        assert node._version == "0.4.0"
+        assert node._version == "0.4.4"
         assert node.connected is False
         assert node.node_id is not None
         assert len(node.node_id) > 20