BlackForestBytes/goext
14
0
Fork 0
Code Pull Requests 2 Actions Activity

updated dependencies and go

Browse Source
This commit is contained in:
Viktor Neubauer
2026-04-21 11:06:01 +02:00
parent f62e7499ec
commit 84b87d61f2
91 changed files with 551 additions and 637 deletions
Download Patch File Download Diff File Expand all files Collapse all files
exerr/builder.go
+3 -3
View File
@@ -277,11 +277,11 @@ func (b *Builder) Ints32(key string, val []int32) *Builder {
return b.addMeta(key, MDTInt32Array, val)
}
func (b *Builder) Type(key string, cls interface{}) *Builder {
func (b *Builder) Type(key string, cls any) *Builder {
return b.addMeta(key, MDTString, fmt.Sprintf("%T", cls))
}
func (b *Builder) Interface(key string, val interface{}) *Builder {
func (b *Builder) Interface(key string, val any) *Builder {
return b.addMeta(key, MDTAny, newAnyWrap(val))
}
@@ -566,7 +566,7 @@ func (b *Builder) doLogFatal() {
// ----------------------------------------------------------------------------
func (b *Builder) addMeta(key string, mdtype metaDataType, val interface{}) *Builder {
func (b *Builder) addMeta(key string, mdtype metaDataType, val any) *Builder {
b.errorData.Meta.add(key, mdtype, val)
return b
}
exerr/constructor.go
+8 -11
View File
@@ -3,13 +3,14 @@ package exerr
import (
"encoding/json"
"fmt"
"go.mongodb.org/mongo-driver/bson/primitive"
"git.blackforestbytes.com/BlackForestBytes/goext/langext"
"go.mongodb.org/mongo-driver/bson/primitive"
"maps"
"reflect"
"time"
)
var reflectTypeStr = reflect.TypeOf("")
var reflectTypeStr = reflect.TypeFor[string]()
func FromError(err error) *ExErr {
@@ -152,20 +153,18 @@ func getForeignMeta(err error) (mm MetaMap) {
}()
rval := reflect.ValueOf(err)
if rval.Kind() == reflect.Interface || rval.Kind() == reflect.Ptr {
if rval.Kind() == reflect.Interface || rval.Kind() == reflect.Pointer {
rval = reflect.ValueOf(err).Elem()
}
mm.add("foreign.errortype", MDTString, rval.Type().String())
for k, v := range addMetaPrefix("foreign", getReflectedMetaValues(err, 8)) {
mm[k] = v
}
maps.Copy(mm, addMetaPrefix("foreign", getReflectedMetaValues(err, 8)))
return mm
}
func getReflectedMetaValues(value interface{}, remainingDepth int) map[string]MetaValue {
func getReflectedMetaValues(value any, remainingDepth int) map[string]MetaValue {
if remainingDepth <= 0 {
return map[string]MetaValue{}
@@ -177,7 +176,7 @@ func getReflectedMetaValues(value interface{}, remainingDepth int) map[string]Me
rval := reflect.ValueOf(value)
if rval.Type().Kind() == reflect.Ptr {
if rval.Type().Kind() == reflect.Pointer {
if rval.IsNil() {
return map[string]MetaValue{"*": {DataType: MDTNil, Value: nil}}
@@ -237,9 +236,7 @@ func getReflectedMetaValues(value interface{}, remainingDepth int) map[string]Me
fieldname := fieldtype.Name
if fieldtype.IsExported() {
for k, v := range addMetaPrefix(fieldname, getReflectedMetaValues(rval.Field(i).Interface(), remainingDepth-1)) {
m[k] = v
}
maps.Copy(m, addMetaPrefix(fieldname, getReflectedMetaValues(rval.Field(i).Interface(), remainingDepth-1)))
}
}
return m
exerr/dataCategory.go
+3 -3
View File
@@ -54,7 +54,7 @@ func (e ErrorCategory) MarshalBSONValue() (bsontype.Type, []byte, error) {
}
func (e ErrorCategory) DecodeValue(dc bsoncodec.DecodeContext, vr bsonrw.ValueReader, val reflect.Value) error {
if val.Kind() == reflect.Ptr && val.IsNil() {
if val.Kind() == reflect.Pointer && val.IsNil() {
if !val.CanSet() {
return errors.New("ValueUnmarshalerDecodeValue")
}
@@ -66,7 +66,7 @@ func (e ErrorCategory) DecodeValue(dc bsoncodec.DecodeContext, vr bsonrw.ValueRe
return err
}
if val.Kind() == reflect.Ptr && len(src) == 0 {
if val.Kind() == reflect.Pointer && len(src) == 0 {
val.Set(reflect.Zero(val.Type()))
return nil
}
@@ -76,7 +76,7 @@ func (e ErrorCategory) DecodeValue(dc bsoncodec.DecodeContext, vr bsonrw.ValueRe
return err
}
if val.Kind() == reflect.Ptr {
if val.Kind() == reflect.Pointer {
val.Set(reflect.ValueOf(&e))
} else {
val.Set(reflect.ValueOf(e))
exerr/dataSeverity.go
+3 -3
View File
@@ -56,7 +56,7 @@ func (e ErrorSeverity) MarshalBSONValue() (bsontype.Type, []byte, error) {
}
func (e ErrorSeverity) DecodeValue(dc bsoncodec.DecodeContext, vr bsonrw.ValueReader, val reflect.Value) error {
if val.Kind() == reflect.Ptr && val.IsNil() {
if val.Kind() == reflect.Pointer && val.IsNil() {
if !val.CanSet() {
return errors.New("ValueUnmarshalerDecodeValue")
}
@@ -68,7 +68,7 @@ func (e ErrorSeverity) DecodeValue(dc bsoncodec.DecodeContext, vr bsonrw.ValueRe
return err
}
if val.Kind() == reflect.Ptr && len(src) == 0 {
if val.Kind() == reflect.Pointer && len(src) == 0 {
val.Set(reflect.Zero(val.Type()))
return nil
}
@@ -78,7 +78,7 @@ func (e ErrorSeverity) DecodeValue(dc bsoncodec.DecodeContext, vr bsonrw.ValueRe
return err
}
if val.Kind() == reflect.Ptr {
if val.Kind() == reflect.Pointer {
val.Set(reflect.ValueOf(&e))
} else {
val.Set(reflect.ValueOf(e))
exerr/dataType.go
+29 -30
View File
@@ -7,7 +7,6 @@ import (
"reflect"
"git.blackforestbytes.com/BlackForestBytes/goext/dataext"
"git.blackforestbytes.com/BlackForestBytes/goext/langext"
"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/bson/bsoncodec"
"go.mongodb.org/mongo-driver/bson/bsonrw"
@@ -21,42 +20,42 @@ type ErrorType struct {
//goland:noinspection GoUnusedGlobalVariable
var (
TypeInternal = NewType("INTERNAL_ERROR", langext.Ptr(500))
TypePanic = NewType("PANIC", langext.Ptr(500))
TypeNotImplemented = NewType("NOT_IMPLEMENTED", langext.Ptr(500))
TypeAssert = NewType("ASSERT", langext.Ptr(500))
TypeInternal = NewType("INTERNAL_ERROR", new(500))
TypePanic = NewType("PANIC", new(500))
TypeNotImplemented = NewType("NOT_IMPLEMENTED", new(500))
TypeAssert = NewType("ASSERT", new(500))
TypeMongoQuery = NewType("MONGO_QUERY", langext.Ptr(500))
TypeCursorTokenDecode = NewType("CURSOR_TOKEN_DECODE", langext.Ptr(500))
TypeMongoFilter = NewType("MONGO_FILTER", langext.Ptr(500))
TypeMongoReflection = NewType("MONGO_REFLECTION", langext.Ptr(500))
TypeMongoInvalidOpt = NewType("MONGO_INVALIDOPT", langext.Ptr(500))
TypeMongoQuery = NewType("MONGO_QUERY", new(500))
TypeCursorTokenDecode = NewType("CURSOR_TOKEN_DECODE", new(500))
TypeMongoFilter = NewType("MONGO_FILTER", new(500))
TypeMongoReflection = NewType("MONGO_REFLECTION", new(500))
TypeMongoInvalidOpt = NewType("MONGO_INVALIDOPT", new(500))
TypeSQLQuery = NewType("SQL_QUERY", langext.Ptr(500))
TypeSQLBuild = NewType("SQL_BUILD", langext.Ptr(500))
TypeSQLDecode = NewType("SQL_DECODE", langext.Ptr(500))
TypeSQLQuery = NewType("SQL_QUERY", new(500))
TypeSQLBuild = NewType("SQL_BUILD", new(500))
TypeSQLDecode = NewType("SQL_DECODE", new(500))
TypeWrap = NewType("Wrap", nil)
TypeBindFailURI = NewType("BINDFAIL_URI", langext.Ptr(400))
TypeBindFailQuery = NewType("BINDFAIL_QUERY", langext.Ptr(400))
TypeBindFailJSON = NewType("BINDFAIL_JSON", langext.Ptr(400))
TypeBindFailFormData = NewType("BINDFAIL_FORMDATA", langext.Ptr(400))
TypeBindFailHeader = NewType("BINDFAIL_HEADER", langext.Ptr(400))
TypeBindFailURI = NewType("BINDFAIL_URI", new(400))
TypeBindFailQuery = NewType("BINDFAIL_QUERY", new(400))
TypeBindFailJSON = NewType("BINDFAIL_JSON", new(400))
TypeBindFailFormData = NewType("BINDFAIL_FORMDATA", new(400))
TypeBindFailHeader = NewType("BINDFAIL_HEADER", new(400))
TypeMarshalEntityID = NewType("MARSHAL_ENTITY_ID", langext.Ptr(400))
TypeInvalidCSID = NewType("INVALID_CSID", langext.Ptr(400))
TypeMarshalEntityID = NewType("MARSHAL_ENTITY_ID", new(400))
TypeInvalidCSID = NewType("INVALID_CSID", new(400))
TypeGoogleStatuscode = NewType("GOOGLE_STATUSCODE", langext.Ptr(400))
TypeGoogleResponse = NewType("GOOGLE_RESPONSE", langext.Ptr(400))
TypeGoogleStatuscode = NewType("GOOGLE_STATUSCODE", new(400))
TypeGoogleResponse = NewType("GOOGLE_RESPONSE", new(400))
TypeUnauthorized = NewType("UNAUTHORIZED", langext.Ptr(401))
TypeAuthFailed = NewType("AUTH_FAILED", langext.Ptr(401))
TypeUnauthorized = NewType("UNAUTHORIZED", new(401))
TypeAuthFailed = NewType("AUTH_FAILED", new(401))
TypeInvalidImage = NewType("IMAGEEXT_INVALID_IMAGE", langext.Ptr(400))
TypeInvalidMimeType = NewType("IMAGEEXT_INVALID_MIMETYPE", langext.Ptr(400))
TypeInvalidImage = NewType("IMAGEEXT_INVALID_IMAGE", new(400))
TypeInvalidMimeType = NewType("IMAGEEXT_INVALID_MIMETYPE", new(400))
TypeWebsocket = NewType("WEBSOCKET", langext.Ptr(500))
TypeWebsocket = NewType("WEBSOCKET", new(500))
// other values come from the downstream application that uses goext
)
@@ -113,7 +112,7 @@ func (e ErrorType) MarshalBSONValue() (bsontype.Type, []byte, error) {
}
func (e ErrorType) DecodeValue(dc bsoncodec.DecodeContext, vr bsonrw.ValueReader, val reflect.Value) error {
if val.Kind() == reflect.Ptr && val.IsNil() {
if val.Kind() == reflect.Pointer && val.IsNil() {
if !val.CanSet() {
return errors.New("ValueUnmarshalerDecodeValue")
}
@@ -125,7 +124,7 @@ func (e ErrorType) DecodeValue(dc bsoncodec.DecodeContext, vr bsonrw.ValueReader
return err
}
if val.Kind() == reflect.Ptr && len(src) == 0 {
if val.Kind() == reflect.Pointer && len(src) == 0 {
val.Set(reflect.Zero(val.Type()))
return nil
}
@@ -135,7 +134,7 @@ func (e ErrorType) DecodeValue(dc bsoncodec.DecodeContext, vr bsonrw.ValueReader
return err
}
if val.Kind() == reflect.Ptr {
if val.Kind() == reflect.Pointer {
val.Set(reflect.ValueOf(&e))
} else {
val.Set(reflect.ValueOf(e))
exerr/exerr.go
+32 -30
View File
@@ -2,9 +2,9 @@ package exerr
import (
"fmt"
"git.blackforestbytes.com/BlackForestBytes/goext/langext"
"github.com/rs/xid"
"github.com/rs/zerolog"
"git.blackforestbytes.com/BlackForestBytes/goext/langext"
"reflect"
"strings"
"time"
@@ -125,35 +125,37 @@ func (ee *ExErr) FormatLog(lvl LogPrintLevel) string {
} else if lvl == LogPrintOverview {
str := "[" + ee.RecursiveType().Key + "] <" + ee.UniqueID + "> " + strings.ReplaceAll(ee.RecursiveMessage(), "\n", " ") + "\n"
var str strings.Builder
str.WriteString("[" + ee.RecursiveType().Key + "] <" + ee.UniqueID + "> " + strings.ReplaceAll(ee.RecursiveMessage(), "\n", " ") + "\n")
for exk, exv := range ee.Extra {
str += fmt.Sprintf(" # [[[ %s ==> %v ]]]\n", exk, exv)
str.WriteString(fmt.Sprintf(" # [[[ %s ==> %v ]]]\n", exk, exv))
}
indent := ""
var indent strings.Builder
for curr := ee; curr != nil; curr = curr.OriginalError {
indent += " "
indent.WriteString(" ")
str += indent
str += "-> "
str.WriteString(indent).String()
str.WriteString("-> ")
strmsg := strings.Trim(curr.Message, " \r\n\t")
if lbidx := strings.Index(curr.Message, "\n"); lbidx >= 0 {
strmsg = strmsg[0:lbidx]
}
strmsg = langext.StrLimit(strmsg, 61, "...")
str += strmsg
str += "\n"
str.WriteString(strmsg)
str.WriteString("\n")
}
return str
return str.String()
} else if lvl == LogPrintFull {
str := "[" + ee.RecursiveType().Key + "] <" + ee.UniqueID + "> " + strings.ReplaceAll(ee.RecursiveMessage(), "\n", " ") + "\n"
var str strings.Builder
str.WriteString("[" + ee.RecursiveType().Key + "] <" + ee.UniqueID + "> " + strings.ReplaceAll(ee.RecursiveMessage(), "\n", " ") + "\n")
for exk, exv := range ee.Extra {
str += fmt.Sprintf(" # [[[ %s ==> %v ]]]\n", exk, exv)
str.WriteString(fmt.Sprintf(" # [[[ %s ==> %v ]]]\n", exk, exv))
}
indent := ""
@@ -165,33 +167,33 @@ func (ee *ExErr) FormatLog(lvl LogPrintLevel) string {
etype = "~"
}
str += indent
str += "-> ["
str += etype
str.WriteString(indent)
str.WriteString("-> [")
str.WriteString(etype)
if curr.Category == CatForeign {
str += "|Foreign"
str.WriteString("|Foreign")
}
str += "] "
str += strings.ReplaceAll(curr.Message, "\n", " ")
str.WriteString("] ")
str.WriteString(strings.ReplaceAll(curr.Message, "\n", " "))
if curr.Caller != "" {
str += " (@ "
str += curr.Caller
str += ")"
str.WriteString(" (@ ")
str.WriteString(curr.Caller)
str.WriteString(")")
}
str += "\n"
str.WriteString("\n")
if curr.Meta.Any() {
meta := indent + " {" + curr.Meta.FormatOneLine(240) + "}"
if len(meta) < 200 {
str += meta
str += "\n"
str.WriteString(meta)
str.WriteString("\n")
} else {
str += curr.Meta.FormatMultiLine(indent+" ", " ", 1024)
str += "\n"
str.WriteString(curr.Meta.FormatMultiLine(indent+" ", " ", 1024))
str.WriteString("\n")
}
}
}
return str
return str.String()
} else {
@@ -201,7 +203,7 @@ func (ee *ExErr) FormatLog(lvl LogPrintLevel) string {
}
func (ee *ExErr) ShortLog(evt *zerolog.Event) {
ee.Meta.Apply(evt, langext.Ptr(240)).Msg(ee.FormatLog(LogPrintShort))
ee.Meta.Apply(evt, new(240)).Msg(ee.FormatLog(LogPrintShort))
}
// RecursiveMessage returns the message to show
@@ -254,7 +256,7 @@ func (ee *ExErr) RecursiveType() ErrorType {
func (ee *ExErr) RecursiveStatuscode() *int {
for curr := ee; curr != nil; curr = curr.OriginalError {
if curr.StatusCode != nil {
return langext.Ptr(*curr.StatusCode)
return new(*curr.StatusCode)
}
}
@@ -279,7 +281,7 @@ func (ee *ExErr) RecursiveCategory() ErrorCategory {
func (ee *ExErr) RecursiveMeta(key string) *MetaValue {
for curr := ee; curr != nil; curr = curr.OriginalError {
if metaval, ok := curr.Meta[key]; ok {
return langext.Ptr(metaval)
return new(metaval)
}
}
exerr/gin.go
+3 -3
View File
@@ -1,6 +1,8 @@
package exerr
import (
"maps"
json "git.blackforestbytes.com/BlackForestBytes/goext/gojson"
"git.blackforestbytes.com/BlackForestBytes/goext/langext"
"github.com/gin-gonic/gin"
@@ -50,9 +52,7 @@ func (ee *ExErr) toJson(depth int, applyExtendListener bool, outputMeta bool) la
ginJson["meta"] = metaJson
extraJson := langext.H{}
for extraKey, extraVal := range ee.Extra {
extraJson[extraKey] = extraVal
}
maps.Copy(extraJson, ee.Extra)
ginJson["extra"] = extraJson
}
exerr/meta.go
+20 -20
View File
@@ -49,13 +49,13 @@ const (
type MetaValue struct {
DataType metaDataType `json:"dataType"`
Value interface{} `json:"value"`
Value any `json:"value"`
}
type metaValueSerialization struct {
DataType metaDataType `bson:"dataType"`
Value string `bson:"value"`
Raw interface{} `bson:"raw"`
Raw any `bson:"raw"`
}
func (v MetaValue) SerializeValue() (string, error) {
@@ -379,7 +379,7 @@ func (v *MetaValue) Deserialize(value string, datatype metaDataType) error {
v.DataType = datatype
return nil
} else {
v.Value = langext.Ptr(value[1:])
v.Value = new(value[1:])
v.DataType = datatype
return nil
}
@@ -694,28 +694,28 @@ func (v MetaValue) rawValueForJson() any {
}
func (mm MetaMap) FormatOneLine(singleMaxLen int) string {
r := ""
var r strings.Builder
i := 0
for key, val := range mm {
if i > 0 {
r += ", "
r.WriteString(", ")
}
r += "\"" + key + "\""
r += ": "
r += "\"" + val.ShortString(singleMaxLen) + "\""
r.WriteString("\"" + key + "\"")
r.WriteString(": ")
r.WriteString("\"" + val.ShortString(singleMaxLen) + "\"")
i++
}
return r
return r.String()
}
func (mm MetaMap) FormatMultiLine(indentFront string, indentKeys string, maxLenValue int) string {
r := ""
var r strings.Builder
r += indentFront + "{" + "\n"
r.WriteString(indentFront + "{" + "\n")
for key, val := range mm {
if key == "gin.body" {
continue
@@ -724,16 +724,16 @@ func (mm MetaMap) FormatMultiLine(indentFront string, indentKeys string, maxLenV
continue
}
r += indentFront
r += indentKeys
r += "\"" + key + "\""
r += ": "
r += "\"" + val.ShortString(maxLenValue) + "\""
r += ",\n"
r.WriteString(indentFront)
r.WriteString(indentKeys)
r.WriteString("\"" + key + "\"")
r.WriteString(": ")
r.WriteString("\"" + val.ShortString(maxLenValue) + "\"")
r.WriteString(",\n")
}
r += indentFront + "}"
r.WriteString(indentFront + "}")
return r
return r.String()
}
func (mm MetaMap) Any() bool {
@@ -747,7 +747,7 @@ func (mm MetaMap) Apply(evt *zerolog.Event, limitLen *int) *zerolog.Event {
return evt
}
func (mm MetaMap) add(key string, mdtype metaDataType, val interface{}) {
func (mm MetaMap) add(key string, mdtype metaDataType, val any) {
if _, ok := mm[key]; !ok {
mm[key] = MetaValue{DataType: mdtype, Value: val}
return