Update pause usage

Author: nekohasekai

common/ntp/service.go

@@ -10,6 +10,7 @@ import (
 	"github.com/sagernet/sing/common/logger"
 	M "github.com/sagernet/sing/common/metadata"
 	N "github.com/sagernet/sing/common/network"
+	"github.com/sagernet/sing/common/x/list"
 	"github.com/sagernet/sing/service"
 	"github.com/sagernet/sing/service/pause"
 )
@@ -40,9 +41,11 @@ type Service struct {
 	server        M.Socksaddr
 	writeToSystem bool
 	ticker        *time.Ticker
+	interval      time.Duration
 	timeout       time.Duration
 	clockOffset   time.Duration
 	pause         pause.Manager
+	pauseCallback *list.Element[pause.Callback]
 }
 
 func NewService(options Options) *Service {
@@ -82,7 +85,7 @@ func NewService(options Options) *Service {
 		logger:        options.Logger,
 		writeToSystem: options.WriteToSystem,
 		server:        destination,
-		ticker:        time.NewTicker(interval),
+		interval:      interval,
 		timeout:       options.Timeout,
 		pause:         service.FromContext[pause.Manager](ctx),
 	}
@@ -95,7 +98,11 @@ func (s *Service) Start() error {
 	} else {
 		s.logger.Info("updated time: ", s.TimeFunc()().Local().Format(TimeLayout))
 	}
+	s.ticker = time.NewTicker(s.interval)
 	go s.loopUpdate()
+	if s.pause != nil {
+		s.pauseCallback = pause.RegisterTicker(s.pause, s.ticker, s.interval, s.updateOnce)
+	}
 	return nil
 }
 
@@ -118,20 +125,16 @@ func (s *Service) loopUpdate() {
 			return
 		case <-s.ticker.C:
 		}
-		if s.pause != nil {
-			s.pause.WaitActive()
-			select {
-			case <-s.ctx.Done():
-				return
-			default:
-			}
-		}
-		err := s.update()
-		if err == nil {
-			s.logger.Info("updated time: ", s.TimeFunc()().Local().Format(TimeLayout))
-		} else {
-			s.logger.Error("update time: ", err)
-		}
+		s.updateOnce()
+	}
+}
+
+func (s *Service) updateOnce() {
+	err := s.update()
+	if err == nil {
+		s.logger.Info("updated time: ", s.TimeFunc()().Local().Format(TimeLayout))
+	} else {
+		s.logger.Error("update time: ", err)
 	}
 }
 

service/pause/timer.go

@@ -0,0 +1,24 @@
+package pause
+
+import (
+	"time"
+
+	"github.com/sagernet/sing/common/x/list"
+)
+
+func RegisterTicker(manager Manager, ticker *time.Ticker, duration time.Duration, resume func()) *list.Element[Callback] {
+	if manager.IsPaused() {
+		ticker.Stop()
+	}
+	return manager.RegisterCallback(func(event int) {
+		switch event {
+		case EventDevicePaused, EventNetworkPause:
+			ticker.Stop()
+		case EventDeviceWake, EventNetworkWake:
+			if resume != nil {
+				resume()
+			}
+			ticker.Reset(duration)
+		}
+	})
+}