Agent Mesh
Go a2aa2a-protocolagent-meshagentic-aiinferencemcpmeshmesh-networknetwork-securitynetworking-aip2p-network
handle external address
Antonio Ojea4a2e90f25576
diff --git a/cmd/sam-node/main.go b/cmd/sam-node/main.goindex 34b6e12c..cd700407 100644--- a/cmd/sam-node/main.go+++ b/cmd/sam-node/main.go@@ -217,12 +217,20 @@ func main() {logger.Fatalf("Enrollment failed: %v", err)}- storedPubKey, _, _ = store.LoadHubConfig()+ node.Host.Close()++ storedPubKey, storedAddrs, _ := store.LoadHubConfig()hubPubKey = storedPubKey+ var newHubAddrs []multiaddr.Multiaddr+ for _, addrStr := range storedAddrs {+ ma, _ := multiaddr.NewMultiaddr(addrStr)+ newHubAddrs = append(newHubAddrs, ma)+ }- node.keysMu.Lock()- node.trustedKeys = []TrustedKey{{Key: hubPubKey, ReceivedAt: time.Now()}}- node.keysMu.Unlock()+ node, err = NewSamNode(context.Background(), priv, hubPubKey, newHubAddrs, store, meshFlag, discoveryIntervalFlag, listenAddrs, enableRelayFlag, nodeConfig, keyGracePeriodFlag)+ if err != nil {+ logger.Fatalf("Failed to start mesh node after enrollment: %v", err)+ }}// Register static services from config@@ -347,7 +355,7 @@ func main() {}priv := getOrGenerateKey(store)- node, err := NewSamNode(context.Background(), priv, nil, initHubAddrs, store, meshFlag, discoveryIntervalFlag, listenAddrs, enableRelayFlag, nodeConfig, keyGracePeriodFlag)+ node, err := NewSamNode(context.Background(), priv, nil, initHubAddrs, store, meshFlag, discoveryIntervalFlag, []string{"/ip4/0.0.0.0/udp/0/quic-v1", "/ip4/0.0.0.0/tcp/0"}, enableRelayFlag, nodeConfig, keyGracePeriodFlag)if err != nil {logger.Fatalf("Failed to initialize node for enrollment: %v", err)}diff --git a/cmd/sam-node/node.go b/cmd/sam-node/node.goindex 0524ea08..5f3391a2 100644--- a/cmd/sam-node/node.go+++ b/cmd/sam-node/node.go@@ -129,8 +129,11 @@ func NewSamNode(ctx context.Context, privKey crypto.PrivKey, hubPubKey ed25519.Pfor _, addr := range hubAddrs {if addrInfo, err := peer.AddrInfoFromP2pAddr(addr); err == nil && addrInfo.ID != "" {staticRelays = append(staticRelays, *addrInfo)+ } else {+ logger.Warnf("Failed to parse static relay addr %s: %v", addr, err)}}+ logger.Infof("Configured %d static relays: %v", len(staticRelays), staticRelays)cm, err := connmgr.NewConnManager(100, 400, connmgr.WithGracePeriod(time.Minute))if err != nil {@@ -152,6 +155,9 @@ func NewSamNode(ctx context.Context, privKey crypto.PrivKey, hubPubKey ed25519.P// If we have a Hub, configure it as our static fallback relay for NAT hole-punchingif len(staticRelays) > 0 {opts = append(opts, libp2p.EnableAutoRelayWithStaticRelays(staticRelays))+ if !enableRelay {+ opts = append(opts, libp2p.ForceReachabilityPrivate())+ }}// If the user explicitly opts in, allow this node to serve as a relay for othersdiff --git a/tests/integration/login_test.go b/tests/integration/login_test.goindex 229f7230..1c943d1c 100644--- a/tests/integration/login_test.go+++ b/tests/integration/login_test.go@@ -103,6 +103,8 @@ func TestSamNodeJoin(t *testing.T) {nodeBin,"run","--hub", hubAddr,+ "--listen", "/ip4/127.0.0.1/udp/0/quic-v1",+ "--listen", "/ip4/127.0.0.1/tcp/0","--bind-addr", "127.0.0.1:0","--api-token", "dummy-token",)