fix: barry quick fix, 2025-09-06 13:36:08

Author: kooksee

errors/aaa.go

@@ -1,78 +1,15 @@
 package errors
 
 import (
-	"encoding/json"
-	"fmt"
-
 	"github.com/pubgo/funk/errors/errinter"
 )
 
-var (
-	_ json.Marshaler = (Tags)(nil)
-	_ fmt.Formatter  = (Tags)(nil)
-)
-
-type Maps map[string]any
-
-func (t Maps) Tags() Tags {
-	tags := make(Tags, 0, len(t))
-	for k, v := range t {
-		tags = append(tags, Tag{K: k, V: v})
-	}
-	return tags
-}
-
-type Tags []Tag
-
-func (t Tags) Format(f fmt.State, verb rune) {
-	tags := make(map[string]any, len(t))
-	for i := range t {
-		tags[t[i].K] = t[i].V
-	}
-
-	data, err := json.Marshal(tags)
-	if err != nil {
-		fmt.Fprintf(f, "%v", err)
-	} else {
-		fmt.Fprintln(f, string(data))
-	}
-}
-
-func (t Tags) ToMap() map[string]string {
-	var data = make(map[string]string, len(t))
-	for _, tag := range t {
-		data[tag.K] = fmt.Sprintf("%v", tag.V)
-	}
-	return data
-}
-
-func (t Tags) MarshalJSON() ([]byte, error) {
-	tags := make(map[string]any, len(t))
-	for i := range t {
-		tags[t[i].K] = t[i].V
-	}
-	return json.Marshal(tags)
-}
-
-type Tag struct {
-	K string
-	V any
-}
-
-func (t Tag) String() string {
-	return fmt.Sprintf("%s: %v", t.K, t.V)
-}
-
-type ErrUnwrap errinter.ErrUnwrap
-
-type ErrIs interface {
-	Is(error) bool
-}
-
-type ErrAs interface {
-	As(any) bool
-}
-
+type Maps = errinter.Maps
+type Tags = errinter.Tags
+type Tag = errinter.Tag
+type ErrIs = errinter.ErrIs
+type ErrAs = errinter.ErrAs
+type ErrUnwrap = errinter.ErrUnwrap
 type Error = errinter.Error
 type ErrorProto = errinter.ErrorProto
 type GRPCStatus = errinter.GRPCStatus

errors/errinter/aaa.go

@@ -1,6 +1,9 @@
 package errinter
 
 import (
+	"encoding/json"
+	"fmt"
+
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/proto"
 )
@@ -24,3 +27,67 @@ type ErrorProto interface {
 type GRPCStatus interface {
 	GRPCStatus() *status.Status
 }
+
+var (
+	_ json.Marshaler = (Tags)(nil)
+	_ fmt.Formatter  = (Tags)(nil)
+)
+
+type Maps map[string]any
+
+func (t Maps) Tags() Tags {
+	tags := make(Tags, 0, len(t))
+	for k, v := range t {
+		tags = append(tags, Tag{K: k, V: v})
+	}
+	return tags
+}
+
+type Tags []Tag
+
+func (t Tags) Format(f fmt.State, verb rune) {
+	tags := make(map[string]any, len(t))
+	for i := range t {
+		tags[t[i].K] = t[i].V
+	}
+
+	data, err := json.Marshal(tags)
+	if err != nil {
+		fmt.Fprintf(f, "%v", err)
+	} else {
+		fmt.Fprintln(f, string(data))
+	}
+}
+
+func (t Tags) ToMap() map[string]string {
+	var data = make(map[string]string, len(t))
+	for _, tag := range t {
+		data[tag.K] = fmt.Sprintf("%v", tag.V)
+	}
+	return data
+}
+
+func (t Tags) MarshalJSON() ([]byte, error) {
+	tags := make(map[string]any, len(t))
+	for i := range t {
+		tags[t[i].K] = t[i].V
+	}
+	return json.Marshal(tags)
+}
+
+type Tag struct {
+	K string
+	V any
+}
+
+func (t Tag) String() string {
+	return fmt.Sprintf("%s: %v", t.K, t.V)
+}
+
+type ErrIs interface {
+	Is(error) bool
+}
+
+type ErrAs interface {
+	As(any) bool
+}

errors/errinter/utils.go

@@ -1,15 +1,24 @@
 package errinter
 
 import (
+	"encoding/json"
 	"errors"
 	"fmt"
+	"os"
 	"strings"
 	"sync"
 
 	"github.com/k0kubun/pp/v3"
+	"github.com/rs/zerolog/log"
+	"github.com/samber/lo"
+	"google.golang.org/protobuf/encoding/prototext"
 	"google.golang.org/protobuf/proto"
-	
+	"google.golang.org/protobuf/types/known/anypb"
+	"google.golang.org/protobuf/types/known/structpb"
+
 	"github.com/pubgo/funk"
+	"github.com/pubgo/funk/log/logutil"
+	"github.com/pubgo/funk/pretty"
 	"github.com/pubgo/funk/proto/errorpb"
 )
 
@@ -83,3 +92,82 @@ func ParseErrToPb(err error) proto.Message {
 		return &errorpb.ErrMsg{Msg: err.Error(), Detail: fmt.Sprintf("%v", err)}
 	}
 }
+
+func Debug(err error) {
+	if err == nil {
+		return
+	}
+
+	if _err, ok := err.(fmt.Stringer); ok {
+		_, _ = fmt.Fprintln(os.Stderr, _err.String())
+		return
+	}
+
+	pretty.SetDefaultMaxDepth(20)
+	pretty.Println(err)
+}
+
+func MustTagsToAny(tags ...*errorpb.Tag) []*anypb.Any {
+	if len(tags) == 0 {
+		return nil
+	}
+
+	return lo.Map(tags, func(item *errorpb.Tag, index int) *anypb.Any {
+		return MustProtoToAny(item)
+	})
+}
+
+func MustStructToAny(p map[string]any) *anypb.Any {
+	if p == nil {
+		return nil
+	}
+
+	pb, err := structpb.NewStruct(p)
+	if err != nil {
+		log.Err(err).
+			Any("params", p).
+			Func(logutil.WithNotice()).
+			Stack().
+			Msgf("failed to encode map-any to struct protobuf")
+		return anyToProtobuf(p)
+	} else {
+		return MustProtoToAny(pb)
+	}
+}
+
+func anyToProtobuf(v any) *anypb.Any {
+	data, err := json.Marshal(v)
+	if err != nil {
+		return &anypb.Any{
+			TypeUrl: "type.googleapis.com/google.protobuf.StringValue",
+			Value:   []byte(fmt.Sprintf("err:%s detail:%#v", err.Error(), v)),
+		}
+	}
+	return &anypb.Any{
+		TypeUrl: "type.googleapis.com/google.protobuf.Struct",
+		Value:   data,
+	}
+}
+
+func MustProtoToAny(p proto.Message) *anypb.Any {
+	switch p := p.(type) {
+	case nil:
+		return nil
+	case *anypb.Any:
+		return p
+	}
+
+	pb, err := anypb.New(p)
+	if err != nil {
+		params := prototext.Format(p)
+		log.Err(err).
+			Str("protobuf", params).
+			Func(logutil.WithNotice()).
+			Stack().
+			Msgf("failed to encode protobuf message to any protobuf")
+		pb, _ = anypb.New(structpb.NewStringValue(params))
+		return pb
+	}
+
+	return pb
+}