chore: quick update fix/version at 2025-10-22 18:36:17

Author: kooksee

cmds/protoc-gen-go-errors2/internal/gen.go

@@ -93,7 +93,7 @@ func GenerateFile(gen *protogen.Plugin, file *protogen.File) *protogen.Generated
 					jen.Id("Message"):    jen.Lit(rr),
 				})
 			genFile.Var().Id("_").Op("=").
-				Qual("github.com/pubgo/funk/v2/errors", "RegisterErrCodes").
+				Qual("github.com/pubgo/funk/v2/errors/errorcodes", "RegisterErrCodes").
 				Call(jen.Id(errCodeName)).Line()
 		}
 	}

env/env.go

@@ -2,7 +2,6 @@ package env
 
 import (
 	"fmt"
-	"log/slog"
 	"os"
 	"strconv"
 	"strings"
@@ -21,11 +20,12 @@ import (
 const Name = "env"
 
 func Set(key, value string) result.Error {
-	return result.ErrOf(os.Setenv(keyHandler(key), value)).Log(func(e *zerolog.Event) {
-		e.Str("key", key)
-		e.Str("value", value)
-		e.Str(logfields.Msg, "env_set_error")
-	})
+	return result.ErrOf(os.Setenv(keyHandler(key), value)).
+		Log(func(e *zerolog.Event) {
+			e.Str("key", key)
+			e.Str("value", value)
+			e.Str(logfields.Msg, "env_set_error")
+		})
 }
 
 func MustSet(key, value string) { Set(key, value).Must() }
@@ -38,7 +38,7 @@ func Get(names ...string) string {
 
 func MustGet(names ...string) string {
 	val := Get(names...)
-	assert.If(val == "", "env not found, names=%q", names)
+	assert.If(val == "", "env value not set, names=%q", names)
 	return val
 }
 
@@ -70,7 +70,7 @@ func GetBool(names ...string) bool {
 
 	v, err := strconv.ParseBool(val)
 	if err != nil {
-		slog.Error(fmt.Sprintf("env: failed to parse string to bool, keys=%q value=%s err=%v", names, val, err))
+		getLog().Error("failed to parse string to bool", "keys", names, "value", val, "err", err)
 		return false
 	}
 
@@ -86,7 +86,7 @@ func GetInt(names ...string) int {
 
 	v, err := strconv.Atoi(val)
 	if err != nil {
-		slog.Error(fmt.Sprintf("env: failed to parse string to int, keys=%q value=%s err=%v", names, val, err))
+		getLog().Error("failed to parse string to int", "keys", names, "value", val, "err", err)
 		return -1
 	}
 
@@ -102,7 +102,7 @@ func GetFloat(names ...string) float64 {
 
 	v, err := strconv.ParseFloat(val, 64)
 	if err != nil {
-		slog.Error(fmt.Sprintf("env: failed to parse string to float, keys=%q value=%s err=%v", names, val, err))
+		getLog().Error("failed to parse string to float", "keys", names, "value", val, "err", err)
 		return -1
 	}
 
@@ -112,19 +112,21 @@ func GetFloat(names ...string) float64 {
 func Lookup(key string) (string, bool) { return os.LookupEnv(keyHandler(key)) }
 
 func Delete(key string) result.Error {
-	return result.ErrOf(os.Unsetenv(keyHandler(key))).Log(func(e *zerolog.Event) {
-		e.Str("key", key)
-		e.Str(logfields.Msg, "env_delete_error")
-	})
+	return result.ErrOf(os.Unsetenv(keyHandler(key))).
+		Log(func(e *zerolog.Event) {
+			e.Str("key", key)
+			e.Str(logfields.Msg, "env_delete_error")
+		})
 }
 
 func MustDelete(key string) { Delete(key).Must() }
 
 func Expand(value string) result.Result[string] {
-	return result.Wrap(envsubst.String(value)).Log(func(e *zerolog.Event) {
-		e.Str("value", value)
-		e.Str(logfields.Msg, "env_expand_error")
-	})
+	return result.Wrap(envsubst.String(value)).
+		Log(func(e *zerolog.Event) {
+			e.Str("value", value)
+			e.Str(logfields.Msg, "env_expand_error")
+		})
 }
 
 func Map() map[string]string {
@@ -150,13 +152,22 @@ func LoadFiles(files ...string) (r result.Error) {
 		return
 	}
 
+	var needReloadEnv bool
 	for _, file := range files {
-		data := result.Wrap(os.ReadFile(file)).Unwrap(&r)
+		data := result.Wrap(os.ReadFile(file)).
+			Log(func(e *zerolog.Event) {
+				e.Str(logfields.Msg, fmt.Sprintf("failed to read file:%s", file))
+			}).
+			Unwrap(&r)
 		if r.IsErr() {
 			return
 		}
 
-		dataMap := result.Wrap(godotenv.UnmarshalBytes(data)).Unwrap(&r)
+		dataMap := result.Wrap(godotenv.UnmarshalBytes(data)).
+			Log(func(e *zerolog.Event) {
+				e.Str(logfields.Msg, fmt.Sprintf("failed to parse env file:%s", file))
+			}).
+			Unwrap(&r)
 		if r.IsErr() {
 			return
 		}
@@ -169,10 +180,15 @@ func LoadFiles(files ...string) (r result.Error) {
 			if Set(k, v).Catch(&r) {
 				return
 			}
+
+			needReloadEnv = true
 		}
 	}
 
-	loadEnv()
+	if needReloadEnv {
+		loadEnv()
+	}
+
 	return
 }
 

env/reload.go

@@ -7,7 +7,6 @@ import (
 	"strings"
 
 	"github.com/pubgo/funk/v2/assert"
-	"github.com/pubgo/funk/v2/log/logfields"
 )
 
 func Reload() {
@@ -17,7 +16,7 @@ func Reload() {
 // 环境变量处理, key转大写, 同时把`-./`转换为`_`
 // a-b=>a_b, a.b=>a_b, a/b=>a_b
 func loadEnv() {
-	var logger = slog.With(slog.String(logfields.Module, Name))
+	var logger = getLog()
 	logger.Info("reload env")
 
 	for _, env := range os.Environ() {

env/util.go

@@ -1,9 +1,11 @@
 package env
 
 import (
+	"log/slog"
 	"strings"
 
 	"github.com/ettle/strcase"
+	"github.com/pubgo/funk/v2/log/logfields"
 )
 
 var trim = strings.TrimSpace
@@ -21,3 +23,7 @@ func keyHandler(key string) string {
 	key = strings.ReplaceAll(replacer.ToSNAKE(key), "__", "_")
 	return strings.ToUpper(trim(key))
 }
+
+func getLog() *slog.Logger {
+	return slog.With(slog.String(logfields.Module, Name))
+}

errors/aaa.go

@@ -9,7 +9,7 @@ type Tags = errinter.Tags
 type Tag = errinter.Tag
 type ErrIs = errinter.ErrIs
 type ErrAs = errinter.ErrAs
-type ErrUnwrap = errinter.ErrUnwrap
+type ErrUnwrapper = errinter.ErrUnwrapper
 type Error = errinter.Error
 type ErrorProto = errinter.ErrorProto
 type GRPCStatus = errinter.GRPCStatus

errors/err_code.go

@@ -7,13 +7,13 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/pubgo/funk/v2/errors/errinter"
-	"github.com/pubgo/funk/v2/generic"
-	"github.com/pubgo/funk/v2/proto/errorpb"
-	"github.com/pubgo/funk/v2/stack"
 	"github.com/samber/lo"
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/types/known/structpb"
+
+	"github.com/pubgo/funk/v2/errors/errinter"
+	"github.com/pubgo/funk/v2/generic"
+	"github.com/pubgo/funk/v2/proto/errorpb"
 )
 
 func NewCodeErrWithMap(code *errorpb.ErrCode, details ...map[string]any) error {
@@ -91,13 +91,10 @@ func WrapCode(err error, code *errorpb.ErrCode) error {
 	}
 
 	code.Details = append(code.Details, MustProtoToAny(ParseErrToPb(err)))
-	return &ErrWrap{
-		err: &ErrCode{pb: code, err: errors.New(code.Message)},
-		pb: &errorpb.ErrWrap{
-			Caller: stack.Caller(1).String(),
-			Error:  MustProtoToAny(code),
-		},
-	}
+	return newErrWrap(
+		&ErrCode{pb: code, err: errors.New(code.Message)},
+		Tags{Kv("msg", err.Error())},
+	)
 }
 
 var (
@@ -126,10 +123,9 @@ func (t *ErrCode) Is(err error) bool {
 		return true
 	}
 
-	var check = func(err2 *ErrCode) bool {
-		return err2.pb.Code == t.pb.Code && err2.pb.Name == t.pb.Name
+	var check = func(errCode *ErrCode) bool {
+		return errCode.pb.Code == t.pb.Code && errCode.pb.Name == t.pb.Name
 	}
-
 	if err1, ok := err.(*ErrCode); ok && check(err1) {
 		return true
 	}

errors/err_msg.go

@@ -9,7 +9,6 @@ import (
 	"github.com/pubgo/funk/v2/errors/errinter"
 	"github.com/pubgo/funk/v2/generic"
 	"github.com/pubgo/funk/v2/proto/errorpb"
-	"github.com/pubgo/funk/v2/stack"
 	"github.com/samber/lo"
 	"google.golang.org/protobuf/proto"
 )
@@ -39,13 +38,10 @@ func WrapMsg(err error, msg *errorpb.ErrMsg) error {
 		msg.Id = lo.ToPtr(getErrorId(err))
 	}
 
-	return &ErrWrap{
-		err: &ErrMsg{pb: msg, err: handleGrpcError(err)},
-		pb: &errorpb.ErrWrap{
-			Caller: stack.Caller(1).String(),
-			Error:  MustProtoToAny(msg),
-		},
-	}
+	return newErrWrap(
+		&ErrMsg{pb: msg, err: handleGrpcError(err)},
+		Tags{Kv("msg", err.Error())},
+	)
 }
 
 var (

errors/err_wrap.go

@@ -5,33 +5,57 @@ import (
 	"encoding/json"
 	"fmt"
 
+	"github.com/samber/lo"
+	"google.golang.org/protobuf/proto"
+
 	"github.com/pubgo/funk/v2/errors/errinter"
 	"github.com/pubgo/funk/v2/proto/errorpb"
-	"google.golang.org/protobuf/proto"
+	"github.com/pubgo/funk/v2/stack"
 )
 
 var (
 	_ Error         = (*ErrWrap)(nil)
 	_ fmt.Formatter = (*ErrWrap)(nil)
 )
 
-type ErrWrap struct {
-	err error
-	id  string
-	pb  *errorpb.ErrWrap
+func newErrWrapStack(err error, tags Tags) *ErrWrap {
+	if err == nil {
+		return nil
+	}
+
+	pb := &errorpb.ErrWrap{
+		Caller: stack.Caller(2).String(),
+		Stacks: lo.Map(getStack(), func(item *stack.Frame, index int) string { return item.String() }),
+		Error:  MustProtoToAny(ParseErrToPb(err)),
+		Tags:   tags.ToMap(),
+		Id:     lo.ToPtr(getErrorId(err)),
+	}
+
+	return &ErrWrap{err: err, pb: pb}
 }
 
-func (e *ErrWrap) ID() string {
-	if e.id != "" {
-		return e.id
+func newErrWrap(err error, tags Tags, callers ...int) *ErrWrap {
+	if err == nil {
+		return nil
+	}
+
+	pb := &errorpb.ErrWrap{
+		Caller: stack.Caller(2 + lo.FirstOrEmpty(callers)).String(),
+		Error:  MustProtoToAny(ParseErrToPb(err)),
+		Tags:   tags.ToMap(),
+		Id:     lo.ToPtr(getErrorId(err)),
 	}
 
-	e.id = getErrorId(e.err)
-	return e.id
+	return &ErrWrap{err: handleGrpcError(err), pb: pb}
 }
-func (e *ErrWrap) Proto() proto.Message {
-	return e.pb
+
+type ErrWrap struct {
+	err error
+	pb  *errorpb.ErrWrap
 }
+
+func (e *ErrWrap) ID() string                    { return e.pb.GetId() }
+func (e *ErrWrap) Proto() proto.Message          { return e.pb }
 func (e *ErrWrap) Format(f fmt.State, verb rune) { strFormat(f, verb, e) }
 func (e *ErrWrap) Unwrap() error                 { return e.err }
 func (e *ErrWrap) Kind() string                  { return "err_wrap" }

errors/errinter/aaa.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"golang.org/x/xerrors"
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/proto"
 )
@@ -17,9 +16,9 @@ type Error interface {
 	MarshalJSON() ([]byte, error)
 }
 
-type ErrUnwrap = xerrors.Wrapper
-type Formatter = xerrors.Formatter
-type Printer = xerrors.Printer
+type ErrUnwrapper interface {
+	Unwrap() error
+}
 
 type ErrorProto interface {
 	error

errors/errinter/utils.go

@@ -51,7 +51,7 @@ func GetErrorId(err error) string {
 }
 
 func Unwrap(err error) error {
-	u, ok := err.(ErrUnwrap)
+	u, ok := err.(ErrUnwrapper)
 	if !ok {
 		return nil
 	}