probe: fast report stamps last-seen; snapshot TTL 900ms (V2.0.3)

install-agent.sh

@@ -76,7 +76,7 @@ esac
 # sing-box 核心在 NexusGate 仓的专用发行里（见下方 SINGBOX_BASE）。
 # 注意：本脚本是 V2 版——只装 sing-box 运行时；主控未升 V2 前不要用它
 # 重装节点（节点升级走面板一键更新，不需要本脚本）。
-RELEASE_BASE="https://git.881218.xyz/rogue/3x-ui-agent/releases/download/V2.0.0"
+RELEASE_BASE="https://git.881218.xyz/rogue/3x-ui-agent/releases/download/V2.0.1"
 XUI_URL="${XUI_URL:-${RELEASE_BASE}/x-ui-linux-${BIN_ARCH}}"
 
 ROOT="${XUI_ROOT:-}"

internal/web/controller/agent.go

@@ -626,11 +626,16 @@ func probeStatIface(agentID int64) string {
 }
 
 // probeReport ingests one fast report (V2.0.1): a probe metrics
-// block and nothing else. It deliberately does NOT touch the
-// agent's last-seen stamp — liveness stays the 60 s heartbeat's
-// signal, and the traffic ledger's unseen-boot rule keeps measuring
-// reboots against heartbeat sightings exactly as before. Agents on
-// older masters never see this endpoint (404) and simply keep
+// block and nothing else. Since V2.0.3 it also touches the agent's
+// last-seen stamp, like every other report channel: the hub's
+// themes gate each batch on the node's last_seen being newer than
+// the last one they applied, so a metrics-only channel that never
+// advanced the stamp froze the public cards between the 10 s
+// traffic reports. Liveness now means "any report from the agent"
+// — all channels come from the same process — and the traffic
+// ledger's unseen-boot rule is unaffected: Record still receives
+// the pre-touch stamp, so gaps measure exactly as before. Agents
+// on older masters never see this endpoint (404) and simply keep
 // reporting metrics on the heartbeat; masters accept metrics on
 // either channel.
 func (a *AgentController) probeReport(c *gin.Context) {
@@ -644,9 +649,13 @@ func (a *AgentController) probeReport(c *gin.Context) {
 		ProbeMetrics *heartbeatProbeMetrics `json:"probeMetrics"`
 	}
 	_ = c.ShouldBindJSON(&req)
+	// The last-seen stamp as it stood before this report (see the
+	// heartbeat handler): captured before touchAgent overwrites it.
+	prevLastSeen := agent.LastSeen
+	a.touchAgent(uint(agent.Id), "")
 	if req.ProbeMetrics != nil {
 		a.updateAgentProbe(uint(agent.Id), nil, req.ProbeMetrics)
-		probe.Record(int64(agent.Id), probeSample(req.ProbeMetrics), agent.LastSeen)
+		probe.Record(int64(agent.Id), probeSample(req.ProbeMetrics), prevLastSeen)
 	}
 	jsonObj(c, gin.H{"message": "ok"}, nil)
 }

internal/web/controller/agent_fast_report_test.go

@@ -18,9 +18,10 @@ import (
 )
 
 // V2.0.1 probe batch, master side: the fast-report endpoint ingests
