feat(api): serve underlay and connections in /peers response

pkg/api/api.go

@@ -28,6 +28,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethersphere/bee/pkg/accounting"
+	"github.com/ethersphere/bee/pkg/addressbook"
 	"github.com/ethersphere/bee/pkg/auth"
 	"github.com/ethersphere/bee/pkg/crypto"
 	"github.com/ethersphere/bee/pkg/feeds"
@@ -177,6 +178,7 @@ type Service struct {
 	chequebook     chequebook.Service
 	pseudosettle   settlement.Interface
 	pingpong       pingpong.Interface
+	addressBook    addressbook.Getter
 
 	batchStore   postage.Storer
 	stamperStore storage.Store
@@ -248,6 +250,7 @@ type ExtraOptions struct {
 	Steward         steward.Interface
 	SyncStatus      func() (bool, error)
 	NodeStatus      *status.Service
+	AddressBook     addressbook.Getter
 }
 
 func New(
@@ -323,6 +326,7 @@ func (s *Service) Configure(signer crypto.Signer, auth auth.Authenticator, trace
 	s.postageContract = e.PostageContract
 	s.steward = e.Steward
 	s.stakingContract = e.Staking
+	s.addressBook = e.AddressBook
 
 	s.pingpong = e.Pingpong
 	s.topologyDriver = e.TopologyDriver

pkg/api/api_test.go

@@ -24,6 +24,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	accountingmock "github.com/ethersphere/bee/pkg/accounting/mock"
+	"github.com/ethersphere/bee/pkg/addressbook"
 	"github.com/ethersphere/bee/pkg/api"
 	"github.com/ethersphere/bee/pkg/auth"
 	mockauth "github.com/ethersphere/bee/pkg/auth/mock"
@@ -170,6 +171,8 @@ func newTestServer(t *testing.T, o testServerOptions) (*http.Client, *websocket.
 	chequebook := chequebookmock.NewChequebook(o.ChequebookOpts...)
 	ln := lightnode.NewContainer(o.Overlay)
 
+	addressBook := addressbook.New(statestore.NewStateStore())
+
 	transaction := transactionmock.New(o.TransactionOpts...)
 
 	storeRecipient := statestore.NewStateStore()
@@ -200,6 +203,7 @@ func newTestServer(t *testing.T, o testServerOptions) (*http.Client, *websocket.
 		SyncStatus:      o.SyncStatus,
 		Staking:         o.StakingContract,
 		NodeStatus:      o.NodeStatus,
+		AddressBook:     addressBook,
 	}
 
 	// By default bee mode is set to full mode.

pkg/api/peer.go

@@ -79,9 +79,10 @@ func (s *Service) peerDisconnectHandler(w http.ResponseWriter, r *http.Request)
 
 // Peer holds information about a Peer.
 type Peer struct {
-	Address  swarm.Address         `json:"address"`
-	FullNode bool                  `json:"fullNode"`
-	Underlay []multiaddr.Multiaddr `json:"underlay,omitempty"`
+	Address     swarm.Address         `json:"address"`
+	Underlay    multiaddr.Multiaddr   `json:"underlay,omitempty"`
+	FullNode    bool                  `json:"fullNode"`
+	Connections []multiaddr.Multiaddr `json:"connections,omitempty"`
 }
 
 type BlockListedPeer struct {
@@ -100,7 +101,7 @@ type blockListedPeersResponse struct {
 
 func (s *Service) peersHandler(w http.ResponseWriter, _ *http.Request) {
 	jsonhttp.OK(w, peersResponse{
-		Peers: mapPeers(s.p2p.Peers()),
+		Peers: s.mapPeers(s.p2p.Peers()),
 	})
 }
 
@@ -119,14 +120,22 @@ func (s *Service) blocklistedPeersHandler(w http.ResponseWriter, _ *http.Request
 	})
 }
 
-func mapPeers(peers []p2p.Peer) (out []Peer) {
+func (s *Service) mapPeers(peers []p2p.Peer) (out []Peer) {
 	out = make([]Peer, 0, len(peers))
 	for _, peer := range peers {
-		out = append(out, Peer{
-			Address:  peer.Address,
-			FullNode: peer.FullNode,
-			Underlay: peer.Underlay,
-		})
+		bzz, err := s.addressBook.Get(peer.Address)
+		if err != nil {
+			s.logger.Debug("get bzz address from addressbook", "address", peer.Address, "error", err)
+		}
+		p := Peer{
+			Address:     peer.Address,
+			FullNode:    peer.FullNode,
+			Connections: peer.Connections,
+		}
+		if bzz != nil {
+			p.Underlay = bzz.Underlay
+		}
+		out = append(out, p)
 	}
 	return
 }

pkg/node/node.go

@@ -1094,6 +1094,7 @@ func NewBee(
 		Steward:         steward,
 		SyncStatus:      syncStatusFn,
 		NodeStatus:      nodeStatus,
+		AddressBook:     addressbook,
 	}
 
 	if o.APIAddr != "" {

pkg/p2p/libp2p/peer.go

@@ -124,7 +124,7 @@ func (r *peerRegistry) peers() []p2p.Peer {
 			FullNode: r.full[p],
 		}
 		for conn := range r.connections[p] {
-			peer.Underlay = append(peer.Underlay, conn.RemoteMultiaddr())
+			peer.Connections = append(peer.Connections, conn.RemoteMultiaddr())
 		}
 		peers = append(peers, peer)
 	}

pkg/p2p/p2p.go

@@ -191,7 +191,7 @@ type Peer struct {
 	Address         swarm.Address
 	FullNode        bool
 	EthereumAddress []byte
-	Underlay        []ma.Multiaddr
+	Connections     []ma.Multiaddr
 }
 
 // BlockListedPeer holds information about a Peer that is blocked.