Update per-network dashboard charts and stats collector

Author: teovl

pkg/registry/dashboard.go

@@ -337,15 +337,15 @@ footer a:hover{color:#58a6ff}
 
 <div class="charts-row" id="charts-row" style="display:none">
   <div class="chart-card">
-    <h2>Last 24 Hours</h2>
+    <h2>Online Nodes — Last 24 Hours</h2>
     <div class="disclaimer">Since last registry restart</div>
     <div style="position:relative">
       <svg id="chart-hourly" viewBox="0 0 400 180" preserveAspectRatio="xMidYMid meet"></svg>
       <div class="chart-tooltip" id="tip-hourly"></div>
     </div>
   </div>
   <div class="chart-card">
-    <h2>Last 7 Days</h2>
+    <h2>Online Nodes — Last 7 Days</h2>
     <div class="disclaimer">Since last registry restart</div>
     <div style="position:relative">
       <svg id="chart-daily" viewBox="0 0 400 180" preserveAspectRatio="xMidYMid meet"></svg>
@@ -465,9 +465,9 @@ function showNetDetail(idx){
     var d=new Date(s.ts*1000);return ['Sun','Mon','Tue','Wed','Thu','Fri','Sat'][d.getDay()]+' '+d.getDate();
   },'#3fb950');
 }
