Full Flow : Catalog + Peer

daemons/node/common/common_stream.go

@@ -27,9 +27,9 @@ type LongLivedStreamRecordedService[T interface{}] struct {
 	StreamRecords map[protocol.ID]map[pp.ID]*StreamRecord[T]
 	StreamMU      sync.RWMutex
 	maxNodesConn  int
-	// AfterHeartbeat is an optional hook called after each successful heartbeat update.
-	// The indexer sets it to republish the embedded signed record to the DHT.
-	AfterHeartbeat func(pid pp.ID)
+	// AfterHeartbeat is called after each successful heartbeat with the full
+	// decoded Heartbeat so the hook can use the fresh embedded PeerRecord.
+	AfterHeartbeat func(hb *Heartbeat)
 	// AfterDelete is called after gc() evicts an expired peer, outside the lock.
 	// name and did may be empty if the HeartbeatStream had no metadata.
 	AfterDelete func(pid pp.ID, name string, did string)
@@ -66,7 +66,6 @@ func (ix *LongLivedStreamRecordedService[T]) gc() {
 		return
 	}
 	streams := ix.StreamRecords[ProtocolHeartbeat]
-	fmt.Println(StaticNatives, StaticIndexers, streams)
 
 	type gcEntry struct {
 		pid  pp.ID
@@ -184,9 +183,26 @@ func (ix *LongLivedStreamRecordedService[T]) HandleHeartbeat(s network.Stream) {
 			logger.Info().Msg("A new node is subscribed : " + pid.String())
 		}
 		ix.StreamMU.Unlock()
-		// Let the indexer republish the embedded signed record to the DHT.
-		if ix.AfterHeartbeat != nil {
-			ix.AfterHeartbeat(*pid)
+		// Enrich hb.DID before calling the hook: nodes never set hb.DID directly;
+		// extract it from the embedded signed PeerRecord if available, then fall
+		// back to the DID stored by handleNodePublish in the stream record.
+		if hb.DID == "" && len(hb.Record) > 0 {
+			var partial struct {
+				DID string `json:"did"`
+			}
+			if json.Unmarshal(hb.Record, &partial) == nil && partial.DID != "" {
+				hb.DID = partial.DID
+			}
+		}
+		if hb.DID == "" {
+			ix.StreamMU.RLock()
+			if rec, ok := streams[*pid]; ok {
+				hb.DID = rec.DID
+			}
+			ix.StreamMU.RUnlock()
+		}
+		if ix.AfterHeartbeat != nil && hb.DID != "" {
+			ix.AfterHeartbeat(hb)
 		}
 	}
 }
@@ -214,17 +230,15 @@ func CheckHeartbeat(h host.Host, s network.Stream, dec *json.Decoder, streams ma
 		}
 		lock.Unlock()
 		diversity := getDiversityRate(h, hb.IndexersBinded)
-		fmt.Println(upTime, bpms, diversity)
 		hb.ComputeIndexerScore(upTime, bpms, diversity)
 		// First heartbeat: uptime is always 0 so the score ceiling is 60, below the
 		// steady-state threshold of 75. Use a lower admission threshold so new peers
 		// can enter and start accumulating uptime. Subsequent heartbeats must meet
 		// the full threshold once uptime is tracked.
-		minScore := float64(50)
+		minScore := float64(40)
 		if isFirstHeartbeat {
 			minScore = 40
 		}
-		fmt.Println(hb.Score, minScore)
 		if hb.Score < minScore {
 			return nil, nil, errors.New("not enough trusting value")
 		}
@@ -239,13 +253,11 @@ func CheckHeartbeat(h host.Host, s network.Stream, dec *json.Decoder, streams ma
 }
 
 func getDiversityRate(h host.Host, peers []string) float64 {
-
 	peers, _ = checkPeers(h, peers)
 	diverse := []string{}
 	for _, p := range peers {
 		ip, err := ExtractIP(p)
 		if err != nil {
-			fmt.Println("NO IP", p, err)
 			continue
 		}
 		div := ip.Mask(net.CIDRMask(24, 32)).String()
@@ -725,7 +737,7 @@ func SendHeartbeat(ctx context.Context, proto protocol.ID, name string, h host.H
 							go replenishIndexersFromNative(h, idxNeed)
 						}
 					}
-					logger.Debug().Str("peer", ix.ID.String()).Str("proto", string(proto)).Msg("[native] step 2 — heartbeat sent ok")
+					// logger.Debug().Str("peer", ix.ID.String()).Str("proto", string(proto)).Msg("[native] step 2 — heartbeat sent ok")
 				}
 			}
 		}
@@ -768,6 +780,7 @@ func TempStream(h host.Host, ad pp.AddrInfo, proto protocol.ID, did string, stre
 			return streams, err
 		}
 	}
+
 	if streams[proto] != nil && streams[proto][ad.ID] != nil {
 		return streams, nil
 	} else if s, err := h.NewStream(ctxTTL, ad.ID, proto); err == nil {