Refactor adapter

log/hook.go

@@ -0,0 +1,48 @@
+package log
+
+import (
+	"github.com/logrusorgru/aurora"
+	F "github.com/sagernet/sing/common/format"
+	"github.com/sirupsen/logrus"
+)
+
+type Hook struct{}
+
+func (h *Hook) Levels() []logrus.Level {
+	return logrus.AllLevels
+}
+
+func (h *Hook) Fire(entry *logrus.Entry) error {
+	if prefix, loaded := entry.Data["prefix"]; loaded {
+		prefixStr := prefix.(string)
+		delete(entry.Data, "prefix")
+		entry.Message = prefixStr + entry.Message
+	}
+	var idCtx *idContext
+	if entry.Context != nil {
+		idCtx = entry.Context.Value(idType).(*idContext)
+	}
+	if idCtx != nil {
+		var color aurora.Color
+		color = aurora.Color(uint8(idCtx.id))
+		color %= 215
+		row := uint(color / 36)
+		column := uint(color % 36)
+
+		var r, g, b float32
+		r = float32(row * 51)
+		g = float32(column / 6 * 51)
+		b = float32((column % 6) * 51)
+		luma := 0.2126*r + 0.7152*g + 0.0722*b
+		if luma < 60 {
+			row = 5 - row
+			column = 35 - column
+			color = aurora.Color(row*36 + column)
+		}
+		color += 16
+		color = color << 16
+		color |= 1 << 14
+		entry.Message = F.ToString("[", aurora.Colorize(idCtx.id, color).String(), "] ", entry.Message)
+	}
+	return nil
+}

log/id.go

@@ -3,13 +3,31 @@ package log
 import (
 	"context"
 	"math/rand"
+
+	"github.com/sagernet/sing/common/random"
 )
 
+func init() {
+	random.InitializeSeed()
+}
+
+var idType = (*idContext)(nil)
+
 type idContext struct {
 	context.Context
 	id uint32
 }
 
+func (c *idContext) Value(key any) any {
+	if key == idType {
+		return c
+	}
+	return c.Context.Value(key)
+}
+
 func ContextWithID(ctx context.Context) context.Context {
+	if ctx.Value(idType) != nil {
+		return ctx
+	}
 	return &idContext{ctx, rand.Uint32()}
 }

log/log.go

@@ -3,9 +3,6 @@ package log
 import (
 	"context"
 
-	"github.com/logrusorgru/aurora"
-	"github.com/sagernet/sing/common"
-	F "github.com/sagernet/sing/common/format"
 	"github.com/sirupsen/logrus"
 )
 
@@ -13,40 +10,3 @@ type Logger interface {
 	logrus.FieldLogger
 	WithContext(ctx context.Context) *logrus.Entry
 }
-
-type Hook struct{}
-
-func (h *Hook) Levels() []logrus.Level {
-	return logrus.AllLevels
-}
-
-func (h *Hook) Fire(entry *logrus.Entry) error {
-	if prefix, loaded := entry.Data["prefix"]; loaded {
-		prefixStr := prefix.(string)
-		delete(entry.Data, "prefix")
-		entry.Message = prefixStr + entry.Message
-	}
-	if idCtx, loaded := common.Cast[*idContext](entry.Context); loaded {
-		var color aurora.Color
-		color = aurora.Color(uint8(idCtx.id))
-		color %= 215
-		row := uint(color / 36)
-		column := uint(color % 36)
-
-		var r, g, b float32
-		r = float32(row * 51)
-		g = float32(column / 6 * 51)
-		b = float32((column % 6) * 51)
-		luma := 0.2126*r + 0.7152*g + 0.0722*b
-		if luma < 60 {
-			row = 5 - row
-			column = 35 - column
-			color = aurora.Color(row*36 + column)
-		}
-		color += 16
-		color = color << 16
-		color |= 1 << 14
-		entry.Message = F.ToString("[", aurora.Colorize(idCtx.id, color).String(), "] ", entry.Message)
-	}
-	return nil
-}