Fix lint errors

service/acme/service.go

@@ -10,6 +10,7 @@ import (
 	"net/http"
 	"net/url"
 	"reflect"
+	"slices"
 	"strings"
 	"time"
 	"unsafe"
@@ -113,13 +114,8 @@ func NewCertificateProvider(ctx context.Context, logger log.ContextLogger, tag s
 	}
 
 	profile := options.Profile
-	if profile == "" && acmeServer == certmagic.LetsEncryptProductionCA {
-		for _, domain := range options.Domain {
-			if certmagic.SubjectIsIP(domain) {
-				profile = "shortlived"
-				break
-			}
-		}
+	if profile == "" && acmeServer == certmagic.LetsEncryptProductionCA && slices.ContainsFunc(options.Domain, certmagic.SubjectIsIP) {
+		profile = "shortlived"
 	}
 
 	acmeIssuer := certmagic.ACMEIssuer{

service/oomkiller/service.go

@@ -31,6 +31,7 @@ type Service struct {
 	timerConfig    timerConfig
 	adaptiveTimer  *adaptiveTimer
 	lastReportTime atomic.Int64
+	//nolint:unused // touched only on darwin && cgo via writeOOMDraft/discardOOMDraft.
 	draftCancelled atomic.Bool
 }
 
@@ -84,37 +85,3 @@ func (s *Service) writeOOMReport(memoryUsage uint64) {
 		s.logger.Info("OOM report saved")
 	}
 }
-
-func (s *Service) writeOOMDraft(memoryUsage uint64) {
-	if s.draftCancelled.Load() {
-		return
-	}
-	reporter := service.FromContext[OOMReporter](s.ctx)
-	if reporter == nil {
-		return
-	}
-	err := reporter.WriteDraft(memoryUsage)
-	if s.draftCancelled.Load() {
-		reporter.DiscardDraft()
-		return
-	}
-	if err != nil {
-		s.logger.Warn("failed to write OOM draft: ", err)
-	} else {
-		s.logger.Warn("OOM draft saved")
-	}
-}
-
-func (s *Service) discardOOMDraft() {
-	s.draftCancelled.Store(true)
-	reporter := service.FromContext[OOMReporter](s.ctx)
-	if reporter == nil {
-		return
-	}
-	err := reporter.DiscardDraft()
-	if err != nil {
-		s.logger.Warn("failed to discard OOM draft: ", err)
-	} else {
-		s.logger.Info("OOM draft discarded")
-	}
-}

service/oomkiller/service_darwin.go

@@ -38,6 +38,7 @@ import (
 	"github.com/sagernet/sing-box/adapter"
 	"github.com/sagernet/sing/common/byteformats"
 	E "github.com/sagernet/sing/common/exceptions"
+	"github.com/sagernet/sing/service"
 )
 
 var (
@@ -103,3 +104,37 @@ func goMemoryPressureCallback(status C.ulong) {
 		s.adaptiveTimer.notifyPressure()
 	}
 }
+
+func (s *Service) writeOOMDraft(memoryUsage uint64) {
+	if s.draftCancelled.Load() {
+		return
+	}
+	reporter := service.FromContext[OOMReporter](s.ctx)
+	if reporter == nil {
+		return
+	}
+	err := reporter.WriteDraft(memoryUsage)
+	if s.draftCancelled.Load() {
+		reporter.DiscardDraft()
+		return
+	}
+	if err != nil {
+		s.logger.Warn("failed to write OOM draft: ", err)
+	} else {
+		s.logger.Warn("OOM draft saved")
+	}
+}
+
+func (s *Service) discardOOMDraft() {
+	s.draftCancelled.Store(true)
+	reporter := service.FromContext[OOMReporter](s.ctx)
+	if reporter == nil {
+		return
+	}
+	err := reporter.DiscardDraft()
+	if err != nil {
+		s.logger.Warn("failed to discard OOM draft: ", err)
+	} else {
+		s.logger.Info("OOM draft discarded")
+	}
+}

service/oomkiller/timer.go

@@ -134,15 +134,6 @@ func (t *adaptiveTimer) start() {
 	t.startLocked()
 }
 
-func (t *adaptiveTimer) notifyPressure() {
-	t.access.Lock()
-	t.startLocked()
-	t.forceMinInterval = true
-	t.pendingPressureBaseline = true
-	t.access.Unlock()
-	t.poll()
-}
-
 func (t *adaptiveTimer) startLocked() {
 	if t.timer != nil {
 		return

service/oomkiller/timer_darwin.go

@@ -0,0 +1,12 @@
+//go:build darwin && cgo
+
+package oomkiller
+
+func (t *adaptiveTimer) notifyPressure() {
+	t.access.Lock()
+	t.startLocked()
+	t.forceMinInterval = true
+	t.pendingPressureBaseline = true
+	t.access.Unlock()
+	t.poll()
+}

service/origin_ca/service.go

@@ -210,10 +210,7 @@ func (s *Service) refreshLoop() {
 				waitDuration = minimumRenewRetryDelay
 			} else {
 				refreshAt := leaf.NotAfter.Add(-s.effectiveRenewBefore(leaf))
-				waitDuration = refreshAt.Sub(s.timeFunc())
-				if waitDuration < minimumRenewRetryDelay {
-					waitDuration = minimumRenewRetryDelay
-				}
+				waitDuration = max(refreshAt.Sub(s.timeFunc()), minimumRenewRetryDelay)
 			}
 		}
 		timer := time.NewTimer(waitDuration)