Files
pangolin/server/internal/usage/service.go
T
wangjia f2499a64e1
ci-pangolin / Lint — shellcheck (push) Successful in 7s
ci-pangolin / OpenAPI Sync Check (push) Successful in 16s
ci-pangolin / Redline Scan — 脱敏 (UI 文案) (push) Successful in 6s
ci-pangolin / Flutter — analyze + test (push) Successful in 24s
ci-pangolin / Portable SQL — 可移植性 (mysql/sqlite) (push) Successful in 4s
ci-pangolin / Codegen Drift — token 生成物未漂移 (push) Successful in 5s
ci-pangolin / Go — build + test (push) Successful in 10s
ci-pangolin / E2E Smoke — L4 进程级端到端 (push) Successful in 14s
ci-pangolin / Go — integration (mysql/redis testcontainers) (push) Failing after 4m8s
ci-pangolin / Golden — 视觉回归 (components + auth) (push) Successful in 14s
fix(usage): 统计按客户端本地日聚合 —— 修「29号却显示28号数据」时区 bug
根因:服务端用量全按 UTC 预切天,UTC+8 用户在中国 0-8 点时 UTC 还是前一天,
「今天」就显示前一天数据。

改法(用户拍板:小时桶+查询带时区偏移):
- migration 000017 `usage_hourly`(UTC 纪元小时整数桶,稀疏存储,空小时不落行)。
- ReportUsage 同时累加 usage_hourly(按 windowEnd 的 UTC 小时);usage_daily 保留作配额/今日。
- `UsageCurve(days, offsetMin)`:读 UTC 小时桶,按客户端时区偏移**重新聚合成本地日**曲线。
- `/v1/usage?tz_offset=分钟`;客户端 `usage()` 带 `DateTime.now().timeZoneOffset.inMinutes`。
- 客户端早已「取曲线最后一点当今日」,故只改服务端聚合 + 带偏移即可。

测试:store 时区分桶证明(UTC 18:00 在 UTC vs UTC+8 落不同本地日,锁住 bug 修复)+
migration v17 + usage_hourly 表;集成测试改喂 hourly;全量 go/flutter test 绿。

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-29 07:02:04 +08:00

241 lines
7.2 KiB
Go

