рабочий вариант, но скороть 10 МБит

agents/rap-node-agent/internal/mesh/peer_cache.go

@@ -11,6 +11,8 @@ const DefaultWarmPeerLimit = 8
 
 type PeerCacheConfig struct {
 	Local                    PeerIdentity
+	LocalityGroupID          string
+	LocalNATGroupID          string
 	PeerEndpoints            map[string]string
 	PeerEndpointCandidates   map[string][]PeerEndpointCandidate
 	PeerEndpointObservations map[string]EndpointCandidateHealthObservation
@@ -59,11 +61,12 @@ type PeerCacheEntry struct {
 	BestCandidateScore int                     `json:"best_candidate_score,omitempty"`
 	BestScoreReasons   []string                `json:"best_score_reasons,omitempty"`
 	BestPeerCertSHA256 string                  `json:"best_peer_cert_sha256,omitempty"`
+	PublicIngressCount int                     `json:"public_ingress_count,omitempty"`
 	EndpointCandidates []PeerEndpointCandidate `json:"endpoint_candidates,omitempty"`
 	RendezvousLeaseID  string                  `json:"rendezvous_lease_id,omitempty"`
 	RelayNodeID        string                  `json:"relay_node_id,omitempty"`
 	RelayEndpoint      string                  `json:"relay_endpoint,omitempty"`
-	RelayControl       bool                    `json:"relay_control"`
+	RelayQUIC          bool                    `json:"relay_quic"`
 }
 
 type peerCacheBuildEntry struct {
@@ -119,6 +122,8 @@ func NewPeerCache(cfg PeerCacheConfig) *PeerCache {
 		scored := RankPeerEndpointCandidates(candidates, EndpointCandidateScoreOptions{
 			ChannelClass:       SyntheticChannelFabricControl,
 			PreferredRegion:    cfg.PreferredRegion,
+			LocalityGroupID:    cfg.LocalityGroupID,
+			LocalNATGroupID:    cfg.LocalNATGroupID,
 			Now:                now,
 			MaxVerificationAge: time.Hour,
 			Observations:       cfg.PeerEndpointObservations,
@@ -129,6 +134,7 @@ func NewPeerCache(cfg PeerCacheConfig) *PeerCache {
 			for _, scoredCandidate := range scored {
 				entry.EndpointCandidates = append(entry.EndpointCandidates, scoredCandidate.Candidate)
 			}
+			entry.PublicIngressCount = publicIngressCountFromCandidates(entry.EndpointCandidates)
 			entry.BestCandidateID = scored[0].Candidate.EndpointID
 			entry.BestCandidateAddr = scored[0].Candidate.Address
 			entry.BestTransport = scored[0].Candidate.Transport
@@ -197,9 +203,9 @@ func NewPeerCache(cfg PeerCacheConfig) *PeerCache {
 			entry.RendezvousLeaseID = lease.LeaseID
 			entry.RelayNodeID = lease.RelayNodeID
 			entry.RelayEndpoint = strings.TrimRight(strings.TrimSpace(lease.RelayEndpoint), "/")
-			entry.RelayControl = true
+			entry.RelayQUIC = true
 			entry.CandidateCount = maxInt(entry.CandidateCount, 1)
-			entry.ConnectivityModes = mergeStrings(entry.ConnectivityModes, []string{firstNonEmpty(lease.ConnectivityMode, "relay_required"), "relay_control"})
+			entry.ConnectivityModes = mergeStrings(entry.ConnectivityModes, []string{firstNonEmpty(lease.ConnectivityMode, "relay_required"), "relay_quic"})
 			if useLeaseEndpoint {
 				if localRelay {
 					entry.BestTransport = "reverse_quic"
@@ -225,7 +231,7 @@ func NewPeerCache(cfg PeerCacheConfig) *PeerCache {
 				entry.Endpoint = strings.TrimRight(strings.TrimSpace(lease.RelayEndpoint), "/")
 			}
 			entry.EndpointCount = maxInt(entry.EndpointCount, 1)
-			entry.ConnectivityModes = mergeStrings(entry.ConnectivityModes, []string{"relay_control"})
+			entry.ConnectivityModes = mergeStrings(entry.ConnectivityModes, []string{"relay_quic"})
 		}
 	}
 	out := make([]peerCacheBuildEntry, 0, len(entries))
@@ -334,13 +340,37 @@ func warmPeerPriority(entry peerCacheBuildEntry) int {
 	if entry.bestScore > 0 {
 		score += entry.bestScore
 	}
-	if entry.RelayControl {
+	if entry.RelayQUIC {
 		score += 300
 	}
+	if entry.PublicIngressCount > 0 {
+		score += entry.PublicIngressCount * 75
+	}
 	score += entry.CandidateCount
 	return score
 }
 
+func publicIngressCountFromCandidates(candidates []PeerEndpointCandidate) int {
+	if len(candidates) == 0 {
+		return 0
+	}
+	distinct := map[string]struct{}{}
+	for _, candidate := range candidates {
+		if strings.ToLower(strings.TrimSpace(candidate.Reachability)) != "public" {
+			continue
+		}
+		if !strings.Contains(strings.ToLower(strings.TrimSpace(candidate.Transport)), "quic") {
+			continue
+		}
+		address := strings.TrimSpace(candidate.Address)
+		if address == "" {
+			continue
+		}
+		distinct[address] = struct{}{}
+	}
+	return len(distinct)
+}
+
 func warmPeerReason(entry peerCacheBuildEntry) string {
 	if entry.adjacentRoutePeer {
 		return "route_adjacent"
@@ -348,7 +378,7 @@ func warmPeerReason(entry peerCacheBuildEntry) string {
 	if entry.RecoverySeed {
 		return "recovery_seed"
 	}
-	if entry.RelayControl {
+	if entry.RelayQUIC {
 		return "rendezvous_lease"
 	}
 	if entry.BestCandidateID != "" {