From 388530bbe44452dad28225325ee02f4cb322fb4f Mon Sep 17 00:00:00 2001
From: pk910 <philipp@pk910.de>
Date: Thu, 24 Aug 2023 09:47:40 +0200
Subject: [PATCH] small fixes for clients page

---
 indexer/client.go              | 32 ++++++++++++++++----------------
 templates/clients/clients.html | 10 +++++-----
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/indexer/client.go b/indexer/client.go
index d434612c..bb013ea9 100644
--- a/indexer/client.go
+++ b/indexer/client.go
@@ -67,10 +67,10 @@ func (client *IndexerClient) GetLastHead() (int64, []byte) {
 }
 
 func (client *IndexerClient) GetStatus() string {
-	if !client.isConnected {
-		return "disconnected"
-	} else if client.isSynchronizing {
+	if client.isSynchronizing {
 		return "synchronizing"
+	} else if !client.isConnected {
+		return "disconnected"
 	} else {
 		return "ready"
 	}
@@ -119,6 +119,16 @@ func (client *IndexerClient) runIndexerClient() error {
 		return fmt.Errorf("genesis fork version from RPC does not match the genesis fork version explorer configuration")
 	}
 
+	// get latest header
+	latestHeader, err := client.rpcClient.GetLatestBlockHead()
+	if err != nil {
+		return fmt.Errorf("could not get latest header: %v", err)
+	}
+	if latestHeader == nil {
+		return fmt.Errorf("could not find latest header")
+	}
+	client.setHeadBlock(latestHeader.Data.Root, uint64(latestHeader.Data.Header.Message.Slot))
+
 	// check syncronization state
 	syncStatus, err := client.rpcClient.GetNodeSyncing()
 	if err != nil {
@@ -132,6 +142,9 @@ func (client *IndexerClient) runIndexerClient() error {
 	if syncStatus.Data.IsSyncing || syncStatus.Data.IsOptimistic {
 		return fmt.Errorf("beacon node is synchronizing")
 	}
+	if client.indexerCache.finalizedEpoch >= 0 && utils.EpochOfSlot(uint64(latestHeader.Data.Header.Message.Slot)) <= uint64(client.indexerCache.finalizedEpoch) {
+		return fmt.Errorf("client is far behind - head is before synchronized checkpoint")
+	}
 
 	// get finalized header
 	finalizedHeader, err := client.rpcClient.GetFinalizedBlockHead()
@@ -147,19 +160,6 @@ func (client *IndexerClient) runIndexerClient() error {
 		client.cacheMutex.Unlock()
 	}
 
-	// get latest header
-	latestHeader, err := client.rpcClient.GetLatestBlockHead()
-	if err != nil {
-		return fmt.Errorf("could not get latest header: %v", err)
-	}
-	if latestHeader == nil {
-		return fmt.Errorf("could not find latest header")
-	}
-	client.setHeadBlock(latestHeader.Data.Root, uint64(latestHeader.Data.Header.Message.Slot))
-	if client.indexerCache.finalizedEpoch >= 0 && utils.EpochOfSlot(uint64(latestHeader.Data.Header.Message.Slot)) <= uint64(client.indexerCache.finalizedEpoch) {
-		return fmt.Errorf("client is far behind - head is before synchronized checkpoint")
-	}
-
 	logger.WithField("client", client.clientName).Debugf("endpoint %v ready: %v ", client.clientName, client.versionStr)
 	client.retryCounter = 0
 
diff --git a/templates/clients/clients.html b/templates/clients/clients.html
index 74804239..bf7eaedd 100644
--- a/templates/clients/clients.html
+++ b/templates/clients/clients.html
@@ -18,10 +18,10 @@ <h1 class="h4 mb-1 mb-md-0"><i class="fas fa-server mx-2"></i>Clients</h1>
               <tr>
                 <th>#</th>
                 <th>Name</th>
-                <th>Version</th>
                 <th>Head Slot</th>
                 <th>Head Root</th>
                 <th>Status</th>
+                <th>Version</th>
               </tr>
             </thead>
               <tbody>
@@ -29,20 +29,20 @@ <h1 class="h4 mb-1 mb-md-0"><i class="fas fa-server mx-2"></i>Clients</h1>
                   <tr>
                     <td>{{ $client.Index }}</td>
                     <td>{{ $client.Name }}</td>
-                    <td>{{ $client.Version }}</td>
                     <td><a href="/slot/{{ $client.HeadSlot }}">{{ formatAddCommas $client.HeadSlot }}</a></td>
                     <td><a href="/slot/0x{{ printf "%x" $client.HeadRoot }}">0x{{ printf "%x" $client.HeadRoot }}</a></td>
                     <td>
                       {{ if eq $client.Status "ready" }}
                         <span class="badge rounded-pill text-bg-success">Connected</span>
-                      {{ else if eq $client.Status "syncing" }}
-                        <span class="badge rounded-pill text-bg-secondary">Synchronizing</span>
+                      {{ else if eq $client.Status "synchronizing" }}
+                        <span class="badge rounded-pill text-bg-warning">Synchronizing</span>
                       {{ else if eq $client.Status "disconnected" }}
                         <span class="badge rounded-pill text-bg-secondary">Disconnected</span>
                       {{ else }}
-                        <span class="badge rounded-pill text-bg-dark">Unknown</span>
+                        <span class="badge rounded-pill text-bg-dark">{{ $client.Status }}</span>
                       {{ end }}
                     </td>
+                    <td>{{ $client.Version }}</td>
                   </tr>
                 {{ end }}
               </tbody>