64a1a64c3f
节点 sing-box 编入 with_v2ray_api 后,每个 dp_uuid 有独立计数器
user>>>{dp_uuid}>>>traffic>>>uplink|downlink。agent 用 QueryStats(reset=true)
取窗口 delta,按用户精确上报(替代旧 clash 节点总量分摊:单用户准、多用户近似)。
- render.go: experimental.v2ray_api(loopback :19091)+ stats.users 列全部 dp_uuid
- v2rayapi/: vendor sing-box stats.pb.go(消息)+ 手写 client(用 v2ray 规范
ServiceName 路径,绕开生成代码的 experimental.v2rayapi.* 误名)
- usage_v2ray.go: V2RayUsageSource,uplink/downlink 天然用户视角(无需 swap)
- agent.UseV2RayUsage() 取代 UseClashUsage();clash_api 保留作本地调试
节点需部署带 with_v2ray_api 的 sing-box(已编好 linux/amd64 二进制)。
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
213 lines
5.9 KiB
Go
213 lines
5.9 KiB
Go
package agentd
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"math/rand"
|
|
"sync/atomic"
|
|
"time"
|
|
|
|
agentv1 "github.com/wangjia/pangolin/server/internal/pb/agentv1"
|
|
)
|
|
|
|
// errResync is returned within a session to force a reconnect + full Register.
|
|
var errResync = errors.New("agentd: full resync required")
|
|
|
|
// Agent is the top-level node daemon. Construct with New and drive with Run.
|
|
type Agent struct {
|
|
cfg Config
|
|
sb *SingBox
|
|
nodeUUID atomic.Value // string; written once by Run, read by all loops + tests
|
|
|
|
dial Dialer
|
|
enrollDial EnrollDialer
|
|
load LoadSource
|
|
usage UsageSource
|
|
clock func() time.Time
|
|
|
|
lastCommandID atomic.Int64
|
|
shutdown context.CancelFunc
|
|
|
|
restarter Restarter
|
|
}
|
|
|
|
// Option customises an Agent (primarily for tests / dependency injection).
|
|
type Option func(*Agent)
|
|
|
|
func WithRestarter(r Restarter) Option { return func(a *Agent) { a.restarter = r } }
|
|
func WithDialer(d Dialer) Option { return func(a *Agent) { a.dial = d } }
|
|
func WithEnrollDialer(d EnrollDialer) Option { return func(a *Agent) { a.enrollDial = d } }
|
|
func WithLoadSource(l LoadSource) Option { return func(a *Agent) { a.load = l } }
|
|
func WithUsageSource(u UsageSource) Option { return func(a *Agent) { a.usage = u } }
|
|
func WithClock(f func() time.Time) Option { return func(a *Agent) { a.clock = f } }
|
|
|
|
// New builds an Agent. Production callers pass nothing extra and get mTLS dialers;
|
|
// tests inject bufconn dialers, fake restarters, etc.
|
|
func New(cfg Config, opts ...Option) *Agent {
|
|
cfg = cfg.withDefaults()
|
|
a := &Agent{cfg: cfg, clock: time.Now}
|
|
for _, o := range opts {
|
|
o(a)
|
|
}
|
|
if a.dial == nil {
|
|
if cfg.Insecure {
|
|
a.dial = insecureDialer(cfg.ControlPlaneAddr)
|
|
} else {
|
|
a.dial = NewMTLSDialer(cfg)
|
|
}
|
|
}
|
|
if a.enrollDial == nil {
|
|
if cfg.Insecure {
|
|
a.enrollDial = EnrollDialer(insecureDialer(cfg.ControlPlaneAddr))
|
|
} else {
|
|
a.enrollDial = NewEnrollDialer(cfg)
|
|
}
|
|
}
|
|
a.sb = NewSingBox(cfg, a.restarter)
|
|
a.sb.clock = a.clock
|
|
if a.load == nil {
|
|
a.load = defaultLoadSource{sb: a.sb}
|
|
}
|
|
if a.usage == nil {
|
|
a.usage = nopUsageSource{}
|
|
}
|
|
return a
|
|
}
|
|
|
|
// SingBox exposes the underlying manager (tests / introspection).
|
|
func (a *Agent) SingBox() *SingBox { return a.sb }
|
|
|
|
// UseClashUsage wires the legacy usage source: reads node-total traffic from the
|
|
// local clash_api and reports per-window deltas (split across dp_uuids — exact
|
|
// for one active user, approximate for many). Superseded by UseV2RayUsage.
|
|
func (a *Agent) UseClashUsage() { a.usage = newClashUsageSource(a.sb) }
|
|
|
|
// UseV2RayUsage wires the accurate usage source: reads PER-USER traffic from the
|
|
// local v2ray_api StatsService (one counter pair per dp_uuid). Production main
|
|
// enables this; tests leave it off.
|
|
func (a *Agent) UseV2RayUsage() { a.usage = newV2RayUsageSource() }
|
|
|
|
// NodeUUID returns the enrolled node UUID (empty until Run enrolls).
|
|
func (a *Agent) NodeUUID() string {
|
|
v, _ := a.nodeUUID.Load().(string)
|
|
return v
|
|
}
|
|
|
|
// Run enrolls (if needed), restores state, then maintains the control-plane
|
|
// connection with exponential-backoff reconnect until ctx is cancelled.
|
|
func (a *Agent) Run(ctx context.Context) error {
|
|
ctx, cancel := context.WithCancel(ctx)
|
|
defer cancel()
|
|
a.shutdown = cancel
|
|
|
|
uuid, err := EnsureEnrolled(ctx, a.cfg, a.enrollDial)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
a.nodeUUID.Store(uuid)
|
|
|
|
if err := a.sb.LoadState(); err != nil {
|
|
return err
|
|
}
|
|
|
|
go a.sb.Run(ctx)
|
|
go a.runTTL(ctx)
|
|
a.sb.markDirty() // render whatever we restored before the first connect
|
|
|
|
backoff := a.cfg.BackoffMin
|
|
for {
|
|
if ctx.Err() != nil {
|
|
return nil
|
|
}
|
|
registered, err := a.runSession(ctx)
|
|
if ctx.Err() != nil {
|
|
return nil
|
|
}
|
|
if registered {
|
|
backoff = a.cfg.BackoffMin // healthy session → reset backoff
|
|
}
|
|
if err != nil && !errors.Is(err, errResync) {
|
|
logf("session ended: %v; reconnecting in %s", err, backoff)
|
|
}
|
|
if !sleepCtx(ctx, jitter(backoff)) {
|
|
return nil
|
|
}
|
|
backoff = nextBackoff(backoff, a.cfg.BackoffMax)
|
|
}
|
|
}
|
|
|
|
// runSession establishes one connection: Register (full snapshot), then runs
|
|
// heartbeat/subscribe/usage until the first of them fails. Returns whether
|
|
// Register succeeded (used to reset backoff).
|
|
func (a *Agent) runSession(ctx context.Context) (registered bool, err error) {
|
|
conn, err := a.dial(ctx)
|
|
if err != nil {
|
|
return false, err
|
|
}
|
|
defer conn.Close()
|
|
|
|
client := agentv1.NewAgentServiceClient(conn)
|
|
|
|
snap, err := client.Register(ctx, &agentv1.RegisterRequest{
|
|
NodeUUID: a.NodeUUID(),
|
|
AgentVersion: a.cfg.AgentVersion,
|
|
LocalConfigVersion: a.sb.ConfigVersion(),
|
|
})
|
|
if err != nil {
|
|
return false, err
|
|
}
|
|
// Full snapshot is authoritative: overwrite local credential table + inbounds.
|
|
a.sb.ApplyConfig(snap, true)
|
|
if snap.LastCommandID > a.lastCommandID.Load() {
|
|
a.lastCommandID.Store(snap.LastCommandID)
|
|
}
|
|
|
|
sctx, cancel := context.WithCancel(ctx)
|
|
defer cancel()
|
|
|
|
errc := make(chan error, 3)
|
|
go func() { errc <- a.runHeartbeat(sctx, client) }()
|
|
go func() { errc <- a.runSubscribe(sctx, client) }()
|
|
go func() { errc <- a.runUsage(sctx, client) }()
|
|
|
|
first := <-errc
|
|
cancel()
|
|
<-errc
|
|
<-errc
|
|
return true, first
|
|
}
|
|
|
|
// ─── backoff helpers ─────────────────────────────────────────────────────────
|
|
|
|
func nextBackoff(cur, max time.Duration) time.Duration {
|
|
next := cur * 2
|
|
if next > max {
|
|
next = max
|
|
}
|
|
return next
|
|
}
|
|
|
|
// jitter applies ±20% randomisation to avoid thundering-herd reconnects.
|
|
func jitter(d time.Duration) time.Duration {
|
|
if d <= 0 {
|
|
return 0
|
|
}
|
|
delta := float64(d) * 0.2
|
|
return d + time.Duration((rand.Float64()*2-1)*delta)
|
|
}
|
|
|
|
// sleepCtx sleeps for d unless ctx is cancelled first. Returns false if cancelled.
|
|
func sleepCtx(ctx context.Context, d time.Duration) bool {
|
|
if d <= 0 {
|
|
return ctx.Err() == nil
|
|
}
|
|
t := time.NewTimer(d)
|
|
defer t.Stop()
|
|
select {
|
|
case <-ctx.Done():
|
|
return false
|
|
case <-t.C:
|
|
return true
|
|
}
|
|
}
|