sort peers by names and types

ethpandaops · Jul 10, 2024 · a039de8 · a039de8
1 parent 4071910
commit a039de8
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 16 deletions.
diff --git a/handlers/clients.go b/handlers/clients.go
@@ -139,6 +139,11 @@ func buildClientsPageData() (*models.ClientsPageData, time.Duration) {
 	}
 	cacheTime := time.Duration(utils.Config.Chain.Config.SecondsPerSlot) * time.Second
 
+	aliases := map[string]string{}
+	for _, client := range services.GlobalBeaconService.GetClients() {
+		aliases[client.GetPeerId()] = client.GetName()
+	}
+
 	for _, client := range services.GlobalBeaconService.GetClients() {
 		lastHeadSlot, lastHeadRoot, clientRefresh := client.GetLastHead()
 		if lastHeadSlot < 0 {
@@ -148,12 +153,29 @@ func buildClientsPageData() (*models.ClientsPageData, time.Duration) {
 		peers := client.GetNodePeers()
 		resPeers := []*models.ClientPageDataClientPeers{}
 		for _, peer := range peers {
+
+			peerAlias := peer.PeerID
+			peerType := "external"
+			if alias, ok := aliases[peer.PeerID]; ok {
+				peerAlias = alias
+				peerType = "internal"
+			}
 			resPeers = append(resPeers, &models.ClientPageDataClientPeers{
 				PeerID:    peer.PeerID,
 				State:     peer.State,
 				Direction: peer.Direction,
+				Alias:     peerAlias,
+				PeerType:  peerType,
 			})
 		}
+		sort.Slice(resPeers, func(i, j int) bool {
+			if resPeers[i].PeerType == resPeers[j].PeerType {
+				return resPeers[i].Alias < resPeers[j].Alias
+			}
+
+			return resPeers[i].PeerType > resPeers[j].PeerType
+		})
+
 		resClient := &models.ClientsPageDataClient{
 			Index:       int(client.GetIndex()) + 1,
 			Name:        client.GetName(),

diff --git a/templates/clients/clients.html b/templates/clients/clients.html
@@ -251,14 +251,7 @@ <h1 class="h4 mb-1 mb-md-0"><i class="fas fa-server mx-2"></i>Clients</h1>
                             <div style="padding-left: 20px;">
                               <img src="/identicon?key={{ $peer.PeerID }}" class="peer-table-icon {{ $peer.State }}" alt="{{ $peer.State }}"/>
                               <code data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="{{ $peer.PeerID }}">
-                                <script type="text/javascript">
-                                  if ("{{ $peer.PeerID }}" in nodeStats){
-                                    node = nodeStats["{{ $peer.PeerID }}"];
-                                    document.write(node.alias);
-                                  } else {
-                                    document.write("{{ $peer.PeerID }}");
-                                  }
-                                </script>
+                                {{ $peer.Alias }}
                               </code>
                             </div>
                             {{end}}
@@ -272,14 +265,7 @@ <h1 class="h4 mb-1 mb-md-0"><i class="fas fa-server mx-2"></i>Clients</h1>
                               <img src="/identicon?key={{ $peer.PeerID }}" class="peer-table-icon {{ $peer.State }}" alt="{{ $peer.State }}"/>
 
                               <code data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="{{ $peer.PeerID }}">
-                                <script type="text/javascript">
-                                  if ("{{ $peer.PeerID }}" in nodeStats){
-                                    node = nodeStats["{{ $peer.PeerID }}"];
-                                    document.write(node.alias);
-                                  } else {
-                                    document.write("{{ $peer.PeerID }}");
-                                  }
-                                </script>
+                                {{ $peer.Alias }}
                               </code>
 
                             </div>

diff --git a/types/models/clients.go b/types/models/clients.go
@@ -26,6 +26,8 @@ type ClientsPageDataClient struct {
 
 type ClientPageDataClientPeers struct {
 	PeerID    string `json:"peer_id"`
+	Alias     string `json:"alias"`
+	PeerType  string `json"type"`
 	State     string `json:"state"`
 	Direction string `json:"direction"`
 }