chore: quick update feat/supervisor at 2025-10-29 21:48:12

Author: kooksee

.golangci.yaml

@@ -1,40 +1,44 @@
 version: "2"
-
+issues:
+  fix: true
 linters:
   default: none
   enable:
-    - errcheck
     - govet
-    - staticcheck
   exclusions:
     presets:
       - comments
       - common-false-positives
       - legacy
       - std-error-handling
-    rules:
-      - linters:
-          - dupl
-          - errcheck
-          - gocyclo
-          - gosec
-        path: _test\.go
-      - linters:
-          - forbidigo
-        path-except: _test\.go
     paths:
-      - .*_test\.go$
-      - examples/
+      - internal/examples
+      - vendor
       - third_party$
       - builtin$
       - examples$
 formatters:
   enable:
     - goimports
+    - gofmt
+    - gofumpt
+  settings:
+    gofumpt:
+      extra-rules: true
+    goimports:
+      local-prefixes:
+        - github.com/pubgo/lava/v2
+    gofmt:
+      simplify: false
+      rewrite-rules:
+        - pattern: 'interface{}'
+          replacement: 'any'
+        - pattern: 'a[b:len(a)]'
+          replacement: 'a[b:]'
+
   exclusions:
     paths:
-      - .*_test\.go$
-      - examples/
-      - third_party$
-      - builtin$
+      - internal/examples
+      - vendor
       - examples$
+      - proto

clients/grpcc/aaa.go

@@ -3,8 +3,9 @@ package grpcc
 import (
 	"context"
 
-	"github.com/pubgo/lava/v2/clients/grpcc/grpccconfig"
 	"google.golang.org/grpc"
+
+	"github.com/pubgo/lava/v2/clients/grpcc/grpccconfig"
 )
 
 const Name = "grpcc"

clients/grpcc/client.go

