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

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

@@ -3,7 +3,6 @@ package mesh
 import (
 	"context"
 	"fmt"
-	"net/http"
 	"strings"
 	"sync"
 	"time"
@@ -25,7 +24,6 @@ type PeerConnectionManagerConfig struct {
 	PeerCache        *PeerCache
 	Tracker          *PeerConnectionTracker
 	RendezvousLeases []PeerRendezvousLease
-	HTTPClient       *http.Client
 	QUICTransport    *QUICFabricTransport
 	PreferredRegion  string
 	ProbeTimeout     time.Duration
@@ -37,7 +35,6 @@ type PeerConnectionManager struct {
 	peerCache        *PeerCache
 	tracker          *PeerConnectionTracker
 	rendezvousLeases []PeerRendezvousLease
-	httpClient       *http.Client
 	quicTransport    *QUICFabricTransport
 	preferredRegion  string
 	probeTimeout     time.Duration
@@ -60,7 +57,7 @@ type PeerConnectionManagerCycle struct {
 	Skipped                 int                         `json:"skipped"`
 	RendezvousRequiredCount int                         `json:"rendezvous_required_count"`
 	RendezvousResolvedCount int                         `json:"rendezvous_resolved_count"`
-	RelayControlCount       int                         `json:"relay_control_count"`
+	RelayQUICCount          int                         `json:"relay_quic_count"`
 	RecoveryPlan            PeerRecoveryPlan            `json:"recovery_plan"`
 	IntentPlan              PeerConnectionIntentPlan    `json:"intent_plan"`
 	Results                 []PeerConnectionProbeResult `json:"results,omitempty"`
@@ -117,17 +114,6 @@ func NewPeerConnectionManager(cfg PeerConnectionManagerConfig) *PeerConnectionMa
 	if probeTimeout <= 0 {
 		probeTimeout = DefaultPeerConnectionProbeTimeout
 	}
-	httpClient := cfg.HTTPClient
-	if httpClient == nil {
-		httpClient = &http.Client{
-			Transport: &http.Transport{
-				MaxIdleConns:        64,
-				MaxIdleConnsPerHost: 8,
-				IdleConnTimeout:     90 * time.Second,
-			},
-			Timeout: probeTimeout + time.Second,
-		}
-	}
 	now := cfg.Now
 	if now == nil {
 		now = func() time.Time { return time.Now().UTC() }
@@ -137,7 +123,6 @@ func NewPeerConnectionManager(cfg PeerConnectionManagerConfig) *PeerConnectionMa
 		peerCache:        cfg.PeerCache,
 		tracker:          cfg.Tracker,
 		rendezvousLeases: append([]PeerRendezvousLease{}, cfg.RendezvousLeases...),
-		httpClient:       httpClient,
 		quicTransport:    cfg.QUICTransport,
 		preferredRegion:  strings.TrimSpace(cfg.PreferredRegion),
 		probeTimeout:     probeTimeout,
@@ -157,6 +142,7 @@ func (m *PeerConnectionManager) ProbeOnce(ctx context.Context) PeerConnectionMan
 		Connections:        m.tracker.Snapshot(),
 		TargetReadyPeers:   DefaultStablePeerTarget,
 		MaxProbeCandidates: DefaultRecoveryProbeLimit,
+		PreferredRegion:    m.preferredRegion,
 		Now:                startedAt,
 	})
 	intentPlan := PlanPeerConnectionIntents(PeerConnectionIntentPlanConfig{
@@ -177,7 +163,7 @@ func (m *PeerConnectionManager) ProbeOnce(ctx context.Context) PeerConnectionMan
 		IntentCount:             intentPlan.IntentCount,
 		RendezvousRequiredCount: intentPlan.RendezvousRequiredCount,
 		RendezvousResolvedCount: intentPlan.RendezvousResolvedCount,
-		RelayControlCount:       intentPlan.RelayControlCount,
+		RelayQUICCount:          intentPlan.RelayQUICCount,
 		RecoveryPlan:            recoveryPlan,
 		IntentPlan:              intentPlan,
 		Results:                 make([]PeerConnectionProbeResult, 0, len(intentPlan.Intents)),
@@ -270,7 +256,7 @@ func (m *PeerConnectionManager) probeIntent(ctx context.Context, intent PeerConn
 		RendezvousLeaseID:  intent.RendezvousLeaseID,
 		RelayNodeID:        intent.RelayNodeID,
 		RelayEndpoint:      intent.RelayEndpoint,
-		RelayControl:       intent.RelayCandidate,
+		RelayQUIC:          intent.RelayCandidate,
 		BestPeerCertSHA256: firstNonEmpty(intent.BestPeerCertSHA256, cacheEntry.BestPeerCertSHA256),
 	}
 	if intent.RequiresRendezvous {
@@ -385,7 +371,7 @@ func peerConnectionProbeTargetNodeID(intent PeerConnectionIntent, localNodeID st
 func (m *PeerConnectionManager) probePeerTarget(ctx context.Context, probePeer PeerCacheEntry, target PeerIdentity) error {
 	endpoint := strings.TrimRight(strings.TrimSpace(probePeer.Endpoint), "/")
 	transport := strings.TrimSpace(probePeer.BestTransport)
-	if hasLegacyEndpointScheme(endpoint) {
+	if hasUnsupportedEndpointScheme(endpoint) {
 		return fmt.Errorf("non_quic_probe_rejected")
 	}
 	if peerConnectionTargetIsQUIC(transport, endpoint) {
@@ -445,7 +431,7 @@ func peerConnectionProbeTargets(intent PeerConnectionIntent, cacheEntry PeerCach
 		}
 		add(candidate.EndpointID, candidate.Address, candidate.Transport, candidatePeerCertSHA256(candidate))
 	}
-	add(intent.BestCandidateID, intent.Endpoint, intent.Transport, cacheEntry.BestPeerCertSHA256)
+	add(intent.BestCandidateID, intent.Endpoint, intent.Transport, intent.BestPeerCertSHA256)
 	return out
 }
 
@@ -455,7 +441,7 @@ func peerConnectionShouldProbeDirectUpgrade(intent PeerConnectionIntent, cacheEn
 	}
 	if strings.TrimSpace(intent.ConnectionState) != PeerConnectionRelayReady &&
 		!intent.RelayCandidate &&
-		strings.TrimSpace(intent.TransportMode) != PeerTransportModeRelayControl {
+		strings.TrimSpace(intent.TransportMode) != PeerTransportModeRelayQUIC {
 		return false
 	}
 	for _, candidate := range cacheEntry.EndpointCandidates {
@@ -509,8 +495,3 @@ func (m *PeerConnectionManager) connectionState(nodeID string) PeerConnectionSta
 	}
 	return PeerConnectionState{NodeID: nodeID, State: PeerConnectionDisconnected}
 }
-
-func (c Client) withHTTPClient(httpClient *http.Client) Client {
-	c.HTTPClient = httpClient
-	return c
-}