Agent Mesh
Go a2aa2a-protocolagent-meshagentic-aiinferencemcpmeshmesh-networknetwork-securitynetworking-aip2p-network
sdk/js: push the relay address to the routers already connected
Antonio Ojeae5bcbf42f518
diff --git a/sdk/js/src/host.ts b/sdk/js/src/host.tsindex 6953487e..3d691eaf 100644--- a/sdk/js/src/host.ts+++ b/sdk/js/src/host.ts@@ -22,7 +22,7 @@ import { yamux } from "@chainsafe/libp2p-yamux";import { circuitRelayTransport } from "@libp2p/circuit-relay-v2";import { privateKeyFromProtobuf } from "@libp2p/crypto/keys";import { gossipsub, type GossipSub } from "@libp2p/gossipsub";-import { identify } from "@libp2p/identify";+import { identify, identifyPush } from "@libp2p/identify";import type { Libp2p, PeerId } from "@libp2p/interface";import { kadDHT, passthroughMapper } from "@libp2p/kad-dht";import { ping } from "@libp2p/ping";@@ -79,6 +79,12 @@ export async function createMeshHost(identity: Identity, options: MeshHostOption},services: {identify: identify(),+ // A member's addresses change after it connects: the relay address+ // arrives with the reservation, which follows the auth handshake.+ // Identify alone tells a router the addresses at connect time; push+ // tells the routers already connected, the reservation's own among+ // them, where the member is reached now, as agentmesh-node does.+ identifyPush: identifyPush(),ping: ping(),// A client of the mesh DHT: it looks providers up and does not hold// records. Peers keep their private addresses; a mesh member oftendiff --git a/sdk/js/src/session.test.ts b/sdk/js/src/session.test.tsindex c61accc7..ac3b2aaa 100644--- a/sdk/js/src/session.test.ts+++ b/sdk/js/src/session.test.ts@@ -22,7 +22,8 @@ import { durationFromMs, timestampFromMs } from "@bufbuild/protobuf/wkt";import { yamux } from "@chainsafe/libp2p-yamux";import { circuitRelayServer, circuitRelayTransport } from "@libp2p/circuit-relay-v2";import { privateKeyFromProtobuf } from "@libp2p/crypto/keys";-import { identify } from "@libp2p/identify";+import { peerIdFromString } from "@libp2p/peer-id";+import { identify, identifyPush } from "@libp2p/identify";import type { Libp2p } from "@libp2p/interface";import { tcp } from "@libp2p/tcp";import { tls } from "@libp2p/tls";@@ -132,7 +133,9 @@ before(async () => {transports: [tcp()],connectionEncrypters: [tls()],streamMuxers: [yamux()],- services: { identify: identify(), relay: circuitRelayServer() },+ // identifyPush on the receiving side, as a Go router has it: a member's+ // relay address arrives after it connected.+ services: { identify: identify(), identifyPush: identifyPush(), relay: circuitRelayServer() },// Every member here dials from loopback; the per-host inbound rate limit would refuse the later ones.connectionManager: { inboundConnectionThreshold: Infinity },});@@ -160,6 +163,19 @@ test("join authenticates with the router, reserves a relay slot and answers peerconst relayed = session.relayAddresses.find((ma) => ma.toString().startsWith(routerAddr));assert.ok(relayed, `relayed address ${session.relayAddresses.map(String).join(",")} does not go through ${routerAddr}`);+ // The router learned the member's addresses when it connected, before+ // the reservation; the member pushes the relay address to it once it+ // has one, so a lookup that reaches this router finds the member. The+ // router keeps a peer's address without the peer's own /p2p suffix.+ const pushed = `${routerAddr}/p2p-circuit`;+ const deadline = Date.now() + 5_000;+ let known: string[] = [];+ while (Date.now() < deadline && !known.includes(pushed)) {+ known = (await router.peerStore.get(peerIdFromString(mesh.peerId))).addresses.map((a) => a.multiaddr.toString());+ if (!known.includes(pushed)) await new Promise((r) => setTimeout(r, 50));+ }+ assert.ok(known.includes(pushed), `the router holds ${JSON.stringify(known)} for the member, not its address through the router ${pushed}`);+// A peer reaches the member through the router and both sides verify each other.const peerIdentity = Identity.generate();const peerBiscuit = mint(peerIdentity.peerId, ROLE_NODE);