package usage
import (
"context"
"crypto/sha256"
"encoding/hex"
"time"
"github.com/redis/go-redis/v9"
"github.com/wangjia/pangolin/server/internal/apierr"
)
// nowFunc is overridable in tests to pin "today".
var nowFunc = time.Now
// utcToday returns the current UTC calendar date (time truncated).
func utcToday() time.Time {
n := nowFunc().UTC()
return time.Date(n.Year(), n.Month(), n.Day(), 0, 0, 0, 0, time.UTC)
}
// Service serves usage queries, the /v1/me usage summary, the ads-unlock flow,
// and the free-plan connect quota check.
type Service struct {
store *Store
rdb *redis.Client
verifier AdVerifier
adNonceTTL time.Duration
}
// NewService builds a Service. rdb may be nil (ad-token replay protection is
// then disabled — not recommended in production). verifier may be nil if the
// ads-unlock endpoint is not mounted. adNonceTTL <= 0 defaults to 1h.
func NewService(store *Store, rdb *redis.Client, verifier AdVerifier, adNonceTTL time.Duration) *Service {
if adNonceTTL <= 0 {
adNonceTTL = time.Hour
}
return &Service{store: store, rdb: rdb, verifier: verifier, adNonceTTL: adNonceTTL}
}
// UsagePoint is one day of the usage curve.
type UsagePoint struct {
Date string `json:"date"` // YYYY-MM-DD (UTC)
BytesUp uint64 `json:"bytes_up"`
BytesDown uint64 `json:"bytes_down"`
MinutesUsed int `json:"minutes_used"`
}
// UsageCurve returns the last `days` usage points for userID bucketed in the
// CLIENT's timezone (offsetMin = client UTC offset in minutes, e.g. 480 for
// UTC+8), missing days zero-filled, oldest first. days clamped to [1,90].
//
// It reads UTC hourly buckets (usage_hourly) and re-aggregates by local calendar
// day, so "today" matches the user's local date regardless of server timezone
// (fixes "29号却显示28号数据"). offsetMin out of ±14h falls back to 0 (UTC).
func (svc *Service) UsageCurve(ctx context.Context, userID int64, days, offsetMin int) ([]UsagePoint, *apierr.Error) {
if days < 1 {
days = 7
}
if days > 90 {
days = 90
}
if offsetMin < -14*60 || offsetMin > 14*60 {
offsetMin = 0
}
loc := time.FixedZone("client", offsetMin*60)
now := nowFunc().UTC()
ln := now.In(loc)
localToday := time.Date(ln.Year(), ln.Month(), ln.Day(), 0, 0, 0, 0, loc)
fromLocal := localToday.AddDate(0, 0, -(days - 1))
fromHour := fromLocal.UTC().Unix() / 3600
toHour := now.Unix() / 3600
rows, err := svc.store.HourlyRange(ctx, userID, fromHour, toHour)
if err != nil {
return nil, apierr.ErrInternal
}
type agg struct {
up, down uint64
min int
}
byDay := make(map[string]*agg)
for _, b := range rows {
key := time.Unix(b.Hour*3600, 0).In(loc).Format(dateLayout)
a := byDay[key]
if a == nil {
a = &agg{}
byDay[key] = a
}
a.up += b.BytesUp
a.down += b.BytesDown
a.min += b.MinutesUsed
}
points := make([]UsagePoint, 0, days)
for i := 0; i < days; i++ {
d := fromLocal.AddDate(0, 0, i).Format(dateLayout)
if a, ok := byDay[d]; ok {
points = append(points, UsagePoint{Date: d, BytesUp: a.up, BytesDown: a.down, MinutesUsed: a.min})
} else {
points = append(points, UsagePoint{Date: d})
}
}
return points, nil
}
// DeviceUsagePoint is one device's aggregated usage over the requested window,
// used by the stats page's per-device ("下分设备") breakdown.
type DeviceUsagePoint struct {
UUID string `json:"uuid"`
Name string `json:"name"`
Platform string `json:"platform"` // ios | android | windows | macos
BytesUp uint64 `json:"bytes_up"`
BytesDown uint64 `json:"bytes_down"`
MinutesUsed int `json:"minutes_used"`
}
// DeviceUsage returns per-device usage totals for userID over the last `days`
// (UTC), busiest device first. days is clamped to [1, 90]. Devices with no
// usage in the window are omitted (the response is never nil — empty slice).
func (svc *Service) DeviceUsage(ctx context.Context, userID int64, days int) ([]DeviceUsagePoint, *apierr.Error) {
if days < 1 {
days = 7
}
if days > 90 {
days = 90
}
today := utcToday()
from := today.AddDate(0, 0, -(days - 1))
rows, err := svc.store.DeviceUsageRange(ctx, userID, from, today)
if err != nil {
return nil, apierr.ErrInternal
}
points := make([]DeviceUsagePoint, 0, len(rows))
for _, r := range rows {
points = append(points, DeviceUsagePoint{
UUID: r.UUID,
Name: r.Name,
Platform: r.Platform,
BytesUp: r.BytesUp,
BytesDown: r.BytesDown,
MinutesUsed: r.MinutesUsed,
})
}
return points, nil
}
// TodaySummary is the /v1/me today_usage block.
type TodaySummary struct {
MinutesUsed int `json:"minutes_used"`
MinutesRemaining *int `json:"minutes_remaining"` // nil = unlimited (pro/team)
AdUnlocked bool `json:"ad_unlocked"`
}
// TodaySummary returns the current user's usage summary for today (UTC),
// reflecting plan limits and ad-unlock state.
func (svc *Service) TodaySummary(ctx context.Context, userID int64) (*TodaySummary, *apierr.Error) {
plan, err := svc.store.EffectivePlan(ctx, userID)
if err != nil {
return nil, apierr.ErrInternal
}
day, err := svc.store.GetDay(ctx, userID, utcToday())
if err != nil {
return nil, apierr.ErrInternal
}
used := 0
adUnlocked := false
if day != nil {
used = day.MinutesUsed
adUnlocked = day.AdUnlockedAt.Valid
}
out := &TodaySummary{MinutesUsed: used, AdUnlocked: adUnlocked}
if plan.DailyMinutes.Valid {
remaining := int(plan.DailyMinutes.Int64) - used
if remaining < 0 {
remaining = 0
}
out.MinutesRemaining = &remaining
}
return out, nil
}
// UnlockAd verifies a rewarded-ad receipt and records the day's ad-unlock.
//
// Flow: validate inputs → verify the receipt with the ad network → consume the
// ad_token as a one-time nonce (replay-protected) → set ad_unlocked_at. A
// second unlock on a day already unlocked is idempotent (alreadyUnlocked=true).
func (svc *Service) UnlockAd(ctx context.Context, userID int64, deviceID, adToken string) (alreadyUnlocked bool, apiErr *apierr.Error) {
if deviceID == "" || adToken == "" {
return false, apierr.ErrBadRequest
}
if svc.verifier == nil {
return false, apierr.ErrInternal
}
// 1. Authenticate the receipt with the ad network.
if err := svc.verifier.Verify(ctx, AdVerifyRequest{
UserID: userID,
DeviceID: deviceID,
AdToken: adToken,
}); err != nil {
return false, apierr.ErrAdVerifyFailed
}
// 2. One-time nonce: a genuine receipt may only be redeemed once.
if dup, err := svc.consumeAdNonce(ctx, adToken); err != nil {
return false, apierr.ErrInternal
} else if dup {
return false, apierr.ErrAdReplay
}
// 3. Record the unlock (idempotent per UTC day).
already, err := svc.store.MarkAdUnlocked(ctx, userID, utcToday())
if err != nil {
return false, apierr.ErrInternal
}
return already, nil
}
// consumeAdNonce atomically records the ad_token so it cannot be reused.
// Returns dup=true if the token was already consumed. No-ops (dup=false) when
// Redis is not configured.
func (svc *Service) consumeAdNonce(ctx context.Context, adToken string) (bool, error) {
if svc.rdb == nil {
return false, nil
}
sum := sha256.Sum256([]byte(adToken))
key := "ads:nonce:" + hex.EncodeToString(sum[:])
set, err := svc.rdb.SetNX(ctx, key, "1", svc.adNonceTTL).Result()
if err != nil {
return false, err
}
return !set, nil
}