Agent Mesh
Go a2aa2a-protocolagent-meshagentic-aiinferencemcpmeshmesh-networknetwork-securitynetworking-aip2p-network
feat(dht): make ProviderAddrTTL, MaxRecordAge and LookupLimit configurable on node and router
Antonio Ojea997947cb5f22
diff --git a/cmd/sam-node/main.go b/cmd/sam-node/main.goindex b052dd20..1dd78e4b 100644--- a/cmd/sam-node/main.go+++ b/cmd/sam-node/main.go@@ -82,6 +82,10 @@ var (tlsCertFlag stringtlsKeyFlag stringtlsCAFlag string+ dhtProviderAddrTTLFlag time.Duration+ dhtMaxRecordAgeFlag time.Duration+ dhtLookupLimitFlag int+ discoveryConcurrencyFlag int)var logger = golog.Logger("sam-node-cli")@@ -223,6 +227,10 @@ func main() {AutoRelayBootDelay: autoRelayBootDelayFlag,AutoRelayBackoff: autoRelayBackoffFlag,HubConnectTimeout: hubConnectTimeoutFlag,+ DHTProviderAddrTTL: dhtProviderAddrTTLFlag,+ DHTMaxRecordAge: dhtMaxRecordAgeFlag,+ DHTLookupLimit: dhtLookupLimitFlag,+ DiscoveryConcurrency: discoveryConcurrencyFlag,})if err != nil {logger.Fatalf("Failed to initialize mesh node: %v", err)@@ -282,6 +290,10 @@ func main() {AutoRelayBootDelay: autoRelayBootDelayFlag,AutoRelayBackoff: autoRelayBackoffFlag,HubConnectTimeout: hubConnectTimeoutFlag,+ DHTProviderAddrTTL: dhtProviderAddrTTLFlag,+ DHTMaxRecordAge: dhtMaxRecordAgeFlag,+ DHTLookupLimit: dhtLookupLimitFlag,+ DiscoveryConcurrency: discoveryConcurrencyFlag,})if err != nil {enrollCancel()@@ -554,6 +566,10 @@ func main() {runCmd.Flags().StringVar(&tlsCertFlag, "tls-cert", "", "Path to TLS certificate for sidecar API")runCmd.Flags().StringVar(&tlsKeyFlag, "tls-key", "", "Path to TLS key for sidecar API")runCmd.Flags().StringVar(&tlsCAFlag, "tls-ca", "", "Path to TLS CA for sidecar API mTLS")+ runCmd.Flags().DurationVar(&dhtProviderAddrTTLFlag, "dht-provider-addr-ttl", 0, "Time-To-Live for DHT provider addresses (0s uses library default)")+ runCmd.Flags().DurationVar(&dhtMaxRecordAgeFlag, "dht-max-record-age", 0, "Maximum age for DHT records (0s uses library default)")+ runCmd.Flags().IntVar(&dhtLookupLimitFlag, "dht-lookup-limit", 0, "Maximum number of providers to query from the DHT (0 uses default 20)")+ runCmd.Flags().IntVar(&discoveryConcurrencyFlag, "discovery-concurrency", 0, "Max concurrent catalog fetches during discovery (0 uses default 10)")rootCmd.PersistentFlags().StringVar(&hubAddr, "hub", "", "Hub URL")rootCmd.PersistentFlags().StringVar(&configFile, "config", node.DefaultConfigFile, "Path to sam-node.yaml configuration file")rootCmd.PersistentFlags().StringVar(&oidcIssuerFlag, "oidc-issuer", "", "OIDC Issuer URL")diff --git a/cmd/sam-router/main.go b/cmd/sam-router/main.goindex 1a470ab5..1b1d4d60 100644--- a/cmd/sam-router/main.go+++ b/cmd/sam-router/main.go@@ -37,6 +37,8 @@ var (keysPath stringallowLoopback boollogLevel string+ dhtProviderAddrTTL time.Duration+ dhtMaxRecordAge time.Duration)var logger = golog.Logger("sam-router-cli")@@ -70,6 +72,8 @@ func main() {JWTPath: jwtPath,KeysDBPath: keysPath,AllowLoopback: allowLoopback,+ DHTProviderAddrTTL: dhtProviderAddrTTL,+ DHTMaxRecordAge: dhtMaxRecordAge,}r, err := router.NewRouter(cmd.Context(), opts)@@ -102,6 +106,8 @@ func main() {rootCmd.Flags().StringVar(&keysPath, "keys-path", "router.key", "Path to save/load persistent private key")rootCmd.Flags().BoolVar(&allowLoopback, "allow-loopback", false, "Allow loopback and link-local addresses for discovery")rootCmd.Flags().StringVar(&logLevel, "log-level", "info", "Log level (debug, info, warn, error)")+ rootCmd.Flags().DurationVar(&dhtProviderAddrTTL, "dht-provider-addr-ttl", 0, "Time-To-Live for DHT provider addresses (0s uses library default)")+ rootCmd.Flags().DurationVar(&dhtMaxRecordAge, "dht-max-record-age", 0, "Maximum age for DHT records (0s uses library default)")ctx, cancel := context.WithCancel(context.Background())defer cancel()diff --git a/internal/node/node.go b/internal/node/node.goindex 3bb51c9d..d1773d8f 100644--- a/internal/node/node.go+++ b/internal/node/node.go@@ -45,6 +45,7 @@ import ("github.com/libp2p/go-libp2p"gostream "github.com/libp2p/go-libp2p-gostream"dht "github.com/libp2p/go-libp2p-kad-dht"+ records "github.com/libp2p/go-libp2p-kad-dht/records"pubsub "github.com/libp2p/go-libp2p-pubsub""github.com/libp2p/go-libp2p/core/crypto""github.com/libp2p/go-libp2p/core/discovery"@@ -395,7 +396,22 @@ func (n *SamNode) Start(ctx context.Context) error {}// Initialize Rendezvous (DHT Client)- kdht, err := dht.New(ctx, h, dht.Mode(dht.ModeAuto), dht.ProtocolPrefix("/sam"))+ dhtOpts := []dht.Option{+ dht.Mode(dht.ModeAuto),+ dht.ProtocolPrefix("/sam"),+ }+ var pmOpts []records.Option+ if n.config.DHTProviderAddrTTL > 0 {+ pmOpts = append(pmOpts, records.ProviderAddrTTL(n.config.DHTProviderAddrTTL))+ pmOpts = append(pmOpts, records.ProvideValidity(n.config.DHTProviderAddrTTL))+ }+ if len(pmOpts) > 0 {+ dhtOpts = append(dhtOpts, dht.ProviderManagerOpts(pmOpts...))+ }+ if n.config.DHTMaxRecordAge > 0 {+ dhtOpts = append(dhtOpts, dht.MaxRecordAge(n.config.DHTMaxRecordAge))+ }+ kdht, err := dht.New(ctx, h, dhtOpts...)if err != nil {return err}@@ -1443,7 +1459,7 @@ func (n *SamNode) findProvidersByCID(ctx context.Context, c cid.Cid) ([]peer.Add// DHT walk converges from different paths; dedupe so downstream// fan-out (e.g. discoverServicesByType) doesn't double-fetch.providersMap := make(map[peer.ID]peer.AddrInfo)- for p := range n.DHT.FindProvidersAsync(lookupCtx, c, 20) {+ for p := range n.DHT.FindProvidersAsync(lookupCtx, c, n.config.DHTLookupLimit) {providersMap[p.ID] = p}providers := make([]peer.AddrInfo, 0, len(providersMap))@@ -1549,6 +1565,7 @@ func (n *SamNode) DiscoverRemoteServicesStream(ctx context.Context, serviceTypefanoutCtx, cancel := context.WithTimeout(ctx, discoveryFanoutTimeout)defer cancel()+ sem := make(chan struct{}, n.config.DiscoveryConcurrency)var wg sync.WaitGroupfor _, p := range peers {if p.ID == n.Host.ID() {@@ -1557,6 +1574,12 @@ func (n *SamNode) DiscoverRemoteServicesStream(ctx context.Context, serviceTypewg.Add(1)go func(peerID peer.ID) {defer wg.Done()+ select {+ case sem <- struct{}{}:+ defer func() { <-sem }()+ case <-fanoutCtx.Done():+ return+ }services, err := n.fetchRemoteServiceCatalog(fanoutCtx, peerID, typeStr)if err != nil {logger.Warnf("[Discovery] catalog fetch from %s failed: %v", peerID, err)@@ -1620,6 +1643,7 @@ func (n *SamNode) discoverServicesByType(ctx context.Context, serviceType api.Seservices []*api.ServiceInfo}results := make(chan peerCatalog, len(peers))+ sem := make(chan struct{}, n.config.DiscoveryConcurrency)var wg sync.WaitGroupfor _, p := range peers {if p.ID == n.Host.ID() {@@ -1628,6 +1652,12 @@ func (n *SamNode) discoverServicesByType(ctx context.Context, serviceType api.Sewg.Add(1)go func(peerID peer.ID) {defer wg.Done()+ select {+ case sem <- struct{}{}:+ defer func() { <-sem }()+ case <-fanoutCtx.Done():+ return+ }services, err := n.fetchRemoteServiceCatalog(fanoutCtx, peerID, typeStr)if err != nil {logger.Warnf("[Discovery] catalog fetch from %s failed: %v", peerID, err)diff --git a/internal/node/node_test.go b/internal/node/node_test.goindex 0fb57c31..4f3414d5 100644--- a/internal/node/node_test.go+++ b/internal/node/node_test.go@@ -162,3 +162,37 @@ func TestNewSamNode_Validation(t *testing.T) {}})}++func TestNewSamNode_DHTOptions(t *testing.T) {+ priv, _, _ := crypto.GenerateKeyPair(crypto.Ed25519, -1)+ store, _ := NewStore(t.TempDir())+ defer func() { _ = store.Close() }()++ opts := Options{+ PrivKey: priv,+ Store: store,+ ListenAddrs: []string{"/ip4/127.0.0.1/tcp/0"},+ DHTProviderAddrTTL: 10 * time.Second,+ DHTMaxRecordAge: 15 * time.Second,+ DHTLookupLimit: 50,+ DiscoveryConcurrency: 5,+ }++ node, err := NewSamNode(opts)+ if err != nil {+ t.Fatalf("failed to create node with DHT options: %v", err)+ }++ if node.config.DHTProviderAddrTTL != 10*time.Second {+ t.Errorf("expected DHTProviderAddrTTL to be 10s, got %v", node.config.DHTProviderAddrTTL)+ }+ if node.config.DHTMaxRecordAge != 15*time.Second {+ t.Errorf("expected DHTMaxRecordAge to be 15s, got %v", node.config.DHTMaxRecordAge)+ }+ if node.config.DHTLookupLimit != 50 {+ t.Errorf("expected DHTLookupLimit to be 50, got %d", node.config.DHTLookupLimit)+ }+ if node.config.DiscoveryConcurrency != 5 {+ t.Errorf("expected DiscoveryConcurrency to be 5, got %d", node.config.DiscoveryConcurrency)+ }+}diff --git a/internal/node/options.go b/internal/node/options.goindex 573b4e2d..108eeb3d 100644--- a/internal/node/options.go+++ b/internal/node/options.go@@ -50,6 +50,11 @@ type Options struct {AutoRelayBackoff time.Duration// HubConnectTimeout bounds each hub address's dial (connect + stream open).HubConnectTimeout time.Duration+ // DHT Options+ DHTProviderAddrTTL time.Duration+ DHTMaxRecordAge time.Duration+ DHTLookupLimit int+ DiscoveryConcurrency int}// Default applies default values to Options if they are not specified.@@ -78,6 +83,12 @@ func (o *Options) Default() {if o.HubConnectTimeout == 0 {o.HubConnectTimeout = DefaultHubConnectTimeout}+ if o.DHTLookupLimit <= 0 {+ o.DHTLookupLimit = 20+ }+ if o.DiscoveryConcurrency <= 0 {+ o.DiscoveryConcurrency = 10+ }if len(o.ListenAddrs) == 0 {o.ListenAddrs = []string{"/ip4/0.0.0.0/udp/5001/quic-v1", "/ip4/0.0.0.0/tcp/5002"}}diff --git a/internal/router/config.go b/internal/router/config.goindex e8d45767..d3b21152 100644--- a/internal/router/config.go+++ b/internal/router/config.go@@ -35,6 +35,8 @@ type Options struct {AllowLoopback boolBiscuitTimeout time.DurationLogVerbose bool+ DHTProviderAddrTTL time.Duration+ DHTMaxRecordAge time.Duration}// Default sets default values for options.diff --git a/internal/router/router.go b/internal/router/router.goindex 2f20dc12..e2b7b3ba 100644--- a/internal/router/router.go+++ b/internal/router/router.go@@ -37,6 +37,7 @@ import (golog "github.com/ipfs/go-log/v2""github.com/libp2p/go-libp2p"dht "github.com/libp2p/go-libp2p-kad-dht"+ records "github.com/libp2p/go-libp2p-kad-dht/records"pubsub "github.com/libp2p/go-libp2p-pubsub""github.com/libp2p/go-libp2p/core/crypto""github.com/libp2p/go-libp2p/core/host"@@ -205,7 +206,22 @@ func (r *Router) Start() error {r.Host = hostNode// Setup DHT- kadDHT, err := dht.New(r.ctx, hostNode, dht.Mode(dht.ModeServer), dht.ProtocolPrefix("/sam"))+ dhtOpts := []dht.Option{+ dht.Mode(dht.ModeServer),+ dht.ProtocolPrefix("/sam"),+ }+ var pmOpts []records.Option+ if r.config.DHTProviderAddrTTL > 0 {+ pmOpts = append(pmOpts, records.ProviderAddrTTL(r.config.DHTProviderAddrTTL))+ pmOpts = append(pmOpts, records.ProvideValidity(r.config.DHTProviderAddrTTL))+ }+ if len(pmOpts) > 0 {+ dhtOpts = append(dhtOpts, dht.ProviderManagerOpts(pmOpts...))+ }+ if r.config.DHTMaxRecordAge > 0 {+ dhtOpts = append(dhtOpts, dht.MaxRecordAge(r.config.DHTMaxRecordAge))+ }+ kadDHT, err := dht.New(r.ctx, hostNode, dhtOpts...)if err != nil {_ = hostNode.Close()return err