fix: upgrade dix, funk (#62)

Author: kooksee

.github/workflows/lint-test.yml

@@ -12,15 +12,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-
+      - uses: "actions/checkout@v4"
       - name: Set up Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v5
         with:
-          go-version: 1.22
+          go-version-file: 'go.mod'
 
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v8
         with:
           skip-go-installation: true
           args: --timeout 3m --verbose
@@ -30,12 +29,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Set up Go
-        uses: actions/setup-go@v2
+        uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
-          go-version: 1.22
+          go-version-file: 'go.mod'
 
       - name: Collect dependencies
         run: |
@@ -46,7 +43,7 @@ jobs:
         run: gotestsum --junitfile unit-tests.xml -- -gcflags=-l ./...
 
       - name: Test report
-        uses: dorny/test-reporter@v1
+        uses: dorny/test-reporter@v2
         if: success() || failure()
         with:
           name: Test report

.github/workflows/release.yml

@@ -1,30 +1,32 @@
+version: "2"
 linters:
-  fast: true
-  disable-all: true
+  default: none
   enable:
-#    - bodyclose     # checks whether HTTP response body is closed successfully
-    - errcheck      # Errcheck is a program for checking for unchecked errors in go programs. These unchecked errors can be critical bugs in some cases
-    - gosimple      # Linter for Go source code that specializes in simplifying a code
-    - govet         # Vet examines Go source code and reports suspicious constructs, such as Printf calls whose arguments do not align with the format string
-#    - ineffassign   # Detects when assignments to existing variables are not used
-#    - dogsled       # Checks assignments with too many blank identifiers (e.g. x, , , _, := f())
-#    - goconst       # Finds repeated strings that could be replaced by a constant
-    - goimports     # Goimports does everything that gofmt does. Additionally it checks unused imports
-#    - goprintffuncname # Checks that printf-like functions are named with f at the end
-#    - nolintlint     # Reports ill-formed or insufficient nolint directives
-#    - rowserrcheck   # checks whether Err of rows is checked successfully
-    - staticcheck    # Staticcheck is a go vet on steroids, applying a ton of static analysis checks
-#    - unconvert      # Remove unnecessary type conversions
-#    - unparam        # Reports unused function parameters
-#    - unused         # Checks Go code for unused constants, variables, functions and types
-
-issues:
-  exclude-dirs:
-    - internal/example
-    - cmds
-    - vendor
-    - pkg/proto
-  exclude-generated: strict
-  exclude-dirs-use-default: true
-  exclude-case-sensitive: false
-  exclude-use-default: true
+    - govet
+  exclusions:
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - internal/example
+      - cmds
+      - vendor
+      - pkg/proto
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - goimports
+    - gofmt
+  exclusions:
+    paths:
+      - internal/example
+      - cmds
+      - vendor
+      - pkg/proto
+      - third_party$
+      - builtin$
+      - examples$

.golangci.yaml

@@ -44,7 +44,7 @@ protobuf:
 .PHONY: lint
 lint:
 	golangci-lint --version
-	golangci-lint run --timeout 3m --verbose ./...
+	golangci-lint run --timeout=10m --verbose
 
 install-protoc:
 	go install -v ./cmds/protoc-gen-lava

.goreleaser.yaml

@@ -9,7 +9,7 @@ import (
 	"github.com/pubgo/funk/errors"
 	"github.com/pubgo/funk/log"
 	"github.com/pubgo/funk/recovery"
-	"github.com/pubgo/funk/result"
+	"github.com/pubgo/funk/v2/result"
 	"github.com/pubgo/funk/vars"
 	"github.com/pubgo/lava/clients/grpcc/grpcc_config"
 	"github.com/pubgo/lava/core/metrics"
@@ -47,53 +47,53 @@ type clientImpl struct {
 	middlewares []lava.Middleware
 }
 
-func (t *clientImpl) Invoke(ctx context.Context, method string, args, reply interface{}, opts ...grpc.CallOption) (err error) {
+func (t *clientImpl) Invoke(ctx context.Context, method string, args, reply any, opts ...grpc.CallOption) (err error) {
 	defer recovery.Err(&err, func(err error) error {
 		return errors.WrapTag(err, errors.T("method", method), errors.T("args", args))
 	})
 
 	conn := t.Get()
 	if conn.IsErr() {
-		return errors.Wrapf(conn.Err(), "failed to get grpc client, service=%s, method=%s", t.cfg.Service, method)
+		return errors.Wrapf(conn.GetErr(), "failed to get grpc client, service=%s, method=%s", t.cfg.Service, method)
 	}
 
-	return conn.Unwrap().Invoke(ctx, method, args, reply, opts...)
+	return conn.Must().Invoke(ctx, method, args, reply, opts...)
 }
 
 func (t *clientImpl) Healthy(ctx context.Context) error {
 	conn := t.Get()
 	if conn.IsErr() {
-		return errors.Wrapf(conn.Err(), "failed to get grpc client, service=%s, method=healthy", t.cfg.Service)
+		return errors.Wrapf(conn.GetErr(), "failed to get grpc client, service=%s, method=healthy", t.cfg.Service)
 	}
 
-	_, err := grpc_health_v1.NewHealthClient(conn.Unwrap()).Check(ctx, &grpc_health_v1.HealthCheckRequest{})
+	_, err := grpc_health_v1.NewHealthClient(conn.Must()).Check(ctx, &grpc_health_v1.HealthCheckRequest{})
 	return errors.Wrapf(err, "service %s heath check failed", t.cfg.Service)
 }
 
 func (t *clientImpl) NewStream(ctx context.Context, desc *grpc.StreamDesc, method string, opts ...grpc.CallOption) (grpc.ClientStream, error) {
 	conn := t.Get()
 	if conn.IsErr() {
-		return nil, errors.Wrapf(conn.Err(), "failed to get grpc client, service=%s, method=%s", t.cfg.Service, method)
+		return nil, errors.Wrapf(conn.GetErr(), "failed to get grpc client, service=%s, method=%s", t.cfg.Service, method)
 	}
 
-	c, err1 := conn.Unwrap().NewStream(ctx, desc, method, opts...)
+	c, err1 := conn.Must().NewStream(ctx, desc, method, opts...)
 	return c, errors.Wrap(err1, method)
 }
 
 // Get new grpc client
 func (t *clientImpl) Get() (r result.Result[grpc.ClientConnInterface]) {
-	defer recovery.Result(&r)
+	defer result.RecoveryErr(&r)
 
 	if t.conn != nil {
-		return r.WithVal(t.conn)
+		return r.WithValue(t.conn)
 	}
 
 	t.mu.Lock()
 	defer t.mu.Unlock()
 
 	// 双检, 避免多次创建
 	if t.conn != nil {
-		return r.WithVal(t.conn)
+		return r.WithValue(t.conn)
 	}
 
 	conn, err := createConn(t.cfg, t.log, t.middlewares)
@@ -102,5 +102,5 @@ func (t *clientImpl) Get() (r result.Result[grpc.ClientConnInterface]) {
 	}
 
 	t.conn = conn
-	return r.WithVal(t.conn)
+	return r.WithValue(t.conn)
 }

Makefile

@@ -96,9 +96,10 @@ func (d *discoveryBuilder) Build(target resolver.Target, cc resolver.ClientConn,
 
 	// target.Endpoint是服务的名字, 是项目启动的时候注册中心中注册的项目名字
 	// GetService根据服务名字获取注册中心该项目所有服务
-	services := d.disco.GetService(context.Background(), srv).Unwrap(func(err error) error {
-		return errors.Wrapf(err, "failed to GetService, srv=%s", srv)
-	})
+	services := d.disco.GetService(context.Background(), srv).
+		MapErr(func(err error) error {
+			return errors.Wrapf(err, "failed to GetService, srv=%s", srv)
+		}).Unwrap(&gErr)
 
 	// 启动后，更新服务地址
 	d.updateService(services...)
@@ -109,9 +110,10 @@ func (d *discoveryBuilder) Build(target resolver.Target, cc resolver.ClientConn,
 	logs.Info().Msgf("discovery builder UpdateState, address=%v", address)
 	assert.MustF(cc.UpdateState(newState(address)), "update resolver address: %v", address)
 
-	w := d.disco.Watch(context.Background(), srv).Unwrap(func(err error) error {
-		return errors.Wrapf(err, "target.Endpoint: %s", srv)
-	})
+	w := d.disco.Watch(context.Background(), srv).
+		MapErr(func(err error) error {
+			return errors.Wrapf(err, "target.Endpoint: %s", srv)
+		}).Unwrap(&gErr)
 
 	return &baseResolver{
 		serviceName: srv,
@@ -126,24 +128,24 @@ func (d *discoveryBuilder) Build(target resolver.Target, cc resolver.ClientConn,
 				default:
 					res := w.Next()
 					if res.IsErr() {
-						if errors.Is(res.Err(), discovery.ErrWatcherStopped) {
+						if errors.Is(res.GetErr(), discovery.ErrWatcherStopped) {
 							return
 						}
 
-						d.log.Err(res.Err(), ctx).Msg("failed to get service watcher event")
+						d.log.Err(res.GetErr(), ctx).Msg("failed to get service watcher event")
 
-						if errors.Is(res.Err(), discovery.ErrTimeout) {
+						if errors.Is(res.GetErr(), discovery.ErrTimeout) {
 							continue
 						}
 
 						continue
 					}
 
 					// 注册中心删除服务
-					if res.Unwrap().Action == lavapbv1.EventType_DELETE {
-						d.delService(res.Unwrap().Service)
+					if res.Must().Action == lavapbv1.EventType_DELETE {
+						d.delService(res.Must().Service)
 					} else {
-						d.updateService(res.Unwrap().Service)
+						d.updateService(res.Must().Service)
 					}
 
 					logutil.ErrRecord(logs, try.Try(func() error {

clients/grpcc/client.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/pubgo/funk/result"
+	"github.com/pubgo/funk/v2/result"
 	"github.com/valyala/fasthttp"
 )
 

clients/grpcc/grpcc_resolver/discoverybuilder.go

@@ -8,9 +8,8 @@ import (
 	"github.com/pubgo/funk/assert"
 	"github.com/pubgo/funk/config"
 	"github.com/pubgo/funk/log"
-	"github.com/pubgo/funk/recovery"
-	"github.com/pubgo/funk/result"
 	"github.com/pubgo/funk/retry"
+	"github.com/pubgo/funk/v2/result"
 	"github.com/valyala/fasthttp"
 
 	"github.com/pubgo/lava/core/metrics"
@@ -67,7 +66,7 @@ type Client struct {
 }
 
 func (c *Client) Do(ctx context.Context, req *Request) (r result.Result[*fasthttp.Response]) {
-	defer recovery.Result(&r)
+	defer result.RecoveryErr(&r)
 
 	reqErr := doRequest(c, req)
 	if reqErr.IsErr() {
@@ -82,5 +81,5 @@ func (c *Client) Do(ctx context.Context, req *Request) (r result.Result[*fasthtt
 		return r.WithErr(err)
 	}
 
-	return r.WithVal(resp.(*responseImpl).resp)
+	return r.WithValue(resp.(*responseImpl).resp)
 }

clients/resty/aaa.go

@@ -2,6 +2,7 @@ package grpcservercmd
 
 import (
 	"context"
+
 	"github.com/pubgo/dix"
 	"github.com/pubgo/funk/recovery"
 	"github.com/pubgo/funk/version"