合并远程main并保留和平小店功能

internal/seckill/schedule_timer.go

@@ -3,6 +3,7 @@ package seckill
 import (
 	"errors"
 	"fmt"
+	"math"
 	"sync/atomic"
 	"time"
 
@@ -30,7 +31,8 @@ func (s *Scheduler) ScheduleRun(req types.SeckillRequest) (types.ScheduleResult,
 	calibration := s.calibrateDouyuTime("定时")
 	serverTime := calibration.EstimatedServerNow()
 
-	triggerTime := targetTime.Add(-internalAdvance)
+	advance := dynamicAdvance(calibration)
+	triggerTime := targetTime.Add(-advance)
 	remain := triggerTime.Sub(serverTime)
 	if remain <= 0 {
 		return types.ScheduleResult{}, errors.New("目标时间已过")
@@ -52,7 +54,8 @@ func (s *Scheduler) ScheduleRun(req types.SeckillRequest) (types.ScheduleResult,
 	s.scheduleMu.Lock()
 	s.replaceTimerLocked(&s.resyncSchedule, resyncRemain, func() {
 		newCalibration := s.calibrateDouyuTime("临近")
-		s.scheduleTimers(ap, targetTime, triggerTime, newCalibration, req.Attempts, req.DelayMs, true)
+		newTriggerTime := targetTime.Add(-dynamicAdvance(newCalibration))
+		s.scheduleTimers(ap, targetTime, newTriggerTime, newCalibration, req.Attempts, req.DelayMs, true)
 	})
 	s.scheduleMu.Unlock()
 
@@ -64,7 +67,7 @@ func (s *Scheduler) ScheduleRun(req types.SeckillRequest) (types.ScheduleResult,
 	logger.LogEvent("定时", "success", "定时已设置: 目标=%s 触发=%s 提前=%dms 斗鱼估算=%s 本地偏移=%dms 误差<=%dms RTT=%dms 预热=%s 复校=%s",
 		targetTime.In(constants.CST).Format("2006-01-02 15:04:05.000"),
 		triggerTime.In(constants.CST).Format("2006-01-02 15:04:05.000"),
-		internalAdvance.Milliseconds(),
+		advance.Milliseconds(),
 		serverTime.In(constants.CST).Format("2006-01-02 15:04:05.000"),
 		calibration.Offset.Milliseconds(),
 		calibration.ErrorBound.Milliseconds(),
@@ -73,7 +76,7 @@ func (s *Scheduler) ScheduleRun(req types.SeckillRequest) (types.ScheduleResult,
 		time.Now().Add(resyncRemain).In(constants.CST).Format("15:04:05.000"),
 	)
 
-	remainSecond := int(triggerTime.Sub(serverTime).Seconds())
+	remainSecond := int(math.Ceil(triggerTime.Sub(serverTime).Seconds()))
 	if remainSecond < 0 {
 		remainSecond = 0
 	}
@@ -95,26 +98,27 @@ func (s *Scheduler) scheduleTimers(accountProducts map[string]string, targetTime
 	if remain < 0 {
 		remain = 0
 	}
-	warmupRemain := remain - warmupBeforeTrigger
-	if warmupRemain < 0 {
-		warmupRemain = 0
-	}
-
 	s.scheduleMu.Lock()
 	defer s.scheduleMu.Unlock()
-	gen := atomic.AddInt64(&s.warmupGen, 1)
-	s.replaceTimerLocked(&s.warmupSchedule, warmupRemain, func() {
-		if atomic.LoadInt64(&s.warmupGen) != gen {
-			return
+	if !resync {
+		warmupRemain := remain - warmupBeforeTrigger
+		if warmupRemain < 0 {
+			warmupRemain = 0
 		}
-		if s.clientSnapshot().Activity.IsXiaodian {
-			return
-		}
-		logger.LogEvent("预热", "success", "预热触发: 本地=%s", time.Now().In(constants.CST).Format("15:04:05.000"))
-		settings := s.settingsSnapshot()
-		attempts := s.buildAttempts(accountProducts, settings.attempts)
-		s.warmupAttempts(attempts)
-	})
+		gen := atomic.AddInt64(&s.warmupGen, 1)
+		s.replaceTimerLocked(&s.warmupSchedule, warmupRemain, func() {
+			if atomic.LoadInt64(&s.warmupGen) != gen {
+				return
+			}
+			if s.clientSnapshot().Activity.IsXiaodian {
+				return
+			}
+			logger.LogEvent("预热", "success", "预热触发: 本地=%s", time.Now().In(constants.CST).Format("15:04:05.000"))
+			settings := s.settingsSnapshot()
+			attempts := s.buildAttempts(accountProducts, settings.attempts)
+			s.warmupAttempts(attempts)
+		})
+	}
 	s.replaceTimerLocked(&s.schedule, remain, func() {
 		now := time.Now()
 		estimatedServer := now.Add(calibration.Offset)
@@ -134,14 +138,13 @@ func (s *Scheduler) scheduleTimers(accountProducts map[string]string, targetTime
 		s.RunNow(accountProducts)
 	})
 	if resync {
-		logger.LogEvent("定时", "success", "临近复校已应用: 目标=%s 触发=%s 斗鱼估算=%s 本地偏移=%dms 误差<=%dms RTT=%dms 预热=%s",
+		logger.LogEvent("定时", "success", "临近复校已应用: 目标=%s 触发=%s 斗鱼估算=%s 偏移=%dms 误差<=%dms RTT=%dms",
 			targetTime.In(constants.CST).Format("2006-01-02 15:04:05.000"),
 			triggerTime.In(constants.CST).Format("2006-01-02 15:04:05.000"),
 			serverTime.In(constants.CST).Format("2006-01-02 15:04:05.000"),
 			calibration.Offset.Milliseconds(),
 			calibration.ErrorBound.Milliseconds(),
-			calibration.RTT.Milliseconds(),
-			time.Now().Add(warmupRemain).In(constants.CST).Format("15:04:05.000"))
+			calibration.RTT.Milliseconds())
 	}
 }
 
@@ -164,11 +167,19 @@ func (s *Scheduler) calibrateDouyuTime(label string) types.TimeCalibration {
 	if err != nil {
 		logger.LogEvent("时间", "warn", "%s校准降级: %v", label, err)
 	}
-	logger.SetDouyuOffset(calibration.Offset)
-	logger.LogEvent("时间", "success", "%s校准完成: 斗鱼估算=%s 偏移=%dms 误差<=%dms RTT=%dms 采样=%d 来源=%s",
+	if !calibration.Fallback {
+		s.recordCalibrationOffset(calibration.Offset)
+	}
+	smoothed := s.smoothedOffset()
+	if smoothed == 0 && calibration.Fallback {
+		smoothed = calibration.Offset
+	}
+	calibration.Offset = smoothed
+	logger.SetDouyuOffset(smoothed)
+	logger.LogEvent("时间", "success", "%s校准完成: 斗鱼估算=%s 平滑偏移=%dms 误差<=%dms RTT=%dms 采样=%d 来源=%s",
 		label,
 		calibration.EstimatedServerNow().In(constants.CST).Format("2006-01-02 15:04:05.000"),
-		calibration.Offset.Milliseconds(),
+		smoothed.Milliseconds(),
 		calibration.ErrorBound.Milliseconds(),
 		calibration.RTT.Milliseconds(),
 		calibration.Samples,