add peer infos to global peer map

ethpandaops · Sep 27, 2024 · ae0e485 · ae0e485
1 parent 0fbe709
commit ae0e485
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 5 deletions.
diff --git a/handlers/clients_cl.go b/handlers/clients_cl.go
@@ -295,6 +295,12 @@ func buildCLClientsPageData() (*models.ClientsCLPageData, time.Duration) {
  }
  pageData.ClientCount = uint64(len(pageData.Clients))
 
+ // Add peer in/out infos to global nodes map
+ for _, edge := range pageData.PeerMap.ClientDataMapEdges {
+ pageData.Nodes[edge.From].PeersOut = append(pageData.Nodes[edge.From].PeersOut, edge.To)
+ pageData.Nodes[edge.To].PeersIn = append(pageData.Nodes[edge.To].PeersIn, edge.From)
+ }
+
  columnDistribution := make(map[uint64]map[string]bool)
  resultColumnDistribution := make(map[uint64][]string)
 

diff --git a/static/css/clients.css b/static/css/clients.css
@@ -186,3 +186,11 @@ Client peers table
 .dastablenode.blur {
  opacity: 0.2;
 }
+
+.peerdetails-modal-peer{
+ cursor: pointer;
+}
+
+.peerdetails-modal-peer:hover{
+ font-weight: 600;
+}
diff --git a/templates/clients/clients_cl.html b/templates/clients/clients_cl.html
@@ -146,7 +146,7 @@ <h5 class="modal-title" id="peerDasWarningsModal">👀 PeerDAS: Some problems we
  <ul>
  {{ range $i, $p := $root.PeerDASInfos.Warnings.MissingENRsPeers }}
  <li>
- <code>{{ $p }}</code>
+ <code class="peerdetails-modal-peer" onclick="showPeerDetailsModal('{{ $p }}')">{{ $p }}</code>
  </li>
  {{ end }}
  </ul>
@@ -161,7 +161,7 @@ <h5 class="modal-title" id="peerDasWarningsModal">👀 PeerDAS: Some problems we
  <ul>
  {{ range $i, $p := $root.PeerDASInfos.Warnings.MissingCSCFromENRPeers }}
  <li>
- <code>{{ $p }}</code>
+ <code class="peerdetails-modal-peer" onclick="showPeerDetailsModal('{{ $p }}')">{{ $p }}</code>
  {{ $peer := index $root.Nodes $p}}
  {{ if ne $peer.Alias $peer.PeerID }}
  ( <code>{{ $peer.Alias }}</code> )
@@ -592,11 +592,45 @@ <h5 class="modal-title" id="peerDasWarningsModal">👀 PeerDAS: Some problems we
  <td>Subnets</td>
  <td><code style="word-break: break-all; text-wrap: pretty;">${nodes[peerID].peer_das.custody_column_subnets}</code></td>
  </tr>
- </table>
+ <tr>
+ <td colspan="2" style="font-weight: 700;padding-top: 5px;padding-bottom: 5px; text-align: center;border-top:1px dashed; border-bottom:1px dashed">Peers</td>
+ </tr>
  `;
 
+ if (nodes[peerID].peers_in != null){
+ nodes[peerID].peers_in.forEach(element => {
+ peerDetailsTemplate += `
+ <tr>
+ <td colspan="2">
+ <i class="fa-solid fa-down-long text-success" data-bs-toggle="tooltip" data-bs-placement="left" data-bs-title="Inbound""></i>
+ <svg class="peer-table-icon peer-details-jdenticon" data-jdenticon-value="${element}"></svg>
+ <span class="peerdetails-modal-peer" onclick="showPeerDetailsModal('${element}')">
+ <code>${element}</code> ${nodes[element].alias!=element?"<span class='badge text-bg-secondary'>"+nodes[element].alias+"</span>":""}
+ </span>
+ </td>
+ `;
+ });
+ }
+
+ if (nodes[peerID].peers_out != null){
+ nodes[peerID].peers_out.forEach(element => {
+ peerDetailsTemplate += `
+ <tr>
+ <td colspan="2">
+ <i class="fa-solid fa-up-long text-danger" data-bs-toggle="tooltip" data-bs-placement="left" data-bs-title="Outbound""></i>
+ <svg class="peer-table-icon peer-details-jdenticon" data-jdenticon-value="${element}"></svg>
+ <span class="peerdetails-modal-peer" onclick="showPeerDetailsModal('${element}')">
+ <code>${element}</code> ${nodes[element].alias!=element?"<span class='badge text-bg-secondary'>"+nodes[element].alias+"</span>":""}
+ </span>
+ </td>
+ `;
+ });
+ }
+ peerDetailsTemplate += `</table>`;
+
  //peerDetailsTemplate += `<pre><code>${JSON.stringify(nodes[peerID], null, 2)}</code></pre>`;
  $('#peerDetailsModalBody').html(peerDetailsTemplate)
+ jdenticon.update(".peer-details-jdenticon",null)
  $('#peerDetailsModal').modal('show');
  }
 
@@ -658,8 +692,6 @@ <h5 class="modal-title" id="peerDasWarningsModal">👀 PeerDAS: Some problems we
 
  // PeerDASTable Click
  $('.dastablenode').on('click', function() {
-
-
  const $target = $(this);
  const selector = $target.attr('class').split(/\s+/).map(cls => '.' + cls).join('');
 

diff --git a/types/models/clients_cl.go b/types/models/clients_cl.go
@@ -124,4 +124,6 @@ type ClientCLNode struct {
  ENR string `json:"enr"`
  ENRKeyValues map[string]interface{} `json:"enr_kv"`
  PeerDAS *ClientCLPageDataPeerDAS `json:"peer_das"`
+ PeersIn []string `json:"peers_in"`
+ PeersOut []string `json:"peers_out"`
 }