@@ -11,12 +11,13 @@ import (
 	"github.com/pubgo/funk/v2/recovery"
 	"github.com/pubgo/funk/v2/result"
 	"github.com/pubgo/funk/v2/vars"
-	"github.com/pubgo/lava/v2/clients/grpcc/grpccconfig"
-	"github.com/pubgo/lava/v2/core/metrics"
-	"github.com/pubgo/lava/v2/lava"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/health/grpc_health_v1"
 	"google.golang.org/grpc/resolver"
+
+	"github.com/pubgo/lava/v2/clients/grpcc/grpccconfig"
+	"github.com/pubgo/lava/v2/core/metrics"
+	"github.com/pubgo/lava/v2/lava"
 )
 
 type Params struct {
@@ -98,7 +99,7 @@ func (t *clientImpl) Get() (r result.Result[grpc.ClientConnInterface]) {
 
 	conn := createConn(t.cfg, t.log, t.middlewares).Unwrap(&r)
 	if r.IsErr() {
-		return
+		return r
 	}
 
 	t.conn = conn

clients/grpcc/grpccconfig/config.go

@@ -3,9 +3,10 @@ package grpccconfig
 import (
 	"time"
 
-	"github.com/pubgo/lava/v2/clients/grpcc/grpccresolver"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/resolver"
+
+	"github.com/pubgo/lava/v2/clients/grpcc/grpccresolver"
 )
 
 const (

clients/grpcc/grpcclb/p2c/lc.go

@@ -10,7 +10,7 @@ import (
 )
 
 type node struct {
-	item      interface{}
+	item      any
 	loadCount int64
 }
 
@@ -28,11 +28,11 @@ func newP2cAgl() *loadAggregate {
 	}
 }
 
-func (la *loadAggregate) Add(n interface{}) {
+func (la *loadAggregate) Add(n any) {
 	la.items = append(la.items, &node{item: n})
 }
 
-func (la *loadAggregate) Next(info balancer.PickInfo) (interface{}, func(info balancer.DoneInfo)) {
+func (la *loadAggregate) Next(info balancer.PickInfo) (any, func(info balancer.DoneInfo)) {
 	var election, alternative *node
 	switch len(la.items) {
 	case 0:

clients/grpcc/grpccresolver/discoverybuilder.go

@@ -71,7 +71,7 @@ func (d *discoveryBuilder) updateService(services ...*service.Service) {
 // 获取服务地址
 func (d *discoveryBuilder) getAddrList(name string) []resolver.Address {
 	var addrList []resolver.Address
-	d.services.Range(func(_, value interface{}) bool {
+	d.services.Range(func(_, value any) bool {
 		addr := *value.(*resolver.Address)
 		if addr.ServerName == name {
 			addrList = append(addrList, *value.(*resolver.Address))
@@ -125,12 +125,12 @@ func (d *discoveryBuilder) Build(target resolver.Target, cc resolver.ClientConn,
 			for {
 				select {
 				case <-ctx.Done():
-					return
+					return gErr
 				default:
 					res := w.Next()
 					if res.IsErr() {
 						if errors.Is(res.GetErr(), discovery.ErrWatcherStopped) {
-							return
+							return gErr
 						}
 
 						d.log.Err(res.GetErr(), ctx).Msg("failed to get service watcher event")

clients/grpcc/middleware.go

@@ -8,16 +8,17 @@ import (
 	"github.com/pubgo/funk/v2/convert"
 	"github.com/pubgo/funk/v2/errors"
 	"github.com/pubgo/funk/v2/strutil"
-	"github.com/pubgo/lava/v2/clients/grpcc/grpccconfig"
-	"github.com/pubgo/lava/v2/core/lavacontexts"
-	"github.com/pubgo/lava/v2/lava"
-	"github.com/pubgo/lava/v2/pkg/grpcutil"
-	"github.com/pubgo/lava/v2/pkg/httputil"
 	"github.com/rs/xid"
 	"github.com/valyala/fasthttp"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/peer"
+
+	"github.com/pubgo/lava/v2/clients/grpcc/grpccconfig"
+	"github.com/pubgo/lava/v2/core/lavacontexts"
+	"github.com/pubgo/lava/v2/lava"
+	"github.com/pubgo/lava/v2/pkg/grpcutil"
+	"github.com/pubgo/lava/v2/pkg/httputil"
 )
 
 func md2Head(md metadata.MD, header interface{ Add(key, value string) }) {
@@ -54,7 +55,7 @@ func unaryInterceptor(middlewares []lava.Middleware) grpc.UnaryClientInterceptor
 	}
 
 	unaryWrapper = lava.Chain(middlewares...).Middleware(unaryWrapper)
-	return func(ctx context.Context, method string, req, reply interface{}, cc *grpc.ClientConn, invoker grpc.UnaryInvoker, opts ...grpc.CallOption) (err error) {
+	return func(ctx context.Context, method string, req, reply any, cc *grpc.ClientConn, invoker grpc.UnaryInvoker, opts ...grpc.CallOption) (err error) {
 		md, ok := metadata.FromOutgoingContext(ctx)
 		if !ok {
 			md = make(metadata.MD)

clients/grpcc/request.go

@@ -10,12 +10,12 @@ var _ lava.Request = (*request)(nil)
 
 type request struct {
 	resp     grpc.ClientStream
-	reply    interface{}
+	reply    any
 	ct       string
 	opts     []grpc.CallOption
 	method   string
 	service  string
-	req      interface{}
+	req      any
 	cc       *grpc.ClientConn
 	invoker  grpc.UnaryInvoker
 	streamer grpc.Streamer
@@ -30,5 +30,5 @@ func (r *request) Service() string             { return r.service }
 func (r *request) Endpoint() string            { return r.method }
 func (r *request) ContentType() string         { return r.ct }
 func (r *request) Header() *lava.RequestHeader { return r.header }
-func (r *request) Payload() interface{}        { return r.req }
+func (r *request) Payload() any                { return r.req }
 func (r *request) Stream() bool                { return r.desc != nil }

clients/grpcc/response.go

@@ -11,9 +11,9 @@ var _ lava.Response = (*response)(nil)
 type response struct {
 	header *lava.ResponseHeader
 	stream grpc.ClientStream
-	resp   interface{}
+	resp   any
 }
 
 func (r *response) Stream() bool                 { return r.stream != nil }
 func (r *response) Header() *lava.ResponseHeader { return r.header }
-func (r *response) Payload() interface{}         { return r.resp }
+func (r *response) Payload() any                 { return r.resp }

clients/grpcc/util.go

@@ -6,12 +6,13 @@ import (
 	"github.com/pubgo/funk/v2/errors"
 	"github.com/pubgo/funk/v2/log"
 	"github.com/pubgo/funk/v2/result"
+	"github.com/rs/zerolog"
+	"google.golang.org/grpc"
+
 	"github.com/pubgo/lava/v2/clients/grpcc/grpccconfig"
 	"github.com/pubgo/lava/v2/clients/grpcc/grpccresolver"
 	"github.com/pubgo/lava/v2/core/logging/logkey"
 	"github.com/pubgo/lava/v2/lava"
-	"github.com/rs/zerolog"
-	"google.golang.org/grpc"
 )
 
 func buildTarget(cfg *grpccconfig.ServiceCfg) string {
@@ -36,7 +37,7 @@ func buildTarget(cfg *grpccconfig.ServiceCfg) string {
 func createConn(cfg *grpccconfig.Cfg, log log.Logger, mm []lava.Middleware) (r result.Result[grpc.ClientConnInterface]) {
 	addr := buildTarget(cfg.Service)
 
-	var logMsg = func(e *zerolog.Event) {
+	logMsg := func(e *zerolog.Event) {
 		e.Any(logkey.Service, cfg.Service)
 		e.Any("config", cfg.Client)
 		e.Str("addr", addr)
@@ -63,7 +64,7 @@ func createConn(cfg *grpccconfig.Cfg, log log.Logger, mm []lava.Middleware) (r r
 		}).
 		Unwrap(&r)
 	if r.IsErr() {
-		return
+		return r
 	}
 
 	return r.WithValue(conn)