wangjia/pangolin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 26 Wiki Activity

feat(server/stats): stats-overhaul Phase2 — 每设备归因 + GB 综合配额

Browse Source 
服务端记账从「账户」细到「每设备」(每设备独立 dp_uuid),配额单位分钟→GB
按账户综合卡控。000015_per_device_usage 迁移(mysql+sqlite 双份):devices.dp_uuid
+ usage_device_daily 表 + plans.daily_mb。handler_grpc 按 dp_uuid 回映射
(user_id,device_id) 双写账户+每设备;usage 服务/handler 暴露 /v1/usage(/devices)。
含 sqlite_per_device / usage handler 测试。

注:此迁移 prod 已 migrate up 运行、部署二进制已内嵌;本次补提交使 git 与线上一致。

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
wangjia
2026-06-28 18:12:00 +08:00
parent 4f9d2d2cf3
commit 636a3bbf2f
14 changed files with 778 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/internal/nodes/store.go
+128 -4
View File
@@ -7,6 +7,7 @@ import (
"time"
dbx "github.com/wangjia/pangolin/server/internal/db"
"github.com/wangjia/pangolin/server/internal/idgen"
agentv1 "github.com/wangjia/pangolin/server/internal/pb/agentv1"
)
@@ -33,7 +34,8 @@ type Entitlement struct {
PlanCode string
AdGate bool // true = free plan, require ad unlock + minute quota
DailyMinutes sql.NullInt64
ExpiresAt sql.NullTime // latest subscription expiry (nil = trial/active)
DailyMB sql.NullInt64 // 每日综合流量配额(MB, 按账户综合卡); NULL = 不限
ExpiresAt sql.NullTime // latest subscription expiry (nil = trial/active)
}
// NodeStore is the persistence interface used by the nodes domain handlers.
@@ -71,10 +73,31 @@ type NodeStore interface {
// Returns (0, false, nil) if the dp_uuid is unknown or the user is inactive.
UserIDByDpUUID(ctx context.Context, dpUUID string) (int64, bool, error)
// EnsureDeviceDpUUID returns the per-device data-plane UUID for (userID,
// deviceUUID), minting + persisting one (devices.dp_uuid) if the device has
// none yet. Also returns the device's internal id. Each device gets its own
// dp_uuid so the node reports per-device traffic counters (todo #5 Phase 2).
EnsureDeviceDpUUID(ctx context.Context, userID int64, deviceUUID string) (dpUUID string, deviceID int64, err error)
// UserDeviceByDpUUID resolves a data-plane UUID to (userID, deviceID). It
// prefers the per-device credential (devices.dp_uuid); failing that it falls
// back to the account-level users.dp_uuid (deviceID=0) for legacy compat.
// Returns ok=false when unknown or the user is inactive.
UserDeviceByDpUUID(ctx context.Context, dpUUID string) (userID, deviceID int64, ok bool, err error)
// AccumulateUsage adds bytes and minutes to usage_daily for userID on date.
// Uses INSERT … ON DUPLICATE KEY UPDATE (idempotent within a day).
AccumulateUsage(ctx context.Context, userID int64, date time.Time,
bytesUp, bytesDown int64, minutes int64) error
// AccountDayBytes returns the account's total bytes (up+down) for userID on
// date — the basis for the GB 综合配额 connect gate. 0 when no usage yet.
AccountDayBytes(ctx context.Context, userID int64, date time.Time) (int64, error)
// AccumulateDeviceUsage adds bytes/minutes to usage_device_daily for
// (deviceID, date); user_id is carried for per-account rollups/queries.
AccumulateDeviceUsage(ctx context.Context, userID, deviceID int64, date time.Time,
bytesUp, bytesDown int64, minutes int64) error
}
// SQLNodeStore implements NodeStore against a SQL database (MySQL or SQLite).
@@ -159,7 +182,7 @@ func (s *SQLNodeStore) EntitlementForUser(ctx context.Context, userID int64) (*E
// Look up the best active subscription.
const q = `
SELECT p.code, p.ad_gate, p.daily_minutes, s.expires_at
SELECT p.code, p.ad_gate, p.daily_minutes, p.daily_mb, s.expires_at
FROM subscriptions s
JOIN plans p ON p.id = s.plan_id
WHERE s.user_id = ? AND s.expires_at > ?
@@ -168,13 +191,14 @@ func (s *SQLNodeStore) EntitlementForUser(ctx context.Context, userID int64) (*E
`
e := &Entitlement{DpUUID: dpUUID}
err := s.db.QueryRowContext(ctx, q, userID, time.Now().UTC()).Scan(
&e.PlanCode, &e.AdGate, &e.DailyMinutes, &e.ExpiresAt,
&e.PlanCode, &e.AdGate, &e.DailyMinutes, &e.DailyMB, &e.ExpiresAt,
)
if err == sql.ErrNoRows {
// No active subscription → free plan defaults.
// No active subscription → free plan defaults (mirrors the free plan seed).
e.PlanCode = "free"
e.AdGate = true
e.DailyMinutes = sql.NullInt64{Valid: true, Int64: 10}
e.DailyMB = sql.NullInt64{Valid: true, Int64: 500}
return e, nil
}
if err != nil {
@@ -288,6 +312,106 @@ func (s *SQLNodeStore) UserIDByDpUUID(ctx context.Context, dpUUID string) (int64
return userID, true, nil
}
// EnsureDeviceDpUUID returns (and lazily mints) the per-device dp_uuid for the
// (userID, deviceUUID) pair. Minting uses a guarded UPDATE so concurrent connects
// for the same device converge on a single dp_uuid (the loser's UPDATE is a no-op
// and the re-read returns the winner's value).
func (s *SQLNodeStore) EnsureDeviceDpUUID(ctx context.Context, userID int64, deviceUUID string) (string, int64, error) {
var deviceID int64
var dpUUID sql.NullString
err := s.db.QueryRowContext(ctx,
`SELECT id, dp_uuid FROM devices WHERE user_id = ? AND uuid = ? LIMIT 1`,
userID, deviceUUID,
).Scan(&deviceID, &dpUUID)
if err == sql.ErrNoRows {
return "", 0, fmt.Errorf("nodes.SQLNodeStore.EnsureDeviceDpUUID: device %q not found for user %d", deviceUUID, userID)
}
if err != nil {
return "", 0, fmt.Errorf("nodes.SQLNodeStore.EnsureDeviceDpUUID: %w", err)
}
if dpUUID.Valid && dpUUID.String != "" {
return dpUUID.String, deviceID, nil
}
minted := idgen.NewString()
if _, err := s.db.ExecContext(ctx,
`UPDATE devices SET dp_uuid = ? WHERE id = ? AND (dp_uuid IS NULL OR dp_uuid = '')`,
minted, deviceID,
); err != nil {
return "", 0, fmt.Errorf("nodes.SQLNodeStore.EnsureDeviceDpUUID: mint: %w", err)
}
// Re-read to resolve any concurrent mint race deterministically.
if err := s.db.QueryRowContext(ctx,
`SELECT dp_uuid FROM devices WHERE id = ?`, deviceID,
).Scan(&dpUUID); err != nil {
return "", 0, fmt.Errorf("nodes.SQLNodeStore.EnsureDeviceDpUUID: reread: %w", err)
}
return dpUUID.String, deviceID, nil
}
// UserDeviceByDpUUID resolves a dp_uuid to (userID, deviceID), preferring the
// per-device credential and falling back to the legacy account-level users.dp_uuid.
func (s *SQLNodeStore) UserDeviceByDpUUID(ctx context.Context, dpUUID string) (int64, int64, bool, error) {
var userID, deviceID int64
err := s.db.QueryRowContext(ctx,
`SELECT d.user_id, d.id FROM devices d
JOIN users u ON u.id = d.user_id
WHERE d.dp_uuid = ? AND u.status = 'active' LIMIT 1`, dpUUID,
).Scan(&userID, &deviceID)
if err == nil {
return userID, deviceID, true, nil
}
if err != sql.ErrNoRows {
return 0, 0, false, fmt.Errorf("nodes.SQLNodeStore.UserDeviceByDpUUID: device: %w", err)
}
// Legacy fallback: account-level credential, no device attribution.
err = s.db.QueryRowContext(ctx,
`SELECT id FROM users WHERE dp_uuid = ? AND status = 'active' LIMIT 1`, dpUUID,
).Scan(&userID)
if err == sql.ErrNoRows {
return 0, 0, false, nil
}
if err != nil {
return 0, 0, false, fmt.Errorf("nodes.SQLNodeStore.UserDeviceByDpUUID: user: %w", err)
}
return userID, 0, true, nil
}
// AccumulateDeviceUsage adds bytes/minutes to usage_device_daily for (deviceID, date).
func (s *SQLNodeStore) AccumulateDeviceUsage(
ctx context.Context, userID, deviceID int64, date time.Time,
bytesUp, bytesDown int64, minutes int64,
) error {
q := `
INSERT INTO usage_device_daily (user_id, device_id, date, bytes_up, bytes_down, minutes_used)
VALUES (?, ?, ?, ?, ?, ?)
` + s.dialect.Upsert([]string{"device_id", "date"},
"bytes_up = bytes_up + EXCLUDED.bytes_up",
"bytes_down = bytes_down + EXCLUDED.bytes_down",
"minutes_used = minutes_used + EXCLUDED.minutes_used")
if _, err := s.db.ExecContext(ctx, q,
userID, deviceID, date.Format("2006-01-02"), bytesUp, bytesDown, minutes,
); err != nil {
return fmt.Errorf("nodes.SQLNodeStore.AccumulateDeviceUsage: %w", err)
}
return nil
}
// AccountDayBytes returns the account's total bytes (up+down) for the day.
func (s *SQLNodeStore) AccountDayBytes(ctx context.Context, userID int64, date time.Time) (int64, error) {
var total sql.NullInt64
err := s.db.QueryRowContext(ctx,
`SELECT bytes_up + bytes_down FROM usage_daily WHERE user_id = ? AND date = ?`,
userID, date.Format("2006-01-02"),
).Scan(&total)
if err == sql.ErrNoRows {
return 0, nil
}
if err != nil {
return 0, fmt.Errorf("nodes.SQLNodeStore.AccountDayBytes: %w", err)
}
return total.Int64, nil
}
// AccumulateUsage adds bytes/minutes to usage_daily for the given user and date.
func (s *SQLNodeStore) AccumulateUsage(
ctx context.Context, userID int64, date time.Time,