-// metrics without touching liveness (last-seen stays the
-// heartbeat's), and the config poll carries the cadence + the
-// node's counted-interface pin.
+// metrics, and the config poll carries the cadence + the node's
+// counted-interface pin. Since V2.0.3 the fast report also stamps
+// last-seen (the hub's themes gate batches on its freshness); it
+// originally did not — see the probeReport handler comment.
 func TestAgentFastReportAndConfigKeys(t *testing.T) {
 	gin.SetMode(gin.TestMode)
 	dbDir := t.TempDir()
@@ -71,6 +72,12 @@ func TestAgentFastReportAndConfigKeys(t *testing.T) {
 
 	metrics := `{"probeMetrics":{"bootId":"boot-f/0123456789abcdef","uptime":60,` +
 		`"memTotal":1000,"memUsed":400,"netRxTotal":10,"netTxTotal":20}}`
+	// Age the stamp first so the fast report's touch is observable
+	// even within the same millisecond as the heartbeat's.
+	stale := seenAfterHeartbeat - 120_000
+	if err := db.Model(&model.AgentNode{}).Where("id = ?", agent.Id).Update("last_seen", stale).Error; err != nil {
+		t.Fatalf("age last-seen: %v", err)
+	}
 	if code, body := call(http.MethodPost, "/panel/api/agent/probe-report", metrics); code != http.StatusOK {
 		t.Fatalf("probe-report: %d (%s)", code, body)
 	}
@@ -78,8 +85,8 @@ func TestAgentFastReportAndConfigKeys(t *testing.T) {
 	if row.ProbeMemUsed != 400 || row.ProbeAt == 0 {
 		t.Errorf("fast report metrics not stored: %+v", row)
 	}
-	if row.LastSeen != seenAfterHeartbeat {
-		t.Errorf("fast report moved last-seen: %d -> %d (liveness is the heartbeat's signal)", seenAfterHeartbeat, row.LastSeen)
+	if row.LastSeen <= stale {
+		t.Errorf("fast report did not stamp last-seen: %d -> %d (V2.0.3: themes gate on it)", stale, row.LastSeen)
 	}
 
 	// Unauthorized callers are refused.

internal/web/controller/probe_public.go

@@ -211,10 +211,12 @@ func (pc *PublicProbeController) nodeMetrics(c *gin.Context) {
 	c.JSON(http.StatusOK, resp)
 }
 
-// liveWS is the hub's browser stream: a snapshot frame every 2 s,
-// text by default, binary gzip frames for the anonymous audience when
-// opened with ?gzip. Audience eligibility is re-checked every tick —
-// a socket outlives both the session and the public-page switch.
+// liveWS is the hub's browser stream: a snapshot frame on the
+// operator's fast-report cadence (V2.0.2; the hub's fixed 2 s tick
+// made a 1 s agent cadence invisible up front), text by default,
+// binary gzip frames for the anonymous audience when opened with
+// ?gzip. Audience eligibility is re-checked every tick — a socket
+// outlives both the session and the public-page switch.
 func (pc *PublicProbeController) liveWS(c *gin.Context) {
 	authed := probeAuthed(c) && !fromOtherOrigin(c)
 	if !authed && !service.ProbePublicPageEnabled() {
@@ -280,18 +282,19 @@ func (pc *PublicProbeController) liveWS(c *gin.Context) {
 		return conn.WriteMessage(frameType, frame) == nil
 	}
 
-	// The first frame goes out immediately (hub's interval ticks at
-	// once), then one per 2 s tick.
+	// The first frame goes out immediately; later frames follow the
+	// fast-report cadence, re-read after every frame so a settings
+	// change lands on a live socket without a reconnect.
 	if !send() {
 		return
 	}
-	ticker := time.NewTicker(2 * time.Second)
-	defer ticker.Stop()
 	for {
+		timer := time.NewTimer(time.Duration(service.ProbeFastIntervalSec()) * time.Second)
 		select {
 		case <-done:
+			timer.Stop()
 			return
-		case <-ticker.C:
+		case <-timer.C:
 			if !send() {
 				return
 			}

internal/web/controller/probe_ws_cadence_test.go

@@ -0,0 +1,63 @@
+package controller
+
+import (
+	"net/http/httptest"
+	"strings"
+	"testing"
+	"time"
+
+	ws "github.com/gorilla/websocket"
+
+	"github.com/mhsanaei/3x-ui/v3/internal/web/service"
+)
+
+// V2.0.2: /api/ws frame cadence follows the operator's fast-report
+// interval (probe_fast_interval) instead of the hub's fixed 2 s tick.
+// A mid-stream settings change re-paces a live socket: the timer
+// already in flight still fires on the old cadence, the next one is
+// armed from the re-read setting.
+func TestProbeWebSocketCadenceFollowsFastInterval(t *testing.T) {
+	rig := newProbeTestRig(t)
+	_, _ = rig.seedAgent(t, "CadenceNode", true)
+	rig.setSetting(t, "public_page", "on")
+	rig.setSetting(t, "probe_fast_interval", "1")
+	service.InvalidateProbeSnapshot()
+
+	srv := httptest.NewServer(rig.engine)
+	defer srv.Close()
+	wsURL := "ws" + strings.TrimPrefix(srv.URL, "http") + "/api/ws"
+
+	conn, _, err := ws.DefaultDialer.Dial(wsURL, nil)
+	if err != nil {
+		t.Fatalf("dial: %v", err)
+	}
+	defer conn.Close()
+
+	readAt := func() time.Time {
+		t.Helper()
+		_ = conn.SetReadDeadline(time.Now().Add(10 * time.Second))
+		if _, _, err := conn.ReadMessage(); err != nil {
+			t.Fatalf("ws read: %v", err)
+		}
+		return time.Now()
+	}
+
+	_ = readAt() // first frame: immediate
+	prev := readAt()
+	for i := 0; i < 2; i++ {
+		now := readAt()
+		if gap := now.Sub(prev); gap < 500*time.Millisecond || gap > 2500*time.Millisecond {
+			t.Fatalf("frame gap at 1 s cadence: %v", gap)
+		}
+		prev = now
+	}
+
+	// Change to 3 s mid-stream: one in-flight 1 s frame, then the
+	// stream settles onto the new cadence without a reconnect.
+	rig.setSetting(t, "probe_fast_interval", "3")
+	prev = readAt()
+	now := readAt()
+	if gap := now.Sub(prev); gap < 2200*time.Millisecond || gap > 6*time.Second {
+		t.Fatalf("frame gap after change to 3 s: %v", gap)
+	}
+}

internal/web/service/probe_public.go

@@ -29,9 +29,11 @@ import (
 // 150 s absorbs one lost beat plus jitter.
 const ProbeOnlineThresholdMs = 150_000
 
-// ProbeSnapshotTTL mirrors the hub's 1900 ms frame reuse: just under
-// the 2 s push interval, so a frame is built at most once per tick.
-const ProbeSnapshotTTL = 1900 * time.Millisecond
+// ProbeSnapshotTTL mirrors the hub's frame reuse, shortened in
+// V2.0.3 from the hub's 1900 ms: just under the fastest (1 s) push
+// cadence, so a 1 s stream still gets a fresh frame every tick
+// instead of repeating the previous one half the time.
+const ProbeSnapshotTTL = 900 * time.Millisecond
 
 // ---- public-surface settings (main settings KV, hub key names) ----