Skip to content

Agent Mesh

address review comments

Antonio Ojea26c6a1cceae4
diff --git a/cmd/sam-node/main.go b/cmd/sam-node/main.go
index cd700407..73384274 100644
--- a/cmd/sam-node/main.go
+++ b/cmd/sam-node/main.go
@@ -123,7 +123,11 @@ func main() {
if len(storedPubKey) > 0 {
hubPubKey = storedPubKey
for _, addrStr := range storedAddrs {
- ma, _ := multiaddr.NewMultiaddr(addrStr)
+ ma, err := multiaddr.NewMultiaddr(addrStr)
+ if err != nil {
+ logger.Warnf("Failed to parse stored hub address %q: %v", addrStr, err)
+ continue
+ }
hubAddrs = append(hubAddrs, ma)
}
}
@@ -190,10 +194,14 @@ func main() {
if err == nil {
ip := net.ParseIP(host)
var maddr multiaddr.Multiaddr
+ var parseErr error
if ip != nil {
- maddr, _ = multiaddr.NewMultiaddr(fmt.Sprintf("/ip4/%s/tcp/%s", host, port))
+ maddr, parseErr = multiaddr.NewMultiaddr(fmt.Sprintf("/ip4/%s/tcp/%s", host, port))
} else {
- maddr, _ = multiaddr.NewMultiaddr(fmt.Sprintf("/dns4/%s/tcp/%s", host, port))
+ maddr, parseErr = multiaddr.NewMultiaddr(fmt.Sprintf("/dns4/%s/tcp/%s", host, port))
+ }
+ if parseErr != nil {
+ logger.Fatalf("Failed to parse multiaddr: %v", parseErr)
}
initHubAddrs = []multiaddr.Multiaddr{maddr}
} else {
@@ -207,23 +215,43 @@ func main() {
}
priv := getOrGenerateKey(store)
- node, err = NewSamNode(context.Background(), priv, nil, initHubAddrs, store, meshFlag, discoveryIntervalFlag, listenAddrs, enableRelayFlag, nodeConfig, keyGracePeriodFlag)
+ enrollCtx, enrollCancel := context.WithCancel(context.Background())
+ node, err = NewSamNode(enrollCtx, priv, nil, initHubAddrs, store, meshFlag, discoveryIntervalFlag, listenAddrs, enableRelayFlag, nodeConfig, keyGracePeriodFlag)
if err != nil {
+ enrollCancel()
logger.Fatalf("Failed to initialize node for enrollment: %v", err)
}
- err = node.Enroll(context.Background(), jwtStr)
+ err = node.Enroll(enrollCtx, jwtStr)
if err != nil {
+ if teardownErr := node.Teardown(); teardownErr != nil {
+ logger.Errorf("Teardown failed during enrollment error cleanup: %v", teardownErr)
+ }
+ enrollCancel()
logger.Fatalf("Enrollment failed: %v", err)
}
- node.Host.Close()
+ node.mu.Lock()
+ enrollKnownPeers := make(map[string]bool)
+ for k, v := range node.knownPeers {
+ enrollKnownPeers[k] = v
+ }
+ node.mu.Unlock()
+
+ if teardownErr := node.Teardown(); teardownErr != nil {
+ logger.Errorf("Failed to teardown enrollment node: %v", teardownErr)
+ }
+ enrollCancel()
storedPubKey, storedAddrs, _ := store.LoadHubConfig()
hubPubKey = storedPubKey
var newHubAddrs []multiaddr.Multiaddr
for _, addrStr := range storedAddrs {
- ma, _ := multiaddr.NewMultiaddr(addrStr)
+ ma, err := multiaddr.NewMultiaddr(addrStr)
+ if err != nil {
+ logger.Warnf("Failed to parse stored hub address %q: %v", addrStr, err)
+ continue
+ }
newHubAddrs = append(newHubAddrs, ma)
}
@@ -231,6 +259,12 @@ func main() {
if err != nil {
logger.Fatalf("Failed to start mesh node after enrollment: %v", err)
}
+
+ node.mu.Lock()
+ for k, v := range enrollKnownPeers {
+ node.knownPeers[k] = v
+ }
+ node.mu.Unlock()
}
// Register static services from config
@@ -342,10 +376,14 @@ func main() {
if err == nil {
ip := net.ParseIP(host)
var maddr multiaddr.Multiaddr
+ var parseErr error
if ip != nil {
- maddr, _ = multiaddr.NewMultiaddr(fmt.Sprintf("/ip4/%s/tcp/%s", host, port))
+ maddr, parseErr = multiaddr.NewMultiaddr(fmt.Sprintf("/ip4/%s/tcp/%s", host, port))
} else {
- maddr, _ = multiaddr.NewMultiaddr(fmt.Sprintf("/dns4/%s/tcp/%s", host, port))
+ maddr, parseErr = multiaddr.NewMultiaddr(fmt.Sprintf("/dns4/%s/tcp/%s", host, port))
+ }
+ if parseErr != nil {
+ logger.Fatalf("Failed to parse multiaddr: %v", parseErr)
}
initHubAddrs = []multiaddr.Multiaddr{maddr}
} else {
diff --git a/cmd/sam-node/node.go b/cmd/sam-node/node.go
index 5f3391a2..a40e2d3d 100644
--- a/cmd/sam-node/node.go
+++ b/cmd/sam-node/node.go
@@ -155,9 +155,6 @@ 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-punching
if 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 others
diff --git a/tests/e2e/container_mesh.bats b/tests/e2e/container_mesh.bats
index e6618602..9838c4a0 100644
--- a/tests/e2e/container_mesh.bats
+++ b/tests/e2e/container_mesh.bats
@@ -61,7 +61,7 @@ teardown() {
# Verify connected peer count via MCP (wait for full mesh).
for i in $(seq 1 "$node_count"); do
- run mesh_wait_for_node_count "${i}" "${node_count}" 60
+ run mesh_wait_for_node_count "${i}" $((node_count - 1)) 60
[[ "$status" -eq 0 ]]
done
}