-function drawChart(svg,tip,samples,valFn,labelFn,color){
+function drawChart(svg,tip,samples,valFn,labelFn,color,unit){
   if(!svg)return;
-  color=color||'#58a6ff';
+  color=color||'#58a6ff';unit=unit||'online';
   if(!samples||!samples.length){svg.innerHTML='';return}
   var W=400,H=180,padL=40,padR=10,padT=10,padB=30;
   var cW=W-padL-padR,cH=H-padT-padB;
@@ -510,7 +510,7 @@ function drawChart(svg,tip,samples,valFn,labelFn,color){
   if(tip){
     svg.querySelectorAll('rect[data-val]').forEach(function(r){
       r.addEventListener('mouseenter',function(){
-        tip.textContent=r.getAttribute('data-lbl')+': '+r.getAttribute('data-val')+' online';
+        tip.textContent=r.getAttribute('data-lbl')+': '+r.getAttribute('data-val')+' '+unit;
         tip.style.display='block';
         var svgRect=svg.getBoundingClientRect();
         var px=parseFloat(r.getAttribute('data-x'))/W*svgRect.width;
@@ -526,10 +526,10 @@ function renderCharts(hourly,daily){
   row.style.display='grid';
   drawChart(document.getElementById('chart-hourly'),document.getElementById('tip-hourly'),hourly||[],function(s){return s.online_nodes||0},function(s){
     var d=new Date(s.ts*1000);return ('0'+d.getHours()).slice(-2)+':00';
-  });
+  },'#58a6ff','online');
   drawChart(document.getElementById('chart-daily'),document.getElementById('tip-daily'),daily||[],function(s){return s.online_nodes||0},function(s){
     var d=new Date(s.ts*1000);return ['Sun','Mon','Tue','Wed','Thu','Fri','Sat'][d.getDay()]+' '+d.getDate();
-  });
+  },'#58a6ff','online');
 }
 function update(){
   var url='/api/stats';

pkg/registry/server.go

@@ -5636,7 +5636,7 @@ func (s *Server) sampleStats() statsSampleResult {
 	return statsSampleResult{
 		global: StatsSample{
 			Timestamp:     now.Unix(),
-			TotalNodes:    len(s.nodes),
+			TotalNodes:    int(s.nextNode - 1),
 			OnlineNodes:   online,
 			TrustLinks:    len(s.trustPairs),
 			TotalRequests: s.requestCount.Load(),
@@ -6261,65 +6261,45 @@ func (s *Server) load() error {
 		slog.Info("loaded invite inboxes", "queues", len(s.inviteInbox))
 	}
 
-	// Restore time-series history ring buffers
+	// Restore time-series history ring buffers (deduplicate by bucket)
 	if len(snap.HourlyHistory) > 0 {
-		for i, sample := range snap.HourlyHistory {
-			if i >= 24 {
-				break
-			}
+		deduped := deduplicateSamples(snap.HourlyHistory, 3600, 24)
+		for i, sample := range deduped {
 			s.hourlyHistory[i] = sample
 		}
-		s.hourlyIdx = len(snap.HourlyHistory)
-		if s.hourlyIdx > 24 {
-			s.hourlyIdx = 24
-		}
-		slog.Info("loaded hourly history", "samples", len(snap.HourlyHistory))
+		s.hourlyIdx = len(deduped)
+		slog.Info("loaded hourly history", "samples", len(deduped))
 	}
 	if len(snap.DailyHistory) > 0 {
-		for i, sample := range snap.DailyHistory {
-			if i >= 7 {
-				break
-			}
+		deduped := deduplicateSamples(snap.DailyHistory, 86400, 7)
+		for i, sample := range deduped {
 			s.dailyHistory[i] = sample
 		}
-		s.dailyIdx = len(snap.DailyHistory)
-		if s.dailyIdx > 7 {
-			s.dailyIdx = 7
-		}
-		slog.Info("loaded daily history", "samples", len(snap.DailyHistory))
+		s.dailyIdx = len(deduped)
+		slog.Info("loaded daily history", "samples", len(deduped))
 	}
-	// Restore per-network history
+	// Restore per-network history (deduplicated)
 	for netIDStr, entries := range snap.NetHourlyHistory {
 		var netID uint16
 		if _, err := fmt.Sscanf(netIDStr, "%d", &netID); err == nil {
+			deduped := deduplicateNetSamples(entries, 3600, 24)
 			ring := newNetHistoryRing(24)
-			for i, e := range entries {
-				if i >= 24 {
-					break
-				}
+			for i, e := range deduped {
 				ring.Samples[i] = e
 			}
-			ring.Idx = len(entries)
-			if ring.Idx > 24 {
-				ring.Idx = 24
-			}
+			ring.Idx = len(deduped)
 			s.netHourly[netID] = ring
 		}
 	}
 	for netIDStr, entries := range snap.NetDailyHistory {
 		var netID uint16
 		if _, err := fmt.Sscanf(netIDStr, "%d", &netID); err == nil {
+			deduped := deduplicateNetSamples(entries, 86400, 7)
 			ring := newNetHistoryRing(7)
-			for i, e := range entries {
-				if i >= 7 {
-					break
-				}
+			for i, e := range deduped {
 				ring.Samples[i] = e
 			}
-			ring.Idx = len(entries)
-			if ring.Idx > 7 {
-				ring.Idx = 7
-			}
+			ring.Idx = len(deduped)
 			s.netDaily[netID] = ring
 		}
 	}
@@ -6532,7 +6512,7 @@ func (s *Server) GetDashboardStats() DashboardStats {
 	}
 
 	return DashboardStats{
-		TotalNodes:      len(s.nodes),
+		TotalNodes:      int(s.nextNode - 1),
 		ActiveNodes:     activeCount,
 		TotalTrustLinks: len(s.trustPairs),
 		TotalRequests:   s.requestCount.Load(),
@@ -6541,6 +6521,75 @@ func (s *Server) GetDashboardStats() DashboardStats {
 	}
 }
 
+// deduplicateSamples keeps only the latest sample per time bucket.
+// bucketSecs is 3600 for hourly or 86400 for daily. maxOut caps the result.
+func deduplicateSamples(samples []StatsSample, bucketSecs int64, maxOut int) []StatsSample {
+	type entry struct {
+		bucket int64
+		sample StatsSample
+	}
+	seen := make(map[int64]int) // bucket -> index in result
+	var result []entry
+	for _, s := range samples {
+		if s.Timestamp == 0 {
+			continue
+		}
+		b := s.Timestamp / bucketSecs
+		if idx, ok := seen[b]; ok {
+			// Keep the later sample in the same bucket
+			if s.Timestamp > result[idx].sample.Timestamp {
+				result[idx].sample = s
+			}
+		} else {
+			seen[b] = len(result)
+			result = append(result, entry{bucket: b, sample: s})
+		}
+	}
+	// Sort chronologically
+	sort.Slice(result, func(i, j int) bool { return result[i].bucket < result[j].bucket })
+	out := make([]StatsSample, 0, len(result))
+	for _, e := range result {
+		out = append(out, e.sample)
+	}
+	if len(out) > maxOut {
+		out = out[len(out)-maxOut:]
+	}
+	return out
+}
+
+// deduplicateNetSamples keeps only the latest NetworkSampleEntry per time bucket.
+func deduplicateNetSamples(samples []NetworkSampleEntry, bucketSecs int64, maxOut int) []NetworkSampleEntry {
+	type entry struct {
+		bucket int64
+		sample NetworkSampleEntry
+	}
+	seen := make(map[int64]int)
+	var result []entry
+	for _, s := range samples {
+		if s.Timestamp == 0 {
+			continue
+		}
+		b := s.Timestamp / bucketSecs
+		if idx, ok := seen[b]; ok {
+			if s.Timestamp > result[idx].sample.Timestamp {
+				result[idx].sample = s
+			}
+		} else {
+			seen[b] = len(result)
+			result = append(result, entry{bucket: b, sample: s})
+		}
+	}
+	sort.Slice(result, func(i, j int) bool { return result[i].bucket < result[j].bucket })
+	out := make([]NetworkSampleEntry, 0, len(result))
+	for _, e := range result {
+		out = append(out, e.sample)
+	}
+	if len(out) > maxOut {
+		out = out[len(out)-maxOut:]
+	}
+	return out
+}
+
 // readHistory returns chronologically-ordered hourly and daily samples.
 // Caller must hold s.mu (at least RLock).
 func (s *Server) readHistory() (hourly, daily []StatsSample) {
@@ -6660,7 +6709,7 @@ func (s *Server) GetDashboardStatsExtended() DashboardStats {
 	hourly, daily := s.readHistory()
 
 	return DashboardStats{
-		TotalNodes:      len(s.nodes),
+		TotalNodes:      int(s.nextNode - 1),
 		ActiveNodes:     activeCount,
 		TotalTrustLinks: len(s.trustPairs),
 		TotalRequests:   s.requestCount.Load(),