v0.0.131

.gitea/workflows/tests.yml

@@ -1,55 +0,0 @@
-
-# https://docs.gitea.com/next/usage/actions/quickstart
-# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions
-# https://docs.github.com/en/actions/learn-github-actions/contexts#github-context
-
-name: Build Docker and Deploy
-run-name: Build & Deploy ${{ gitea.ref }} on ${{ gitea.actor }}
-
-on:
-  push:
-    branches:
-      - '*'
-      - '**'
-
-
-jobs:
-  run_tests:
-    name: Run goext test-suite  
-    runs-on: bfb-cicd-latest
-    steps:
-
-      - name: Check out code
-        uses: actions/checkout@v3
-
-      - name: Setup go
-        uses: actions/setup-go@v4
-        with:
-          go-version-file: '${{ gitea.workspace }}/go.mod'
-
-      - name: Setup packages
-        uses: awalsh128/cache-apt-pkgs-action@latest
-        with:
-          packages: curl python3
-          version: 1.0
-
-      - name: go version
-        run: go version
-
-      - name: Run tests
-        run: cd "${{ gitea.workspace }}" && make test
-
-      - name: Send failure mail
-        if: failure()
-        uses: dawidd6/action-send-mail@v3
-        with:
-          server_address: smtp.fastmail.com
-          server_port: 465
-          secure: true
-          username: ${{secrets.MAIL_USERNAME}}
-          password: ${{secrets.MAIL_PASSWORD}}
-          subject: Pipeline on '${{ gitea.repository }}' failed
-          to: ${{ steps.commiter_info.outputs.MAIL }}
-          from: Gitea Actions <gitea_actions@blackforestbytes.de>
-          body: "Go to https://gogs.blackforestbytes.com/${{ gitea.repository }}/actions"
-

.idea/.gitignore

@@ -6,5 +6,3 @@
 # Datasource local storage ignored files
 /dataSources/
 /dataSources.local.xml
-# GitHub Copilot persisted chat sessions
-/copilot/chatSessions

.idea/copilot.data.migration.agent.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AgentMigrationStateService">
-    <option name="migrationStatus" value="COMPLETED" />
-  </component>
-</project>

.idea/copilot.data.migration.ask.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AskMigrationStateService">
-    <option name="migrationStatus" value="COMPLETED" />
-  </component>
-</project>

.idea/copilot.data.migration.ask2agent.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Ask2AgentMigrationStateService">
-    <option name="migrationStatus" value="COMPLETED" />
-  </component>
-</project>

.idea/copilot.data.migration.edit.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EditMigrationStateService">
-    <option name="migrationStatus" value="COMPLETED" />
-  </component>
-</project>

.idea/goext.iml

@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="WEB_MODULE" version="4">
-  <component name="Go" enabled="true">
-    <buildTags>
-      <option name="goVersion" value="1.19" />
-    </buildTags>
-  </component>
+  <component name="Go" enabled="true" />
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$" />
     <orderEntry type="inheritedJdk" />

.idea/golinter.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GoLinterSettings">
-    <option name="checkGoLinterExe" value="false" />
-  </component>
-</project>

.idea/sqldialects.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="SqlDialectMappings">
-    <file url="file://$PROJECT_DIR$/sq/sq_test.go" dialect="SQLite" />
-  </component>
-</project>

Makefile

@@ -5,13 +5,7 @@ run:
 test:
 	# go test ./...
 	which gotestsum || go install gotest.tools/gotestsum@latest
-	gotestsum --format "testname" -- -tags="timetzdata sqlite_fts5 sqlite_foreign_keys" "./..."
-
-test-in-docker:
-	tag="goext_temp_test_image:$(shell uuidgen | tr -d '-')";        \
-	docker build --tag $$tag . -f .gitea/workflows/Dockerfile_tests; \
-	docker run --rm $$tag;                                           \
-	docker rmi $$tag
+	gotestsum --format "testname" -- -tags="timetzdata sqlite_fts5 sqlite_foreign_keys" "./test"
 
 version:
 	_data/version.sh

README.md

@@ -5,107 +5,4 @@ A collection of general & useful library methods
 
 This should not have any heavy dependencies (gin, mongo, etc) and add missing basic language features...
 
-Potentially needs `export GOPRIVATE="git.blackforestbytes.com"`
-
-
-## Packages:
-
-| Name        | Maintainer | Description                                                                                                   |
-|-------------|------------|---------------------------------------------------------------------------------------------------------------|
-| langext     | Mike       | General uttility/helper functions, (everything thats missing from go standard library)                        |
-| mathext     | Mike       | Utility/Helper functions for math                                                                             |
-| cryptext    | Mike       | Utility/Helper functions for encryption                                                                       |
-| syncext     | Mike       | Utility/Helper funtions for multi-threading / mutex / channels                                                |
-| dataext     | Mike       | Various useful data structures                                                                                |
-| zipext      | Mike       | Utility for zip/gzip/tar etc                                                                                  |
-| reflectext  | Mike       | Utility for golang reflection                                                                                 |
-| fsext       | Mike       | Utility for filesytem access                                                                                  |
-| ctxext      | Mike       | Utility for context.Context                                                                                   |
-|             |            |                                                                                                               |
-| mongoext    | Mike       | Utility/Helper functions for mongodb (kinda abandoned)                                                        |
-| cursortoken | Mike       | MongoDB cursortoken implementation                                                                            |
-| pagination  | Mike       | Pagination implementation                                                                                     |
-|             |            |                                                                                                               |
-| totpext     | Mike       | Implementation of TOTP (2-Factor-Auth)                                                                        |
-| termext     | Mike       | Utilities for terminals (mostly color output)                                                                 |
-| confext     | Mike       | Parses environment configuration into structs                                                                 |
-| cmdext      | Mike       | Runner for external commands/processes                                                                        |
-|             |            |                                                                                                               |
-| sq          | Mike       | Utility functions for sql based databases (primarily sqlite)                                                  |
-| tst         | Mike       | Utility functions for unit tests                                                                              |
-|             |            |                                                                                                               |
-| rfctime     | Mike       | Classes for time seriallization, with different marshallign method for mongo and json                         |
-| gojson      | Mike       | Same interface for marshalling/unmarshalling as go/json, except with proper serialization of null arrays/maps |
-|             |            |                                                                                                               |
-| bfcodegen   | Mike       | Various codegen tools (run via go generate)                                                                   |
-|             |            |                                                                                                               |
-| rext        | Mike       | Regex Wrapper, wraps regexp with a better interface                                                           |
-| wmo         | Mike       | Mongo Wrapper, wraps mongodb with a better interface                                                          |
-|             |            |                                                                                                               |
-| scn         | Mike       | SimpleCloudNotifier                                                                                           |
-|             |            |                                                                                                               |
-
-
-
-## Usage:
-
-### exerr
-
- - see **mongoext/builder.go** for full info
-
-Short summary:
- - An better error package with metadata, listener, api-output and error-traces
- - Initialize with `exerr.Init()`
- - *Never* return `err` direct, always use exerr.Wrap(err, "...") - add metadata where applicable
- - at the end either Print(), Fatal() or Output() your error (print = stdout, fatal = panic, output = json API response)
- - You can add listeners with exerr.RegisterListener(), and save the full errors to a db or smth
-
-### wmo
-
- - A typed wrapper around the official mongo-go-driver
- - Use `wmo.W[...](...)` to wrap the collections and type-ify them
- - The new collections have all the usual methods, but types
- - Also they have List() and Paginate() methods for paginated listings (witehr with a cursortoken or page/limit)
- - Register additional hooks with `WithDecodeFunc`, `WithUnmarshalHook`, `WithMarshalHook`, `WithModifyingPipeline`, `WithModifyingPipelineFunc`
- - List(), Paginate(), etc support filter interfaces
-   - Rule(s) of thumb: 
-     - filter the results in the filter interface
-     - sort the results in the sort function of the filter interface
-     - add joins ($lookup's) in the `WithModifyingPipelineFunc`/`WithModifyingPipeline`
-
-#### ginext
-
- - A wrapper around gin-gonic/gin
- - create the gin engine with `ginext.NewEngine`
- - Add routes with `engine.Routes()...`
-   - `.Use(..)` adds a middleware
-   - `.Group(..)` adds a group
-   - `.Get().Handle(..)` adds a handler
- - Handler return values (in contract to ginext) - values implement the `ginext.HTTPResponse` interface
- - Every handler starts with something like:
-```go 
-func (handler Handler) CommunityMetricsValues(pctx ginext.PreContext) ginext.HTTPResponse {
-    type communityURI struct {
-        Version     string             `uri:"version"`
-        CommunityID models.CommunityID `uri:"cid"`
-    }
-    type body struct {
-        UserID  models.UserID  `json:"userID"`
-        EventID models.EventID `json:"eventID"`
-    }
-
-    var u uri
-    var b body
-    ctx, gctx, httpErr := pctx.URI(&u).Body(&b).Start() // can have more unmarshaller, like header, form, etc
-    if httpErr != nil {
-    	return *httpErr
-    }
-    defer ctx.Cancel()
-
-    // do stuff
-}
-```
-
-#### sq
-
- - TODO (like mongoext for sqlite/sql databases)
+Potentially needs `export GOPRIVATE="gogs.mikescher.com"`

TODO.md

@@ -1,9 +0,0 @@
-
-
- - cronext
-
- - rfctime.HMSTimeOnly
- - rfctime.NanoTimeOnly
-
- - remove sqlx dependency from sq  (unmaintained, and mostly superseeded by our own stuff?)
- - Move DBLogger and DBPreprocessor to sq

_data/version.sh

@@ -21,15 +21,8 @@ if [ "$( git rev-parse --abbrev-ref HEAD )" != "master" ]; then
   exit 1
 fi
 
-echo ""
-echo -n "Insert optional commit message: "
-read commitMessage
-echo ""
-
 git pull --ff
 
-go get -u ./...
-
 curr_vers=$(git describe --tags --abbrev=0 | sed 's/v//g')
 
 next_ver=$(echo "$curr_vers" | awk -F. -v OFS=. 'NF==1{print ++$NF}; NF>1{if(length($NF+1)>length($NF))$(NF-1)++; $NF=sprintf("%0*d", length($NF), ($NF+1)%(10^length($NF))); print}')
@@ -39,17 +32,10 @@ echo "> Current Version: ${curr_vers}"
 echo "> Next    Version: ${next_ver}"
 echo ""
 
-printf "package goext\n\nconst GoextVersion = \"%s\"\n\nconst GoextVersionTimestamp = \"%s\"\n" "${next_ver}" "$( date +"%Y-%m-%dT%H:%M:%S%z" )" > "goextVersion.go"
-
 git add --verbose .
 
 msg="v${next_ver}"
 
-if [[ "$commitMessage" != "" ]]; then
-  msg="${msg} ${commitMessage}"
-fi
-
-
 if [ $# -gt 0 ]; then
   msg="$1"
 fi

bfcodegen/csid-generate.go

@@ -1,197 +0,0 @@
-package bfcodegen
-
-import (
-	"bytes"
-	_ "embed"
-	"errors"
-	"fmt"
-	"go/format"
-	"git.blackforestbytes.com/BlackForestBytes/goext"
-	"git.blackforestbytes.com/BlackForestBytes/goext/cryptext"
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
-	"git.blackforestbytes.com/BlackForestBytes/goext/rext"
-	"io"
-	"os"
-	"path"
-	"path/filepath"
-	"regexp"
-	"strings"
-	"text/template"
-)
-
-type CSIDDef struct {
-	File         string
-	FileRelative string
-	Name         string
-	Prefix       string
-}
-
-type CSIDGenOptions struct {
-	DebugOutput *bool
-}
-
-var rexCSIDPackage = rext.W(regexp.MustCompile(`^package\s+(?P<name>[A-Za-z0-9_]+)\s*$`))
-
-var rexCSIDDef = rext.W(regexp.MustCompile(`^\s*type\s+(?P<name>[A-Za-z0-9_]+)\s+string\s*//\s*(@csid:type)\s+\[(?P<prefix>[A-Z0-9]{3})].*$`))
-
-var rexCSIDChecksumConst = rext.W(regexp.MustCompile(`const ChecksumCharsetIDGenerator = "(?P<cs>[A-Za-z0-9_]*)"`))
-
-//go:embed csid-generate.template
-var templateCSIDGenerateText string
-
-func GenerateCharsetIDSpecs(sourceDir string, destFile string, opt CSIDGenOptions) error {
-
-	debugOutput := langext.Coalesce(opt.DebugOutput, false)
-
-	files, err := os.ReadDir(sourceDir)
-	if err != nil {
-		return err
-	}
-
-	oldChecksum := "N/A"
-	if _, err := os.Stat(destFile); !os.IsNotExist(err) {
-		content, err := os.ReadFile(destFile)
-		if err != nil {
-			return err
-		}
-		if m, ok := rexCSIDChecksumConst.MatchFirst(string(content)); ok {
-			oldChecksum = m.GroupByName("cs").Value()
-		}
-	}
-
-	files = langext.ArrFilter(files, func(v os.DirEntry) bool { return v.Name() != path.Base(destFile) })
-	files = langext.ArrFilter(files, func(v os.DirEntry) bool { return strings.HasSuffix(v.Name(), ".go") })
-	files = langext.ArrFilter(files, func(v os.DirEntry) bool { return !strings.HasSuffix(v.Name(), "_gen.go") })
-	langext.SortBy(files, func(v os.DirEntry) string { return v.Name() })
-
-	newChecksumStr := goext.GoextVersion
-	for _, f := range files {
-		content, err := os.ReadFile(path.Join(sourceDir, f.Name()))
-		if err != nil {
-			return err
-		}
-		newChecksumStr += "\n" + f.Name() + "\t" + cryptext.BytesSha256(content)
-	}
-
-	newChecksum := cryptext.BytesSha256([]byte(newChecksumStr))
-
-	if newChecksum != oldChecksum {
-		fmt.Printf("[CSIDGenerate] Checksum has changed ( %s -> %s ), will generate new file\n\n", oldChecksum, newChecksum)
-	} else {
-		fmt.Printf("[CSIDGenerate] Checksum unchanged ( %s ), nothing to do\n", oldChecksum)
-		return nil
-	}
-
-	allIDs := make([]CSIDDef, 0)
-
-	pkgname := ""
-
-	for _, f := range files {
-		if debugOutput {
-			fmt.Printf("========= %s =========\n\n", f.Name())
-		}
-
-		fileIDs, pn, err := processCSIDFile(sourceDir, path.Join(sourceDir, f.Name()), debugOutput)
-		if err != nil {
-			return err
-		}
-
-		if debugOutput {
-			fmt.Printf("\n")
-		}
-
-		allIDs = append(allIDs, fileIDs...)
-
-		if pn != "" {
-			pkgname = pn
-		}
-	}
-
-	if pkgname == "" {
-		return errors.New("no package name found in any file")
-	}
-
-	fdata, err := format.Source([]byte(fmtCSIDOutput(newChecksum, allIDs, pkgname)))
-	if err != nil {
-		return err
-	}
-
-	err = os.WriteFile(destFile, fdata, 0o755)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func processCSIDFile(basedir string, fn string, debugOutput bool) ([]CSIDDef, string, error) {
-	file, err := os.Open(fn)
-	if err != nil {
-		return nil, "", err
-	}
-
-	defer func() { _ = file.Close() }()
-
-	bin, err := io.ReadAll(file)
-	if err != nil {
-		return nil, "", err
-	}
-
-	lines := strings.Split(string(bin), "\n")
-
-	ids := make([]CSIDDef, 0)
-
-	pkgname := ""
-
-	for i, line := range lines {
-		if i == 0 && strings.HasPrefix(line, "// Code generated by") {
-			break
-		}
-
-		if match, ok := rexCSIDPackage.MatchFirst(line); i == 0 && ok {
-			pkgname = match.GroupByName("name").Value()
-			continue
-		}
-
-		if match, ok := rexCSIDDef.MatchFirst(line); ok {
-
-			rfp, err := filepath.Rel(basedir, fn)
-			if err != nil {
-				return nil, "", err
-			}
-
-			def := CSIDDef{
-				File:         fn,
-				FileRelative: rfp,
-				Name:         match.GroupByName("name").Value(),
-				Prefix:       match.GroupByName("prefix").Value(),
-			}
-
-			if debugOutput {
-				fmt.Printf("Found ID definition { '%s' }\n", def.Name)
-			}
-
-			ids = append(ids, def)
-		}
-	}
-
-	return ids, pkgname, nil
-}
-
-func fmtCSIDOutput(cs string, ids []CSIDDef, pkgname string) string {
-	templ := template.Must(template.New("csid-generate").Parse(templateCSIDGenerateText))
-
-	buffer := bytes.Buffer{}
-
-	err := templ.Execute(&buffer, langext.H{
-		"PkgName":      pkgname,
-		"Checksum":     cs,
-		"GoextVersion": goext.GoextVersion,
-		"IDs":          ids,
-	})
-	if err != nil {
-		panic(err)
-	}
-
-	return buffer.String()
-}

bfcodegen/csid-generate.template

@@ -1,194 +0,0 @@
-// Code generated by csid-generate.go DO NOT EDIT.
-
-package {{.PkgName}}
-
-import "crypto/rand"
-import "crypto/sha256"
-import "fmt"
-import "github.com/go-playground/validator/v10"
-import "github.com/rs/zerolog/log"
-import "git.blackforestbytes.com/BlackForestBytes/goext/exerr"
-import "git.blackforestbytes.com/BlackForestBytes/goext/langext"
-import "git.blackforestbytes.com/BlackForestBytes/goext/rext"
-import "math/big"
-import "reflect"
-import "regexp"
-import "strings"
-
-const ChecksumCharsetIDGenerator = "{{.Checksum}}" // GoExtVersion: {{.GoextVersion}}
-
-const idlen = 24
-
-const checklen = 1
-
-const idCharset = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
-const idCharsetLen = len(idCharset)
-
-var charSetReverseMap = generateCharsetMap()
-
-const ({{range .IDs}}
-	prefix{{.Name}} = "{{.Prefix}}" {{end}}
-)
-
-var ({{range .IDs}}
-	regex{{.Name}} = generateRegex(prefix{{.Name}}) {{end}}
-)
-
-func generateRegex(prefix string) rext.Regex {
-	return rext.W(regexp.MustCompile(fmt.Sprintf("^%s[%s]{%d}[%s]{%d}$", prefix, idCharset, idlen-len(prefix)-checklen, idCharset, checklen)))
-}
-
-func generateCharsetMap() []int {
-	result := make([]int, 128)
-	for i := 0; i < len(result); i++ {
-		result[i] = -1
-	}
-	for idx, chr := range idCharset {
-		result[int(chr)] = idx
-	}
-	return result
-}
-
-func generateID(prefix string) string {
-	k := ""
-	csMax := big.NewInt(int64(idCharsetLen))
-	checksum := 0
-	for i := 0; i < idlen-len(prefix)-checklen; i++ {
-		v, err := rand.Int(rand.Reader, csMax)
-		if err != nil {
-			panic(err)
-		}
-		v64 := v.Int64()
-		k += string(idCharset[v64])
-		checksum = (checksum + int(v64)) % (idCharsetLen)
-	}
-	checkstr := string(idCharset[checksum%idCharsetLen])
-	return prefix + k + checkstr
-}
-
-func generateIDFromSeed(prefix string, seed string) string {
-	h := sha256.New()
-
-	iddata := ""
-	for len(iddata) < idlen-len(prefix)-checklen {
-		h.Write([]byte(seed))
-		bs := h.Sum(nil)
-		iddata += langext.NewAnyBaseConverter(idCharset).Encode(bs)
-	}
-
-	checksum := 0
-	for i := 0; i < idlen-len(prefix)-checklen; i++ {
-		ichr := int(iddata[i])
-		checksum = (checksum + charSetReverseMap[ichr]) % (idCharsetLen)
-	}
-
-	checkstr := string(idCharset[checksum%idCharsetLen])
-
-	return prefix + iddata[:(idlen-len(prefix)-checklen)] + checkstr
-}
-
-func validateID(prefix string, value string) error {
-	if len(value) != idlen {
-		return exerr.New(exerr.TypeInvalidCSID, "id has the wrong length").Str("value", value).Build()
-	}
-
-	if !strings.HasPrefix(value, prefix) {
-		return exerr.New(exerr.TypeInvalidCSID, "id is missing the correct prefix").Str("value", value).Str("prefix", prefix).Build()
-	}
-
-	checksum := 0
-	for i := len(prefix); i < len(value)-checklen; i++ {
-		ichr := int(value[i])
-		if ichr < 0 || ichr >= len(charSetReverseMap) || charSetReverseMap[ichr] == -1 {
-			return exerr.New(exerr.TypeInvalidCSID, "id contains invalid characters").Str("value", value).Build()
-		}
-		checksum = (checksum + charSetReverseMap[ichr]) % (idCharsetLen)
-	}
-
-	checkstr := string(idCharset[checksum%idCharsetLen])
-
-	if !strings.HasSuffix(value, checkstr) {
-		return exerr.New(exerr.TypeInvalidCSID, "id checkstring is invalid").Str("value", value).Str("checkstr", checkstr).Build()
-	}
-
-	return nil
-}
-
-func getRawData(prefix string, value string) string {
-	if len(value) != idlen {
-		return ""
-	}
-	return value[len(prefix) : idlen-checklen]
-}
-
-func getCheckString(prefix string, value string) string {
-	if len(value) != idlen {
-		return ""
-	}
-	return value[idlen-checklen:]
-}
-
-func ValidateEntityID(vfl validator.FieldLevel) bool {
-	if !vfl.Field().CanInterface() {
-		log.Error().Msgf("Failed to validate EntityID (cannot interface ?!?)")
-		return false
-	}
-
-	ifvalue := vfl.Field().Interface()
-
-	if value1, ok := ifvalue.(EntityID); ok {
-
-		if vfl.Field().Type().Kind() == reflect.Pointer && langext.IsNil(value1) {
-			return true
-		}
-
-		if err := value1.Valid(); err != nil {
-			log.Debug().Msgf("Failed to validate EntityID '%s' (%s)", value1.String(), err.Error())
-			return false
-		} else {
-			return true
-		}
-
-	} else {
-		log.Error().Msgf("Failed to validate EntityID (wrong type: %T)", ifvalue)
-		return false
-	}
-}
-
-{{range .IDs}}
-
-// ================================ {{.Name}} ({{.FileRelative}}) ================================
-
-func New{{.Name}}() {{.Name}} {
-	return {{.Name}}(generateID(prefix{{.Name}}))
-}
-
-func (id {{.Name}}) Valid() error {
-	return validateID(prefix{{.Name}}, string(id))
-}
-
-func (i {{.Name}}) String() string {
-	return string(i)
-}
-
-func (i {{.Name}}) Prefix() string {
-	return prefix{{.Name}}
-}
-
-func (id {{.Name}}) Raw() string {
-	return getRawData(prefix{{.Name}}, string(id))
-}
-
-func (id {{.Name}}) CheckString() string {
-	return getCheckString(prefix{{.Name}}, string(id))
-}
-
-func (id {{.Name}}) IsZero() bool {
-	return id == ""
-}
-
-func (id {{.Name}}) Regex() rext.Regex {
-	return regex{{.Name}}
-}
-
-{{end}}

bfcodegen/csid-generate_test.go

@@ -1,52 +0,0 @@
-package bfcodegen
-
-import (
-	_ "embed"
-	"fmt"
-	"git.blackforestbytes.com/BlackForestBytes/goext/cmdext"
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
-	"git.blackforestbytes.com/BlackForestBytes/goext/tst"
-	"os"
-	"path/filepath"
-	"testing"
-	"time"
-)
-
-//go:embed _test_example_1.tgz
-var CSIDExampleModels1 []byte
-
-func TestGenerateCSIDSpecs(t *testing.T) {
-
-	tmpFile := filepath.Join(t.TempDir(), langext.MustHexUUID()+".tgz")
-
-	tmpDir := filepath.Join(t.TempDir(), langext.MustHexUUID())
-
-	err := os.WriteFile(tmpFile, CSIDExampleModels1, 0o777)
-	tst.AssertNoErr(t, err)
-
-	t.Cleanup(func() { _ = os.Remove(tmpFile) })
-
-	err = os.Mkdir(tmpDir, 0o777)
-	tst.AssertNoErr(t, err)
-
-	t.Cleanup(func() { _ = os.RemoveAll(tmpFile) })
-
-	_, err = cmdext.Runner("tar").Arg("-xvzf").Arg(tmpFile).Arg("-C").Arg(tmpDir).FailOnExitCode().FailOnTimeout().Timeout(time.Minute).Run()
-	tst.AssertNoErr(t, err)
-
-	err = GenerateCharsetIDSpecs(tmpDir, tmpDir+"/csid_gen.go", CSIDGenOptions{DebugOutput: langext.PTrue})
-	tst.AssertNoErr(t, err)
-
-	err = GenerateCharsetIDSpecs(tmpDir, tmpDir+"/csid_gen.go", CSIDGenOptions{DebugOutput: langext.PTrue})
-	tst.AssertNoErr(t, err)
-
-	fmt.Println()
-	fmt.Println()
-	fmt.Println()
-	fmt.Println("=====================================================================================================")
-	fmt.Println(string(tst.Must(os.ReadFile(tmpDir + "/csid_gen.go"))(t)))
-	fmt.Println("=====================================================================================================")
-	fmt.Println()
-	fmt.Println()
-	fmt.Println()
-}

bfcodegen/enum-generate.go

@@ -1,116 +1,42 @@
 package bfcodegen
 
 import (
-	"bytes"
-	_ "embed"
-	"encoding/json"
 	"errors"
 	"fmt"
-	"git.blackforestbytes.com/BlackForestBytes/goext"
-	"git.blackforestbytes.com/BlackForestBytes/goext/cryptext"
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
-	"git.blackforestbytes.com/BlackForestBytes/goext/rext"
-	"go/format"
+	"gogs.mikescher.com/BlackForestBytes/goext/cmdext"
+	"gogs.mikescher.com/BlackForestBytes/goext/langext"
+	"gogs.mikescher.com/BlackForestBytes/goext/rext"
 	"io"
 	"os"
-	"path"
-	"path/filepath"
-	"reflect"
 	"regexp"
 	"strings"
-	"text/template"
+	"time"
 )
 
 type EnumDefVal struct {
 	VarName     string
 	Value       string
 	Description *string
-	Data        *map[string]any
-	RawComment  *string
 }
 
 type EnumDef struct {
 	File         string
-	FileRelative string
 	EnumTypeName string
 	Type         string
 	Values       []EnumDefVal
 }
 
-type EnumGenOptions struct {
-	DebugOutput *bool
-	GoFormat    *bool
-}
+var rexPackage = rext.W(regexp.MustCompile("^package\\s+(?P<name>[A-Za-z0-9_]+)\\s*$"))
 
-var rexEnumPackage = rext.W(regexp.MustCompile(`^package\s+(?P<name>[A-Za-z0-9_]+)\s*$`))
+var rexEnumDef = rext.W(regexp.MustCompile("^\\s*type\\s+(?P<name>[A-Za-z0-9_]+)\\s+(?P<type>[A-Za-z0-9_]+)\\s*//\\s*(@enum:type).*$"))
 
-var rexEnumDef = rext.W(regexp.MustCompile(`^\s*type\s+(?P<name>[A-Za-z0-9_]+)\s+(?P<type>[A-Za-z0-9_]+)\s*//\s*(@enum:type).*$`))
+var rexValueDef = rext.W(regexp.MustCompile("^\\s*(?P<name>[A-Za-z0-9_]+)\\s+(?P<type>[A-Za-z0-9_]+)\\s*=\\s*(?P<value>(\"[A-Za-z0-9_:]+\"|[0-9]+))\\s*(//(?P<descr>.*))?.*$"))
 
-var rexEnumValueDef = rext.W(regexp.MustCompile(`^\s*(?P<name>[A-Za-z0-9_]+)\s+(?P<type>[A-Za-z0-9_]+)\s*=\s*(?P<value>("[/@A-Za-z0-9_:\s\-.]*"|[0-9]+))\s*(//(?P<comm>.*))?.*$`))
-
-var rexEnumChecksumConst = rext.W(regexp.MustCompile(`const ChecksumEnumGenerator = "(?P<cs>[A-Za-z0-9_]*)"`))
-
-//go:embed enum-generate.template
-var templateEnumGenerateText string
-
-func GenerateEnumSpecs(sourceDir string, destFile string, opt EnumGenOptions) error {
-
-	oldChecksum := "N/A"
-	if _, err := os.Stat(destFile); !os.IsNotExist(err) {
-		content, err := os.ReadFile(destFile)
-		if err != nil {
-			return err
-		}
-		if m, ok := rexEnumChecksumConst.MatchFirst(string(content)); ok {
-			oldChecksum = m.GroupByName("cs").Value()
-		}
-	}
-
-	gocode, _, changed, err := _generateEnumSpecs(sourceDir, destFile, oldChecksum, langext.Coalesce(opt.GoFormat, true), langext.Coalesce(opt.DebugOutput, false))
-	if err != nil {
-		return err
-	}
-
-	if !changed {
-		return nil
-	}
-
-	err = os.WriteFile(destFile, []byte(gocode), 0o755)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func _generateEnumSpecs(sourceDir string, destFile string, oldChecksum string, gofmt bool, debugOutput bool) (string, string, bool, error) {
+func GenerateEnumSpecs(sourceDir string, destFile string) error {
 
 	files, err := os.ReadDir(sourceDir)
 	if err != nil {
-		return "", "", false, err
-	}
-
-	files = langext.ArrFilter(files, func(v os.DirEntry) bool { return v.Name() != path.Base(destFile) })
-	files = langext.ArrFilter(files, func(v os.DirEntry) bool { return strings.HasSuffix(v.Name(), ".go") })
-	files = langext.ArrFilter(files, func(v os.DirEntry) bool { return !strings.HasSuffix(v.Name(), "_gen.go") })
-	langext.SortBy(files, func(v os.DirEntry) string { return v.Name() })
-
-	newChecksumStr := goext.GoextVersion
-	for _, f := range files {
-		content, err := os.ReadFile(path.Join(sourceDir, f.Name()))
-		if err != nil {
-			return "", "", false, err
-		}
-		newChecksumStr += "\n" + f.Name() + "\t" + cryptext.BytesSha256(content)
-	}
-
-	newChecksum := cryptext.BytesSha256([]byte(newChecksumStr))
-
-	if newChecksum != oldChecksum {
-		fmt.Printf("[EnumGenerate] Checksum has changed ( %s -> %s ), will generate new file\n\n", oldChecksum, newChecksum)
-	} else {
-		fmt.Printf("[EnumGenerate] Checksum unchanged ( %s ), nothing to do\n", oldChecksum)
-		return "", oldChecksum, false, nil
+		return err
 	}
 
 	allEnums := make([]EnumDef, 0)
@@ -118,18 +44,17 @@ func _generateEnumSpecs(sourceDir string, destFile string, oldChecksum string, g
 	pkgname := ""
 
 	for _, f := range files {
-		if debugOutput {
-			fmt.Printf("========= %s =========\n\n", f.Name())
+		if !strings.HasSuffix(f.Name(), ".go") {
+			continue
 		}
 
-		fileEnums, pn, err := processEnumFile(sourceDir, path.Join(sourceDir, f.Name()), debugOutput)
+		fmt.Printf("========= %s =========\n\n", f.Name())
+		fileEnums, pn, err := processFile(f.Name())
 		if err != nil {
-			return "", "", false, err
+			return err
 		}
 
-		if debugOutput {
-			fmt.Printf("\n")
-		}
+		fmt.Printf("\n")
 
 		allEnums = append(allEnums, fileEnums...)
 
@@ -139,24 +64,32 @@ func _generateEnumSpecs(sourceDir string, destFile string, oldChecksum string, g
 	}
 
 	if pkgname == "" {
-		return "", "", false, errors.New("no package name found in any file")
+		return errors.New("no package name found in any file")
 	}
 
-	rdata := fmtEnumOutput(newChecksum, allEnums, pkgname)
-
-	if !gofmt {
-		return rdata, newChecksum, true, nil
-	}
-
-	fdata, err := format.Source([]byte(rdata))
+	err = os.WriteFile(destFile, []byte(fmtOutput(allEnums, pkgname)), 0o755)
 	if err != nil {
-		return "", "", false, err
+		return err
 	}
 
-	return string(fdata), newChecksum, true, nil
+	res, err := cmdext.RunCommand("go", []string{"fmt", destFile}, langext.Ptr(2*time.Second))
+	if err != nil {
+		return err
+	}
+
+	if res.CommandTimedOut {
+		fmt.Println(res.StdCombined)
+		return errors.New("go fmt timed out")
+	}
+	if res.ExitCode != 0 {
+		fmt.Println(res.StdCombined)
+		return errors.New("go fmt did not succeed")
+	}
+
+	return nil
 }
 
-func processEnumFile(basedir string, fn string, debugOutput bool) ([]EnumDef, string, error) {
+func processFile(fn string) ([]EnumDef, string, error) {
 	file, err := os.Open(fn)
 	if err != nil {
 		return nil, "", err
@@ -180,62 +113,28 @@ func processEnumFile(basedir string, fn string, debugOutput bool) ([]EnumDef, st
 			break
 		}
 
-		if match, ok := rexEnumPackage.MatchFirst(line); i == 0 && ok {
+		if match, ok := rexPackage.MatchFirst(line); i == 0 && ok {
 			pkgname = match.GroupByName("name").Value()
 			continue
 		}
 
 		if match, ok := rexEnumDef.MatchFirst(line); ok {
-
-			rfp, err := filepath.Rel(basedir, fn)
-			if err != nil {
-				return nil, "", err
-			}
-
 			def := EnumDef{
 				File:         fn,
-				FileRelative: rfp,
 				EnumTypeName: match.GroupByName("name").Value(),
 				Type:         match.GroupByName("type").Value(),
 				Values:       make([]EnumDefVal, 0),
 			}
 			enums = append(enums, def)
-
-			if debugOutput {
-				fmt.Printf("Found enum definition { '%s' -> '%s' }\n", def.EnumTypeName, def.Type)
-			}
+			fmt.Printf("Found enum definition { '%s' -> '%s' }\n", def.EnumTypeName, def.Type)
 		}
 
-		if match, ok := rexEnumValueDef.MatchFirst(line); ok {
+		if match, ok := rexValueDef.MatchFirst(line); ok {
 			typename := match.GroupByName("type").Value()
-
-			comment := match.GroupByNameOrEmpty("comm").ValueOrNil()
-			var descr *string = nil
-			var data *map[string]any = nil
-			if comment != nil {
-				comment = langext.Ptr(strings.TrimSpace(*comment))
-				if strings.HasPrefix(*comment, "{") {
-					if v, ok := tryParseDataComment(*comment); ok {
-						data = &v
-						if anyDataDescr, ok := v["description"]; ok {
-							if dataDescr, ok := anyDataDescr.(string); ok {
-								descr = &dataDescr
-							}
-						}
-					} else {
-						descr = comment
-					}
-				} else {
-					descr = comment
-				}
-			}
-
 			def := EnumDefVal{
 				VarName:     match.GroupByName("name").Value(),
 				Value:       match.GroupByName("value").Value(),
-				RawComment:  comment,
-				Description: descr,
-				Data:        data,
+				Description: match.GroupByNameOrEmpty("descr").ValueOrNil(),
 			}
 
 			found := false
@@ -243,21 +142,16 @@ func processEnumFile(basedir string, fn string, debugOutput bool) ([]EnumDef, st
 				if v.EnumTypeName == typename {
 					enums[i].Values = append(enums[i].Values, def)
 					found = true
-
-					if debugOutput {
-						if def.Description != nil {
-							fmt.Printf("Found enum value [%s] for '%s'  ('%s')\n", def.Value, def.VarName, *def.Description)
-						} else {
-							fmt.Printf("Found enum value [%s] for '%s'\n", def.Value, def.VarName)
-						}
+					if def.Description != nil {
+						fmt.Printf("Found enum value [%s] for '%s'  ('%s')\n", def.Value, def.VarName, *def.Description)
+					} else {
+						fmt.Printf("Found enum value [%s] for '%s'\n", def.Value, def.VarName)
 					}
 					break
 				}
 			}
 			if !found {
-				if debugOutput {
-					fmt.Printf("Found non-enum value [%s] for '%s' ( looks like enum value, but no matching @enum:type )\n", def.Value, def.VarName)
-				}
+				fmt.Printf("Found non-enum value [%s] for '%s' ( looks like enum value, but no matching @enum:type )\n", def.Value, def.VarName)
 			}
 		}
 	}
@@ -265,109 +159,160 @@ func processEnumFile(basedir string, fn string, debugOutput bool) ([]EnumDef, st
 	return enums, pkgname, nil
 }
 
-func tryParseDataComment(s string) (map[string]any, bool) {
+func fmtOutput(enums []EnumDef, pkgname string) string {
+	str := "// Code generated by permissions_gen.sh DO NOT EDIT.\n"
+	str += "\n"
+	str += "package " + pkgname + "\n"
+	str += "\n"
 
-	r := make(map[string]any)
+	str += "import \"gogs.mikescher.com/BlackForestBytes/goext/langext\"" + "\n"
+	str += "\n"
 
-	err := json.Unmarshal([]byte(s), &r)
-	if err != nil {
-		return nil, false
-	}
+	str += "type Enum interface {" + "\n"
+	str += "    Valid() bool" + "\n"
+	str += "    ValuesAny() []any" + "\n"
+	str += "    ValuesMeta() []EnumMetaValue" + "\n"
+	str += "    VarName() string" + "\n"
+	str += "}" + "\n"
+	str += "" + "\n"
 
-	for _, v := range r {
+	str += "type StringEnum interface {" + "\n"
+	str += "    Enum" + "\n"
+	str += "    String() string" + "\n"
+	str += "}" + "\n"
+	str += "" + "\n"
 
-		rv := reflect.ValueOf(v)
+	str += "type DescriptionEnum interface {" + "\n"
+	str += "    Enum" + "\n"
+	str += "    Description() string" + "\n"
+	str += "}" + "\n"
+	str += "\n"
 
-		if rv.Kind() == reflect.Ptr && rv.IsNil() {
-			continue
-		}
-		if rv.Kind() == reflect.Bool {
-			continue
-		}
-		if rv.Kind() == reflect.String {
-			continue
-		}
-		if rv.Kind() == reflect.Int64 {
-			continue
-		}
-		if rv.Kind() == reflect.Float64 {
-			continue
+	str += "type EnumMetaValue struct {" + "\n"
+	str += "    VarName     string  `json:\"varName\"`" + "\n"
+	str += "    Value       any     `json:\"value\"`" + "\n"
+	str += "    Description *string `json:\"description\"`" + "\n"
+	str += "}" + "\n"
+	str += "\n"
+
+	for _, enumdef := range enums {
+
+		hasDescr := langext.ArrAll(enumdef.Values, func(val EnumDefVal) bool { return val.Description != nil })
+		hasStr := enumdef.Type == "string"
+
+		str += "// ================================ " + enumdef.EnumTypeName + " ================================" + "\n"
+		str += "//" + "\n"
+		str += "// File:       " + enumdef.File + "\n"
+		str += "// StringEnum: " + langext.Conditional(hasStr, "true", "false") + "\n"
+		str += "// DescrEnum:  " + langext.Conditional(hasDescr, "true", "false") + "\n"
+		str += "//" + "\n"
+		str += "" + "\n"
+
+		str += "var __" + enumdef.EnumTypeName + "Values = []" + enumdef.EnumTypeName + "{" + "\n"
+		for _, v := range enumdef.Values {
+			str += "    " + v.VarName + "," + "\n"
 		}
+		str += "}" + "\n"
+		str += "" + "\n"
 
-		return nil, false
-	}
-
-	return r, true
-}
-
-func fmtEnumOutput(cs string, enums []EnumDef, pkgname string) string {
-
-	templ := template.New("enum-generate")
-
-	templ = templ.Funcs(template.FuncMap{
-		"boolToStr": func(b bool) string { return langext.Conditional(b, "true", "false") },
-		"deref":     func(v *string) string { return *v },
-		"trimSpace": func(str string) string { return strings.TrimSpace(str) },
-		"hasStr":    func(v EnumDef) bool { return v.Type == "string" },
-		"hasDescr": func(v EnumDef) bool {
-			return langext.ArrAll(v.Values, func(val EnumDefVal) bool { return val.Description != nil })
-		},
-		"hasData": func(v EnumDef) bool {
-			return len(v.Values) > 0 && langext.ArrAll(v.Values, func(val EnumDefVal) bool { return val.Data != nil })
-		},
-		"gostr": func(v any) string {
-			return fmt.Sprintf("%#+v", v)
-		},
-		"goobj": func(name string, v any) string {
-			return fmt.Sprintf("%#+v", v)
-		},
-		"godatakey": func(v string) string {
-			return strings.ToUpper(v[0:1]) + v[1:]
-		},
-		"godatavalue": func(v any) string {
-			return fmt.Sprintf("%#+v", v)
-		},
-		"godatatype": func(v any) string {
-			return fmt.Sprintf("%T", v)
-		},
-		"mapindex": func(v map[string]any, k string) any {
-			return v[k]
-		},
-		"generalDataKeys": func(v EnumDef) map[string]string {
-			r0 := make(map[string]int)
-
-			for _, eval := range v.Values {
-				for k := range *eval.Data {
-					if ctr, ok := r0[k]; ok {
-						r0[k] = ctr + 1
-					} else {
-						r0[k] = 1
-					}
-				}
+		if hasDescr {
+			str += "var __" + enumdef.EnumTypeName + "Descriptions = map[" + enumdef.EnumTypeName + "]string{" + "\n"
+			for _, v := range enumdef.Values {
+				str += "    " + v.VarName + ": \"" + strings.TrimSpace(*v.Description) + "\"," + "\n"
 			}
+			str += "}" + "\n"
+			str += "" + "\n"
+		}
 
-			r1 := langext.MapToArr(r0)
-			r2 := langext.ArrFilter(r1, func(p langext.MapEntry[string, int]) bool { return p.Value == len(v.Values) })
-			r3 := langext.ArrMap(r2, func(p langext.MapEntry[string, int]) string { return p.Key })
-			r4 := langext.ArrToKVMap(r3, func(p string) string { return p }, func(p string) string { return fmt.Sprintf("%T", (*v.Values[0].Data)[p]) })
+		str += "var __" + enumdef.EnumTypeName + "Varnames = map[" + enumdef.EnumTypeName + "]string{" + "\n"
+		for _, v := range enumdef.Values {
+			str += "    " + v.VarName + ": \"" + v.VarName + "\"," + "\n"
+		}
+		str += "}" + "\n"
+		str += "" + "\n"
 
-			return r4
-		},
-	})
+		str += "func (e " + enumdef.EnumTypeName + ") Valid() bool {" + "\n"
+		str += "    return langext.InArray(e, __" + enumdef.EnumTypeName + "Values)" + "\n"
+		str += "}" + "\n"
+		str += "" + "\n"
 
-	templ = template.Must(templ.Parse(templateEnumGenerateText))
+		str += "func (e " + enumdef.EnumTypeName + ") Values() []" + enumdef.EnumTypeName + " {" + "\n"
+		str += "    return __" + enumdef.EnumTypeName + "Values" + "\n"
+		str += "}" + "\n"
+		str += "" + "\n"
 
-	buffer := bytes.Buffer{}
+		str += "func (e " + enumdef.EnumTypeName + ") ValuesAny() []any {" + "\n"
+		str += "    return langext.ArrCastToAny(__" + enumdef.EnumTypeName + "Values)" + "\n"
+		str += "}" + "\n"
+		str += "" + "\n"
+
+		str += "func (e " + enumdef.EnumTypeName + ") ValuesMeta() []EnumMetaValue {" + "\n"
+		str += "    return []EnumMetaValue{" + "\n"
+		for _, v := range enumdef.Values {
+			if hasDescr {
+				str += "        " + fmt.Sprintf("EnumMetaValue{VarName: \"%s\", Value: %s, Description: langext.Ptr(\"%s\")},", v.VarName, v.VarName, strings.TrimSpace(*v.Description)) + "\n"
+			} else {
+				str += "        " + fmt.Sprintf("EnumMetaValue{VarName: \"%s\", Value: %s, Description: nil},", v.VarName, v.VarName) + "\n"
+			}
+		}
+		str += "    }" + "\n"
+		str += "}" + "\n"
+		str += "" + "\n"
+
+		if hasStr {
+			str += "func (e " + enumdef.EnumTypeName + ") String() string {" + "\n"
+			str += "    return string(e)" + "\n"
+			str += "}" + "\n"
+			str += "" + "\n"
+		}
+
+		if hasDescr {
+			str += "func (e " + enumdef.EnumTypeName + ") Description() string {" + "\n"
+			str += "    if d, ok := __" + enumdef.EnumTypeName + "Descriptions[e]; ok {" + "\n"
+			str += "        return d" + "\n"
+			str += "    }" + "\n"
+			str += "    return \"\"" + "\n"
+			str += "}" + "\n"
+			str += "" + "\n"
+		}
+
+		str += "func (e " + enumdef.EnumTypeName + ") VarName() string {" + "\n"
+		str += "    if d, ok := __" + enumdef.EnumTypeName + "Varnames[e]; ok {" + "\n"
+		str += "        return d" + "\n"
+		str += "    }" + "\n"
+		str += "    return \"\"" + "\n"
+		str += "}" + "\n"
+		str += "" + "\n"
+
+		str += "func Parse" + enumdef.EnumTypeName + "(vv string) (" + enumdef.EnumTypeName + ", bool) {" + "\n"
+		str += "    for _, ev := range __" + enumdef.EnumTypeName + "Values {" + "\n"
+		str += "        if string(ev) == vv {" + "\n"
+		str += "            return ev, true" + "\n"
+		str += "        }" + "\n"
+		str += "    }" + "\n"
+		str += "    return \"\", false" + "\n"
+		str += "}" + "\n"
+		str += "" + "\n"
+
+		str += "func " + enumdef.EnumTypeName + "Values() []" + enumdef.EnumTypeName + " {" + "\n"
+		str += "    return __" + enumdef.EnumTypeName + "Values" + "\n"
+		str += "}" + "\n"
+		str += "" + "\n"
+
+		str += "func " + enumdef.EnumTypeName + "ValuesMeta() []EnumMetaValue {" + "\n"
+		str += "    return []EnumMetaValue{" + "\n"
+		for _, v := range enumdef.Values {
+			if hasDescr {
+				str += "        " + fmt.Sprintf("EnumMetaValue{VarName: \"%s\", Value: %s, Description: langext.Ptr(\"%s\")},", v.VarName, v.VarName, strings.TrimSpace(*v.Description)) + "\n"
+			} else {
+				str += "        " + fmt.Sprintf("EnumMetaValue{VarName: \"%s\", Value: %s, Description: nil},", v.VarName, v.VarName) + "\n"
+			}
+		}
+		str += "    }" + "\n"
+		str += "}" + "\n"
+		str += "" + "\n"
 
-	err := templ.Execute(&buffer, langext.H{
-		"PkgName":      pkgname,
-		"Checksum":     cs,
-		"GoextVersion": goext.GoextVersion,
-		"Enums":        enums,
-	})
-	if err != nil {
-		panic(err)
 	}
 
-	return buffer.String()
+	return str
 }

bfcodegen/enum-generate.template

@@ -1,177 +0,0 @@
-// Code generated by enum-generate.go DO NOT EDIT.
-
-package {{.PkgName}}
-
-import "git.blackforestbytes.com/BlackForestBytes/goext/langext"
-import "git.blackforestbytes.com/BlackForestBytes/goext/enums"
-
-const ChecksumEnumGenerator = "{{.Checksum}}" // GoExtVersion: {{.GoextVersion}}
-
-{{ $pkgname  := .PkgName }}
-
-{{range .Enums}}
-
-{{ $hasStr   := ( . | hasStr   ) }}
-{{ $hasDescr := ( . | hasDescr ) }}
-{{ $hasData  := ( . | hasData  ) }}
-
-// ================================ {{.EnumTypeName}} ================================
-//
-// File:       {{.FileRelative}}
-// StringEnum: {{$hasStr   | boolToStr}}
-// DescrEnum:  {{$hasDescr | boolToStr}}
-// DataEnum:   {{$hasData  | boolToStr}}
-//
-
-{{ $typename := .EnumTypeName }}
-{{ $enumdef  := . }}
-
-var __{{.EnumTypeName}}Values = []{{.EnumTypeName}}{ {{range .Values}}
-	{{.VarName}}, {{end}}
-}
-
-{{if $hasDescr}}
-var __{{.EnumTypeName}}Descriptions = map[{{.EnumTypeName}}]string{ {{range .Values}}
-	{{.VarName}}: {{.Description | deref | trimSpace | gostr}}, {{end}}
-}
-{{end}}
-
-{{if $hasData}}
-type {{ .EnumTypeName }}Data struct { {{ range $datakey, $datatype := ($enumdef | generalDataKeys)  }}
-    {{ $datakey | godatakey }} {{ $datatype }} `json:"{{ $datakey }}"` {{ end }}
-}
-
-var __{{.EnumTypeName}}Data = map[{{.EnumTypeName}}]{{.EnumTypeName}}Data{ {{range .Values}} {{ $enumvalue := . }}
-	{{.VarName}}: {{ $typename }}Data{ {{ range $datakey, $datatype := $enumdef | generalDataKeys  }}
-	    {{ $datakey | godatakey }}: {{ (mapindex $enumvalue.Data $datakey) | godatavalue }}, {{ end }}
-	}, {{end}}
-}
-{{end}}
-
-var __{{.EnumTypeName}}Varnames = map[{{.EnumTypeName}}]string{ {{range .Values}}
-	{{.VarName}}: "{{.VarName}}", {{end}}
-}
-
-func (e {{.EnumTypeName}}) Valid() bool {
-	return langext.InArray(e, __{{.EnumTypeName}}Values)
-}
-
-func (e {{.EnumTypeName}}) Values() []{{.EnumTypeName}} {
-	return __{{.EnumTypeName}}Values
-}
-
-func (e {{.EnumTypeName}}) ValuesAny() []any {
-	return langext.ArrCastToAny(__{{.EnumTypeName}}Values)
-}
-
-func (e {{.EnumTypeName}}) ValuesMeta() []enums.EnumMetaValue {
-	return {{.EnumTypeName}}ValuesMeta()
-}
-
-{{if $hasStr}}
-func (e {{.EnumTypeName}}) String() string {
-	return string(e)
-}
-{{end}}
-
-{{if $hasDescr}}
-func (e {{.EnumTypeName}}) Description() string {
-	if d, ok := __{{.EnumTypeName}}Descriptions[e]; ok {
-		return d
-	}
-	return ""
-}
-{{end}}
-
-{{if $hasData}}
-func (e {{.EnumTypeName}}) Data() {{.EnumTypeName}}Data {
-	if d, ok := __{{.EnumTypeName}}Data[e]; ok {
-		return d
-	}
-	return {{.EnumTypeName}}Data{}
-}
-{{end}}
-
-func (e {{.EnumTypeName}}) VarName() string {
-	if d, ok := __{{.EnumTypeName}}Varnames[e]; ok {
-		return d
-	}
-	return ""
-}
-
-func (e {{.EnumTypeName}}) TypeName() string {
-	return "{{$typename}}"
-}
-
-func (e {{.EnumTypeName}}) PackageName() string {
-	return "{{$pkgname }}"
-}
-
-func (e {{.EnumTypeName}}) Meta() enums.EnumMetaValue {
-    {{if $hasDescr}} return enums.EnumMetaValue{VarName: e.VarName(), Value: e, Description: langext.Ptr(e.Description())} {{else}} return enums.EnumMetaValue{VarName: e.VarName(), Value: e, Description: nil} {{end}}
-}
-
-{{if $hasDescr}}
-func (e {{.EnumTypeName}}) DescriptionMeta() enums.EnumDescriptionMetaValue {
-    return enums.EnumDescriptionMetaValue{VarName: e.VarName(), Value: e, Description: e.Description()}
-}
-{{end}}
-
-{{if $hasData}}
-func (e {{.EnumTypeName}}) DataMeta() enums.EnumDataMetaValue {
-    return enums.EnumDataMetaValue{
-        VarName: e.VarName(),
-        Value: e,
-        {{if $hasDescr}} Description: langext.Ptr(e.Description()), {{else}} Description: nil, {{end}}
-        Data: map[string]any{
-            {{ range $datakey, $datatype := $enumdef | generalDataKeys  }} "{{ $datakey }}": e.Data().{{ $datakey | godatakey }},
-            {{ end }}
-        },
-    }
-}
-{{end}}
-
-func Parse{{.EnumTypeName}}(vv string) ({{.EnumTypeName}}, bool) {
-	for _, ev := range __{{.EnumTypeName}}Values {
-		if string(ev) == vv {
-			return ev, true
-		}
-	}
-	return "", false
-}
-
-func {{.EnumTypeName}}Values() []{{.EnumTypeName}} {
-	return __{{.EnumTypeName}}Values
-}
-
-func {{.EnumTypeName}}ValuesMeta() []enums.EnumMetaValue {
-	return []enums.EnumMetaValue{ {{range .Values}}
-            {{.VarName}}.Meta(), {{end}}
-	}
-}
-
-{{if $hasData}}
-func {{.EnumTypeName}}ValuesDataMeta() []enums.EnumDataMetaValue {
-	return []enums.EnumDataMetaValue{ {{range .Values}}
-            {{.VarName}}.DataMeta(), {{end}}
-	}
-}
-{{end}}
-
-{{if $hasDescr}}
-func {{.EnumTypeName}}ValuesDescriptionMeta() []enums.EnumDescriptionMetaValue {
-	return []enums.EnumDescriptionMetaValue{ {{range .Values}}
-            {{.VarName}}.DescriptionMeta(), {{end}}
-	}
-}
-{{end}}
-
-{{end}}
-
-// ================================ ================= ================================
-
-func AllPackageEnums() []enums.Enum {
-    return []enums.Enum{ {{range .Enums}}
-        {{ if gt (len .Values) 0 }} {{  $v := index .Values 0 }} {{ $v.VarName}}, {{end}} // {{ .EnumTypeName }} {{end}}
-    }
-}

bfcodegen/enum-generate_test.go

@@ -1,91 +0,0 @@
-package bfcodegen
-
-import (
-	_ "embed"
-	"fmt"
-	"git.blackforestbytes.com/BlackForestBytes/goext/cmdext"
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
-	"git.blackforestbytes.com/BlackForestBytes/goext/tst"
-	"os"
-	"path/filepath"
-	"testing"
-	"time"
-)
-
-//go:embed _test_example_1.tgz
-var EnumExampleModels1 []byte
-
-//go:embed _test_example_2.tgz
-var EnumExampleModels2 []byte
-
-func TestGenerateEnumSpecs(t *testing.T) {
-
-	tmpFile := filepath.Join(t.TempDir(), langext.MustHexUUID()+".tgz")
-
-	tmpDir := filepath.Join(t.TempDir(), langext.MustHexUUID())
-
-	err := os.WriteFile(tmpFile, EnumExampleModels1, 0o777)
-	tst.AssertNoErr(t, err)
-
-	t.Cleanup(func() { _ = os.Remove(tmpFile) })
-
-	err = os.Mkdir(tmpDir, 0o777)
-	tst.AssertNoErr(t, err)
-
-	t.Cleanup(func() { _ = os.RemoveAll(tmpFile) })
-
-	_, err = cmdext.Runner("tar").Arg("-xvzf").Arg(tmpFile).Arg("-C").Arg(tmpDir).FailOnExitCode().FailOnTimeout().Timeout(time.Minute).Run()
-	tst.AssertNoErr(t, err)
-
-	s1, cs1, _, err := _generateEnumSpecs(tmpDir, "", "N/A", true, true)
-	tst.AssertNoErr(t, err)
-
-	s2, cs2, _, err := _generateEnumSpecs(tmpDir, "", "N/A", true, true)
-	tst.AssertNoErr(t, err)
-
-	tst.AssertEqual(t, cs1, cs2)
-	tst.AssertEqual(t, s1, s2)
-
-	fmt.Println()
-	fmt.Println()
-	fmt.Println()
-	fmt.Println("=====================================================================================================")
-	fmt.Println(s1)
-	fmt.Println("=====================================================================================================")
-	fmt.Println()
-	fmt.Println()
-	fmt.Println()
-}
-
-func TestGenerateEnumSpecsData(t *testing.T) {
-
-	tmpFile := filepath.Join(t.TempDir(), langext.MustHexUUID()+".tgz")
-
-	tmpDir := filepath.Join(t.TempDir(), langext.MustHexUUID())
-
-	err := os.WriteFile(tmpFile, EnumExampleModels2, 0o777)
-	tst.AssertNoErr(t, err)
-
-	t.Cleanup(func() { _ = os.Remove(tmpFile) })
-
-	err = os.Mkdir(tmpDir, 0o777)
-	tst.AssertNoErr(t, err)
-
-	t.Cleanup(func() { _ = os.RemoveAll(tmpFile) })
-
-	_, err = cmdext.Runner("tar").Arg("-xvzf").Arg(tmpFile).Arg("-C").Arg(tmpDir).FailOnExitCode().FailOnTimeout().Timeout(time.Minute).Run()
-	tst.AssertNoErr(t, err)
-
-	s1, _, _, err := _generateEnumSpecs(tmpDir, "", "", true, true)
-	tst.AssertNoErr(t, err)
-
-	fmt.Println()
-	fmt.Println()
-	fmt.Println()
-	fmt.Println("=====================================================================================================")
-	fmt.Println(s1)
-	fmt.Println("=====================================================================================================")
-	fmt.Println()
-	fmt.Println()
-	fmt.Println()
-}

bfcodegen/id-generate.go

@@ -1,198 +0,0 @@
-package bfcodegen
-
-import (
-	"bytes"
-	_ "embed"
-	"errors"
-	"fmt"
-	"go/format"
-	"git.blackforestbytes.com/BlackForestBytes/goext"
-	"git.blackforestbytes.com/BlackForestBytes/goext/cryptext"
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
-	"git.blackforestbytes.com/BlackForestBytes/goext/rext"
-	"io"
-	"os"
-	"path"
-	"path/filepath"
-	"regexp"
-	"strings"
-	"text/template"
-)
-
-type IDDef struct {
-	File         string
-	FileRelative string
-	Name         string
-}
-
-type IDGenOptions struct {
-	DebugOutput *bool
-}
-
-var rexIDPackage = rext.W(regexp.MustCompile(`^package\s+(?P<name>[A-Za-z0-9_]+)\s*$`))
-
-var rexIDDef = rext.W(regexp.MustCompile(`^\s*type\s+(?P<name>[A-Za-z0-9_]+)\s+string\s*//\s*(@id:type).*$`))
-
-var rexIDChecksumConst = rext.W(regexp.MustCompile(`const ChecksumIDGenerator = "(?P<cs>[A-Za-z0-9_]*)"`))
-
-//go:embed id-generate.template
-var templateIDGenerateText string
-
-func GenerateIDSpecs(sourceDir string, destFile string, opt IDGenOptions) error {
-
-	debugOutput := langext.Coalesce(opt.DebugOutput, false)
-
-	files, err := os.ReadDir(sourceDir)
-	if err != nil {
-		return err
-	}
-
-	oldChecksum := "N/A"
-	if _, err := os.Stat(destFile); !os.IsNotExist(err) {
-		content, err := os.ReadFile(destFile)
-		if err != nil {
-			return err
-		}
-		if m, ok := rexIDChecksumConst.MatchFirst(string(content)); ok {
-			oldChecksum = m.GroupByName("cs").Value()
-		}
-	}
-
-	files = langext.ArrFilter(files, func(v os.DirEntry) bool { return v.Name() != path.Base(destFile) })
-	files = langext.ArrFilter(files, func(v os.DirEntry) bool { return strings.HasSuffix(v.Name(), ".go") })
-	files = langext.ArrFilter(files, func(v os.DirEntry) bool { return !strings.HasSuffix(v.Name(), "_gen.go") })
-	langext.SortBy(files, func(v os.DirEntry) string { return v.Name() })
-
-	newChecksumStr := goext.GoextVersion
-	for _, f := range files {
-		content, err := os.ReadFile(path.Join(sourceDir, f.Name()))
-		if err != nil {
-			return err
-		}
-		newChecksumStr += "\n" + f.Name() + "\t" + cryptext.BytesSha256(content)
-	}
-
-	newChecksum := cryptext.BytesSha256([]byte(newChecksumStr))
-
-	if newChecksum != oldChecksum {
-		fmt.Printf("[IDGenerate] Checksum has changed ( %s -> %s ), will generate new file\n\n", oldChecksum, newChecksum)
-	} else {
-		fmt.Printf("[IDGenerate] Checksum unchanged ( %s ), nothing to do\n", oldChecksum)
-		return nil
-	}
-
-	allIDs := make([]IDDef, 0)
-
-	pkgname := ""
-
-	for _, f := range files {
-		if debugOutput {
-			fmt.Printf("========= %s =========\n\n", f.Name())
-		}
-
-		fileIDs, pn, err := processIDFile(sourceDir, path.Join(sourceDir, f.Name()), debugOutput)
-		if err != nil {
-			return err
-		}
-
-		if debugOutput {
-			fmt.Printf("\n")
-		}
-
-		allIDs = append(allIDs, fileIDs...)
-
-		if pn != "" {
-			pkgname = pn
-		}
-	}
-
-	if pkgname == "" {
-		return errors.New("no package name found in any file")
-	}
-
-	fdata, err := format.Source([]byte(fmtIDOutput(newChecksum, allIDs, pkgname)))
-	if err != nil {
-		return err
-	}
-
-	err = os.WriteFile(destFile, fdata, 0o755)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func processIDFile(basedir string, fn string, debugOutput bool) ([]IDDef, string, error) {
-	file, err := os.Open(fn)
-	if err != nil {
-		return nil, "", err
-	}
-
-	defer func() { _ = file.Close() }()
-
-	bin, err := io.ReadAll(file)
-	if err != nil {
-		return nil, "", err
-	}
-
-	lines := strings.Split(string(bin), "\n")
-
-	ids := make([]IDDef, 0)
-
-	pkgname := ""
-
-	for i, line := range lines {
-		if i == 0 && strings.HasPrefix(line, "// Code generated by") {
-			break
-		}
-
-		if match, ok := rexIDPackage.MatchFirst(line); i == 0 && ok {
-			pkgname = match.GroupByName("name").Value()
-			continue
-		}
-
-		if match, ok := rexIDDef.MatchFirst(line); ok {
-
-			rfp, err := filepath.Rel(basedir, fn)
-			if err != nil {
-				return nil, "", err
-			}
-
-			def := IDDef{
-				File:         fn,
-				FileRelative: rfp,
-				Name:         match.GroupByName("name").Value(),
-			}
-
-			if debugOutput {
-				fmt.Printf("Found ID definition { '%s' }\n", def.Name)
-			}
-
-			ids = append(ids, def)
-		}
-	}
-
-	return ids, pkgname, nil
-}
-
-func fmtIDOutput(cs string, ids []IDDef, pkgname string) string {
-	templ := template.Must(template.New("id-generate").Parse(templateIDGenerateText))
-
-	buffer := bytes.Buffer{}
-
-	anyDef := langext.ArrFirstOrNil(ids, func(def IDDef) bool { return def.Name == "AnyID" || def.Name == "AnyId" })
-
-	err := templ.Execute(&buffer, langext.H{
-		"PkgName":      pkgname,
-		"Checksum":     cs,
-		"GoextVersion": goext.GoextVersion,
-		"IDs":          ids,
-		"AnyDef":       anyDef,
-	})
-	if err != nil {
-		panic(err)
-	}
-
-	return buffer.String()
-}

bfcodegen/id-generate.template

@@ -1,56 +0,0 @@
-// Code generated by id-generate.go DO NOT EDIT.
-
-package {{.PkgName}}
-
-import "go.mongodb.org/mongo-driver/bson"
-import "go.mongodb.org/mongo-driver/bson/bsontype"
-import "go.mongodb.org/mongo-driver/bson/primitive"
-import "git.blackforestbytes.com/BlackForestBytes/goext/exerr"
-
-const ChecksumIDGenerator = "{{.Checksum}}" // GoExtVersion: {{.GoextVersion}}
-
-{{range .IDs}}
-
-// ================================ {{.Name}} ({{.FileRelative}}) ================================
-
-func (i {{.Name}}) MarshalBSONValue() (bsontype.Type, []byte, error) {
-	if objId, err := primitive.ObjectIDFromHex(string(i)); err == nil {
-		return bson.MarshalValue(objId)
-	} else {
-		return 0, nil, exerr.New(exerr.TypeMarshalEntityID, "Failed to marshal {{.Name}}("+i.String()+") to ObjectId").Str("value", string(i)).Type("type", i).Build()
-	}
-}
-
-func (i {{.Name}}) String() string {
-	return string(i)
-}
-
-func (i {{.Name}}) ObjID() (primitive.ObjectID, error) {
-	return primitive.ObjectIDFromHex(string(i))
-}
-
-func (i {{.Name}}) Valid() bool {
-	_, err := primitive.ObjectIDFromHex(string(i))
-	return err == nil
-}
-
-{{if ne $.AnyDef nil}}
-func (i {{.Name}}) AsAny() {{$.AnyDef.Name}} {
-	return {{$.AnyDef.Name}}(i)
-}
-
-func (i {{.Name}}) AsAnyPtr() *{{$.AnyDef.Name}} {
-    v := {{$.AnyDef.Name}}(i)
-	return &v
-}
-{{end}}
-
-func (i {{.Name}}) IsZero() bool {
-	return i == ""
-}
-
-func New{{.Name}}() {{.Name}} {
-	return {{.Name}}(primitive.NewObjectID().Hex())
-}
-
-{{end}}

bfcodegen/id-generate_test.go

@@ -1,52 +0,0 @@
-package bfcodegen
-
-import (
-	_ "embed"
-	"fmt"
-	"git.blackforestbytes.com/BlackForestBytes/goext/cmdext"
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
-	"git.blackforestbytes.com/BlackForestBytes/goext/tst"
-	"os"
-	"path/filepath"
-	"testing"
-	"time"
-)
-
-//go:embed _test_example_1.tgz
-var IDExampleModels1 []byte
-
-func TestGenerateIDSpecs(t *testing.T) {
-
-	tmpFile := filepath.Join(t.TempDir(), langext.MustHexUUID()+".tgz")
-
-	tmpDir := filepath.Join(t.TempDir(), langext.MustHexUUID())
-
-	err := os.WriteFile(tmpFile, IDExampleModels1, 0o777)
-	tst.AssertNoErr(t, err)
-
-	t.Cleanup(func() { _ = os.Remove(tmpFile) })
-
-	err = os.Mkdir(tmpDir, 0o777)
-	tst.AssertNoErr(t, err)
-
-	t.Cleanup(func() { _ = os.RemoveAll(tmpFile) })
-
-	_, err = cmdext.Runner("tar").Arg("-xvzf").Arg(tmpFile).Arg("-C").Arg(tmpDir).FailOnExitCode().FailOnTimeout().Timeout(time.Minute).Run()
-	tst.AssertNoErr(t, err)
-
-	err = GenerateIDSpecs(tmpDir, tmpDir+"/id_gen.go", IDGenOptions{DebugOutput: langext.PTrue})
-	tst.AssertNoErr(t, err)
-
-	err = GenerateIDSpecs(tmpDir, tmpDir+"/id_gen.go", IDGenOptions{DebugOutput: langext.PTrue})
-	tst.AssertNoErr(t, err)
-
-	fmt.Println()
-	fmt.Println()
-	fmt.Println()
-	fmt.Println("=====================================================================================================")
-	fmt.Println(string(tst.Must(os.ReadFile(tmpDir + "/id_gen.go"))(t)))
-	fmt.Println("=====================================================================================================")
-	fmt.Println()
-	fmt.Println()
-	fmt.Println()
-}

cmdext/builder.go

@@ -2,7 +2,7 @@ package cmdext
 
 import (
 	"fmt"
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
+	"gogs.mikescher.com/BlackForestBytes/goext/langext"
 	"time"
 )
 
@@ -14,7 +14,6 @@ type CommandRunner struct {
 	listener         []CommandListener
 	enforceExitCodes *[]int
 	enforceNoTimeout bool
-	enforceNoStderr  bool
 }
 
 func Runner(program string) *CommandRunner {
@@ -26,7 +25,6 @@ func Runner(program string) *CommandRunner {
 		listener:         make([]CommandListener, 0),
 		enforceExitCodes: nil,
 		enforceNoTimeout: false,
-		enforceNoStderr:  false,
 	}
 }
 
@@ -75,11 +73,6 @@ func (r *CommandRunner) FailOnTimeout() *CommandRunner {
 	return r
 }
 
-func (r *CommandRunner) FailOnStderr() *CommandRunner {
-	r.enforceNoStderr = true
-	return r
-}
-
 func (r *CommandRunner) Listen(lstr CommandListener) *CommandRunner {
 	r.listener = append(r.listener, lstr)
 	return r

cmdext/cmdrunner.go

@@ -2,16 +2,15 @@ package cmdext
 
 import (
 	"errors"
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
-	"git.blackforestbytes.com/BlackForestBytes/goext/mathext"
-	"git.blackforestbytes.com/BlackForestBytes/goext/syncext"
+	"gogs.mikescher.com/BlackForestBytes/goext/langext"
+	"gogs.mikescher.com/BlackForestBytes/goext/mathext"
+	"gogs.mikescher.com/BlackForestBytes/goext/syncext"
 	"os/exec"
 	"time"
 )
 
 var ErrExitCode = errors.New("process exited with an unexpected exitcode")
 var ErrTimeout = errors.New("process did not exit after the specified timeout")
-var ErrStderrPrint = errors.New("process did print to stderr stream")
 
 type CommandResult struct {
 	StdOut          string
@@ -54,27 +53,12 @@ func run(opt CommandRunner) (CommandResult, error) {
 		err         error
 	}
 
-	stderrFailChan := make(chan bool)
-
 	outputChan := make(chan resultObj)
 	go func() {
 		// we need to first fully read the pipes and then call Wait
 		// see https://pkg.go.dev/os/exec#Cmd.StdoutPipe
 
-		listener := make([]CommandListener, 0)
-		listener = append(listener, opt.listener...)
-
-		if opt.enforceNoStderr {
-			listener = append(listener, genericCommandListener{
-				_readRawStderr: langext.Ptr(func(v []byte) {
-					if len(v) > 0 {
-						stderrFailChan <- true
-					}
-				}),
-			})
-		}
-
-		stdout, stderr, stdcombined, err := preader.Read(listener)
+		stdout, stderr, stdcombined, err := preader.Read(opt.listener)
 		if err != nil {
 			outputChan <- resultObj{stdout, stderr, stdcombined, err}
 			_ = cmd.Process.Kill()
@@ -131,34 +115,8 @@ func run(opt CommandRunner) (CommandResult, error) {
 			return res, nil
 		}
 
-	case <-stderrFailChan:
-		_ = cmd.Process.Kill()
-
-		if fallback, ok := syncext.ReadChannelWithTimeout(outputChan, 32*time.Millisecond); ok {
-			// most of the time the cmd.Process.Kill() should also have finished the pipereader
-			// and we can at least return the already collected stdout, stderr, etc
-			res := CommandResult{
-				StdOut:          fallback.stdout,
-				StdErr:          fallback.stderr,
-				StdCombined:     fallback.stdcombined,
-				ExitCode:        -1,
-				CommandTimedOut: false,
-			}
-			return res, ErrStderrPrint
-		} else {
-			res := CommandResult{
-				StdOut:          "",
-				StdErr:          "",
-				StdCombined:     "",
-				ExitCode:        -1,
-				CommandTimedOut: false,
-			}
-			return res, ErrStderrPrint
-		}
-
 	case outobj := <-outputChan:
-		var exiterr *exec.ExitError
-		if errors.As(outobj.err, &exiterr) {
+		if exiterr, ok := outobj.err.(*exec.ExitError); ok {
 			excode := exiterr.ExitCode()
 			for _, lstr := range opt.listener {
 				lstr.Finished(excode)

cmdext/cmdrunner_test.go

@@ -1,7 +1,6 @@
 package cmdext
 
 import (
-	"errors"
 	"fmt"
 	"testing"
 	"time"
@@ -33,7 +32,7 @@ func TestStdout(t *testing.T) {
 
 func TestStderr(t *testing.T) {
 
-	res1, err := Runner("python3").Arg("-c").Arg("import sys; print(\"error\", file=sys.stderr, end='')").Run()
+	res1, err := Runner("python").Arg("-c").Arg("import sys; print(\"error\", file=sys.stderr, end='')").Run()
 	if err != nil {
 		t.Errorf("%v", err)
 	}
@@ -56,7 +55,7 @@ func TestStderr(t *testing.T) {
 }
 
 func TestStdcombined(t *testing.T) {
-	res1, err := Runner("python3").
+	res1, err := Runner("python").
 		Arg("-c").
 		Arg("import sys; import time; print(\"1\", file=sys.stderr, flush=True); time.sleep(0.1); print(\"2\", file=sys.stdout, flush=True); time.sleep(0.1); print(\"3\", file=sys.stderr, flush=True)").
 		Run()
@@ -82,7 +81,7 @@ func TestStdcombined(t *testing.T) {
 }
 
 func TestPartialRead(t *testing.T) {
-	res1, err := Runner("python3").
+	res1, err := Runner("python").
 		Arg("-c").
 		Arg("import sys; import time; print(\"first message\", flush=True); time.sleep(5); print(\"cant see me\", flush=True);").
 		Timeout(100 * time.Millisecond).
@@ -106,7 +105,7 @@ func TestPartialRead(t *testing.T) {
 }
 
 func TestPartialReadStderr(t *testing.T) {
-	res1, err := Runner("python3").
+	res1, err := Runner("python").
 		Arg("-c").
 		Arg("import sys; import time; print(\"first message\", file=sys.stderr, flush=True); time.sleep(5); print(\"cant see me\", file=sys.stderr, flush=True);").
 		Timeout(100 * time.Millisecond).
@@ -131,7 +130,7 @@ func TestPartialReadStderr(t *testing.T) {
 
 func TestReadUnflushedStdout(t *testing.T) {
 
-	res1, err := Runner("python3").Arg("-c").Arg("import sys; print(\"message101\", file=sys.stdout, end='')").Run()
+	res1, err := Runner("python").Arg("-c").Arg("import sys; print(\"message101\", file=sys.stdout, end='')").Run()
 	if err != nil {
 		t.Errorf("%v", err)
 	}
@@ -155,7 +154,7 @@ func TestReadUnflushedStdout(t *testing.T) {
 
 func TestReadUnflushedStderr(t *testing.T) {
 
-	res1, err := Runner("python3").Arg("-c").Arg("import sys; print(\"message101\", file=sys.stderr, end='')").Run()
+	res1, err := Runner("python").Arg("-c").Arg("import sys; print(\"message101\", file=sys.stderr, end='')").Run()
 	if err != nil {
 		t.Errorf("%v", err)
 	}
@@ -180,7 +179,7 @@ func TestReadUnflushedStderr(t *testing.T) {
 func TestPartialReadUnflushed(t *testing.T) {
 	t.SkipNow()
 
-	res1, err := Runner("python3").
+	res1, err := Runner("python").
 		Arg("-c").
 		Arg("import sys; import time; print(\"first message\", end=''); time.sleep(5); print(\"cant see me\", end='');").
 		Timeout(100 * time.Millisecond).
@@ -206,7 +205,7 @@ func TestPartialReadUnflushed(t *testing.T) {
 func TestPartialReadUnflushedStderr(t *testing.T) {
 	t.SkipNow()
 
-	res1, err := Runner("python3").
+	res1, err := Runner("python").
 		Arg("-c").
 		Arg("import sys; import time; print(\"first message\", file=sys.stderr, end=''); time.sleep(5); print(\"cant see me\", file=sys.stderr, end='');").
 		Timeout(100 * time.Millisecond).
@@ -231,7 +230,7 @@ func TestPartialReadUnflushedStderr(t *testing.T) {
 
 func TestListener(t *testing.T) {
 
-	res1, err := Runner("python3").
+	res1, err := Runner("python").
 		Arg("-c").
 		Arg("import sys;" +
 			"import time;" +
@@ -264,7 +263,7 @@ func TestListener(t *testing.T) {
 
 func TestLongStdout(t *testing.T) {
 
-	res1, err := Runner("python3").
+	res1, err := Runner("python").
 		Arg("-c").
 		Arg("import sys; import time; print(\"X\" * 125001 + \"\\n\"); print(\"Y\" * 125001 + \"\\n\"); print(\"Z\" * 125001 + \"\\n\");").
 		Timeout(5000 * time.Millisecond).
@@ -290,40 +289,16 @@ func TestLongStdout(t *testing.T) {
 func TestFailOnTimeout(t *testing.T) {
 
 	_, err := Runner("sleep").Arg("2").Timeout(200 * time.Millisecond).FailOnTimeout().Run()
-	if !errors.Is(err, ErrTimeout) {
+	if err != ErrTimeout {
 		t.Errorf("wrong err := %v", err)
 	}
 
 }
 
-func TestFailOnStderr(t *testing.T) {
-
-	res1, err := Runner("python3").Arg("-c").Arg("import sys; print(\"error\", file=sys.stderr, end='')").FailOnStderr().Run()
-	if err == nil {
-		t.Errorf("no err")
-	}
-	if res1.CommandTimedOut {
-		t.Errorf("Timeout")
-	}
-	if res1.ExitCode != -1 {
-		t.Errorf("res1.ExitCode == %v", res1.ExitCode)
-	}
-	if res1.StdErr != "error" {
-		t.Errorf("res1.StdErr == '%v'", res1.StdErr)
-	}
-	if res1.StdOut != "" {
-		t.Errorf("res1.StdOut == '%v'", res1.StdOut)
-	}
-	if res1.StdCombined != "error\n" {
-		t.Errorf("res1.StdCombined == '%v'", res1.StdCombined)
-	}
-
-}
-
 func TestFailOnExitcode(t *testing.T) {
 
 	_, err := Runner("false").Timeout(200 * time.Millisecond).FailOnExitCode().Run()
-	if !errors.Is(err, ErrExitCode) {
+	if err != ErrExitCode {
 		t.Errorf("wrong err := %v", err)
 	}
 

cmdext/pipereader.go

@@ -2,7 +2,7 @@ package cmdext
 
 import (
 	"bufio"
-	"git.blackforestbytes.com/BlackForestBytes/goext/syncext"
+	"gogs.mikescher.com/BlackForestBytes/goext/syncext"
 	"io"
 	"sync"
 )
@@ -32,8 +32,8 @@ func (pr *pipeReader) Read(listener []CommandListener) (string, string, string,
 	stdout := ""
 	go func() {
 		buf := make([]byte, 128)
-		for {
-			n, err := pr.stdout.Read(buf)
+		for true {
+			n, out := pr.stdout.Read(buf)
 			if n > 0 {
 				txt := string(buf[:n])
 				stdout += txt
@@ -42,11 +42,11 @@ func (pr *pipeReader) Read(listener []CommandListener) (string, string, string,
 					lstr.ReadRawStdout(buf[:n])
 				}
 			}
-			if err == io.EOF {
+			if out == io.EOF {
 				break
 			}
-			if err != nil {
-				errch <- err
+			if out != nil {
+				errch <- out
 				break
 			}
 		}
@@ -61,7 +61,7 @@ func (pr *pipeReader) Read(listener []CommandListener) (string, string, string,
 	stderr := ""
 	go func() {
 		buf := make([]byte, 128)
-		for {
+		for true {
 			n, err := pr.stderr.Read(buf)
 
 			if n > 0 {

confext/confParser.go

@@ -3,7 +3,7 @@ package confext
 import (
 	"errors"
 	"fmt"
-	"git.blackforestbytes.com/BlackForestBytes/goext/timeext"
+	"gogs.mikescher.com/BlackForestBytes/goext/timeext"
 	"math/bits"
 	"os"
 	"reflect"
@@ -41,12 +41,12 @@ func processEnvOverrides(rval reflect.Value, delim string, prefix string) error
 			continue
 		}
 
-		envkey, found := rsfield.Tag.Lookup("env")
-		if !found || envkey == "-" {
-			continue
-		}
+		if rvfield.Kind() == reflect.Struct {
 
-		if rvfield.Kind() == reflect.Struct && rvfield.Type() != reflect.TypeOf(time.UnixMilli(0)) {
+			envkey, found := rsfield.Tag.Lookup("env")
+			if !found || envkey == "-" {
+				continue
+			}
 
 			subPrefix := prefix
 			if envkey != "" {
@@ -57,7 +57,10 @@ func processEnvOverrides(rval reflect.Value, delim string, prefix string) error
 			if err != nil {
 				return err
 			}
+		}
 
+		envkey := rsfield.Tag.Get("env")
+		if envkey == "" || envkey == "-" {
 			continue
 		}
 
@@ -175,9 +178,9 @@ func parseEnvToValue(envval string, fullEnvKey string, rvtype reflect.Type) (ref
 		if strings.TrimSpace(strings.ToLower(envval)) == "true" {
 			return reflect.ValueOf(true).Convert(rvtype), nil
 		} else if strings.TrimSpace(strings.ToLower(envval)) == "false" {
-			return reflect.ValueOf(false).Convert(rvtype), nil
-		} else if strings.TrimSpace(strings.ToLower(envval)) == "1" {
 			return reflect.ValueOf(true).Convert(rvtype), nil
+		} else if strings.TrimSpace(strings.ToLower(envval)) == "1" {
+			return reflect.ValueOf(false).Convert(rvtype), nil
 		} else if strings.TrimSpace(strings.ToLower(envval)) == "0" {
 			return reflect.ValueOf(false).Convert(rvtype), nil
 		} else {

confext/confParser_test.go

@@ -1,8 +1,8 @@
 package confext
 
 import (
-	"git.blackforestbytes.com/BlackForestBytes/goext/timeext"
-	"git.blackforestbytes.com/BlackForestBytes/goext/tst"
+	"gogs.mikescher.com/BlackForestBytes/goext/timeext"
+	"gogs.mikescher.com/BlackForestBytes/goext/tst"
 	"testing"
 	"time"
 )

cryptext/aes_test.go

@@ -2,7 +2,7 @@ package cryptext
 
 import (
 	"fmt"
-	"git.blackforestbytes.com/BlackForestBytes/goext/tst"
+	"gogs.mikescher.com/BlackForestBytes/goext/tst"
 	"testing"
 )
 

cryptext/hash_test.go

@@ -1,7 +1,7 @@
 package cryptext
 
 import (
-	"git.blackforestbytes.com/BlackForestBytes/goext/tst"
+	"gogs.mikescher.com/BlackForestBytes/goext/tst"
 	"testing"
 )
 

cryptext/passHash.go

@@ -3,29 +3,25 @@ package cryptext
 import (
 	"crypto/rand"
 	"crypto/sha256"
-	"crypto/sha512"
 	"encoding/base64"
 	"encoding/hex"
-	"encoding/json"
 	"errors"
 	"fmt"
+	"gogs.mikescher.com/BlackForestBytes/goext/langext"
+	"gogs.mikescher.com/BlackForestBytes/goext/totpext"
+	"golang.org/x/crypto/bcrypt"
 	"strconv"
 	"strings"
-
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
-	"git.blackforestbytes.com/BlackForestBytes/goext/totpext"
-	"golang.org/x/crypto/bcrypt"
 )
 
-const LatestPassHashVersion = 5
+const LatestPassHashVersion = 4
 
 // PassHash
-// - [v0]: plaintext password ( `0|...` )                  // simple, used to write PW's directly in DB
-// - [v1]: sha256(plaintext)                               // simple hashing
-// - [v2]: seed | sha256<seed>(plaintext)                  // add seed
-// - [v3]: seed | sha256<seed>(plaintext) | [hex(totp)]    // add TOTP support
-// - [v4]: bcrypt(plaintext) | [hex(totp)]                 // use proper bcrypt
-// - [v5]: bcrypt(sha512(plaintext)) | [hex(totp)]         // hash pw before bcrypt (otherwise max pw-len = 72)
+// - [v0]: plaintext password ( `0|...` )
+// - [v1]: sha256(plaintext)
+// - [v2]: seed | sha256<seed>(plaintext)
+// - [v3]: seed | sha256<seed>(plaintext) | [hex(totp)]
+// - [v4]: bcrypt(plaintext) | [hex(totp)]
 type PassHash string
 
 func (ph PassHash) Valid() bool {
@@ -68,6 +64,7 @@ func (ph PassHash) Data() (_version int, _seed []byte, _payload []byte, _totp bo
 		return int(version), nil, payload, false, nil, true
 	}
 
+	//
 	if version == 2 {
 		if len(split) != 3 {
 			return -1, nil, nil, false, nil, false
@@ -112,21 +109,7 @@ func (ph PassHash) Data() (_version int, _seed []byte, _payload []byte, _totp bo
 		totp := false
 		totpsecret := make([]byte, 0)
 		if split[2] != "0" {
-			totpsecret, err = hex.DecodeString(split[2])
-			totp = true
-		}
-		return int(version), nil, payload, totp, totpsecret, true
-	}
-
-	if version == 5 {
-		if len(split) != 3 {
-			return -1, nil, nil, false, nil, false
-		}
-		payload := []byte(split[1])
-		totp := false
-		totpsecret := make([]byte, 0)
-		if split[2] != "0" {
-			totpsecret, err = hex.DecodeString(split[2])
+			totpsecret, err = hex.DecodeString(split[3])
 			totp = true
 		}
 		return int(version), nil, payload, totp, totpsecret, true
@@ -173,14 +156,6 @@ func (ph PassHash) Verify(plainpass string, totp *string) bool {
 		}
 	}
 
-	if version == 5 {
-		if !hastotp {
-			return bcrypt.CompareHashAndPassword(payload, hash512(plainpass)) == nil
-		} else {
-			return bcrypt.CompareHashAndPassword(payload, hash512(plainpass)) == nil && totpext.Validate(totpsecret, *totp)
-		}
-	}
-
 	return false
 }
 
@@ -234,12 +209,6 @@ func (ph PassHash) ClearTOTP() (PassHash, error) {
 		return PassHash(strings.Join(split, "|")), nil
 	}
 
-	if version == 5 {
-		split := strings.Split(string(ph), "|")
-		split[2] = "0"
-		return PassHash(strings.Join(split, "|")), nil
-	}
-
 	return "", errors.New("unknown version")
 }
 
@@ -273,12 +242,6 @@ func (ph PassHash) WithTOTP(totpSecret []byte) (PassHash, error) {
 		return PassHash(strings.Join(split, "|")), nil
 	}
 
-	if version == 5 {
-		split := strings.Split(string(ph), "|")
-		split[2] = hex.EncodeToString(totpSecret)
-		return PassHash(strings.Join(split, "|")), nil
-	}
-
 	return "", errors.New("unknown version")
 }
 
@@ -308,10 +271,6 @@ func (ph PassHash) Change(newPlainPass string) (PassHash, error) {
 		return HashPasswordV4(newPlainPass, langext.Conditional(hastotp, totpsecret, nil))
 	}
 
-	if version == 5 {
-		return HashPasswordV5(newPlainPass, langext.Conditional(hastotp, totpsecret, nil))
-	}
-
 	return "", errors.New("unknown version")
 }
 
@@ -319,32 +278,8 @@ func (ph PassHash) String() string {
 	return string(ph)
 }
 
-func (ph PassHash) MarshalJSON() ([]byte, error) {
-	if ph == "" {
-		return json.Marshal("")
-	}
-	return json.Marshal("*****")
-}
-
 func HashPassword(plainpass string, totpSecret []byte) (PassHash, error) {
-	return HashPasswordV5(plainpass, totpSecret)
-}
-
-func HashPasswordV5(plainpass string, totpSecret []byte) (PassHash, error) {
-	var strtotp string
-
-	if totpSecret == nil {
-		strtotp = "0"
-	} else {
-		strtotp = hex.EncodeToString(totpSecret)
-	}
-
-	payload, err := bcrypt.GenerateFromPassword(hash512(plainpass), bcrypt.MinCost)
-	if err != nil {
-		return "", err
-	}
-
-	return PassHash(fmt.Sprintf("5|%s|%s", string(payload), strtotp)), nil
+	return HashPasswordV4(plainpass, totpSecret)
 }
 
 func HashPasswordV4(plainpass string, totpSecret []byte) (PassHash, error) {
@@ -405,13 +340,6 @@ func HashPasswordV0(plainpass string) (PassHash, error) {
 	return PassHash(fmt.Sprintf("0|%s", plainpass)), nil
 }
 
-func hash512(s string) []byte {
-	h := sha512.New()
-	h.Write([]byte(s))
-	bs := h.Sum(nil)
-	return bs
-}
-
 func hash256(s string) []byte {
 	h := sha256.New()
 	h.Write([]byte(s))

cryptext/passHash_test.go

@@ -1,210 +0,0 @@
-package cryptext
-
-import (
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
-	"git.blackforestbytes.com/BlackForestBytes/goext/totpext"
-	"git.blackforestbytes.com/BlackForestBytes/goext/tst"
-	"testing"
-)
-
-func TestPassHash1(t *testing.T) {
-	ph, err := HashPassword("test123", nil)
-	tst.AssertNoErr(t, err)
-
-	tst.AssertTrue(t, ph.Valid())
-	tst.AssertFalse(t, ph.HasTOTP())
-	tst.AssertFalse(t, ph.NeedsPasswordUpgrade())
-
-	tst.AssertTrue(t, ph.Verify("test123", nil))
-	tst.AssertFalse(t, ph.Verify("test124", nil))
-}
-
-func TestPassHashTOTP(t *testing.T) {
-	sec, err := totpext.GenerateSecret()
-	tst.AssertNoErr(t, err)
-
-	ph, err := HashPassword("test123", sec)
-	tst.AssertNoErr(t, err)
-
-	tst.AssertTrue(t, ph.Valid())
-	tst.AssertTrue(t, ph.HasTOTP())
-	tst.AssertFalse(t, ph.NeedsPasswordUpgrade())
-
-	tst.AssertFalse(t, ph.Verify("test123", nil))
-	tst.AssertFalse(t, ph.Verify("test124", nil))
-	tst.AssertTrue(t, ph.Verify("test123", langext.Ptr(totpext.TOTP(sec))))
-	tst.AssertFalse(t, ph.Verify("test124", nil))
-}
-
-func TestPassHashUpgrade_V0(t *testing.T) {
-	ph, err := HashPasswordV0("test123")
-	tst.AssertNoErr(t, err)
-
-	tst.AssertTrue(t, ph.Valid())
-	tst.AssertFalse(t, ph.HasTOTP())
-	tst.AssertTrue(t, ph.NeedsPasswordUpgrade())
-
-	tst.AssertTrue(t, ph.Verify("test123", nil))
-	tst.AssertFalse(t, ph.Verify("test124", nil))
-
-	ph, err = ph.Upgrade("test123")
-	tst.AssertNoErr(t, err)
-
-	tst.AssertTrue(t, ph.Valid())
-	tst.AssertFalse(t, ph.HasTOTP())
-	tst.AssertFalse(t, ph.NeedsPasswordUpgrade())
-
-	tst.AssertTrue(t, ph.Verify("test123", nil))
-	tst.AssertFalse(t, ph.Verify("test124", nil))
-
-}
-
-func TestPassHashUpgrade_V1(t *testing.T) {
-	ph, err := HashPasswordV1("test123")
-	tst.AssertNoErr(t, err)
-
-	tst.AssertTrue(t, ph.Valid())
-	tst.AssertFalse(t, ph.HasTOTP())
-	tst.AssertTrue(t, ph.NeedsPasswordUpgrade())
-
-	tst.AssertTrue(t, ph.Verify("test123", nil))
-	tst.AssertFalse(t, ph.Verify("test124", nil))
-
-	ph, err = ph.Upgrade("test123")
-	tst.AssertNoErr(t, err)
-
-	tst.AssertTrue(t, ph.Valid())
-	tst.AssertFalse(t, ph.HasTOTP())
-	tst.AssertFalse(t, ph.NeedsPasswordUpgrade())
-
-	tst.AssertTrue(t, ph.Verify("test123", nil))
-	tst.AssertFalse(t, ph.Verify("test124", nil))
-
-}
-
-func TestPassHashUpgrade_V2(t *testing.T) {
-	ph, err := HashPasswordV2("test123")
-	tst.AssertNoErr(t, err)
-
-	tst.AssertTrue(t, ph.Valid())
-	tst.AssertFalse(t, ph.HasTOTP())
-	tst.AssertTrue(t, ph.NeedsPasswordUpgrade())
-
-	tst.AssertTrue(t, ph.Verify("test123", nil))
-	tst.AssertFalse(t, ph.Verify("test124", nil))
-
-	ph, err = ph.Upgrade("test123")
-	tst.AssertNoErr(t, err)
-
-	tst.AssertTrue(t, ph.Valid())
-	tst.AssertFalse(t, ph.HasTOTP())
-	tst.AssertFalse(t, ph.NeedsPasswordUpgrade())
-
-	tst.AssertTrue(t, ph.Verify("test123", nil))
-	tst.AssertFalse(t, ph.Verify("test124", nil))
-
-}
-
-func TestPassHashUpgrade_V3(t *testing.T) {
-	ph, err := HashPasswordV3("test123", nil)
-	tst.AssertNoErr(t, err)
-
-	tst.AssertTrue(t, ph.Valid())
-	tst.AssertFalse(t, ph.HasTOTP())
-	tst.AssertTrue(t, ph.NeedsPasswordUpgrade())
-
-	tst.AssertTrue(t, ph.Verify("test123", nil))
-	tst.AssertFalse(t, ph.Verify("test124", nil))
-
-	ph, err = ph.Upgrade("test123")
-	tst.AssertNoErr(t, err)
-
-	tst.AssertTrue(t, ph.Valid())
-	tst.AssertFalse(t, ph.HasTOTP())
-	tst.AssertFalse(t, ph.NeedsPasswordUpgrade())
-
-	tst.AssertTrue(t, ph.Verify("test123", nil))
-	tst.AssertFalse(t, ph.Verify("test124", nil))
-
-}
-
-func TestPassHashUpgrade_V3_TOTP(t *testing.T) {
-	sec, err := totpext.GenerateSecret()
-	tst.AssertNoErr(t, err)
-
-	ph, err := HashPasswordV3("test123", sec)
-	tst.AssertNoErr(t, err)
-
-	tst.AssertTrue(t, ph.Valid())
-	tst.AssertTrue(t, ph.HasTOTP())
-	tst.AssertTrue(t, ph.NeedsPasswordUpgrade())
-
-	tst.AssertFalse(t, ph.Verify("test123", nil))
-	tst.AssertFalse(t, ph.Verify("test124", nil))
-	tst.AssertTrue(t, ph.Verify("test123", langext.Ptr(totpext.TOTP(sec))))
-	tst.AssertFalse(t, ph.Verify("test124", nil))
-
-	ph, err = ph.Upgrade("test123")
-	tst.AssertNoErr(t, err)
-
-	tst.AssertTrue(t, ph.Valid())
-	tst.AssertTrue(t, ph.HasTOTP())
-	tst.AssertFalse(t, ph.NeedsPasswordUpgrade())
-
-	tst.AssertFalse(t, ph.Verify("test123", nil))
-	tst.AssertFalse(t, ph.Verify("test124", nil))
-	tst.AssertTrue(t, ph.Verify("test123", langext.Ptr(totpext.TOTP(sec))))
-	tst.AssertFalse(t, ph.Verify("test124", nil))
-}
-
-func TestPassHashUpgrade_V4(t *testing.T) {
-	ph, err := HashPasswordV4("test123", nil)
-	tst.AssertNoErr(t, err)
-
-	tst.AssertTrue(t, ph.Valid())
-	tst.AssertFalse(t, ph.HasTOTP())
-	tst.AssertTrue(t, ph.NeedsPasswordUpgrade())
-
-	tst.AssertTrue(t, ph.Verify("test123", nil))
-	tst.AssertFalse(t, ph.Verify("test124", nil))
-
-	ph, err = ph.Upgrade("test123")
-	tst.AssertNoErr(t, err)
-
-	tst.AssertTrue(t, ph.Valid())
-	tst.AssertFalse(t, ph.HasTOTP())
-	tst.AssertFalse(t, ph.NeedsPasswordUpgrade())
-
-	tst.AssertTrue(t, ph.Verify("test123", nil))
-	tst.AssertFalse(t, ph.Verify("test124", nil))
-
-}
-
-func TestPassHashUpgrade_V4_TOTP(t *testing.T) {
-	sec, err := totpext.GenerateSecret()
-	tst.AssertNoErr(t, err)
-
-	ph, err := HashPasswordV4("test123", sec)
-	tst.AssertNoErr(t, err)
-
-	tst.AssertTrue(t, ph.Valid())
-	tst.AssertTrue(t, ph.HasTOTP())
-	tst.AssertTrue(t, ph.NeedsPasswordUpgrade())
-
-	tst.AssertFalse(t, ph.Verify("test123", nil))
-	tst.AssertFalse(t, ph.Verify("test124", nil))
-	tst.AssertTrue(t, ph.Verify("test123", langext.Ptr(totpext.TOTP(sec))))
-	tst.AssertFalse(t, ph.Verify("test124", nil))
-
-	ph, err = ph.Upgrade("test123")
-	tst.AssertNoErr(t, err)
-
-	tst.AssertTrue(t, ph.Valid())
-	tst.AssertTrue(t, ph.HasTOTP())
-	tst.AssertFalse(t, ph.NeedsPasswordUpgrade())
-
-	tst.AssertFalse(t, ph.Verify("test123", nil))
-	tst.AssertFalse(t, ph.Verify("test124", nil))
-	tst.AssertTrue(t, ph.Verify("test123", langext.Ptr(totpext.TOTP(sec))))
-	tst.AssertFalse(t, ph.Verify("test124", nil))
-}

cryptext/pronouncablePassword.go

@@ -1,263 +0,0 @@
-package cryptext
-
-import (
-	"crypto/rand"
-	"io"
-	"math/big"
-	mathrand "math/rand"
-	"strings"
-)
-
-const (
-	ppStartChar            = "BCDFGHJKLMNPQRSTVWXZ"
-	ppEndChar              = "ABDEFIKMNORSTUXYZ"
-	ppVowel                = "AEIOUY"
-	ppConsonant            = "BCDFGHJKLMNPQRSTVWXZ"
-	ppSegmentLenMin        = 3
-	ppSegmentLenMax        = 7
-	ppMaxRepeatedVowel     = 2
-	ppMaxRepeatedConsonant = 2
-)
-
-var ppContinuation = map[uint8]string{
-	'A': "BCDFGHJKLMNPRSTVWXYZ",
-	'B': "ADFIKLMNORSTUY",
-	'C': "AEIKOUY",
-	'D': "AEILORSUYZ",
-	'E': "BCDFGHJKLMNPRSTVWXYZ",
-	'F': "ADEGIKLOPRTUY",
-	'G': "ABDEFHILMNORSTUY",
-	'H': "AEIOUY",
-	'I': "BCDFGHJKLMNPRSTVWXZ",
-	'J': "AEIOUY",
-	'K': "ADEFHILMNORSTUY",
-	'L': "ADEFGIJKMNOPSTUVWYZ",
-	'M': "ABEFIKOPSTUY",
-	'N': "ABEFIKOPSTUY",
-	'O': "BCDFGHJKLMNPRSTVWXYZ",
-	'P': "AEFIJLORSTUY",
-	'Q': "AEIOUY",
-	'R': "ADEFGHIJKLMNOPSTUVYZ",
-	'S': "ACDEIKLOPTUYZ",
-	'T': "AEHIJOPRSUWY",
-	'U': "BCDFGHJKLMNPRSTVWXZ",
-	'V': "AEIOUY",
-	'W': "AEIOUY",
-	'X': "AEIOUY",
-	'Y': "ABCDFGHKLMNPRSTVXZ",
-	'Z': "AEILOTUY",
-}
-
-var ppLog2Map = map[int]float64{
-	1:  0.00000000,
-	2:  1.00000000,
-	3:  1.58496250,
-	4:  2.00000000,
-	5:  2.32192809,
-	6:  2.58496250,
-	7:  2.80735492,
-	8:  3.00000000,
-	9:  3.16992500,
-	10: 3.32192809,
-	11: 3.45943162,
-	12: 3.58496250,
-	13: 3.70043972,
-	14: 3.80735492,
-	15: 3.90689060,
-	16: 4.00000000,
-	17: 4.08746284,
-	18: 4.16992500,
-	19: 4.24792751,
-	20: 4.32192809,
-	21: 4.39231742,
-	22: 4.45943162,
-	23: 4.52356196,
-	24: 4.58496250,
-	25: 4.64385619,
-	26: 4.70043972,
-	27: 4.75488750,
-	28: 4.80735492,
-	29: 4.85798100,
-	30: 4.90689060,
-	31: 4.95419631,
-	32: 5.00000000,
-}
-
-var (
-	ppVowelMap     = ppMakeSet(ppVowel)
-	ppConsonantMap = ppMakeSet(ppConsonant)
-	ppEndCharMap   = ppMakeSet(ppEndChar)
-)
-
-func ppMakeSet(v string) map[uint8]bool {
-	mp := make(map[uint8]bool, len(v))
-	for _, chr := range v {
-		mp[uint8(chr)] = true
-	}
-	return mp
-}
-
-func ppRandInt(rng io.Reader, max int) int {
-	v, err := rand.Int(rng, big.NewInt(int64(max)))
-	if err != nil {
-		panic(err)
-	}
-	return int(v.Int64())
-}
-
-func ppRand(rng io.Reader, chars string, entropy *float64) uint8 {
-	chr := chars[ppRandInt(rng, len(chars))]
-
-	*entropy = *entropy + ppLog2Map[len(chars)]
-
-	return chr
-}
-
-func ppCharType(chr uint8) (bool, bool) {
-	_, ok1 := ppVowelMap[chr]
-	_, ok2 := ppConsonantMap[chr]
-
-	return ok1, ok2
-}
-
-func ppCharsetRemove(cs string, set map[uint8]bool, allowEmpty bool) string {
-	result := ""
-	for _, chr := range cs {
-		if _, ok := set[uint8(chr)]; !ok {
-			result += string(chr)
-		}
-	}
-	if result == "" && !allowEmpty {
-		return cs
-	}
-	return result
-}
-
-func ppCharsetFilter(cs string, set map[uint8]bool, allowEmpty bool) string {
-	result := ""
-	for _, chr := range cs {
-		if _, ok := set[uint8(chr)]; ok {
-			result += string(chr)
-		}
-	}
-	if result == "" && !allowEmpty {
-		return cs
-	}
-	return result
-}
-
-func PronouncablePasswordExt(rng io.Reader, pwlen int) (string, float64) {
-
-	// kinda pseudo markov-chain - with a few extra rules and no weights...
-
-	if pwlen <= 0 {
-		return "", 0
-	}
-
-	vowelCount := 0
-	consoCount := 0
-	entropy := float64(0)
-
-	startChar := ppRand(rng, ppStartChar, &entropy)
-
-	result := string(startChar)
-	currentChar := startChar
-
-	isVowel, isConsonant := ppCharType(currentChar)
-	if isVowel {
-		vowelCount = 1
-	}
-	if isConsonant {
-		consoCount = ppMaxRepeatedConsonant
-	}
-
-	segmentLen := 1
-
-	segmentLenTarget := ppSegmentLenMin + ppRandInt(rng, ppSegmentLenMax-ppSegmentLenMin)
-
-	for len(result) < pwlen {
-
-		charset := ppContinuation[currentChar]
-		if vowelCount >= ppMaxRepeatedVowel {
-			charset = ppCharsetRemove(charset, ppVowelMap, false)
-		}
-		if consoCount >= ppMaxRepeatedConsonant {
-			charset = ppCharsetRemove(charset, ppConsonantMap, false)
-		}
-
-		lastOfSegment := false
-		newSegment := false
-
-		if len(result)+1 == pwlen {
-			// last of result
-			charset = ppCharsetFilter(charset, ppEndCharMap, false)
-		} else if segmentLen+1 == segmentLenTarget {
-			// last of segment
-			charsetNew := ppCharsetFilter(charset, ppEndCharMap, true)
-			if charsetNew != "" {
-				charset = charsetNew
-				lastOfSegment = true
-			}
-		} else if segmentLen >= segmentLenTarget {
-			// (perhaps) start of new segment
-			if _, ok := ppEndCharMap[currentChar]; ok {
-				charset = ppStartChar
-				newSegment = true
-			} else {
-				// continue segment for one more char to (hopefully) find an end-char
-				charsetNew := ppCharsetFilter(charset, ppEndCharMap, true)
-				if charsetNew != "" {
-					charset = charsetNew
-					lastOfSegment = true
-				}
-			}
-		} else {
-			// normal continuation
-		}
-
-		newChar := ppRand(rng, charset, &entropy)
-		if lastOfSegment {
-			currentChar = newChar
-			segmentLen++
-			result += strings.ToLower(string(newChar))
-		} else if newSegment {
-			currentChar = newChar
-			segmentLen = 1
-			result += strings.ToUpper(string(newChar))
-			segmentLenTarget = ppSegmentLenMin + ppRandInt(rng, ppSegmentLenMax-ppSegmentLenMin)
-			vowelCount = 0
-			consoCount = 0
-		} else {
-			currentChar = newChar
-			segmentLen++
-			result += strings.ToLower(string(newChar))
-		}
-
-		isVowel, isConsonant := ppCharType(currentChar)
-		if isVowel {
-			vowelCount++
-			consoCount = 0
-		}
-		if isConsonant {
-			vowelCount = 0
-			if newSegment {
-				consoCount = ppMaxRepeatedConsonant
-			} else {
-				consoCount++
-			}
-		}
-	}
-
-	return result, entropy
-}
-
-func PronouncablePassword(len int) string {
-	v, _ := PronouncablePasswordExt(rand.Reader, len)
-	return v
-}
-
-func PronouncablePasswordSeeded(seed int64, len int) string {
-
-	v, _ := PronouncablePasswordExt(mathrand.New(mathrand.NewSource(seed)), len)
-	return v
-}

cryptext/pronouncablePassword_test.go

@@ -1,35 +0,0 @@
-package cryptext
-
-import (
-	"fmt"
-	"math/rand"
-	"testing"
-)
-
-func TestPronouncablePasswordExt(t *testing.T) {
-	for i := 0; i < 20; i++ {
-		pw, entropy := PronouncablePasswordExt(rand.New(rand.NewSource(int64(i))), 16)
-		fmt.Printf("[%.2f] => %s\n", entropy, pw)
-	}
-}
-
-func TestPronouncablePasswordSeeded(t *testing.T) {
-	for i := 0; i < 20; i++ {
-		pw := PronouncablePasswordSeeded(int64(i), 8)
-		fmt.Printf("%s\n", pw)
-	}
-}
-
-func TestPronouncablePassword(t *testing.T) {
-	for i := 0; i < 20; i++ {
-		pw := PronouncablePassword(i + 1)
-		fmt.Printf("%s\n", pw)
-	}
-}
-
-func TestPronouncablePasswordWrongLen(t *testing.T) {
-	PronouncablePassword(0)
-	PronouncablePassword(-1)
-	PronouncablePassword(-2)
-	PronouncablePassword(-3)
-}

ctxext/getter.go

@@ -1,27 +0,0 @@
-package ctxext
-
-import "context"
-
-func Value[T any](ctx context.Context, key any) (T, bool) {
-	v := ctx.Value(key)
-	if v == nil {
-		return *new(T), false
-	}
-	if tv, ok := v.(T); !ok {
-		return *new(T), false
-	} else {
-		return tv, true
-	}
-}
-
-func ValueOrDefault[T any](ctx context.Context, key any, def T) T {
-	v := ctx.Value(key)
-	if v == nil {
-		return def
-	}
-	if tv, ok := v.(T); !ok {
-		return def
-	} else {
-		return tv
-	}
-}

cursortoken/direction.go

@@ -1,18 +0,0 @@
-package cursortoken
-
-type SortDirection string //@enum:type
-
-const (
-	SortASC  SortDirection = "ASC"
-	SortDESC SortDirection = "DESC"
-)
-
-func (sd SortDirection) ToMongo() int {
-	if sd == SortASC {
-		return 1
-	} else if sd == SortDESC {
-		return -1
-	} else {
-		return 0
-	}
-}

cursortoken/filter.go

@@ -1,15 +0,0 @@
-package cursortoken
-
-import (
-	"context"
-	"go.mongodb.org/mongo-driver/mongo"
-)
-
-type RawFilter interface {
-	FilterQuery(ctx context.Context) mongo.Pipeline
-}
-
-type Filter interface {
-	FilterQuery(ctx context.Context) mongo.Pipeline
-	Pagination(ctx context.Context) (string, SortDirection, string, SortDirection)
-}

cursortoken/token.go

@@ -1,95 +0,0 @@
-package cursortoken
-
-import (
-	"encoding/base32"
-	"encoding/json"
-	"git.blackforestbytes.com/BlackForestBytes/goext/exerr"
-	"strconv"
-	"strings"
-	"time"
-)
-
-type CursorToken interface {
-	Token() string
-	IsStart() bool
-	IsEnd() bool
-}
-
-type Mode string
-
-const (
-	CTMStart  Mode = "START"
-	CTMNormal Mode = "NORMAL"
-	CTMEnd    Mode = "END"
-)
-
-type Extra struct {
-	Timestamp *time.Time
-	Id        *string
-	Page      *int
-	PageSize  *int
-}
-
-func Decode(tok string) (CursorToken, error) {
-	if tok == "" {
-		return Start(), nil
-	}
-	if strings.ToLower(tok) == "@start" {
-		return Start(), nil
-	}
-	if strings.ToLower(tok) == "@end" {
-		return End(), nil
-	}
-	if strings.ToLower(tok) == "$end" {
-		return PageEnd(), nil
-	}
-	if strings.HasPrefix(tok, "$") && len(tok) > 1 {
-		n, err := strconv.ParseInt(tok[1:], 10, 64)
-		if err != nil {
-			return nil, exerr.Wrap(err, "failed to deserialize token").Str("token", tok).WithType(exerr.TypeCursorTokenDecode).Build()
-		}
-		return Page(int(n)), nil
-	}
-
-	if strings.HasPrefix(tok, "tok_") {
-
-		body, err := base32.StdEncoding.DecodeString(tok[len("tok_"):])
-		if err != nil {
-			return nil, err
-		}
-
-		var tokenDeserialize cursorTokenKeySortSerialize
-		err = json.Unmarshal(body, &tokenDeserialize)
-		if err != nil {
-			return nil, exerr.Wrap(err, "failed to deserialize token").Str("token", tok).WithType(exerr.TypeCursorTokenDecode).Build()
-		}
-
-		token := CTKeySort{Mode: CTMNormal}
-
-		if tokenDeserialize.ValuePrimary != nil {
-			token.ValuePrimary = *tokenDeserialize.ValuePrimary
-		}
-		if tokenDeserialize.ValueSecondary != nil {
-			token.ValueSecondary = *tokenDeserialize.ValueSecondary
-		}
-		if tokenDeserialize.Direction != nil {
-			token.Direction = *tokenDeserialize.Direction
-		}
-		if tokenDeserialize.DirectionSecondary != nil {
-			token.DirectionSecondary = *tokenDeserialize.DirectionSecondary
-		}
-		if tokenDeserialize.PageSize != nil {
-			token.PageSize = *tokenDeserialize.PageSize
-		}
-
-		token.Extra.Timestamp = tokenDeserialize.ExtraTimestamp
-		token.Extra.Id = tokenDeserialize.ExtraId
-		token.Extra.Page = tokenDeserialize.ExtraPage
-		token.Extra.PageSize = tokenDeserialize.ExtraPageSize
-
-		return token, nil
-
-	} else {
-		return nil, exerr.New(exerr.TypeCursorTokenDecode, "could not decode token, missing/unknown prefix").Str("token", tok).Build()
-	}
-}

cursortoken/tokenKeySort.go

@@ -1,136 +0,0 @@
-package cursortoken
-
-import (
-	"encoding/base32"
-	"encoding/json"
-	"go.mongodb.org/mongo-driver/bson/primitive"
-	"time"
-)
-
-type CTKeySort struct {
-	Mode               Mode
-	ValuePrimary       string
-	ValueSecondary     string
-	Direction          SortDirection
-	DirectionSecondary SortDirection
-	PageSize           int
-	Extra              Extra
-}
-
-type cursorTokenKeySortSerialize struct {
-	ValuePrimary       *string        `json:"v1,omitempty"`
-	ValueSecondary     *string        `json:"v2,omitempty"`
-	Direction          *SortDirection `json:"dir,omitempty"`
-	DirectionSecondary *SortDirection `json:"dir2,omitempty"`
-	PageSize           *int           `json:"size,omitempty"`
-
-	ExtraTimestamp *time.Time `json:"ts,omitempty"`
-	ExtraId        *string    `json:"id,omitempty"`
-	ExtraPage      *int       `json:"pg,omitempty"`
-	ExtraPageSize  *int       `json:"sz,omitempty"`
-}
-
-func NewKeySortToken(valuePrimary string, valueSecondary string, direction SortDirection, directionSecondary SortDirection, pageSize int, extra Extra) CursorToken {
-	return CTKeySort{
-		Mode:               CTMNormal,
-		ValuePrimary:       valuePrimary,
-		ValueSecondary:     valueSecondary,
-		Direction:          direction,
-		DirectionSecondary: directionSecondary,
-		PageSize:           pageSize,
-		Extra:              extra,
-	}
-}
-
-func Start() CursorToken {
-	return CTKeySort{
-		Mode:               CTMStart,
-		ValuePrimary:       "",
-		ValueSecondary:     "",
-		Direction:          "",
-		DirectionSecondary: "",
-		PageSize:           0,
-		Extra:              Extra{},
-	}
-}
-
-func End() CursorToken {
-	return CTKeySort{
-		Mode:               CTMEnd,
-		ValuePrimary:       "",
-		ValueSecondary:     "",
-		Direction:          "",
-		DirectionSecondary: "",
-		PageSize:           0,
-		Extra:              Extra{},
-	}
-}
-
-func (c CTKeySort) Token() string {
-
-	if c.Mode == CTMStart {
-		return "@start"
-	}
-	if c.Mode == CTMEnd {
-		return "@end"
-	}
-
-	// We kinda manually implement omitempty for the CursorToken here
-	// because omitempty does not work for time.Time and otherwise we would always
-	// get weird time values when decoding a token that initially didn't have an Timestamp set
-	// For this usecase we treat Unix=0 as an empty timestamp
-
-	sertok := cursorTokenKeySortSerialize{}
-
-	if c.ValuePrimary != "" {
-		sertok.ValuePrimary = &c.ValuePrimary
-	}
-	if c.ValueSecondary != "" {
-		sertok.ValueSecondary = &c.ValueSecondary
-	}
-	if c.Direction != "" {
-		sertok.Direction = &c.Direction
-	}
-	if c.DirectionSecondary != "" {
-		sertok.DirectionSecondary = &c.DirectionSecondary
-	}
-	if c.PageSize != 0 {
-		sertok.PageSize = &c.PageSize
-	}
-
-	sertok.ExtraTimestamp = c.Extra.Timestamp
-	sertok.ExtraId = c.Extra.Id
-	sertok.ExtraPage = c.Extra.Page
-	sertok.ExtraPageSize = c.Extra.PageSize
-
-	body, err := json.Marshal(sertok)
-	if err != nil {
-		panic(err)
-	}
-
-	return "tok_" + base32.StdEncoding.EncodeToString(body)
-}
-
-func (c CTKeySort) IsEnd() bool {
-	return c.Mode == CTMEnd
-}
-
-func (c CTKeySort) IsStart() bool {
-	return c.Mode == CTMStart
-}
-
-func (c CTKeySort) valuePrimaryObjectId() (primitive.ObjectID, bool) {
-	if oid, err := primitive.ObjectIDFromHex(c.ValuePrimary); err == nil {
-		return oid, true
-	} else {
-		return primitive.ObjectID{}, false
-	}
-}
-
-func (c CTKeySort) valueSecondaryObjectId() (primitive.ObjectID, bool) {
-	if oid, err := primitive.ObjectIDFromHex(c.ValueSecondary); err == nil {
-		return oid, true
-	} else {
-		return primitive.ObjectID{}, false
-	}
-}

cursortoken/tokenPaginate.go

@@ -1,41 +0,0 @@
-package cursortoken
-
-import "strconv"
-
-type CTPaginated struct {
-	Mode Mode
-	Page int
-}
-
-func Page(p int) CursorToken {
-	return CTPaginated{
-		Mode: CTMNormal,
-		Page: p,
-	}
-}
-
-func PageEnd() CursorToken {
-	return CTPaginated{
-		Mode: CTMEnd,
-		Page: 0,
-	}
-}
-
-func (c CTPaginated) Token() string {
-	if c.Mode == CTMStart {
-		return "$1"
-	}
-	if c.Mode == CTMEnd {
-		return "$end"
-	}
-
-	return "$" + strconv.Itoa(c.Page)
-}
-
-func (c CTPaginated) IsEnd() bool {
-	return c.Mode == CTMEnd
-}
-
-func (c CTPaginated) IsStart() bool {
-	return c.Mode == CTMStart || c.Page == 1
-}

dataext/broadcaster.go

@@ -1,230 +0,0 @@
-package dataext
-
-import (
-	"context"
-	"iter"
-	"sync"
-	"time"
-
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
-	"git.blackforestbytes.com/BlackForestBytes/goext/syncext"
-	"github.com/rs/xid"
-)
-
-// Broadcaster is a simple Broadcaster channel
-// This is a simpler interface over Broadcaster - which does not have distinct namespaces
-type Broadcaster[TData any] struct {
-	masterLock *sync.Mutex
-
-	subscriptions []*broadcastSubscription[TData]
-}
-
-type BroadcastSubscription interface {
-	Unsubscribe()
-}
-
-type broadcastSubscription[TData any] struct {
-	ID string
-
-	parent *Broadcaster[TData]
-
-	subLock *sync.Mutex
-
-	Func func(TData)
-	Chan chan TData
-
-	UnsubChan chan bool
-}
-
-func (p *broadcastSubscription[TData]) Unsubscribe() {
-	p.parent.unsubscribe(p)
-}
-
-func NewBroadcaster[TData any](capacity int) *Broadcaster[TData] {
-	return &Broadcaster[TData]{
-		masterLock:    &sync.Mutex{},
-		subscriptions: make([]*broadcastSubscription[TData], 0, capacity),
-	}
-}
-
-func (bb *Broadcaster[TData]) SubscriberCount() int {
-	bb.masterLock.Lock()
-	defer bb.masterLock.Unlock()
-
-	return len(bb.subscriptions)
-}
-
-// Publish sends `data` to all subscriber
-// But unbuffered - if one is currently not listening, we skip (the actualReceiver < subscriber)
-func (bb *Broadcaster[TData]) Publish(data TData) (subscriber int, actualReceiver int) {
-	bb.masterLock.Lock()
-	subs := langext.ArrCopy(bb.subscriptions)
-	bb.masterLock.Unlock()
-
-	subscriber = len(subs)
-	actualReceiver = 0
-
-	for _, sub := range subs {
-		func() {
-			sub.subLock.Lock()
-			defer sub.subLock.Unlock()
-
-			if sub.Func != nil {
-				go func() { sub.Func(data) }()
-				actualReceiver++
-			} else if sub.Chan != nil {
-				msgSent := syncext.WriteNonBlocking(sub.Chan, data)
-				if msgSent {
-					actualReceiver++
-				}
-			}
-		}()
-	}
-
-	return subscriber, actualReceiver
-}
-
-// PublishWithContext sends `data` to all subscriber
-// buffered - if one is currently not listening, we wait (but error out when the context runs out)
-func (bb *Broadcaster[TData]) PublishWithContext(ctx context.Context, data TData) (subscriber int, actualReceiver int, err error) {
-	bb.masterLock.Lock()
-	subs := langext.ArrCopy(bb.subscriptions)
-	bb.masterLock.Unlock()
-
-	subscriber = len(subs)
-	actualReceiver = 0
-
-	for _, sub := range subs {
-		err := func() error {
-			sub.subLock.Lock()
-			defer sub.subLock.Unlock()
-
-			if err := ctx.Err(); err != nil {
-				return err
-			}
-
-			if sub.Func != nil {
-				go func() { sub.Func(data) }()
-				actualReceiver++
-			} else if sub.Chan != nil {
-				err := syncext.WriteChannelWithContext(ctx, sub.Chan, data)
-				if err != nil {
-					return err
-				}
-				actualReceiver++
-			}
-
-			return nil
-		}()
-		if err != nil {
-			return subscriber, actualReceiver, err
-		}
-	}
-
-	return subscriber, actualReceiver, nil
-}
-
-// PublishWithTimeout sends `data` to all subscriber
-// buffered - if one is currently not listening, we wait (but wait at most `timeout` - if the timeout is exceeded then actualReceiver < subscriber)
-func (bb *Broadcaster[TData]) PublishWithTimeout(data TData, timeout time.Duration) (subscriber int, actualReceiver int) {
-	bb.masterLock.Lock()
-	subs := langext.ArrCopy(bb.subscriptions)
-	bb.masterLock.Unlock()
-
-	subscriber = len(subs)
-	actualReceiver = 0
-
-	for _, sub := range subs {
-		func() {
-			sub.subLock.Lock()
-			defer sub.subLock.Unlock()
-
-			if sub.Func != nil {
-				go func() { sub.Func(data) }()
-				actualReceiver++
-			} else if sub.Chan != nil {
-				ok := syncext.WriteChannelWithTimeout(sub.Chan, data, timeout)
-				if ok {
-					actualReceiver++
-				}
-			}
-		}()
-	}
-
-	return subscriber, actualReceiver
-}
-
-func (bb *Broadcaster[TData]) SubscribeByCallback(fn func(TData)) BroadcastSubscription {
-	bb.masterLock.Lock()
-	defer bb.masterLock.Unlock()
-
-	sub := &broadcastSubscription[TData]{ID: xid.New().String(), parent: bb, subLock: &sync.Mutex{}, Func: fn, UnsubChan: nil}
-
-	bb.subscriptions = append(bb.subscriptions, sub)
-
-	return sub
-}
-
-func (bb *Broadcaster[TData]) SubscribeByChan(chanBufferSize int) (chan TData, BroadcastSubscription) {
-	bb.masterLock.Lock()
-	defer bb.masterLock.Unlock()
-
-	msgCh := make(chan TData, chanBufferSize)
-
-	sub := &broadcastSubscription[TData]{ID: xid.New().String(), parent: bb, subLock: &sync.Mutex{}, Chan: msgCh, UnsubChan: nil}
-
-	bb.subscriptions = append(bb.subscriptions, sub)
-
-	return msgCh, sub
-}
-
-func (bb *Broadcaster[TData]) SubscribeByIter(chanBufferSize int) (iter.Seq[TData], BroadcastSubscription) {
-	bb.masterLock.Lock()
-	defer bb.masterLock.Unlock()
-
-	msgCh := make(chan TData, chanBufferSize)
-	unsubChan := make(chan bool, 8)
-
-	sub := &broadcastSubscription[TData]{ID: xid.New().String(), parent: bb, subLock: &sync.Mutex{}, Chan: msgCh, UnsubChan: unsubChan}
-
-	bb.subscriptions = append(bb.subscriptions, sub)
-
-	iterFun := func(yield func(TData) bool) {
-		for {
-			select {
-			case msg := <-msgCh:
-				if !yield(msg) {
-					sub.Unsubscribe()
-					return
-				}
-			case <-sub.UnsubChan:
-				sub.Unsubscribe()
-				return
-			}
-		}
-	}
-
-	return iterFun, sub
-}
-
-func (bb *Broadcaster[TData]) unsubscribe(p *broadcastSubscription[TData]) {
-	bb.masterLock.Lock()
-	defer bb.masterLock.Unlock()
-
-	p.subLock.Lock()
-	defer p.subLock.Unlock()
-
-	if p.Chan != nil {
-		close(p.Chan)
-		p.Chan = nil
-	}
-	if p.UnsubChan != nil {
-		syncext.WriteNonBlocking(p.UnsubChan, true)
-		close(p.UnsubChan)
-		p.UnsubChan = nil
-	}
-
-	bb.subscriptions = langext.ArrFilter(bb.subscriptions, func(v *broadcastSubscription[TData]) bool {
-		return v.ID != p.ID
-	})
-}

dataext/broadcaster_test.go

@@ -1,332 +0,0 @@
-package dataext
-
-import (
-	"context"
-	"sync"
-	"testing"
-	"time"
-)
-
-func TestNewBroadcast(t *testing.T) {
-	bb := NewBroadcaster[string](10)
-	if bb == nil {
-		t.Fatal("NewBroadcaster returned nil")
-	}
-	if bb.masterLock == nil {
-		t.Fatal("masterLock is nil")
-	}
-	if bb.subscriptions == nil {
-		t.Fatal("subscriptions is nil")
-	}
-}
-
-func TestBroadcast_SubscribeByCallback(t *testing.T) {
-	bb := NewBroadcaster[string](10)
-
-	var received string
-	var wg sync.WaitGroup
-	wg.Add(1)
-
-	callback := func(msg string) {
-		received = msg
-		wg.Done()
-	}
-
-	sub := bb.SubscribeByCallback(callback)
-	defer sub.Unsubscribe()
-
-	// Publish a message
-	subs, receivers := bb.Publish("hello")
-
-	if subs != 1 {
-		t.Fatalf("Expected 1 subscriber, got %d", subs)
-	}
-
-	if receivers != 1 {
-		t.Fatalf("Expected 1 receiver, got %d", receivers)
-	}
-
-	// Wait for the callback to be executed
-	wg.Wait()
-
-	if received != "hello" {
-		t.Fatalf("Expected to receive 'hello', got '%s'", received)
-	}
-}
-
-func TestBroadcast_SubscribeByChan(t *testing.T) {
-	bb := NewBroadcaster[string](10)
-
-	ch, sub := bb.SubscribeByChan(1)
-	defer sub.Unsubscribe()
-
-	// Publish a message
-	subs, receivers := bb.Publish("hello")
-
-	if subs != 1 {
-		t.Fatalf("Expected 1 subscriber, got %d", subs)
-	}
-
-	if receivers != 1 {
-		t.Fatalf("Expected 1 receiver, got %d", receivers)
-	}
-
-	// Read from the channel with a timeout to avoid blocking
-	select {
-	case msg := <-ch:
-		if msg != "hello" {
-			t.Fatalf("Expected to receive 'hello', got '%s'", msg)
-		}
-	case <-time.After(time.Second):
-		t.Fatal("Timed out waiting for message")
-	}
-}
-
-func TestBroadcast_SubscribeByIter(t *testing.T) {
-	bb := NewBroadcaster[string](10)
-
-	iterSeq, sub := bb.SubscribeByIter(1)
-	defer sub.Unsubscribe()
-
-	// Channel to communicate when message is received
-	done := make(chan bool)
-	received := false
-
-	// Start a goroutine to use the iterator
-	go func() {
-		for msg := range iterSeq {
-			if msg == "hello" {
-				received = true
-				done <- true
-				return // Stop iteration
-			}
-		}
-	}()
-
-	// Give time for the iterator to start
-	time.Sleep(100 * time.Millisecond)
-
-	// Publish a message
-	bb.Publish("hello")
-
-	// Wait for the message to be received or timeout
-	select {
-	case <-done:
-		if !received {
-			t.Fatal("Message was received but not 'hello'")
-		}
-	case <-time.After(time.Second):
-		t.Fatal("Timed out waiting for message")
-	}
-
-	subCount := bb.SubscriberCount()
-	if subCount != 0 {
-		t.Fatalf("Expected 0 receivers, got %d", subCount)
-	}
-}
-
-func TestBroadcast_Publish(t *testing.T) {
-	bb := NewBroadcaster[string](10)
-
-	// Test publishing with no subscribers
-	subs, receivers := bb.Publish("hello")
-	if subs != 0 {
-		t.Fatalf("Expected 0 subscribers, got %d", subs)
-	}
-	if receivers != 0 {
-		t.Fatalf("Expected 0 receivers, got %d", receivers)
-	}
-
-	// Add a subscriber
-	ch, sub := bb.SubscribeByChan(1)
-	defer sub.Unsubscribe()
-
-	// Publish a message
-	subs, receivers = bb.Publish("hello")
-	if subs != 1 {
-		t.Fatalf("Expected 1 subscriber, got %d", subs)
-	}
-	if receivers != 1 {
-		t.Fatalf("Expected 1 receiver, got %d", receivers)
-	}
-
-	// Verify the message was received
-	select {
-	case msg := <-ch:
-		if msg != "hello" {
-			t.Fatalf("Expected to receive 'hello', got '%s'", msg)
-		}
-	case <-time.After(time.Second):
-		t.Fatal("Timed out waiting for message")
-	}
-
-	// Test non-blocking behavior with a full channel
-	// First fill the channel
-	bb.Publish("fill")
-
-	// Now publish again - this should not block but may skip the receiver
-	subs, receivers = bb.Publish("overflow")
-	if subs != 1 {
-		t.Fatalf("Expected 1 subscriber, got %d", subs)
-	}
-	_ = receivers // may be 0 if channel is full
-
-	// Drain the channel
-	<-ch
-}
-
-func TestBroadcast_PublishWithTimeout(t *testing.T) {
-	bb := NewBroadcaster[string](10)
-
-	// Add a subscriber with a channel
-	ch, sub := bb.SubscribeByChan(1)
-	defer sub.Unsubscribe()
-
-	// Publish with a timeout
-	subs, receivers := bb.PublishWithTimeout("hello", 100*time.Millisecond)
-	if subs != 1 {
-		t.Fatalf("Expected 1 subscriber, got %d", subs)
-	}
-	if receivers != 1 {
-		t.Fatalf("Expected 1 receiver, got %d", receivers)
-	}
-
-	// Verify the message was received
-	select {
-	case msg := <-ch:
-		if msg != "hello" {
-			t.Fatalf("Expected to receive 'hello', got '%s'", msg)
-		}
-	case <-time.After(time.Second):
-		t.Fatal("Timed out waiting for message")
-	}
-
-	// Fill the channel
-	bb.Publish("fill")
-
-	// Test timeout behavior with a full channel
-	start := time.Now()
-	subs, receivers = bb.PublishWithTimeout("timeout-test", 50*time.Millisecond)
-	elapsed := time.Since(start)
-
-	if subs != 1 {
-		t.Fatalf("Expected 1 subscriber, got %d", subs)
-	}
-
-	// The receiver count should be 0 if the timeout occurred
-	if elapsed < 50*time.Millisecond {
-		t.Fatalf("Expected to wait at least 50ms, only waited %v", elapsed)
-	}
-
-	// Drain the channel
-	<-ch
-}
-
-func TestBroadcast_PublishWithContext(t *testing.T) {
-	bb := NewBroadcaster[string](10)
-
-	// Add a subscriber with a channel
-	ch, sub := bb.SubscribeByChan(1)
-	defer sub.Unsubscribe()
-
-	// Create a context
-	ctx, cancel := context.WithTimeout(context.Background(), 100*time.Millisecond)
-	defer cancel()
-
-	// Publish with context
-	subs, receivers, err := bb.PublishWithContext(ctx, "hello")
-	if err != nil {
-		t.Fatalf("Unexpected error: %v", err)
-	}
-	if subs != 1 {
-		t.Fatalf("Expected 1 subscriber, got %d", subs)
-	}
-	if receivers != 1 {
-		t.Fatalf("Expected 1 receiver, got %d", receivers)
-	}
-
-	// Verify the message was received
-	select {
-	case msg := <-ch:
-		if msg != "hello" {
-			t.Fatalf("Expected to receive 'hello', got '%s'", msg)
-		}
-	case <-time.After(time.Second):
-		t.Fatal("Timed out waiting for message")
-	}
-
-	// Fill the channel
-	bb.Publish("fill")
-
-	// Test context cancellation with a full channel
-	ctx, cancel = context.WithCancel(context.Background())
-
-	// Cancel the context after a short delay
-	go func() {
-		time.Sleep(50 * time.Millisecond)
-		cancel()
-	}()
-
-	start := time.Now()
-	subs, receivers, err = bb.PublishWithContext(ctx, "context-test")
-	elapsed := time.Since(start)
-
-	if subs != 1 {
-		t.Fatalf("Expected 1 subscriber, got %d", subs)
-	}
-
-	// Should get a context canceled error
-	if err == nil {
-		t.Fatal("Expected context canceled error, got nil")
-	}
-
-	if elapsed < 50*time.Millisecond {
-		t.Fatalf("Expected to wait at least 50ms, only waited %v", elapsed)
-	}
-
-	// Drain the channel
-	<-ch
-}
-
-func TestBroadcast_Unsubscribe(t *testing.T) {
-	bb := NewBroadcaster[string](10)
-
-	// Add a subscriber
-	ch, sub := bb.SubscribeByChan(1)
-
-	// Publish a message
-	subs, receivers := bb.Publish("hello")
-	if subs != 1 {
-		t.Fatalf("Expected 1 subscriber, got %d", subs)
-	}
-	if receivers != 1 {
-		t.Fatalf("Expected 1 receiver, got %d", receivers)
-	}
-
-	// Verify the message was received
-	select {
-	case msg := <-ch:
-		if msg != "hello" {
-			t.Fatalf("Expected to receive 'hello', got '%s'", msg)
-		}
-	case <-time.After(time.Second):
-		t.Fatal("Timed out waiting for message")
-	}
-
-	// Unsubscribe
-	sub.Unsubscribe()
-
-	// Publish again
-	subs, receivers = bb.Publish("after-unsub")
-	if subs != 0 {
-		t.Fatalf("Expected 0 subscribers after unsubscribe, got %d", subs)
-	}
-	if receivers != 0 {
-		t.Fatalf("Expected 0 receivers after unsubscribe, got %d", receivers)
-	}
-
-	// Check that the subscriber count is 0
-	if bb.SubscriberCount() != 0 {
-		t.Fatalf("Expected SubscriberCount() == 0, got %d", bb.SubscriberCount())
-	}
-}

dataext/bufferedReadCloser.go

@@ -115,9 +115,6 @@ func (b *bufferedReadCloser) BufferedAll() ([]byte, error) {
 				return nil, err
 			}
 		}
-		if err := b.Reset(); err != nil {
-			return nil, err
-		}
 		return b.buffer, nil
 
 	case modeSourceFinished:
@@ -134,22 +131,10 @@ func (b *bufferedReadCloser) BufferedAll() ([]byte, error) {
 	}
 }
 
-// Reset resets the buffer to the beginning of the buffer.
-// If the original source is partially read, we will finish reading it and fill our buffer
 func (b *bufferedReadCloser) Reset() error {
 	switch b.mode {
 	case modeSourceReading:
-		if b.off == 0 {
-			return nil // nobody has read anything yet
-		}
-		err := b.Close()
-		if err != nil {
-			return err
-		}
-		b.mode = modeBufferReading
-		b.off = 0
-		return nil
-
+		fallthrough
 	case modeSourceFinished:
 		err := b.Close()
 		if err != nil {

dataext/casMutex.go

@@ -1,254 +0,0 @@
-package dataext
-
-import (
-	"context"
-	"golang.org/x/sync/semaphore"
-	"runtime"
-	"sync"
-	"sync/atomic"
-	"time"
-	"unsafe"
-)
-
-// from https://github.com/viney-shih/go-lock/blob/2f19fd8ce335e33e0ab9dccb1ff2ce820c3da332/cas.go
-
-// CASMutex is the struct implementing RWMutex with CAS mechanism.
-type CASMutex struct {
-	state     casState
-	turnstile *semaphore.Weighted
-
-	broadcastChan chan struct{}
-	broadcastMut  sync.RWMutex
-}
-
-func NewCASMutex() *CASMutex {
-	return &CASMutex{
-		state:         casStateNoLock,
-		turnstile:     semaphore.NewWeighted(1),
-		broadcastChan: make(chan struct{}),
-	}
-}
-
-type casState int32
-
-const (
-	casStateUndefined casState = iota - 2 // -2
-	casStateWriteLock                     // -1
-	casStateNoLock                        // 0
-	casStateReadLock                      // >= 1
-)
-
-func (m *CASMutex) getState(n int32) casState {
-	switch st := casState(n); {
-	case st == casStateWriteLock:
-		fallthrough
-	case st == casStateNoLock:
-		return st
-	case st >= casStateReadLock:
-		return casStateReadLock
-	default:
-		// actually, it should not happened.
-		return casStateUndefined
-	}
-}
-
-func (m *CASMutex) listen() <-chan struct{} {
-	m.broadcastMut.RLock()
-	defer m.broadcastMut.RUnlock()
-
-	return m.broadcastChan
-}
-
-func (m *CASMutex) broadcast() {
-	newCh := make(chan struct{})
-
-	m.broadcastMut.Lock()
-	ch := m.broadcastChan
-	m.broadcastChan = newCh
-	m.broadcastMut.Unlock()
-
-	close(ch)
-}
-
-func (m *CASMutex) tryLock(ctx context.Context) bool {
-	for {
-		broker := m.listen()
-		if atomic.CompareAndSwapInt32(
-			(*int32)(unsafe.Pointer(&m.state)),
-			int32(casStateNoLock),
-			int32(casStateWriteLock),
-		) {
-			return true
-		}
-
-		if ctx == nil {
-			return false
-		}
-
-		select {
-		case <-ctx.Done():
-			// timeout or cancellation
-			return false
-		case <-broker:
-			// waiting for signal triggered by m.broadcast() and trying again.
-		}
-	}
-}
-
-// TryLockWithContext attempts to acquire the lock, blocking until resources
-// are available or ctx is done (timeout or cancellation).
-func (m *CASMutex) TryLockWithContext(ctx context.Context) bool {
-	if err := m.turnstile.Acquire(ctx, 1); err != nil {
-		// Acquire failed due to timeout or cancellation
-		return false
-	}
-
-	defer m.turnstile.Release(1)
-
-	return m.tryLock(ctx)
-}
-
-// Lock acquires the lock.
-// If it is currently held by others, Lock will wait until it has a chance to acquire it.
-func (m *CASMutex) Lock() {
-	ctx := context.Background()
-
-	m.TryLockWithContext(ctx)
-}
-
-// TryLock attempts to acquire the lock without blocking.
-// Return false if someone is holding it now.
-func (m *CASMutex) TryLock() bool {
-	if !m.turnstile.TryAcquire(1) {
-		return false
-	}
-
-	defer m.turnstile.Release(1)
-
-	return m.tryLock(nil)
-}
-
-// TryLockWithTimeout attempts to acquire the lock within a period of time.
-// Return false if spending time is more than duration and no chance to acquire it.
-func (m *CASMutex) TryLockWithTimeout(duration time.Duration) bool {
-	ctx, cancel := context.WithTimeout(context.Background(), duration)
-	defer cancel()
-
-	return m.TryLockWithContext(ctx)
-}
-
-// Unlock releases the lock.
-func (m *CASMutex) Unlock() {
-	if ok := atomic.CompareAndSwapInt32(
-		(*int32)(unsafe.Pointer(&m.state)),
-		int32(casStateWriteLock),
-		int32(casStateNoLock),
-	); !ok {
-		panic("Unlock failed")
-	}
-
-	m.broadcast()
-}
-
-func (m *CASMutex) rTryLock(ctx context.Context) bool {
-	for {
-		broker := m.listen()
-		n := atomic.LoadInt32((*int32)(unsafe.Pointer(&m.state)))
-		st := m.getState(n)
-		switch st {
-		case casStateNoLock, casStateReadLock:
-			if atomic.CompareAndSwapInt32((*int32)(unsafe.Pointer(&m.state)), n, n+1) {
-				return true
-			}
-		}
-
-		if ctx == nil {
-			return false
-		}
-
-		select {
-		case <-ctx.Done():
-			// timeout or cancellation
-			return false
-		default:
-			switch st {
-			// read-lock failed due to concurrence issue, try again immediately
-			case casStateNoLock, casStateReadLock:
-				runtime.Gosched() // allow other goroutines to do stuff.
-				continue
-			}
-		}
-
-		select {
-		case <-ctx.Done():
-			// timeout or cancellation
-			return false
-		case <-broker:
-			// waiting for signal triggered by m.broadcast() and trying again.
-		}
-	}
-}
-
-// RTryLockWithContext attempts to acquire the read lock, blocking until resources
-// are available or ctx is done (timeout or cancellation).
-func (m *CASMutex) RTryLockWithContext(ctx context.Context) bool {
-	if err := m.turnstile.Acquire(ctx, 1); err != nil {
-		// Acquire failed due to timeout or cancellation
-		return false
-	}
-
-	m.turnstile.Release(1)
-
-	return m.rTryLock(ctx)
-}
-
-// RLock acquires the read lock.
-// If it is currently held by others writing, RLock will wait until it has a chance to acquire it.
-func (m *CASMutex) RLock() {
-	ctx := context.Background()
-
-	m.RTryLockWithContext(ctx)
-}
-
-// RTryLock attempts to acquire the read lock without blocking.
-// Return false if someone is writing it now.
-func (m *CASMutex) RTryLock() bool {
-	if !m.turnstile.TryAcquire(1) {
-		return false
-	}
-
-	m.turnstile.Release(1)
-
-	return m.rTryLock(nil)
-}
-
-// RTryLockWithTimeout attempts to acquire the read lock within a period of time.
-// Return false if spending time is more than duration and no chance to acquire it.
-func (m *CASMutex) RTryLockWithTimeout(duration time.Duration) bool {
-	ctx, cancel := context.WithTimeout(context.Background(), duration)
-	defer cancel()
-
-	return m.RTryLockWithContext(ctx)
-}
-
-// RUnlock releases the read lock.
-func (m *CASMutex) RUnlock() {
-	n := atomic.AddInt32((*int32)(unsafe.Pointer(&m.state)), -1)
-	switch m.getState(n) {
-	case casStateUndefined, casStateWriteLock:
-		panic("RUnlock failed")
-	case casStateNoLock:
-		m.broadcast()
-	}
-}
-
-// RLocker returns a Locker interface that implements the Lock and Unlock methods
-// by calling CASMutex.RLock and CASMutex.RUnlock.
-func (m *CASMutex) RLocker() sync.Locker {
-	return (*rlocker)(m)
-}
-
-type rlocker CASMutex
-
-func (r *rlocker) Lock()   { (*CASMutex)(r).RLock() }
-func (r *rlocker) Unlock() { (*CASMutex)(r).RUnlock() }

dataext/delayedCombiningInvoker.go

@@ -1,202 +0,0 @@
-package dataext
-
-import (
-	"context"
-	"sync"
-	"time"
-
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
-	"git.blackforestbytes.com/BlackForestBytes/goext/syncext"
-)
-
-// DelayedCombiningInvoker is a utility to combine multiple consecutive requests into a single execution
-//
-// Requests are made with Request(), and consecutive requests are combined during the `delay` period.
-//
-// Can be used, e.g., for search-controls, where we want to init the search when teh user stops typing
-// Or generally to queue an execution once a burst of requests is over.
-type DelayedCombiningInvoker struct {
-	syncLock           sync.Mutex
-	triggerChan        chan bool
-	cancelChan         chan bool
-	execNowChan        chan bool
-	action             func()
-	delay              time.Duration
-	maxDelay           time.Duration
-	executorRunning    *syncext.AtomicBool
-	pendingRequests    *syncext.Atomic[int]
-	lastRequestTime    time.Time
-	initialRequestTime time.Time
-
-	onExecutionStart []func(immediately bool)          // listener ( actual execution of action starts )
-	onExecutionDone  []func()                          // listener ( actual execution of action finished )
-	onRequest        []func(pending int, initial bool) // listener ( a request came in, waiting for execution )
-}
-
-func NewDelayedCombiningInvoker(action func(), delay time.Duration, maxDelay time.Duration) *DelayedCombiningInvoker {
-	return &DelayedCombiningInvoker{
-		action:             action,
-		delay:              delay,
-		maxDelay:           maxDelay,
-		executorRunning:    syncext.NewAtomicBool(false),
-		pendingRequests:    syncext.NewAtomic[int](0),
-		triggerChan:        make(chan bool),
-		cancelChan:         make(chan bool, 1),
-		execNowChan:        make(chan bool, 1),
-		lastRequestTime:    time.Now(),
-		initialRequestTime: time.Now(),
-		onExecutionStart:   make([]func(bool), 0),
-		onExecutionDone:    make([]func(), 0),
-		onRequest:          make([]func(int, bool), 0),
-	}
-}
-
-func (d *DelayedCombiningInvoker) Request() {
-	now := time.Now()
-
-	d.syncLock.Lock()
-	defer d.syncLock.Unlock()
-
-	if d.executorRunning.Get() {
-		d.lastRequestTime = now
-		d.pendingRequests.Update(func(v int) int { return v + 1 })
-
-		for _, fn := range d.onRequest {
-			_ = langext.RunPanicSafe(func() { fn(d.pendingRequests.Get(), true) })
-		}
-
-		d.triggerChan <- true
-	} else {
-		d.initialRequestTime = now
-		d.lastRequestTime = now
-
-		d.executorRunning.Set(true)
-		d.pendingRequests.Set(1)
-		syncext.ReadNonBlocking(d.triggerChan) // clear the channel
-		syncext.ReadNonBlocking(d.cancelChan)  // clear the channel
-		syncext.ReadNonBlocking(d.execNowChan) // clear the channel
-
-		for _, fn := range d.onRequest {
-			_ = langext.RunPanicSafe(func() { fn(d.pendingRequests.Get(), false) })
-		}
-
-		go d.run()
-	}
-}
-
-func (d *DelayedCombiningInvoker) run() {
-
-	needsExecutorRunningCleanup := true
-	defer func() {
-		if needsExecutorRunningCleanup {
-			d.syncLock.Lock()
-			d.executorRunning.Set(false)
-			d.syncLock.Unlock()
-		}
-	}()
-
-	for {
-		d.syncLock.Lock()
-		timeOut := min(d.maxDelay-time.Since(d.initialRequestTime), d.delay-time.Since(d.lastRequestTime))
-		if timeOut < 0 {
-			timeOut = 0
-		}
-		d.syncLock.Unlock()
-
-		immediately := false
-
-		select {
-		case <-d.execNowChan:
-			// run immediately
-			immediately = true
-			break
-		case <-d.triggerChan:
-			// external trigger - needs to re-evaluate
-			break
-		case <-d.cancelChan:
-			// cancel
-			return
-		case <-time.After(timeOut):
-			// time elapsed - check for execution
-			break
-
-		}
-
-		d.syncLock.Lock()
-		execute := immediately || time.Since(d.lastRequestTime) >= d.delay || time.Since(d.initialRequestTime) >= d.maxDelay
-		if !execute {
-			d.syncLock.Unlock()
-			continue
-		}
-
-		d.pendingRequests.Set(0)
-
-		for _, fn := range d.onExecutionStart {
-			_ = langext.RunPanicSafe(func() { fn(immediately) })
-		}
-
-		// =================================================
-		_ = langext.RunPanicSafe(d.action)
-		// =================================================
-
-		d.executorRunning.Set(false) // ensure HasPendingRequests returns fals ein onExecutionDone listener
-		needsExecutorRunningCleanup = false
-
-		for _, fn := range d.onExecutionDone {
-			_ = langext.RunPanicSafe(fn)
-		}
-
-		d.syncLock.Unlock()
-
-		return
-	}
-}
-
-func (d *DelayedCombiningInvoker) CancelPendingRequests() {
-	d.syncLock.Lock()
-	defer d.syncLock.Unlock()
-
-	syncext.WriteNonBlocking(d.cancelChan, true)
-}
-
-func (d *DelayedCombiningInvoker) HasPendingRequests() bool {
-	return d.executorRunning.Get()
-}
-
-func (d *DelayedCombiningInvoker) CountPendingRequests() int {
-	return d.pendingRequests.Get()
-}
-
-func (d *DelayedCombiningInvoker) ExecuteNow() bool {
-	d.syncLock.Lock()
-	defer d.syncLock.Unlock()
-
-	if d.executorRunning.Get() {
-		syncext.WriteNonBlocking(d.execNowChan, true)
-		return true
-	} else {
-		return false
-	}
-}
-
-func (d *DelayedCombiningInvoker) WaitForCompletion(ctx context.Context) error {
-	return d.executorRunning.WaitWithContext(ctx, false)
-}
-
-func (d *DelayedCombiningInvoker) RegisterOnExecutionStart(fn func(immediately bool)) {
-	d.syncLock.Lock()
-	defer d.syncLock.Unlock()
-	d.onExecutionStart = append(d.onExecutionStart, fn)
-}
-
-func (d *DelayedCombiningInvoker) RegisterOnExecutionDone(fn func()) {
-	d.syncLock.Lock()
-	defer d.syncLock.Unlock()
-	d.onExecutionDone = append(d.onExecutionDone, fn)
-}
-
-func (d *DelayedCombiningInvoker) RegisterOnRequest(fn func(pending int, initial bool)) {
-	d.syncLock.Lock()
-	defer d.syncLock.Unlock()
-	d.onRequest = append(d.onRequest, fn)
-}

dataext/lruMap_test.go

@@ -1,7 +1,7 @@
 package dataext
 
 import (
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
+	"gogs.mikescher.com/BlackForestBytes/goext/langext"
 	"math/rand"
 	"strconv"
 	"testing"

dataext/merge_test.go

@@ -1,8 +1,8 @@
 package dataext
 
 import (
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
-	"git.blackforestbytes.com/BlackForestBytes/goext/tst"
+	"gogs.mikescher.com/BlackForestBytes/goext/langext"
+	"gogs.mikescher.com/BlackForestBytes/goext/tst"
 	"testing"
 )
 

dataext/mutexSet.go

@@ -1,53 +0,0 @@
-package dataext
-
-import "sync"
-
-type MutexSet[T comparable] struct {
-	master sync.RWMutex
-	locks  map[T]*sync.RWMutex
-}
-
-func NewMutexSet[T comparable]() *MutexSet[T] {
-	return &MutexSet[T]{
-		master: sync.RWMutex{},
-		locks:  make(map[T]*sync.RWMutex),
-	}
-}
-
-func (ms *MutexSet[T]) get(key T) *sync.RWMutex {
-	ms.master.RLock()
-	if v, ok := ms.locks[key]; ok {
-		ms.master.RUnlock()
-		return v
-	}
-	ms.master.RUnlock()
-
-	// ---------
-
-	ms.master.Lock()
-	defer ms.master.Unlock()
-
-	if v, ok := ms.locks[key]; ok {
-		return v
-	}
-
-	m := &sync.RWMutex{}
-	ms.locks[key] = m
-	return m
-}
-
-func (ms *MutexSet[T]) Lock(key T) {
-	ms.get(key).Lock()
-}
-
-func (ms *MutexSet[T]) Unlock(key T) {
-	ms.get(key).Unlock()
-}
-
-func (ms *MutexSet[T]) RLock(key T) {
-	ms.get(key).RLock()
-}
-
-func (ms *MutexSet[T]) RUnlock(key T) {
-	ms.get(key).RUnlock()
-}

dataext/optional.go

@@ -1,83 +0,0 @@
-package dataext
-
-import (
-	"encoding/json"
-	"errors"
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
-)
-
-type JsonOpt[T any] struct {
-	isSet bool
-	value T
-}
-
-func NewJsonOpt[T any](v T) JsonOpt[T] {
-	return JsonOpt[T]{isSet: true, value: v}
-}
-
-func EmptyJsonOpt[T any]() JsonOpt[T] {
-	return JsonOpt[T]{isSet: false}
-}
-
-// MarshalJSON returns m as the JSON encoding of m.
-func (m JsonOpt[T]) MarshalJSON() ([]byte, error) {
-	if !m.isSet {
-		return []byte("null"), nil // actually this would be undefined - but undefined is not valid JSON
-	}
-
-	return json.Marshal(m.value)
-}
-
-// UnmarshalJSON sets *m to a copy of data.
-func (m *JsonOpt[T]) UnmarshalJSON(data []byte) error {
-	if m == nil {
-		return errors.New("JsonOpt: UnmarshalJSON on nil pointer")
-	}
-
-	m.isSet = true
-	return json.Unmarshal(data, &m.value)
-}
-
-func (m JsonOpt[T]) IsSet() bool {
-	return m.isSet
-}
-
-func (m JsonOpt[T]) IsUnset() bool {
-	return !m.isSet
-}
-
-func (m JsonOpt[T]) Value() (T, bool) {
-	if !m.isSet {
-		return *new(T), false
-	}
-	return m.value, true
-}
-
-func (m JsonOpt[T]) ValueOrNil() *T {
-	if !m.isSet {
-		return nil
-	}
-	return &m.value
-}
-
-func (m JsonOpt[T]) ValueDblPtrOrNil() **T {
-	if !m.isSet {
-		return nil
-	}
-	return langext.DblPtr(m.value)
-}
-
-func (m JsonOpt[T]) MustValue() T {
-	if !m.isSet {
-		panic("value not set")
-	}
-	return m.value
-}
-
-func (m JsonOpt[T]) IfSet(fn func(v T)) bool {
-	if !m.isSet {
-		return false
-	}
-	fn(m.value)
-	return true
-}

dataext/pubsub.go

@@ -1,241 +0,0 @@
-package dataext
-
-import (
-	"context"
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
-	"git.blackforestbytes.com/BlackForestBytes/goext/syncext"
-	"github.com/rs/xid"
-	"iter"
-	"sync"
-	"time"
-)
-
-// PubSub is a simple Pub/Sub Broker
-// Clients can subscribe to a namespace and receive published messages on this namespace
-// Messages are broadcast to all subscribers
-type PubSub[TNamespace comparable, TData any] struct {
-	masterLock *sync.Mutex
-
-	subscriptions map[TNamespace][]*pubSubSubscription[TNamespace, TData]
-}
-
-type PubSubSubscription interface {
-	Unsubscribe()
-}
-
-type pubSubSubscription[TNamespace comparable, TData any] struct {
-	ID string
-
-	parent    *PubSub[TNamespace, TData]
-	namespace TNamespace
-
-	subLock *sync.Mutex
-
-	Func func(TData)
-	Chan chan TData
-
-	UnsubChan chan bool
-}
-
-func (p *pubSubSubscription[TNamespace, TData]) Unsubscribe() {
-	p.parent.unsubscribe(p)
-}
-
-func NewPubSub[TNamespace comparable, TData any](capacity int) *PubSub[TNamespace, TData] {
-	return &PubSub[TNamespace, TData]{
-		masterLock:    &sync.Mutex{},
-		subscriptions: make(map[TNamespace][]*pubSubSubscription[TNamespace, TData], capacity),
-	}
-}
-
-func (ps *PubSub[TNamespace, TData]) Namespaces() []TNamespace {
-	ps.masterLock.Lock()
-	defer ps.masterLock.Unlock()
-
-	return langext.MapKeyArr(ps.subscriptions)
-}
-
-func (ps *PubSub[TNamespace, TData]) SubscriberCount(ns TNamespace) int {
-	ps.masterLock.Lock()
-	defer ps.masterLock.Unlock()
-
-	return len(ps.subscriptions[ns])
-}
-
-// Publish sends `data` to all subscriber
-// But unbuffered - if one is currently not listening, we skip (the actualReceiver < subscriber)
-func (ps *PubSub[TNamespace, TData]) Publish(ns TNamespace, data TData) (subscriber int, actualReceiver int) {
-	ps.masterLock.Lock()
-	subs := langext.ArrCopy(ps.subscriptions[ns])
-	ps.masterLock.Unlock()
-
-	subscriber = len(subs)
-	actualReceiver = 0
-
-	for _, sub := range subs {
-		func() {
-			sub.subLock.Lock()
-			defer sub.subLock.Unlock()
-
-			if sub.Func != nil {
-				go func() { sub.Func(data) }()
-				actualReceiver++
-			} else if sub.Chan != nil {
-				msgSent := syncext.WriteNonBlocking(sub.Chan, data)
-				if msgSent {
-					actualReceiver++
-				}
-			}
-		}()
-	}
-
-	return subscriber, actualReceiver
-}
-
-// PublishWithContext sends `data` to all subscriber
-// buffered - if one is currently not listening, we wait (but error out when the context runs out)
-func (ps *PubSub[TNamespace, TData]) PublishWithContext(ctx context.Context, ns TNamespace, data TData) (subscriber int, actualReceiver int, err error) {
-	ps.masterLock.Lock()
-	subs := langext.ArrCopy(ps.subscriptions[ns])
-	ps.masterLock.Unlock()
-
-	subscriber = len(subs)
-	actualReceiver = 0
-
-	for _, sub := range subs {
-		err := func() error {
-			sub.subLock.Lock()
-			defer sub.subLock.Unlock()
-
-			if err := ctx.Err(); err != nil {
-				return err
-			}
-
-			if sub.Func != nil {
-				go func() { sub.Func(data) }()
-				actualReceiver++
-			} else if sub.Chan != nil {
-				err := syncext.WriteChannelWithContext(ctx, sub.Chan, data)
-				if err != nil {
-					return err
-				}
-				actualReceiver++
-			}
-
-			return nil
-		}()
-		if err != nil {
-			return subscriber, actualReceiver, err
-		}
-	}
-
-	return subscriber, actualReceiver, nil
-}
-
-// PublishWithTimeout sends `data` to all subscriber
-// buffered - if one is currently not listening, we wait (but wait at most `timeout` - if the timeout is exceeded then actualReceiver < subscriber)
-func (ps *PubSub[TNamespace, TData]) PublishWithTimeout(ns TNamespace, data TData, timeout time.Duration) (subscriber int, actualReceiver int) {
-	ps.masterLock.Lock()
-	subs := langext.ArrCopy(ps.subscriptions[ns])
-	ps.masterLock.Unlock()
-
-	subscriber = len(subs)
-	actualReceiver = 0
-
-	for _, sub := range subs {
-		func() {
-			sub.subLock.Lock()
-			defer sub.subLock.Unlock()
-
-			if sub.Func != nil {
-				go func() { sub.Func(data) }()
-				actualReceiver++
-			} else if sub.Chan != nil {
-				ok := syncext.WriteChannelWithTimeout(sub.Chan, data, timeout)
-				if ok {
-					actualReceiver++
-				}
-			}
-		}()
-	}
-
-	return subscriber, actualReceiver
-}
-
-func (ps *PubSub[TNamespace, TData]) SubscribeByCallback(ns TNamespace, fn func(TData)) PubSubSubscription {
-	ps.masterLock.Lock()
-	defer ps.masterLock.Unlock()
-
-	sub := &pubSubSubscription[TNamespace, TData]{ID: xid.New().String(), namespace: ns, parent: ps, subLock: &sync.Mutex{}, Func: fn, UnsubChan: nil}
-
-	ps.subscriptions[ns] = append(ps.subscriptions[ns], sub)
-
-	return sub
-}
-
-func (ps *PubSub[TNamespace, TData]) SubscribeByChan(ns TNamespace, chanBufferSize int) (chan TData, PubSubSubscription) {
-	ps.masterLock.Lock()
-	defer ps.masterLock.Unlock()
-
-	msgCh := make(chan TData, chanBufferSize)
-
-	sub := &pubSubSubscription[TNamespace, TData]{ID: xid.New().String(), namespace: ns, parent: ps, subLock: &sync.Mutex{}, Chan: msgCh, UnsubChan: nil}
-
-	ps.subscriptions[ns] = append(ps.subscriptions[ns], sub)
-
-	return msgCh, sub
-}
-
-func (ps *PubSub[TNamespace, TData]) SubscribeByIter(ns TNamespace, chanBufferSize int) (iter.Seq[TData], PubSubSubscription) {
-	ps.masterLock.Lock()
-	defer ps.masterLock.Unlock()
-
-	msgCh := make(chan TData, chanBufferSize)
-	unsubChan := make(chan bool, 8)
-
-	sub := &pubSubSubscription[TNamespace, TData]{ID: xid.New().String(), namespace: ns, parent: ps, subLock: &sync.Mutex{}, Chan: msgCh, UnsubChan: unsubChan}
-
-	ps.subscriptions[ns] = append(ps.subscriptions[ns], sub)
-
-	iterFun := func(yield func(TData) bool) {
-		for {
-			select {
-			case msg := <-msgCh:
-				if !yield(msg) {
-					sub.Unsubscribe()
-					return
-				}
-			case <-sub.UnsubChan:
-				sub.Unsubscribe()
-				return
-			}
-		}
-	}
-
-	return iterFun, sub
-}
-
-func (ps *PubSub[TNamespace, TData]) unsubscribe(p *pubSubSubscription[TNamespace, TData]) {
-	ps.masterLock.Lock()
-	defer ps.masterLock.Unlock()
-
-	p.subLock.Lock()
-	defer p.subLock.Unlock()
-
-	if p.Chan != nil {
-		close(p.Chan)
-		p.Chan = nil
-	}
-	if p.UnsubChan != nil {
-		syncext.WriteNonBlocking(p.UnsubChan, true)
-		close(p.UnsubChan)
-		p.UnsubChan = nil
-	}
-
-	ps.subscriptions[p.namespace] = langext.ArrFilter(ps.subscriptions[p.namespace], func(v *pubSubSubscription[TNamespace, TData]) bool {
-		return v.ID != p.ID
-	})
-	if len(ps.subscriptions[p.namespace]) == 0 {
-		delete(ps.subscriptions, p.namespace)
-	}
-}

dataext/pubsub_test.go

@@ -1,428 +0,0 @@
-package dataext
-
-import (
-	"context"
-	"sync"
-	"testing"
-	"time"
-)
-
-func TestNewPubSub(t *testing.T) {
-	ps := NewPubSub[string, string](10)
-	if ps == nil {
-		t.Fatal("NewPubSub returned nil")
-	}
-	if ps.masterLock == nil {
-		t.Fatal("masterLock is nil")
-	}
-	if ps.subscriptions == nil {
-		t.Fatal("subscriptions is nil")
-	}
-}
-
-func TestPubSub_Namespaces(t *testing.T) {
-	ps := NewPubSub[string, string](10)
-
-	// Initially no namespaces
-	namespaces := ps.Namespaces()
-	if len(namespaces) != 0 {
-		t.Fatalf("Expected 0 namespaces, got %d", len(namespaces))
-	}
-
-	// Add a subscription to create a namespace
-	_, sub1 := ps.SubscribeByChan("test-ns1", 1)
-	defer sub1.Unsubscribe()
-
-	// Add another subscription to a different namespace
-	_, sub2 := ps.SubscribeByChan("test-ns2", 1)
-	defer sub2.Unsubscribe()
-
-	// Check namespaces
-	namespaces = ps.Namespaces()
-	if len(namespaces) != 2 {
-		t.Fatalf("Expected 2 namespaces, got %d", len(namespaces))
-	}
-
-	// Check if namespaces contain the expected values
-	found1, found2 := false, false
-	for _, ns := range namespaces {
-		if ns == "test-ns1" {
-			found1 = true
-		}
-		if ns == "test-ns2" {
-			found2 = true
-		}
-	}
-
-	if !found1 || !found2 {
-		t.Fatalf("Expected to find both namespaces, found ns1: %v, ns2: %v", found1, found2)
-	}
-}
-
-func TestPubSub_SubscribeByCallback(t *testing.T) {
-	ps := NewPubSub[string, string](10)
-
-	var received string
-	var wg sync.WaitGroup
-	wg.Add(1)
-
-	callback := func(msg string) {
-		received = msg
-		wg.Done()
-	}
-
-	sub := ps.SubscribeByCallback("test-ns", callback)
-	defer sub.Unsubscribe()
-
-	// Publish a message
-	subs, receivers := ps.Publish("test-ns", "hello")
-
-	if subs != 1 {
-		t.Fatalf("Expected 1 subscriber, got %d", subs)
-	}
-
-	if receivers != 1 {
-		t.Fatalf("Expected 1 receiver, got %d", receivers)
-	}
-
-	// Wait for the callback to be executed
-	wg.Wait()
-
-	if received != "hello" {
-		t.Fatalf("Expected to receive 'hello', got '%s'", received)
-	}
-}
-
-func TestPubSub_SubscribeByChan(t *testing.T) {
-	ps := NewPubSub[string, string](10)
-
-	ch, sub := ps.SubscribeByChan("test-ns", 1)
-	defer sub.Unsubscribe()
-
-	// Publish a message
-	subs, receivers := ps.Publish("test-ns", "hello")
-
-	if subs != 1 {
-		t.Fatalf("Expected 1 subscriber, got %d", subs)
-	}
-
-	if receivers != 1 {
-		t.Fatalf("Expected 1 receiver, got %d", receivers)
-	}
-
-	// Read from the channel with a timeout to avoid blocking
-	select {
-	case msg := <-ch:
-		if msg != "hello" {
-			t.Fatalf("Expected to receive 'hello', got '%s'", msg)
-		}
-	case <-time.After(time.Second):
-		t.Fatal("Timed out waiting for message")
-	}
-}
-
-func TestPubSub_SubscribeByIter(t *testing.T) {
-	ps := NewPubSub[string, string](10)
-
-	iterSeq, sub := ps.SubscribeByIter("test-ns", 1)
-	defer sub.Unsubscribe()
-
-	// Channel to communicate when message is received
-	done := make(chan bool)
-	received := false
-
-	// Start a goroutine to use the iterator
-	go func() {
-		for msg := range iterSeq {
-			if msg == "hello" {
-				received = true
-				done <- true
-				return // Stop iteration
-			}
-		}
-	}()
-
-	// Give time for the iterator to start
-	time.Sleep(100 * time.Millisecond)
-
-	// Publish a message
-	ps.Publish("test-ns", "hello")
-
-	// Wait for the message to be received or timeout
-	select {
-	case <-done:
-		if !received {
-			t.Fatal("Message was received but not 'hello'")
-		}
-	case <-time.After(time.Second):
-		t.Fatal("Timed out waiting for message")
-	}
-
-	subCount := ps.SubscriberCount("test-ns")
-	if subCount != 0 {
-		t.Fatalf("Expected 0 receivers, got %d", subCount)
-	}
-}
-
-func TestPubSub_Publish(t *testing.T) {
-	ps := NewPubSub[string, string](10)
-
-	// Test publishing to a namespace with no subscribers
-	subs, receivers := ps.Publish("empty-ns", "hello")
-	if subs != 0 {
-		t.Fatalf("Expected 0 subscribers, got %d", subs)
-	}
-	if receivers != 0 {
-		t.Fatalf("Expected 0 receivers, got %d", receivers)
-	}
-
-	// Add a subscriber
-	ch, sub := ps.SubscribeByChan("test-ns", 1)
-	defer sub.Unsubscribe()
-
-	// Publish a message
-	subs, receivers = ps.Publish("test-ns", "hello")
-	if subs != 1 {
-		t.Fatalf("Expected 1 subscriber, got %d", subs)
-	}
-	if receivers != 1 {
-		t.Fatalf("Expected 1 receiver, got %d", receivers)
-	}
-
-	// Verify the message was received
-	select {
-	case msg := <-ch:
-		if msg != "hello" {
-			t.Fatalf("Expected to receive 'hello', got '%s'", msg)
-		}
-	case <-time.After(time.Second):
-		t.Fatal("Timed out waiting for message")
-	}
-
-	// Test non-blocking behavior with a full channel
-	// First fill the channel
-	ps.Publish("test-ns", "fill")
-
-	// Now publish again - this should not block but skip the receiver
-	subs, receivers = ps.Publish("test-ns", "overflow")
-	if subs != 1 {
-		t.Fatalf("Expected 1 subscriber, got %d", subs)
-	}
-	// The receiver count might be 0 if the channel is full
-
-	// Drain the channel
-	<-ch
-}
-
-func TestPubSub_PublishWithTimeout(t *testing.T) {
-	ps := NewPubSub[string, string](10)
-
-	// Add a subscriber with a channel
-	ch, sub := ps.SubscribeByChan("test-ns", 1)
-	defer sub.Unsubscribe()
-
-	// Publish with a timeout
-	subs, receivers := ps.PublishWithTimeout("test-ns", "hello", 100*time.Millisecond)
-	if subs != 1 {
-		t.Fatalf("Expected 1 subscriber, got %d", subs)
-	}
-	if receivers != 1 {
-		t.Fatalf("Expected 1 receiver, got %d", receivers)
-	}
-
-	// Verify the message was received
-	select {
-	case msg := <-ch:
-		if msg != "hello" {
-			t.Fatalf("Expected to receive 'hello', got '%s'", msg)
-		}
-	case <-time.After(time.Second):
-		t.Fatal("Timed out waiting for message")
-	}
-
-	// Fill the channel
-	ps.Publish("test-ns", "fill")
-
-	// Test timeout behavior with a full channel
-	start := time.Now()
-	subs, receivers = ps.PublishWithTimeout("test-ns", "timeout-test", 50*time.Millisecond)
-	elapsed := time.Since(start)
-
-	if subs != 1 {
-		t.Fatalf("Expected 1 subscriber, got %d", subs)
-	}
-
-	// The receiver count should be 0 if the timeout occurred
-	if elapsed < 50*time.Millisecond {
-		t.Fatalf("Expected to wait at least 50ms, only waited %v", elapsed)
-	}
-
-	// Drain the channel
-	<-ch
-}
-
-func TestPubSub_PublishWithContext(t *testing.T) {
-	ps := NewPubSub[string, string](10)
-
-	// Add a subscriber with a channel
-	ch, sub := ps.SubscribeByChan("test-ns", 1)
-	defer sub.Unsubscribe()
-
-	// Create a context
-	ctx, cancel := context.WithTimeout(context.Background(), 100*time.Millisecond)
-	defer cancel()
-
-	// Publish with context
-	subs, receivers, err := ps.PublishWithContext(ctx, "test-ns", "hello")
-	if err != nil {
-		t.Fatalf("Unexpected error: %v", err)
-	}
-	if subs != 1 {
-		t.Fatalf("Expected 1 subscriber, got %d", subs)
-	}
-	if receivers != 1 {
-		t.Fatalf("Expected 1 receiver, got %d", receivers)
-	}
-
-	// Verify the message was received
-	select {
-	case msg := <-ch:
-		if msg != "hello" {
-			t.Fatalf("Expected to receive 'hello', got '%s'", msg)
-		}
-	case <-time.After(time.Second):
-		t.Fatal("Timed out waiting for message")
-	}
-
-	// Fill the channel
-	ps.Publish("test-ns", "fill")
-
-	// Test context cancellation with a full channel
-	ctx, cancel = context.WithCancel(context.Background())
-
-	// Cancel the context after a short delay
-	go func() {
-		time.Sleep(50 * time.Millisecond)
-		cancel()
-	}()
-
-	start := time.Now()
-	subs, receivers, err = ps.PublishWithContext(ctx, "test-ns", "context-test")
-	elapsed := time.Since(start)
-
-	if subs != 1 {
-		t.Fatalf("Expected 1 subscriber, got %d", subs)
-	}
-
-	// Should get a context canceled error
-	if err == nil {
-		t.Fatal("Expected context canceled error, got nil")
-	}
-
-	if elapsed < 50*time.Millisecond {
-		t.Fatalf("Expected to wait at least 50ms, only waited %v", elapsed)
-	}
-
-	// Drain the channel
-	<-ch
-}
-
-func TestPubSub_Unsubscribe(t *testing.T) {
-	ps := NewPubSub[string, string](10)
-
-	// Add a subscriber
-	ch, sub := ps.SubscribeByChan("test-ns", 1)
-
-	// Publish a message
-	subs, receivers := ps.Publish("test-ns", "hello")
-	if subs != 1 {
-		t.Fatalf("Expected 1 subscriber, got %d", subs)
-	}
-	if receivers != 1 {
-		t.Fatalf("Expected 1 receiver, got %d", receivers)
-	}
-
-	// Verify the message was received
-	select {
-	case msg := <-ch:
-		if msg != "hello" {
-			t.Fatalf("Expected to receive 'hello', got '%s'", msg)
-		}
-	case <-time.After(time.Second):
-		t.Fatal("Timed out waiting for message")
-	}
-
-	// Unsubscribe
-	sub.Unsubscribe()
-
-	// Publish again
-	subs, receivers = ps.Publish("test-ns", "after-unsub")
-	if subs != 0 {
-		t.Fatalf("Expected 0 subscribers after unsubscribe, got %d", subs)
-	}
-	if receivers != 0 {
-		t.Fatalf("Expected 0 receivers after unsubscribe, got %d", receivers)
-	}
-
-	// Check that the namespace is removed
-	namespaces := ps.Namespaces()
-	if len(namespaces) != 0 {
-		t.Fatalf("Expected 0 namespaces after unsubscribe, got %d", len(namespaces))
-	}
-}
-
-func TestPubSub_MultipleSubscribers(t *testing.T) {
-	ps := NewPubSub[string, string](10)
-
-	// Add multiple subscribers
-	ch1, sub1 := ps.SubscribeByChan("test-ns", 1)
-	defer sub1.Unsubscribe()
-
-	ch2, sub2 := ps.SubscribeByChan("test-ns", 1)
-	defer sub2.Unsubscribe()
-
-	var received string
-	var wg sync.WaitGroup
-	wg.Add(1)
-
-	sub3 := ps.SubscribeByCallback("test-ns", func(msg string) {
-		received = msg
-		wg.Done()
-	})
-	defer sub3.Unsubscribe()
-
-	// Publish a message
-	subs, receivers := ps.Publish("test-ns", "hello")
-	if subs != 3 {
-		t.Fatalf("Expected 3 subscribers, got %d", subs)
-	}
-	if receivers != 3 {
-		t.Fatalf("Expected 3 receivers, got %d", receivers)
-	}
-
-	// Verify the message was received by all subscribers
-	select {
-	case msg := <-ch1:
-		if msg != "hello" {
-			t.Fatalf("Expected ch1 to receive 'hello', got '%s'", msg)
-		}
-	case <-time.After(time.Second):
-		t.Fatal("Timed out waiting for message on ch1")
-	}
-
-	select {
-	case msg := <-ch2:
-		if msg != "hello" {
-			t.Fatalf("Expected ch2 to receive 'hello', got '%s'", msg)
-		}
-	case <-time.After(time.Second):
-		t.Fatal("Timed out waiting for message on ch2")
-	}
-
-	// Wait for the callback
-	wg.Wait()
-
-	if received != "hello" {
-		t.Fatalf("Expected callback to receive 'hello', got '%s'", received)
-	}
-}

dataext/ringBuffer.go

@@ -1,144 +0,0 @@
-package dataext
-
-import "iter"
-
-type RingBuffer[T any] struct {
-	items    []T //
-	capacity int // max number of items the buffer can hold
-	size     int // how many items are in the buffer
-	head     int // ptr to next item
-}
-
-func NewRingBuffer[T any](capacity int) *RingBuffer[T] {
-	return &RingBuffer[T]{
-		items:    make([]T, capacity),
-		capacity: capacity,
-		size:     0,
-		head:     0,
-	}
-}
-
-func (rb *RingBuffer[T]) Push(item T) {
-	if rb.size < rb.capacity {
-		rb.size++
-	}
-	rb.items[rb.head] = item
-	rb.head = (rb.head + 1) % rb.capacity
-}
-
-func (rb *RingBuffer[T]) PushPop(item T) *T {
-	if rb.size < rb.capacity {
-		rb.size++
-		rb.items[rb.head] = item
-		rb.head = (rb.head + 1) % rb.capacity
-		return nil
-	} else {
-		prev := rb.items[rb.head]
-		rb.items[rb.head] = item
-		rb.head = (rb.head + 1) % rb.capacity
-		return &prev
-	}
-}
-
-func (rb *RingBuffer[T]) Peek() (T, bool) {
-	if rb.size == 0 {
-		return *new(T), false
-	}
-	return rb.items[(rb.head-1+rb.capacity)%rb.capacity], true
-}
-
-func (rb *RingBuffer[T]) Items() []T {
-	if rb.size < rb.capacity {
-		return rb.items[:rb.size]
-	}
-	return append(rb.items[rb.head:], rb.items[:rb.head]...)
-}
-
-func (rb *RingBuffer[T]) Size() int {
-	return rb.size
-}
-
-func (rb *RingBuffer[T]) Capacity() int {
-	return rb.capacity
-}
-
-func (rb *RingBuffer[T]) Clear() {
-	rb.size = 0
-	rb.head = 0
-}
-
-func (rb *RingBuffer[T]) IsFull() bool {
-	return rb.size == rb.capacity
-}
-
-func (rb *RingBuffer[T]) At(i int) T {
-	if i < 0 || i >= rb.size {
-		panic("Index out of bounds")
-	}
-	if rb.size < rb.capacity {
-		return rb.items[i]
-	}
-	return rb.items[(rb.head+i)%rb.capacity]
-}
-
-func (rb *RingBuffer[T]) Get(i int) (T, bool) {
-	if i < 0 || i >= rb.size {
-		return *new(T), false
-	}
-	if rb.size < rb.capacity {
-		return rb.items[i], true
-	}
-	return rb.items[(rb.head+i)%rb.capacity], true
-}
-
-func (rb *RingBuffer[T]) Iter() iter.Seq[T] {
-	return func(yield func(T) bool) {
-		for i := 0; i < rb.size; i++ {
-			if !yield(rb.At(i)) {
-				return
-			}
-		}
-	}
-}
-
-func (rb *RingBuffer[T]) Iter2() iter.Seq2[int, T] {
-	return func(yield func(int, T) bool) {
-		for i := 0; i < rb.size; i++ {
-			if !yield(i, rb.At(i)) {
-				return
-			}
-		}
-	}
-}
-
-func (rb *RingBuffer[T]) Remove(fnEqual func(v T) bool) int {
-	// Mike [2024-11-13]: I *really* tried to write an in-place algorithm to remove elements
-	//                    But after carful consideration, I left that as an exercise for future readers
-	//                    It is, suprisingly, non-trivial, especially because the head-ptr must be weirdly updated
-	//                    And out At() method does not work correctly with {head<>0 && size<capacity}
-
-	dc := 0
-	b := make([]T, rb.capacity)
-	bsize := 0
-
-	for i := 0; i < rb.size; i++ {
-		comp := rb.At(i)
-		if fnEqual(comp) {
-			dc++
-		} else {
-			b[bsize] = comp
-			bsize++
-		}
-	}
-
-	if dc == 0 {
-		return 0
-	}
-
-	rb.items = b
-	rb.size = bsize
-	rb.head = bsize % rb.capacity
-
-	return dc
-
-}

dataext/ringBuffer_test.go

@@ -1,447 +0,0 @@
-package dataext
-
-import "testing"
-
-func TestRingBufferPushAddsItem(t *testing.T) {
-	rb := NewRingBuffer[int](3)
-	rb.Push(1)
-	if rb.Size() != 1 {
-		t.Errorf("Expected size 1, got %d", rb.Size())
-	}
-	if item, _ := rb.Peek(); item != 1 {
-		t.Errorf("Expected item 1, got %d", item)
-	}
-}
-
-func TestRingBufferPushPopReturnsOldestItem(t *testing.T) {
-	rb := NewRingBuffer[int](3)
-	rb.Push(1)
-	rb.Push(2)
-	rb.Push(3)
-	if item := rb.PushPop(4); item == nil || *item != 1 {
-		t.Errorf("Expected item 1, got %v", item)
-	}
-}
-
-func TestRingBufferPeekReturnsLastPushedItem(t *testing.T) {
-	rb := NewRingBuffer[int](3)
-	rb.Push(1)
-	rb.Push(2)
-	if item, _ := rb.Peek(); item != 2 {
-		t.Errorf("Expected item 2, got %d", item)
-	}
-}
-
-func TestRingBufferOverflow1(t *testing.T) {
-	rb := NewRingBuffer[int](5)
-	rb.Push(1) // overriden
-	rb.Push(2) // overriden
-	rb.Push(3)
-	rb.Push(9)
-	rb.Push(4)
-	rb.Push(5)
-	rb.Push(7)
-	if rb.Size() != 5 {
-		t.Errorf("Expected size 4, got %d", rb.Size())
-	}
-	expected := []int{3, 9, 4, 5, 7}
-	items := rb.Items()
-	for i, item := range items {
-		if item != expected[i] {
-			t.Errorf("Expected item %d, got %d", expected[i], item)
-		}
-	}
-}
-
-func TestRingBufferItemsReturnsAllItems(t *testing.T) {
-	rb := NewRingBuffer[int](3)
-	rb.Push(1)
-	rb.Push(2)
-	rb.Push(3)
-	items := rb.Items()
-	expected := []int{1, 2, 3}
-	for i, item := range items {
-		if item != expected[i] {
-			t.Errorf("Expected item %d, got %d", expected[i], item)
-		}
-	}
-}
-
-func TestRingBufferClearEmptiesBuffer(t *testing.T) {
-	rb := NewRingBuffer[int](3)
-	rb.Push(1)
-	rb.Clear()
-	if rb.Size() != 0 {
-		t.Errorf("Expected size 0, got %d", rb.Size())
-	}
-}
-
-func TestRingBufferIsFullReturnsTrueWhenFull(t *testing.T) {
-	rb := NewRingBuffer[int](3)
-	rb.Push(1)
-	rb.Push(2)
-	rb.Push(3)
-	if !rb.IsFull() {
-		t.Errorf("Expected buffer to be full")
-	}
-}
-
-func TestRingBufferAtReturnsCorrectItem(t *testing.T) {
-	rb := NewRingBuffer[int](3)
-	rb.Push(1)
-	rb.Push(2)
-	rb.Push(3)
-	if item := rb.At(1); item != 2 {
-		t.Errorf("Expected item 2, got %d", item)
-	}
-}
-
-func TestRingBufferGetReturnsCorrectItem(t *testing.T) {
-	rb := NewRingBuffer[int](3)
-	rb.Push(1)
-	rb.Push(2)
-	rb.Push(3)
-	if item, ok := rb.Get(1); !ok || item != 2 {
-		t.Errorf("Expected item 2, got %d", item)
-	}
-}
-
-func TestRingBufferRemoveDeletesMatchingItems(t *testing.T) {
-	rb := NewRingBuffer[int](5)
-	rb.Push(1)
-	rb.Push(2)
-	rb.Push(3)
-	rb.Push(2)
-	rb.Push(4)
-	removed := rb.Remove(func(v int) bool { return v == 2 })
-	if removed != 2 {
-		t.Errorf("Expected 2 items removed, got %d", removed)
-	}
-	if rb.Size() != 3 {
-		t.Errorf("Expected size 3, got %d", rb.Size())
-	}
-	expected := []int{1, 3, 4}
-	items := rb.Items()
-	for i, item := range items {
-		if item != expected[i] {
-			t.Errorf("Expected item %d, got %d", expected[i], item)
-		}
-	}
-}
-
-func TestRingBufferRemoveDeletesMatchingItems2(t *testing.T) {
-	rb := NewRingBuffer[int](5)
-	rb.Push(1)
-	rb.Push(2)
-	rb.Push(3)
-	rb.Push(2)
-	rb.Push(4)
-	removed := rb.Remove(func(v int) bool { return v == 3 })
-	if removed != 1 {
-		t.Errorf("Expected 2 items removed, got %d", removed)
-	}
-	if rb.Size() != 4 {
-		t.Errorf("Expected size 3, got %d", rb.Size())
-	}
-	expected := []int{1, 2, 2, 4}
-	items := rb.Items()
-	for i, item := range items {
-		if item != expected[i] {
-			t.Errorf("Expected item %d, got %d", expected[i], item)
-		}
-	}
-}
-
-func TestRingBufferRemoveDeletesMatchingItems3(t *testing.T) {
-	rb := NewRingBuffer[int](5)
-	rb.Push(1)
-	rb.Push(2)
-	rb.Push(3)
-	rb.Push(9)
-	rb.Push(4)
-	removed := rb.Remove(func(v int) bool { return v == 3 })
-	if removed != 1 {
-		t.Errorf("Expected 2 items removed, got %d", removed)
-	}
-	if rb.Size() != 4 {
-		t.Errorf("Expected size 3, got %d", rb.Size())
-	}
-	expected := []int{1, 2, 9, 4}
-	items := rb.Items()
-	for i, item := range items {
-		if item != expected[i] {
-			t.Errorf("Expected item %d, got %d", expected[i], item)
-		}
-	}
-}
-
-func TestRingBufferRemoveDeletesMatchingItems4(t *testing.T) {
-	rb := NewRingBuffer[int](5)
-	rb.Push(1) // overriden
-	rb.Push(2) // overriden
-	rb.Push(3)
-	rb.Push(9)
-	rb.Push(4)
-	rb.Push(5)
-	rb.Push(7)
-	removed := rb.Remove(func(v int) bool { return v == 7 })
-	if removed != 1 {
-		t.Errorf("Expected 1 items removed, got %d", removed)
-	}
-	if rb.Size() != 4 {
-		t.Errorf("Expected size 4, got %d", rb.Size())
-	}
-	expected := []int{3, 9, 4, 5}
-	items := rb.Items()
-	for i, item := range items {
-		if item != expected[i] {
-			t.Errorf("Expected item %d, got %d", expected[i], item)
-		}
-	}
-}
-
-func TestRingBufferRemoveDeletesMatchingItems5(t *testing.T) {
-	rb := NewRingBuffer[int](5)
-	rb.Push(1) // overriden
-	rb.Push(2) // overriden
-	rb.Push(3)
-	rb.Push(9)
-	rb.Push(4)
-	rb.Push(5)
-	rb.Push(7)
-	removed := rb.Remove(func(v int) bool { return v == 3 })
-	if removed != 1 {
-		t.Errorf("Expected 1 items removed, got %d", removed)
-	}
-	if rb.Size() != 4 {
-		t.Errorf("Expected size 4, got %d", rb.Size())
-	}
-	expected := []int{9, 4, 5, 7}
-	items := rb.Items()
-	for i, item := range items {
-		if item != expected[i] {
-			t.Errorf("Expected item %d, got %d", expected[i], item)
-		}
-	}
-}
-
-func TestRingBufferRemoveDeletesMatchingItems6(t *testing.T) {
-	rb := NewRingBuffer[int](5)
-	rb.Push(1) // overriden
-	rb.Push(2) // overriden
-	rb.Push(3)
-	rb.Push(9)
-	rb.Push(4)
-	rb.Push(5)
-	rb.Push(7)
-	removed := rb.Remove(func(v int) bool { return v == 1 })
-	if removed != 0 {
-		t.Errorf("Expected 0 items removed, got %d", removed)
-	}
-	if rb.Size() != 5 {
-		t.Errorf("Expected size 5, got %d", rb.Size())
-	}
-	expected := []int{3, 9, 4, 5, 7}
-	items := rb.Items()
-	for i, item := range items {
-		if item != expected[i] {
-			t.Errorf("Expected item %d, got %d", expected[i], item)
-		}
-	}
-	if !rb.IsFull() {
-		t.Errorf("Expected buffer to not be full")
-	}
-}
-
-func TestRingBufferRemoveDeletesMatchingItems7(t *testing.T) {
-	rb := NewRingBuffer[int](5)
-	rb.Push(1) // overriden
-	rb.Push(2) // overriden
-	rb.Push(3)
-	rb.Push(9)
-	rb.Push(4)
-	rb.Push(5)
-	rb.Push(7)
-	removed := rb.Remove(func(v int) bool { return v == 9 })
-	if removed != 1 {
-		t.Errorf("Expected 1 items removed, got %d", removed)
-	}
-	if rb.Size() != 4 {
-		t.Errorf("Expected size 4, got %d", rb.Size())
-	}
-	expected := []int{3, 4, 5, 7}
-	items := rb.Items()
-	for i, item := range items {
-		if item != expected[i] {
-			t.Errorf("Expected item %d, got %d", expected[i], item)
-		}
-	}
-	if rb.IsFull() {
-		t.Errorf("Expected buffer to not be full")
-	}
-}
-
-func TestRingBufferAddItemsToFullRingBuffer(t *testing.T) {
-	rb := NewRingBuffer[int](3)
-	rb.Push(1)
-	rb.Push(2)
-	rb.Push(3)
-	rb.Push(4)
-	if rb.Size() != 3 {
-		t.Errorf("Expected size 3, got %d", rb.Size())
-	}
-	expected := []int{2, 3, 4}
-	items := rb.Items()
-	for i, item := range items {
-		if item != expected[i] {
-			t.Errorf("Expected item %d, got %d", expected[i], item)
-		}
-	}
-}
-
-func TestRingBufferAddItemsToNonFullRingBuffer(t *testing.T) {
-	rb := NewRingBuffer[int](3)
-	rb.Push(1)
-	rb.Push(2)
-	if rb.Size() != 2 {
-		t.Errorf("Expected size 2, got %d", rb.Size())
-	}
-	expected := []int{1, 2}
-	items := rb.Items()
-	for i, item := range items {
-		if item != expected[i] {
-			t.Errorf("Expected item %d, got %d", expected[i], item)
-		}
-	}
-}
-
-func TestRingBufferRemoveItemsFromNonFullRingBuffer(t *testing.T) {
-	rb := NewRingBuffer[int](3)
-	rb.Push(1)
-	rb.Push(2)
-	removed := rb.Remove(func(v int) bool { return v == 1 })
-	if removed != 1 {
-		t.Errorf("Expected 1 item removed, got %d", removed)
-	}
-	if rb.Size() != 1 {
-		t.Errorf("Expected size 1, got %d", rb.Size())
-	}
-	expected := []int{2}
-	items := rb.Items()
-	for i, item := range items {
-		if item != expected[i] {
-			t.Errorf("Expected item %d, got %d", expected[i], item)
-		}
-	}
-}
-
-func TestRingBufferRemoveItemsFromFullRingBuffer(t *testing.T) {
-	rb := NewRingBuffer[int](3)
-	rb.Push(1)
-	rb.Push(2)
-	rb.Push(3)
-	removed := rb.Remove(func(v int) bool { return v == 2 })
-	if removed != 1 {
-		t.Errorf("Expected 1 item removed, got %d", removed)
-	}
-	if rb.Size() != 2 {
-		t.Errorf("Expected size 2, got %d", rb.Size())
-	}
-	expected := []int{1, 3}
-	items := rb.Items()
-	for i, item := range items {
-		if item != expected[i] {
-			t.Errorf("Expected item %d, got %d", expected[i], item)
-		}
-	}
-}
-
-func TestRingBufferRemoveMultipleItemsFromRingBuffer(t *testing.T) {
-	rb := NewRingBuffer[int](5)
-	rb.Push(1)
-	rb.Push(2)
-	rb.Push(3)
-	rb.Push(2)
-	rb.Push(4)
-	removed := rb.Remove(func(v int) bool { return v == 2 })
-	if removed != 2 {
-		t.Errorf("Expected 2 items removed, got %d", removed)
-	}
-	if rb.Size() != 3 {
-		t.Errorf("Expected size 3, got %d", rb.Size())
-	}
-	expected := []int{1, 3, 4}
-	items := rb.Items()
-	for i, item := range items {
-		if item != expected[i] {
-			t.Errorf("Expected item %d, got %d", expected[i], item)
-		}
-	}
-}
-
-func TestRingBufferRemoveAllItemsFromRingBuffer(t *testing.T) {
-	rb := NewRingBuffer[int](3)
-	rb.Push(1)
-	rb.Push(2)
-	rb.Push(3)
-	removed := rb.Remove(func(v int) bool { return true })
-	if removed != 3 {
-		t.Errorf("Expected 3 items removed, got %d", removed)
-	}
-	if rb.Size() != 0 {
-		t.Errorf("Expected size 0, got %d", rb.Size())
-	}
-}
-
-func TestRingBufferRemoveNoItemsFromRingBuffer(t *testing.T) {
-	rb := NewRingBuffer[int](3)
-	rb.Push(1)
-	rb.Push(2)
-	rb.Push(3)
-	removed := rb.Remove(func(v int) bool { return false })
-	if removed != 0 {
-		t.Errorf("Expected 0 items removed, got %d", removed)
-	}
-	if rb.Size() != 3 {
-		t.Errorf("Expected size 3, got %d", rb.Size())
-	}
-}
-
-func TestRingBufferIteratesOverAllItems(t *testing.T) {
-	rb := NewRingBuffer[int](3)
-	rb.Push(1)
-	rb.Push(2)
-	rb.Push(3)
-	expected := []int{1, 2, 3}
-	i := 0
-	for item := range rb.Iter() {
-		if item != expected[i] {
-			t.Errorf("Expected item %d, got %d", expected[i], item)
-		}
-		i++
-	}
-	if i != len(expected) {
-		t.Errorf("Expected to iterate over %d items, but iterated over %d", len(expected), i)
-	}
-}
-
-func TestRingBufferIter2IteratesOverAllItemsWithIndices(t *testing.T) {
-	rb := NewRingBuffer[int](3)
-	rb.Push(1)
-	rb.Push(2)
-	rb.Push(3)
-	expected := []int{1, 2, 3}
-	i := 0
-	for index, item := range rb.Iter2() {
-		if index != i {
-			t.Errorf("Expected index %d, got %d", i, index)
-		}
-		if item != expected[i] {
-			t.Errorf("Expected item %d, got %d", expected[i], item)
-		}
-		i++
-	}
-	if i != len(expected) {
-		t.Errorf("Expected to iterate over %d items, but iterated over %d", len(expected), i)
-	}
-}

dataext/stack.go

@@ -2,7 +2,7 @@ package dataext
 
 import (
 	"errors"
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
+	"gogs.mikescher.com/BlackForestBytes/goext/langext"
 	"sync"
 )
 

dataext/structHash.go

@@ -6,7 +6,7 @@ import (
 	"encoding/binary"
 	"errors"
 	"fmt"
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
+	"gogs.mikescher.com/BlackForestBytes/goext/langext"
 	"hash"
 	"io"
 	"reflect"

dataext/structHash_test.go

@@ -1,8 +1,8 @@
 package dataext
 
 import (
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
-	"git.blackforestbytes.com/BlackForestBytes/goext/tst"
+	"gogs.mikescher.com/BlackForestBytes/goext/langext"
+	"gogs.mikescher.com/BlackForestBytes/goext/tst"
 	"testing"
 )
 

dataext/syncMap.go

@@ -1,256 +0,0 @@
-package dataext
-
-import "sync"
-
-// SyncMap is a thread-safe map implementation for generic key-value pairs.
-// All functions aresafe to be called in parallel.
-type SyncMap[TKey comparable, TData any] struct {
-	data map[TKey]TData
-	lock sync.Mutex
-}
-
-func NewSyncMap[TKey comparable, TData any]() *SyncMap[TKey, TData] {
-	return &SyncMap[TKey, TData]{data: make(map[TKey]TData), lock: sync.Mutex{}}
-}
-
-// Set sets the value for the provided key
-func (s *SyncMap[TKey, TData]) Set(key TKey, data TData) {
-	s.lock.Lock()
-	defer s.lock.Unlock()
-
-	if s.data == nil {
-		s.data = make(map[TKey]TData)
-	}
-
-	s.data[key] = data
-}
-
-// SetIfNotContains sets the value for the provided key if it does not already exist
-func (s *SyncMap[TKey, TData]) SetIfNotContains(key TKey, data TData) bool {
-	s.lock.Lock()
-	defer s.lock.Unlock()
-
-	if s.data == nil {
-		s.data = make(map[TKey]TData)
-	}
-
-	if _, existsInPreState := s.data[key]; existsInPreState {
-		return false
-	}
-
-	s.data[key] = data
-
-	return true
-}
-
-// SetIfNotContainsFunc sets the value for the provided key using the provided function
-func (s *SyncMap[TKey, TData]) SetIfNotContainsFunc(key TKey, data func() TData) bool {
-	s.lock.Lock()
-	defer s.lock.Unlock()
-
-	if s.data == nil {
-		s.data = make(map[TKey]TData)
-	}
-
-	if _, existsInPreState := s.data[key]; existsInPreState {
-		return false
-	}
-
-	s.data[key] = data()
-
-	return true
-}
-
-// Get retrieves the value for the provided key
-func (s *SyncMap[TKey, TData]) Get(key TKey) (TData, bool) {
-	s.lock.Lock()
-	defer s.lock.Unlock()
-
-	if s.data == nil {
-		s.data = make(map[TKey]TData)
-	}
-
-	if v, ok := s.data[key]; ok {
-		return v, true
-	} else {
-		return *new(TData), false
-	}
-}
-
-// GetAndSetIfNotContains returns the existing value if the key exists.
-// Otherwise, it sets the provided value and returns it.
-func (s *SyncMap[TKey, TData]) GetAndSetIfNotContains(key TKey, data TData) TData {
-	s.lock.Lock()
-	defer s.lock.Unlock()
-
-	if s.data == nil {
-		s.data = make(map[TKey]TData)
-	}
-
-	if v, ok := s.data[key]; ok {
-		return v
-	} else {
-		s.data[key] = data
-		return data
-	}
-}
-
-// GetAndSetIfNotContainsFunc returns the existing value if the key exists.
-// Otherwise, it calls the provided function to generate the value, sets it, and returns it.
-func (s *SyncMap[TKey, TData]) GetAndSetIfNotContainsFunc(key TKey, data func() TData) TData {
-	s.lock.Lock()
-	defer s.lock.Unlock()
-
-	if s.data == nil {
-		s.data = make(map[TKey]TData)
-	}
-
-	if v, ok := s.data[key]; ok {
-		return v
-	} else {
-		dataObj := data()
-		s.data[key] = dataObj
-		return dataObj
-	}
-}
-
-// Delete removes the entry with the provided key and returns true if the key existed before.
-func (s *SyncMap[TKey, TData]) Delete(key TKey) bool {
-	s.lock.Lock()
-	defer s.lock.Unlock()
-
-	if s.data == nil {
-		s.data = make(map[TKey]TData)
-	}
-
-	_, ok := s.data[key]
-
-	delete(s.data, key)
-
-	return ok
-}
-
-// DeleteIf deletes all entries that match the provided function and returns the number of removed entries.
-func (s *SyncMap[TKey, TData]) DeleteIf(fn func(key TKey, data TData) bool) int {
-	s.lock.Lock()
-	defer s.lock.Unlock()
-
-	if s.data == nil {
-		s.data = make(map[TKey]TData)
-	}
-
-	rm := 0
-	for k, v := range s.data {
-		if fn(k, v) {
-			delete(s.data, k)
-			rm++
-		}
-	}
-
-	return rm
-}
-
-// UpdateIfExists updates the value if the key exists, otherwise it does nothing.
-func (s *SyncMap[TKey, TData]) UpdateIfExists(key TKey, fn func(data TData) TData) bool {
-	s.lock.Lock()
-	defer s.lock.Unlock()
-
-	if s.data == nil {
-		s.data = make(map[TKey]TData)
-	}
-
-	if v, ok := s.data[key]; ok {
-		s.data[key] = fn(v)
-		return true
-	} else {
-		return false
-	}
-}
-
-// UpdateOrInsert updates the value if the key exists, otherwise it inserts the provided `insertValue`.
-func (s *SyncMap[TKey, TData]) UpdateOrInsert(key TKey, fn func(data TData) TData, insertValue TData) bool {
-	s.lock.Lock()
-	defer s.lock.Unlock()
-
-	if s.data == nil {
-		s.data = make(map[TKey]TData)
-	}
-
-	if v, ok := s.data[key]; ok {
-		s.data[key] = fn(v)
-		return true
-	} else {
-		s.data[key] = insertValue
-		return false
-	}
-}
-
-// Clear removes all entries from the map.
-func (s *SyncMap[TKey, TData]) Clear() {
-	s.lock.Lock()
-	defer s.lock.Unlock()
-
-	s.data = make(map[TKey]TData)
-}
-
-// Contains checks if the map contains the provided key.
-func (s *SyncMap[TKey, TData]) Contains(key TKey) bool {
-	s.lock.Lock()
-	defer s.lock.Unlock()
-
-	if s.data == nil {
-		s.data = make(map[TKey]TData)
-	}
-
-	_, ok := s.data[key]
-
-	return ok
-}
-
-// GetAllKeys returns a copy (!) of all keys in the map.
-func (s *SyncMap[TKey, TData]) GetAllKeys() []TKey {
-	s.lock.Lock()
-	defer s.lock.Unlock()
-
-	if s.data == nil {
-		s.data = make(map[TKey]TData)
-	}
-
-	r := make([]TKey, 0, len(s.data))
-
-	for k := range s.data {
-		r = append(r, k)
-	}
-
-	return r
-}
-
-// GetAllValues returns a copy (!) of all values in the map.
-func (s *SyncMap[TKey, TData]) GetAllValues() []TData {
-	s.lock.Lock()
-	defer s.lock.Unlock()
-
-	if s.data == nil {
-		s.data = make(map[TKey]TData)
-	}
-
-	r := make([]TData, 0, len(s.data))
-
-	for _, v := range s.data {
-		r = append(r, v)
-	}
-
-	return r
-}
-
-// Count returns the number of entries in the map.
-func (s *SyncMap[TKey, TData]) Count() int {
-	s.lock.Lock()
-	defer s.lock.Unlock()
-
-	if s.data == nil {
-		s.data = make(map[TKey]TData)
-	}
-
-	return len(s.data)
-}

dataext/syncRingSet.go

@@ -1,143 +0,0 @@
-package dataext
-
-import "sync"
-
-type SyncRingSet[TData comparable] struct {
-	data map[TData]bool
-	lock sync.Mutex
-	ring *RingBuffer[TData]
-}
-
-func NewSyncRingSet[TData comparable](capacity int) *SyncRingSet[TData] {
-	return &SyncRingSet[TData]{
-		data: make(map[TData]bool, capacity+1),
-		lock: sync.Mutex{},
-		ring: NewRingBuffer[TData](capacity),
-	}
-}
-
-// Add adds `value` to the set
-// returns true  if the value was actually inserted (value did not exist beforehand)
-// returns false if the value already existed
-func (s *SyncRingSet[TData]) Add(value TData) bool {
-	s.lock.Lock()
-	defer s.lock.Unlock()
-
-	if s.data == nil {
-		s.data = make(map[TData]bool)
-	}
-
-	_, existsInPreState := s.data[value]
-	if existsInPreState {
-		return false
-	}
-
-	prev := s.ring.PushPop(value)
-
-	s.data[value] = true
-	if prev != nil {
-		delete(s.data, *prev)
-	}
-
-	return true
-}
-
-func (s *SyncRingSet[TData]) AddAll(values []TData) {
-	s.lock.Lock()
-	defer s.lock.Unlock()
-
-	if s.data == nil {
-		s.data = make(map[TData]bool)
-	}
-
-	for _, value := range values {
-		_, existsInPreState := s.data[value]
-		if existsInPreState {
-			continue
-		}
-
-		prev := s.ring.PushPop(value)
-
-		s.data[value] = true
-		if prev != nil {
-			delete(s.data, *prev)
-		}
-	}
-}
-
-func (s *SyncRingSet[TData]) Remove(value TData) bool {
-	s.lock.Lock()
-	defer s.lock.Unlock()
-
-	if s.data == nil {
-		s.data = make(map[TData]bool)
-	}
-
-	_, existsInPreState := s.data[value]
-	if !existsInPreState {
-		return false
-	}
-
-	delete(s.data, value)
-	s.ring.Remove(func(v TData) bool { return value == v })
-
-	return true
-}
-
-func (s *SyncRingSet[TData]) RemoveAll(values []TData) {
-	s.lock.Lock()
-	defer s.lock.Unlock()
-
-	if s.data == nil {
-		s.data = make(map[TData]bool)
-	}
-
-	for _, value := range values {
-		delete(s.data, value)
-		s.ring.Remove(func(v TData) bool { return value == v })
-	}
-}
-
-func (s *SyncRingSet[TData]) Contains(value TData) bool {
-	s.lock.Lock()
-	defer s.lock.Unlock()
-
-	if s.data == nil {
-		s.data = make(map[TData]bool)
-	}
-
-	_, ok := s.data[value]
-
-	return ok
-}
-
-func (s *SyncRingSet[TData]) Get() []TData {
-	s.lock.Lock()
-	defer s.lock.Unlock()
-
-	if s.data == nil {
-		s.data = make(map[TData]bool)
-	}
-
-	r := make([]TData, 0, len(s.data))
-
-	for k := range s.data {
-		r = append(r, k)
-	}
-
-	return r
-}
-
-// AddIfNotContains
-// returns true  if the value was actually added (value did not exist beforehand)
-// returns false if the value already existed
-func (s *SyncRingSet[TData]) AddIfNotContains(key TData) bool {
-	return s.Add(key)
-}
-
-// RemoveIfContains
-// returns true  if the value was actually removed (value did exist beforehand)
-// returns false if the value did not exist in the set
-func (s *SyncRingSet[TData]) RemoveIfContains(key TData) bool {
-	return s.Remove(key)
-}

dataext/syncSet.go

@@ -7,13 +7,6 @@ type SyncSet[TData comparable] struct {
 	lock sync.Mutex
 }
 
-func NewSyncSet[TData comparable]() *SyncSet[TData] {
-	return &SyncSet[TData]{data: make(map[TData]bool), lock: sync.Mutex{}}
-}
-
-// Add adds `value` to the set
-// returns true  if the value was actually inserted (value did not exist beforehand)
-// returns false if the value already existed
 func (s *SyncSet[TData]) Add(value TData) bool {
 	s.lock.Lock()
 	defer s.lock.Unlock()
@@ -22,13 +15,10 @@ func (s *SyncSet[TData]) Add(value TData) bool {
 		s.data = make(map[TData]bool)
 	}
 
-	_, existsInPreState := s.data[value]
-	if existsInPreState {
-		return false
-	}
-
+	_, ok := s.data[value]
 	s.data[value] = true
-	return true
+
+	return !ok
 }
 
 func (s *SyncSet[TData]) AddAll(values []TData) {
@@ -44,36 +34,6 @@ func (s *SyncSet[TData]) AddAll(values []TData) {
 	}
 }
 
-func (s *SyncSet[TData]) Remove(value TData) bool {
-	s.lock.Lock()
-	defer s.lock.Unlock()
-
-	if s.data == nil {
-		s.data = make(map[TData]bool)
-	}
-
-	_, existsInPreState := s.data[value]
-	if !existsInPreState {
-		return false
-	}
-
-	delete(s.data, value)
-	return true
-}
-
-func (s *SyncSet[TData]) RemoveAll(values []TData) {
-	s.lock.Lock()
-	defer s.lock.Unlock()
-
-	if s.data == nil {
-		s.data = make(map[TData]bool)
-	}
-
-	for _, value := range values {
-		delete(s.data, value)
-	}
-}
-
 func (s *SyncSet[TData]) Contains(value TData) bool {
 	s.lock.Lock()
 	defer s.lock.Unlock()
@@ -103,17 +63,3 @@ func (s *SyncSet[TData]) Get() []TData {
 
 	return r
 }
-
-// AddIfNotContains
-// returns true  if the value was actually added (value did not exist beforehand)
-// returns false if the value already existed
-func (s *SyncSet[TData]) AddIfNotContains(key TData) bool {
-	return s.Add(key)
-}
-
-// RemoveIfContains
-// returns true  if the value was actually removed (value did exist beforehand)
-// returns false if the value did not exist in the set
-func (s *SyncSet[TData]) RemoveIfContains(key TData) bool {
-	return s.Remove(key)
-}

dataext/tuple.go

@@ -1,241 +0,0 @@
-package dataext
-
-type ValueGroup interface {
-	TupleLength() int
-	TupleValues() []any
-}
-
-// ----------------------------------------------------------------------------
-
-type Single[T1 any] struct {
-	V1 T1
-}
-
-func (s Single[T1]) TupleLength() int {
-	return 1
-}
-
-func (s Single[T1]) TupleValues() []any {
-	return []any{s.V1}
-}
-
-func NewSingle[T1 any](v1 T1) Single[T1] {
-	return Single[T1]{V1: v1}
-}
-
-func NewTuple1[T1 any](v1 T1) Single[T1] {
-	return Single[T1]{V1: v1}
-}
-
-// ----------------------------------------------------------------------------
-
-type Tuple[T1 any, T2 any] struct {
-	V1 T1
-	V2 T2
-}
-
-func (t Tuple[T1, T2]) TupleLength() int {
-	return 2
-}
-
-func (t Tuple[T1, T2]) TupleValues() []any {
-	return []any{t.V1, t.V2}
-}
-
-func NewTuple[T1 any, T2 any](v1 T1, v2 T2) Tuple[T1, T2] {
-	return Tuple[T1, T2]{V1: v1, V2: v2}
-}
-
-func NewTuple2[T1 any, T2 any](v1 T1, v2 T2) Tuple[T1, T2] {
-	return Tuple[T1, T2]{V1: v1, V2: v2}
-}
-
-// ----------------------------------------------------------------------------
-
-type Triple[T1 any, T2 any, T3 any] struct {
-	V1 T1
-	V2 T2
-	V3 T3
-}
-
-func (t Triple[T1, T2, T3]) TupleLength() int {
-	return 3
-}
-
-func (t Triple[T1, T2, T3]) TupleValues() []any {
-	return []any{t.V1, t.V2, t.V3}
-}
-
-func NewTriple[T1 any, T2 any, T3 any](v1 T1, v2 T2, v3 T3) Triple[T1, T2, T3] {
-	return Triple[T1, T2, T3]{V1: v1, V2: v2, V3: v3}
-}
-
-func NewTuple3[T1 any, T2 any, T3 any](v1 T1, v2 T2, v3 T3) Triple[T1, T2, T3] {
-	return Triple[T1, T2, T3]{V1: v1, V2: v2, V3: v3}
-}
-
-// ----------------------------------------------------------------------------
-
-type Quadruple[T1 any, T2 any, T3 any, T4 any] struct {
-	V1 T1
-	V2 T2
-	V3 T3
-	V4 T4
-}
-
-func (t Quadruple[T1, T2, T3, T4]) TupleLength() int {
-	return 4
-}
-
-func (t Quadruple[T1, T2, T3, T4]) TupleValues() []any {
-	return []any{t.V1, t.V2, t.V3, t.V4}
-}
-
-func NewQuadruple[T1 any, T2 any, T3 any, T4 any](v1 T1, v2 T2, v3 T3, v4 T4) Quadruple[T1, T2, T3, T4] {
-	return Quadruple[T1, T2, T3, T4]{V1: v1, V2: v2, V3: v3, V4: v4}
-}
-
-func NewTuple4[T1 any, T2 any, T3 any, T4 any](v1 T1, v2 T2, v3 T3, v4 T4) Quadruple[T1, T2, T3, T4] {
-	return Quadruple[T1, T2, T3, T4]{V1: v1, V2: v2, V3: v3, V4: v4}
-}
-
-// ----------------------------------------------------------------------------
-
-type Quintuple[T1 any, T2 any, T3 any, T4 any, T5 any] struct {
-	V1 T1
-	V2 T2
-	V3 T3
-	V4 T4
-	V5 T5
-}
-
-func (t Quintuple[T1, T2, T3, T4, T5]) TupleLength() int {
-	return 5
-}
-
-func (t Quintuple[T1, T2, T3, T4, T5]) TupleValues() []any {
-	return []any{t.V1, t.V2, t.V3, t.V4, t.V5}
-
-}
-
-func NewQuintuple[T1 any, T2 any, T3 any, T4 any, T5 any](v1 T1, v2 T2, v3 T3, v4 T4, v5 T5) Quintuple[T1, T2, T3, T4, T5] {
-	return Quintuple[T1, T2, T3, T4, T5]{V1: v1, V2: v2, V3: v3, V4: v4, V5: v5}
-}
-
-func NewTuple5[T1 any, T2 any, T3 any, T4 any, T5 any](v1 T1, v2 T2, v3 T3, v4 T4, v5 T5) Quintuple[T1, T2, T3, T4, T5] {
-	return Quintuple[T1, T2, T3, T4, T5]{V1: v1, V2: v2, V3: v3, V4: v4, V5: v5}
-}
-
-// ----------------------------------------------------------------------------
-
-type Sextuple[T1 any, T2 any, T3 any, T4 any, T5 any, T6 any] struct {
-	V1 T1
-	V2 T2
-	V3 T3
-	V4 T4
-	V5 T5
-	V6 T6
-}
-
-func (t Sextuple[T1, T2, T3, T4, T5, T6]) TupleLength() int {
-	return 6
-}
-
-func (t Sextuple[T1, T2, T3, T4, T5, T6]) TupleValues() []any {
-	return []any{t.V1, t.V2, t.V3, t.V4, t.V5, t.V6}
-
-}
-
-func NewSextuple[T1 any, T2 any, T3 any, T4 any, T5 any, T6 any](v1 T1, v2 T2, v3 T3, v4 T4, v5 T5, v6 T6) Sextuple[T1, T2, T3, T4, T5, T6] {
-	return Sextuple[T1, T2, T3, T4, T5, T6]{V1: v1, V2: v2, V3: v3, V4: v4, V5: v5, V6: v6}
-}
-
-func NewTuple6[T1 any, T2 any, T3 any, T4 any, T5 any, T6 any](v1 T1, v2 T2, v3 T3, v4 T4, v5 T5, v6 T6) Sextuple[T1, T2, T3, T4, T5, T6] {
-	return Sextuple[T1, T2, T3, T4, T5, T6]{V1: v1, V2: v2, V3: v3, V4: v4, V5: v5, V6: v6}
-}
-
-// ----------------------------------------------------------------------------
-
-type Septuple[T1 any, T2 any, T3 any, T4 any, T5 any, T6 any, T7 any] struct {
-	V1 T1
-	V2 T2
-	V3 T3
-	V4 T4
-	V5 T5
-	V6 T6
-	V7 T7
-}
-
-func (t Septuple[T1, T2, T3, T4, T5, T6, T7]) TupleLength() int {
-	return 7
-}
-
-func (t Septuple[T1, T2, T3, T4, T5, T6, T7]) TupleValues() []any {
-	return []any{t.V1, t.V2, t.V3, t.V4, t.V5, t.V6, t.V7}
-}
-
-func NewSeptuple[T1 any, T2 any, T3 any, T4 any, T5 any, T6 any, T7 any](v1 T1, v2 T2, v3 T3, v4 T4, v5 T5, v6 T6, v7 T7) Septuple[T1, T2, T3, T4, T5, T6, T7] {
-	return Septuple[T1, T2, T3, T4, T5, T6, T7]{V1: v1, V2: v2, V3: v3, V4: v4, V5: v5, V6: v6, V7: v7}
-}
-
-func NewTuple7[T1 any, T2 any, T3 any, T4 any, T5 any, T6 any, T7 any](v1 T1, v2 T2, v3 T3, v4 T4, v5 T5, v6 T6, v7 T7) Septuple[T1, T2, T3, T4, T5, T6, T7] {
-	return Septuple[T1, T2, T3, T4, T5, T6, T7]{V1: v1, V2: v2, V3: v3, V4: v4, V5: v5, V6: v6, V7: v7}
-}
-
-// ----------------------------------------------------------------------------
-
-type Octuple[T1 any, T2 any, T3 any, T4 any, T5 any, T6 any, T7 any, T8 any] struct {
-	V1 T1
-	V2 T2
-	V3 T3
-	V4 T4
-	V5 T5
-	V6 T6
-	V7 T7
-	V8 T8
-}
-
-func (t Octuple[T1, T2, T3, T4, T5, T6, T7, T8]) TupleLength() int {
-	return 8
-}
-
-func (t Octuple[T1, T2, T3, T4, T5, T6, T7, T8]) TupleValues() []any {
-	return []any{t.V1, t.V2, t.V3, t.V4, t.V5, t.V6, t.V7, t.V8}
-}
-
-func NewOctuple[T1 any, T2 any, T3 any, T4 any, T5 any, T6 any, T7 any, T8 any](v1 T1, v2 T2, v3 T3, v4 T4, v5 T5, v6 T6, v7 T7, v8 T8) Octuple[T1, T2, T3, T4, T5, T6, T7, T8] {
-	return Octuple[T1, T2, T3, T4, T5, T6, T7, T8]{V1: v1, V2: v2, V3: v3, V4: v4, V5: v5, V6: v6, V7: v7, V8: v8}
-}
-
-func NewTuple8[T1 any, T2 any, T3 any, T4 any, T5 any, T6 any, T7 any, T8 any](v1 T1, v2 T2, v3 T3, v4 T4, v5 T5, v6 T6, v7 T7, v8 T8) Octuple[T1, T2, T3, T4, T5, T6, T7, T8] {
-	return Octuple[T1, T2, T3, T4, T5, T6, T7, T8]{V1: v1, V2: v2, V3: v3, V4: v4, V5: v5, V6: v6, V7: v7, V8: v8}
-}
-
-// ----------------------------------------------------------------------------
-
-type Nonuple[T1 any, T2 any, T3 any, T4 any, T5 any, T6 any, T7 any, T8 any, T9 any] struct {
-	V1 T1
-	V2 T2
-	V3 T3
-	V4 T4
-	V5 T5
-	V6 T6
-	V7 T7
-	V8 T8
-	V9 T9
-}
-
-func (t Nonuple[T1, T2, T3, T4, T5, T6, T7, T8, T9]) TupleLength() int {
-	return 9
-}
-
-func (t Nonuple[T1, T2, T3, T4, T5, T6, T7, T8, T9]) TupleValues() []any {
-	return []any{t.V1, t.V2, t.V3, t.V4, t.V5, t.V6, t.V7, t.V8, t.V9}
-}
-
-func NewNonuple[T1 any, T2 any, T3 any, T4 any, T5 any, T6 any, T7 any, T8 any, T9 any](v1 T1, v2 T2, v3 T3, v4 T4, v5 T5, v6 T6, v7 T7, v8 T8, v9 T9) Nonuple[T1, T2, T3, T4, T5, T6, T7, T8, T9] {
-	return Nonuple[T1, T2, T3, T4, T5, T6, T7, T8, T9]{V1: v1, V2: v2, V3: v3, V4: v4, V5: v5, V6: v6, V7: v7, V8: v8, V9: v9}
-}
-func NewTuple9[T1 any, T2 any, T3 any, T4 any, T5 any, T6 any, T7 any, T8 any, T9 any](v1 T1, v2 T2, v3 T3, v4 T4, v5 T5, v6 T6, v7 T7, v8 T8, v9 T9) Nonuple[T1, T2, T3, T4, T5, T6, T7, T8, T9] {
-	return Nonuple[T1, T2, T3, T4, T5, T6, T7, T8, T9]{V1: v1, V2: v2, V3: v3, V4: v4, V5: v5, V6: v6, V7: v7, V8: v8, V9: v9}
-}

enums/enum.go

@@ -1,57 +0,0 @@
-package enums
-
-import "encoding/json"
-
-type Enum interface {
-	Valid() bool
-	ValuesAny() []any
-	ValuesMeta() []EnumMetaValue
-	VarName() string
-	TypeName() string
-	PackageName() string
-}
-
-type StringEnum interface {
-	Enum
-	String() string
-}
-
-type DescriptionEnum interface {
-	Enum
-	Description() string
-	DescriptionMeta() EnumDescriptionMetaValue
-}
-
-type EnumMetaValue struct {
-	VarName     string  `json:"varName"`
-	Value       Enum    `json:"value"`
-	Description *string `json:"description"`
-}
-
-type EnumDescriptionMetaValue struct {
-	VarName     string `json:"varName"`
-	Value       Enum   `json:"value"`
-	Description string `json:"description"`
-}
-
-type EnumDataMetaValue struct {
-	VarName     string  `json:"varName"`
-	Value       Enum    `json:"value"`
-	Description *string `json:"description"`
-
-	Data map[string]any `json:"-"` //handled by MarshalJSON
-}
-
-func (v EnumDataMetaValue) MarshalJSON() ([]byte, error) {
-	m := make(map[string]any, 8)
-
-	for k, dv := range v.Data {
-		m[k] = dv
-	}
-
-	m["varName"] = v.VarName
-	m["value"] = v.Value
-	m["description"] = v.Description
-
-	return json.Marshal(m)
-}

exerr/builder.go

@@ -1,572 +0,0 @@
-package exerr
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"os"
-	"runtime/debug"
-	"strings"
-	"time"
-
-	"git.blackforestbytes.com/BlackForestBytes/goext/dataext"
-	"git.blackforestbytes.com/BlackForestBytes/goext/enums"
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
-	"github.com/gin-gonic/gin"
-	"github.com/rs/zerolog"
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-//
-// ==== USAGE =====
-//
-// If some method returns an error _always wrap it into an exerror:
-//     value, err := do_something(..)
-//     if err != nil {
-//         return nil, exerror.Wrap(err, "do something failed").Build()
-//     }
-//
-// If possible add metadata to the error (eg the id that was not found, ...), the methods are the same as in zerolog
-//     return nil, exerror.Wrap(err, "do something failed").Str("someid", id).Int("count", in.Count).Build()
-//
-// You can also add extra-data to an error with Extra(..)
-// in contrast to metadata is extradata always printed in the resulting error and is more intended for additional (programmatically readable) data in addition to the errortype
-// (metadata is more internal debug info/help)
-//
-// You can change the errortype with `.User()` and `.System()` (User-errors are 400 and System-errors 500)
-// You can also manually set the statuscode with `.WithStatuscode(http.NotFound)`
-// You can set the type with `WithType(..)`
-//
-// New Errors (that don't wrap an existing err object) are created with New
-//     return nil, exerror.New(exerror.TypeInternal, "womethign wen horrible wrong").Build()
-// You can eitehr use an existing ErrorType, the "catch-all" ErrInternal, or add you own ErrType in consts.go
-//
-// All errors should be handled one of the following four ways:
-//   - return the error to the caller and let him handle it:
-//     (also auto-prints the error to the log)
-//     => Wrap/New + Build
-//   - Print the error
-//     (also auto-sends it to the error-service)
-//     This is useful for errors that happen asynchron or are non-fatal for the current request
-//     => Wrap/New + Print
-//   - Return the error to the Rest-API caller
-//     (also auto-prints the error to the log)
-//     (also auto-sends it to the error-service)
-//     => Wrap/New + Output
-//   - Print and stop the service
-//     (also auto-sends it to the error-service)
-//     => Wrap/New + Fatal
-//
-
-type Builder struct {
-	wrappedErr          error
-	errorData           *ExErr
-	containsGinData     bool
-	containsContextData bool
-	noLog               bool
-}
-
-func Get(err error) *Builder {
-	return &Builder{errorData: FromError(err)}
-}
-
-func New(t ErrorType, msg string) *Builder {
-	return &Builder{errorData: newExErr(CatSystem, t, msg)}
-}
-
-func Wrap(err error, msg string) *Builder {
-	if err == nil {
-		return &Builder{errorData: newExErr(CatSystem, TypeInternal, msg)} // prevent NPE if we call Wrap with err==nil
-	}
-
-	v := FromError(err)
-
-	if !pkgconfig.RecursiveErrors {
-		v.Message = msg
-		return &Builder{wrappedErr: err, errorData: v}
-	} else {
-		return &Builder{wrappedErr: err, errorData: wrapExErr(v, msg, CatWrap, 1)}
-	}
-}
-
-// ----------------------------------------------------------------------------
-
-func (b *Builder) WithType(t ErrorType) *Builder {
-	b.errorData.Type = t
-	return b
-}
-
-func (b *Builder) WithStatuscode(status int) *Builder {
-	b.errorData.StatusCode = &status
-	return b
-}
-
-func (b *Builder) WithMessage(msg string) *Builder {
-	b.errorData.Message = msg
-	return b
-}
-
-func (b *Builder) WithSeverity(v ErrorSeverity) *Builder {
-	b.errorData.Severity = v
-	return b
-}
-
-func (b *Builder) WithCategory(v ErrorCategory) *Builder {
-	b.errorData.Category = v
-	return b
-}
-
-// ----------------------------------------------------------------------------
-
-// Err changes the Severity to ERROR (default)
-// The error will be:
-//
-//   - On Build():
-//
-//   - Short-Logged as Err
-//
-//   - On Print():
-//
-//   - Logged as Err
-//
-//   - Send to the error-service
-//
-//   - On Output():
-//
-//   - Logged as Err
-//
-//   - Send to the error-service
-func (b *Builder) Err() *Builder {
-	b.errorData.Severity = SevErr
-	return b
-}
-
-// Warn changes the Severity to WARN
-// The error will be:
-//
-//   - On Build():
-//
-//   - -(nothing)-
-//
-//   - On Print():
-//
-//   - Short-Logged as Warn
-//
-//   - On Output():
-//
-//   - Logged as Warn
-func (b *Builder) Warn() *Builder {
-	b.errorData.Severity = SevWarn
-	return b
-}
-
-// Info changes the Severity to INFO
-// The error will be:
-//
-//   - On Build():
-//
-//   - -(nothing)-
-//
-//   - On Print():
-//
-//   - -(nothing)-
-//
-//   - On Output():
-//
-//   - -(nothing)-
-func (b *Builder) Info() *Builder {
-	b.errorData.Severity = SevInfo
-	return b
-}
-
-// ----------------------------------------------------------------------------
-
-// User sets the Category to CatUser
-//
-// Errors with category
-func (b *Builder) User() *Builder {
-	b.errorData.Category = CatUser
-	return b
-}
-
-func (b *Builder) System() *Builder {
-	b.errorData.Category = CatSystem
-	return b
-}
-
-// ----------------------------------------------------------------------------
-
-func (b *Builder) NoLog() *Builder {
-	b.noLog = true
-	return b
-}
-
-// ----------------------------------------------------------------------------
-
-func (b *Builder) Id(key string, val fmt.Stringer) *Builder {
-	return b.addMeta(key, MDTID, newIDWrap(val))
-}
-
-func (b *Builder) StrPtr(key string, val *string) *Builder {
-	return b.addMeta(key, MDTStringPtr, val)
-}
-
-func (b *Builder) Str(key string, val string) *Builder {
-	return b.addMeta(key, MDTString, val)
-}
-
-func (b *Builder) Int(key string, val int) *Builder {
-	return b.addMeta(key, MDTInt, val)
-}
-
-func (b *Builder) Int8(key string, val int8) *Builder {
-	return b.addMeta(key, MDTInt8, val)
-}
-
-func (b *Builder) Int16(key string, val int16) *Builder {
-	return b.addMeta(key, MDTInt16, val)
-}
-
-func (b *Builder) Int32(key string, val int32) *Builder {
-	return b.addMeta(key, MDTInt32, val)
-}
-
-func (b *Builder) Int64(key string, val int64) *Builder {
-	return b.addMeta(key, MDTInt64, val)
-}
-
-func (b *Builder) Float32(key string, val float32) *Builder {
-	return b.addMeta(key, MDTFloat32, val)
-}
-
-func (b *Builder) Float64(key string, val float64) *Builder {
-	return b.addMeta(key, MDTFloat64, val)
-}
-
-func (b *Builder) Bool(key string, val bool) *Builder {
-	return b.addMeta(key, MDTBool, val)
-}
-
-func (b *Builder) Bytes(key string, val []byte) *Builder {
-	return b.addMeta(key, MDTBytes, val)
-}
-
-func (b *Builder) ObjectID(key string, val primitive.ObjectID) *Builder {
-	return b.addMeta(key, MDTObjectID, val)
-}
-
-func (b *Builder) Time(key string, val time.Time) *Builder {
-	return b.addMeta(key, MDTTime, val)
-}
-
-func (b *Builder) Dur(key string, val time.Duration) *Builder {
-	return b.addMeta(key, MDTDuration, val)
-}
-
-func (b *Builder) Strs(key string, val []string) *Builder {
-	return b.addMeta(key, MDTStringArray, val)
-}
-
-func (b *Builder) Ints(key string, val []int) *Builder {
-	return b.addMeta(key, MDTIntArray, val)
-}
-
-func (b *Builder) Ints32(key string, val []int32) *Builder {
-	return b.addMeta(key, MDTInt32Array, val)
-}
-
-func (b *Builder) Type(key string, cls interface{}) *Builder {
-	return b.addMeta(key, MDTString, fmt.Sprintf("%T", cls))
-}
-
-func (b *Builder) Interface(key string, val interface{}) *Builder {
-	return b.addMeta(key, MDTAny, newAnyWrap(val))
-}
-
-func (b *Builder) Any(key string, val any) *Builder {
-	return b.addMeta(key, MDTAny, newAnyWrap(val))
-}
-
-func (b *Builder) Stringer(key string, val fmt.Stringer) *Builder {
-	if langext.IsNil(val) {
-		return b.addMeta(key, MDTString, "(!nil)")
-	} else {
-		return b.addMeta(key, MDTString, val.String())
-	}
-}
-
-func (b *Builder) Enum(key string, val enums.Enum) *Builder {
-	return b.addMeta(key, MDTEnum, newEnumWrap(val))
-}
-
-func (b *Builder) Stack() *Builder {
-	return b.addMeta("@Stack", MDTString, string(debug.Stack()))
-}
-
-func (b *Builder) Errs(key string, val []error) *Builder {
-	for i, valerr := range val {
-		b.addMeta(fmt.Sprintf("%v[%v]", key, i), MDTString, Get(valerr).errorData.FormatLog(LogPrintFull))
-	}
-	return b
-}
-
-func (b *Builder) GinReq(ctx context.Context, g *gin.Context, req *http.Request) *Builder {
-	if v := ctx.Value("start_timestamp"); v != nil {
-		if t, ok := v.(time.Time); ok {
-			b.Time("ctx_startTimestamp", t)
-			b.Time("ctx_endTimestamp", time.Now())
-		}
-	}
-	b.Str("gin_method", req.Method)
-	b.Str("gin_host", req.Host)
-	b.Str("gin_path", g.FullPath())
-	b.Strs("gin_header", extractHeader(g.Request.Header))
-	if req.URL != nil {
-		b.Str("gin_url", req.URL.String())
-	}
-	if ctxVal := g.GetString("apiversion"); ctxVal != "" {
-		b.Str("gin_context_apiversion", ctxVal)
-	}
-	if ctxVal := g.GetString("uid"); ctxVal != "" {
-		b.Str("gin_context_uid", ctxVal)
-	}
-	if ctxVal := g.GetString("fcmId"); ctxVal != "" {
-		b.Str("gin_context_fcmid", ctxVal)
-	}
-	if ctxVal := g.GetString("reqid"); ctxVal != "" {
-		b.Str("gin_context_reqid", ctxVal)
-	}
-	if req.Method != "GET" && req.Body != nil {
-
-		if req.Header.Get("Content-Type") == "application/json" {
-			if brc, ok := req.Body.(dataext.BufferedReadCloser); ok {
-				if bin, err := brc.BufferedAll(); err == nil {
-					if len(bin) < 16*1024 {
-						var prettyJSON bytes.Buffer
-						err = json.Indent(&prettyJSON, bin, "", "  ")
-						if err == nil {
-							b.Str("gin_body", string(prettyJSON.Bytes()))
-						} else {
-							b.Bytes("gin_body", bin)
-						}
-					} else {
-						b.Str("gin_body", fmt.Sprintf("[[%v bytes | %s]]", len(bin), req.Header.Get("Content-Type")))
-					}
-				}
-			}
-		}
-
-		if req.Header.Get("Content-Type") == "multipart/form-data" || req.Header.Get("Content-Type") == "x-www-form-urlencoded" {
-			if brc, ok := req.Body.(dataext.BufferedReadCloser); ok {
-				if bin, err := brc.BufferedAll(); err == nil {
-					if len(bin) < 16*1024 {
-						b.Bytes("gin_body", bin)
-					} else {
-						b.Str("gin_body", fmt.Sprintf("[[%v bytes | %s]]", len(bin), req.Header.Get("Content-Type")))
-					}
-				}
-			}
-		}
-
-	}
-
-	pkgconfig.ExtendGinMeta(ctx, b, g, req)
-
-	b.containsGinData = true
-	return b
-}
-
-func (b *Builder) CtxData(method Method, ctx context.Context) *Builder {
-	pkgconfig.ExtendContextMeta(b, method, ctx)
-
-	b.containsContextData = true
-
-	return b
-}
-
-func extractHeader(header map[string][]string) []string {
-	r := make([]string, 0, len(header))
-	for k, v := range header {
-		for _, hval := range v {
-			value := hval
-			value = strings.ReplaceAll(value, "\n", "\\n")
-			value = strings.ReplaceAll(value, "\r", "\\r")
-			value = strings.ReplaceAll(value, "\t", "\\t")
-			r = append(r, k+": "+value)
-		}
-	}
-	return r
-}
-
-// ----------------------------------------------------------------------------
-
-// Extra adds additional data to the error
-// this is not like the other metadata (like Id(), Str(), etc)
-// this data is public and will be printed/outputted
-func (b *Builder) Extra(key string, val any) *Builder {
-	b.errorData.Extra[key] = val
-	return b
-}
-
-// ----------------------------------------------------------------------------
-
-// Build creates a new error, ready to pass up the stack
-// If the errors is not SevWarn or SevInfo it gets also logged (in short form, without stacktrace) onto stdout
-// Can be gloablly configured with ZeroLogErrTraces and ZeroLogAllTraces
-// Can be locally suppressed with Builder.NoLog()
-func (b *Builder) Build(ctxs ...context.Context) error {
-	return b.BuildAsExerr(ctxs...)
-}
-
-func (b *Builder) BuildAsExerr(ctxs ...context.Context) *ExErr {
-	warnOnPkgConfigNotInitialized()
-
-	for _, dctx := range ctxs {
-		b.CtxData(MethodBuild, dctx)
-	}
-
-	if pkgconfig.DisableErrorWrapping && b.wrappedErr != nil {
-		return FromError(b.wrappedErr)
-	}
-
-	if pkgconfig.ZeroLogErrTraces && !b.noLog {
-		if b.errorData.Severity == SevErr || b.errorData.Severity == SevFatal {
-			b.errorData.ShortLog(pkgconfig.ZeroLogger.Error())
-		} else if b.errorData.Severity == SevWarn {
-			b.errorData.ShortLog(pkgconfig.ZeroLogger.Warn())
-		} else if b.errorData.Severity == SevInfo {
-			b.errorData.ShortLog(pkgconfig.ZeroLogger.Info())
-		} else if b.errorData.Severity == SevDebug {
-			b.errorData.ShortLog(pkgconfig.ZeroLogger.Debug())
-		} else if b.errorData.Severity == SevTrace {
-			b.errorData.ShortLog(pkgconfig.ZeroLogger.Trace())
-		} else {
-			b.errorData.ShortLog(pkgconfig.ZeroLogger.Error()) // ?!? unknown severity
-		}
-
-	}
-	b.errorData.CallListener(MethodBuild, ListenerOpt{NoLog: b.noLog})
-
-	return b.errorData
-}
-
-// Output prints the error onto the gin stdout.
-// The error also gets printed to stdout/stderr
-// If the error is SevErr|SevFatal we also send it to the error-service
-func (b *Builder) Output(ctx context.Context, g *gin.Context) {
-	warnOnPkgConfigNotInitialized()
-
-	if !b.containsGinData && g.Request != nil {
-		// Auto-Add gin metadata if the caller hasn't already done it
-		b.GinReq(ctx, g, g.Request)
-	}
-
-	b.CtxData(MethodOutput, ctx)
-
-	// this is only here to add one level to the trace
-	// so that .Build() and .Output() and .Print() have the same depth and our stack-skip logger can have the same skip-count
-	b.doGinOutput(ctx, g)
-}
-
-// OutputRaw works teh same as Output() - but does not depend on gin and works with a raw http.ResponseWriter
-func (b *Builder) OutputRaw(w http.ResponseWriter) {
-	warnOnPkgConfigNotInitialized()
-
-	// this is only here to add one level to the trace
-	// so that .Build() and .Output() and .Print() have the same depth and our stack-skip logger can have the same skip-count
-	b.doRawOutput(w)
-}
-
-func (b *Builder) doGinOutput(ctx context.Context, g *gin.Context) {
-	b.errorData.Output(g)
-
-	if (b.errorData.Severity == SevErr || b.errorData.Severity == SevFatal) && (pkgconfig.ZeroLogErrGinOutput || pkgconfig.ZeroLogAllGinOutput) {
-		b.errorData.Log(pkgconfig.ZeroLogger.Error())
-	} else if (b.errorData.Severity == SevWarn) && (pkgconfig.ZeroLogAllGinOutput) {
-		b.errorData.Log(pkgconfig.ZeroLogger.Warn())
-	}
-
-	b.errorData.CallListener(MethodOutput, ListenerOpt{NoLog: b.noLog})
-}
-
-func (b *Builder) doRawOutput(w http.ResponseWriter) {
-	b.errorData.OutputRaw(w)
-
-	if (b.errorData.Severity == SevErr || b.errorData.Severity == SevFatal) && (pkgconfig.ZeroLogErrGinOutput || pkgconfig.ZeroLogAllGinOutput) {
-		b.errorData.Log(pkgconfig.ZeroLogger.Error())
-	} else if (b.errorData.Severity == SevWarn) && (pkgconfig.ZeroLogAllGinOutput) {
-		b.errorData.Log(pkgconfig.ZeroLogger.Warn())
-	}
-
-	b.errorData.CallListener(MethodOutput, ListenerOpt{NoLog: b.noLog})
-}
-
-// Print prints the error
-// If the error is SevErr we also send it to the error-service
-func (b *Builder) Print(ctxs ...context.Context) Proxy {
-	warnOnPkgConfigNotInitialized()
-
-	for _, dctx := range ctxs {
-		b.CtxData(MethodPrint, dctx)
-	}
-
-	// this is only here to add one level to the trace
-	// so that .Build() and .Output() and .Print() have the same depth and our stack-skip logger can have the same skip-count
-	return b.doPrint()
-}
-
-func (b *Builder) doPrint() Proxy {
-	if b.errorData.Severity == SevErr || b.errorData.Severity == SevFatal {
-		b.errorData.Log(pkgconfig.ZeroLogger.Error())
-	} else if b.errorData.Severity == SevWarn {
-		b.errorData.ShortLog(pkgconfig.ZeroLogger.Warn())
-	} else if b.errorData.Severity == SevInfo {
-		b.errorData.ShortLog(pkgconfig.ZeroLogger.Info())
-	} else if b.errorData.Severity == SevDebug {
-		b.errorData.ShortLog(pkgconfig.ZeroLogger.Debug())
-	} else if b.errorData.Severity == SevTrace {
-		b.errorData.ShortLog(pkgconfig.ZeroLogger.Trace())
-	} else {
-		b.errorData.Log(pkgconfig.ZeroLogger.Error()) // ?!? unknown severity
-	}
-
-	b.errorData.CallListener(MethodPrint, ListenerOpt{NoLog: b.noLog})
-
-	return Proxy{v: *b.errorData} // we return Proxy<Exerr> here instead of Exerr to prevent warnings on ignored err-returns
-}
-
-func (b *Builder) Format(level LogPrintLevel) string {
-	return b.errorData.FormatLog(level)
-}
-
-// Fatal prints the error and terminates the program
-// If the error is SevErr we also send it to the error-service
-func (b *Builder) Fatal(ctxs ...context.Context) {
-
-	b.errorData.Severity = SevFatal
-
-	for _, dctx := range ctxs {
-		b.CtxData(MethodFatal, dctx)
-	}
-
-	// this is only here to add one level to the trace
-	// so that .Build() and .Output() and .Print() have the same depth and our stack-skip logger can have the same skip-count
-	b.doLogFatal()
-
-	b.errorData.CallListener(MethodFatal, ListenerOpt{NoLog: b.noLog})
-
-	os.Exit(1)
-}
-
-func (b *Builder) doLogFatal() {
-	b.errorData.Log(pkgconfig.ZeroLogger.WithLevel(zerolog.FatalLevel))
-}
-
-// ----------------------------------------------------------------------------
-
-func (b *Builder) addMeta(key string, mdtype metaDataType, val interface{}) *Builder {
-	b.errorData.Meta.add(key, mdtype, val)
-	return b
-}

exerr/constructor.go

@@ -1,274 +0,0 @@
-package exerr
-
-import (
-	"encoding/json"
-	"fmt"
-	"go.mongodb.org/mongo-driver/bson/primitive"
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
-	"reflect"
-	"time"
-)
-
-var reflectTypeStr = reflect.TypeOf("")
-
-func FromError(err error) *ExErr {
-
-	if err == nil {
-		// prevent NPE if we call FromError with err==nil
-		return &ExErr{
-			UniqueID:       newID(),
-			Category:       CatForeign,
-			Type:           TypeInternal,
-			Severity:       SevErr,
-			Timestamp:      time.Time{},
-			StatusCode:     nil,
-			Message:        "",
-			WrappedErrType: "nil",
-			WrappedErr:     err,
-			Caller:         "",
-			OriginalError:  nil,
-			Meta:           make(MetaMap),
-			Extra:          make(map[string]any),
-		}
-	}
-
-	//goland:noinspection GoTypeAssertionOnErrors
-	if verr, ok := err.(*ExErr); ok {
-		// A simple ExErr
-		return verr
-	}
-
-	//goland:noinspection GoTypeAssertionOnErrors
-	if verr, ok := err.(langext.PanicWrappedErr); ok {
-		return &ExErr{
-			UniqueID:       newID(),
-			Category:       CatForeign,
-			Type:           TypePanic,
-			Severity:       SevErr,
-			Timestamp:      time.Time{},
-			StatusCode:     nil,
-			Message:        "A panic occured",
-			WrappedErrType: fmt.Sprintf("%T", verr),
-			WrappedErr:     err,
-			Caller:         "",
-			OriginalError:  nil,
-			Meta: MetaMap{
-				"panic_object": {DataType: MDTString, Value: fmt.Sprintf("%+v", verr.RecoveredObj())},
-				"panic_type":   {DataType: MDTString, Value: fmt.Sprintf("%T", verr.RecoveredObj())},
-				"stack":        {DataType: MDTString, Value: verr.Stack},
-			},
-			Extra: make(map[string]any),
-		}
-	}
-
-	//goland:noinspection GoTypeAssertionOnErrors
-	if verr, ok := err.(*langext.PanicWrappedErr); ok && verr != nil {
-		return &ExErr{
-			UniqueID:       newID(),
-			Category:       CatForeign,
-			Type:           TypePanic,
-			Severity:       SevErr,
-			Timestamp:      time.Time{},
-			StatusCode:     nil,
-			Message:        "A panic occured",
-			WrappedErrType: fmt.Sprintf("%T", verr),
-			WrappedErr:     err,
-			Caller:         "",
-			OriginalError:  nil,
-			Meta: MetaMap{
-				"panic_object": {DataType: MDTString, Value: fmt.Sprintf("%+v", verr.RecoveredObj())},
-				"panic_type":   {DataType: MDTString, Value: fmt.Sprintf("%T", verr.RecoveredObj())},
-				"stack":        {DataType: MDTString, Value: verr.Stack},
-			},
-			Extra: make(map[string]any),
-		}
-	}
-
-	// A foreign error (eg a MongoDB exception)
-	return &ExErr{
-		UniqueID:       newID(),
-		Category:       CatForeign,
-		Type:           TypeInternal,
-		Severity:       SevErr,
-		Timestamp:      time.Time{},
-		StatusCode:     nil,
-		Message:        err.Error(),
-		WrappedErrType: fmt.Sprintf("%T", err),
-		WrappedErr:     err,
-		Caller:         "",
-		OriginalError:  nil,
-		Meta:           getForeignMeta(err),
-		Extra:          make(map[string]any),
-	}
-}
-
-func newExErr(cat ErrorCategory, errtype ErrorType, msg string) *ExErr {
-	return &ExErr{
-		UniqueID:       newID(),
-		Category:       cat,
-		Type:           errtype,
-		Severity:       SevErr,
-		Timestamp:      time.Now(),
-		StatusCode:     nil,
-		Message:        msg,
-		WrappedErrType: "",
-		WrappedErr:     nil,
-		Caller:         callername(2),
-		OriginalError:  nil,
-		Meta:           make(map[string]MetaValue),
-		Extra:          make(map[string]any),
-	}
-}
-
-func wrapExErr(e *ExErr, msg string, cat ErrorCategory, stacktraceskip int) *ExErr {
-	return &ExErr{
-		UniqueID:       newID(),
-		Category:       cat,
-		Type:           TypeWrap,
-		Severity:       e.Severity,
-		Timestamp:      time.Now(),
-		StatusCode:     e.StatusCode,
-		Message:        msg,
-		WrappedErrType: "",
-		WrappedErr:     nil,
-		Caller:         callername(1 + stacktraceskip),
-		OriginalError:  e,
-		Meta:           make(map[string]MetaValue),
-		Extra:          langext.CopyMap(langext.ForceMap(e.Extra)),
-	}
-}
-
-func getForeignMeta(err error) (mm MetaMap) {
-	mm = make(map[string]MetaValue)
-
-	defer func() {
-		if panicerr := recover(); panicerr != nil {
-			New(TypePanic, "Panic while trying to get foreign meta").
-				Str("source", err.Error()).
-				Interface("panic-object", panicerr).
-				Stack().
-				Print()
-		}
-	}()
-
-	rval := reflect.ValueOf(err)
-	if rval.Kind() == reflect.Interface || rval.Kind() == reflect.Ptr {
-		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
-	}
-
-	return mm
-}
-
-func getReflectedMetaValues(value interface{}, remainingDepth int) map[string]MetaValue {
-
-	if remainingDepth <= 0 {
-		return map[string]MetaValue{}
-	}
-
-	if langext.IsNil(value) {
-		return map[string]MetaValue{"": {DataType: MDTNil, Value: nil}}
-	}
-
-	rval := reflect.ValueOf(value)
-
-	if rval.Type().Kind() == reflect.Ptr {
-
-		if rval.IsNil() {
-			return map[string]MetaValue{"*": {DataType: MDTNil, Value: nil}}
-		}
-
-		elem := rval.Elem()
-
-		return addMetaPrefix("*", getReflectedMetaValues(elem.Interface(), remainingDepth-1))
-	}
-
-	if !rval.CanInterface() {
-		return map[string]MetaValue{"": {DataType: MDTString, Value: "<<no-interface>>"}}
-	}
-
-	raw := rval.Interface()
-
-	switch ifraw := raw.(type) {
-	case time.Time:
-		return map[string]MetaValue{"": {DataType: MDTTime, Value: ifraw}}
-	case time.Duration:
-		return map[string]MetaValue{"": {DataType: MDTDuration, Value: ifraw}}
-	case int:
-		return map[string]MetaValue{"": {DataType: MDTInt, Value: ifraw}}
-	case int8:
-		return map[string]MetaValue{"": {DataType: MDTInt8, Value: ifraw}}
-	case int16:
-		return map[string]MetaValue{"": {DataType: MDTInt16, Value: ifraw}}
-	case int32:
-		return map[string]MetaValue{"": {DataType: MDTInt32, Value: ifraw}}
-	case int64:
-		return map[string]MetaValue{"": {DataType: MDTInt64, Value: ifraw}}
-	case string:
-		return map[string]MetaValue{"": {DataType: MDTString, Value: ifraw}}
-	case bool:
-		return map[string]MetaValue{"": {DataType: MDTBool, Value: ifraw}}
-	case []byte:
-		return map[string]MetaValue{"": {DataType: MDTBytes, Value: ifraw}}
-	case float32:
-		return map[string]MetaValue{"": {DataType: MDTFloat32, Value: ifraw}}
-	case float64:
-		return map[string]MetaValue{"": {DataType: MDTFloat64, Value: ifraw}}
-	case []int:
-		return map[string]MetaValue{"": {DataType: MDTIntArray, Value: ifraw}}
-	case []int32:
-		return map[string]MetaValue{"": {DataType: MDTInt32Array, Value: ifraw}}
-	case primitive.ObjectID:
-		return map[string]MetaValue{"": {DataType: MDTObjectID, Value: ifraw}}
-	case []string:
-		return map[string]MetaValue{"": {DataType: MDTStringArray, Value: ifraw}}
-	}
-
-	if rval.Type().Kind() == reflect.Struct {
-		m := make(map[string]MetaValue)
-		for i := 0; i < rval.NumField(); i++ {
-			fieldtype := rval.Type().Field(i)
-
-			fieldname := fieldtype.Name
-
-			if fieldtype.IsExported() {
-				for k, v := range addMetaPrefix(fieldname, getReflectedMetaValues(rval.Field(i).Interface(), remainingDepth-1)) {
-					m[k] = v
-				}
-			}
-		}
-		return m
-	}
-
-	if rval.Type().ConvertibleTo(reflectTypeStr) {
-		return map[string]MetaValue{"": {DataType: MDTString, Value: rval.Convert(reflectTypeStr).String()}}
-	}
-
-	jsonval, err := json.Marshal(value)
-	if err != nil {
-		return map[string]MetaValue{"": {DataType: MDTString, Value: fmt.Sprintf("Failed to Marshal %T:\n%+v", value, value)}}
-	}
-
-	return map[string]MetaValue{"": {DataType: MDTString, Value: string(jsonval)}}
-}
-
-func addMetaPrefix(prefix string, m map[string]MetaValue) map[string]MetaValue {
-	if len(m) == 1 {
-		for k, v := range m {
-			if k == "" {
-				return map[string]MetaValue{prefix: v}
-			}
-		}
-	}
-
-	r := make(map[string]MetaValue, len(m))
-	for k, v := range m {
-		r[prefix+"."+k] = v
-	}
-	return r
-}

exerr/data.go

@@ -1,18 +0,0 @@
-package exerr
-
-type Method string
-
-const (
-	MethodOutput Method = "OUTPUT"
-	MethodPrint  Method = "PRINT"
-	MethodBuild  Method = "BUILD"
-	MethodFatal  Method = "FATAL"
-)
-
-type LogPrintLevel string
-
-const (
-	LogPrintFull     LogPrintLevel = "Full"
-	LogPrintOverview LogPrintLevel = "Overview"
-	LogPrintShort    LogPrintLevel = "Short"
-)

exerr/dataCategory.go

@@ -1,89 +0,0 @@
-package exerr
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/bson/bsoncodec"
-	"go.mongodb.org/mongo-driver/bson/bsonrw"
-	"go.mongodb.org/mongo-driver/bson/bsontype"
-	"reflect"
-)
-
-type ErrorCategory struct{ Category string }
-
-var (
-	CatWrap    = ErrorCategory{"Wrap"}    // The error is simply wrapping another error (e.g. when a grpc call returns an error)
-	CatSystem  = ErrorCategory{"System"}  // An internal system error (e.g. connection to db failed)
-	CatUser    = ErrorCategory{"User"}    // The user (the API caller) did something wrong (e.g. he has no permissions to do this)
-	CatForeign = ErrorCategory{"Foreign"} // A foreign error that some component threw (e.g. an unknown mongodb error), happens if we call Wrap(..) on an non-bmerror value
-)
-
-func (e *ErrorCategory) UnmarshalJSON(bytes []byte) error {
-	return json.Unmarshal(bytes, &e.Category)
-}
-
-func (e ErrorCategory) MarshalJSON() ([]byte, error) {
-	return json.Marshal(e.Category)
-}
-
-func (e *ErrorCategory) UnmarshalBSONValue(bt bsontype.Type, data []byte) error {
-	if bt == bson.TypeNull {
-		// we can't set nil in UnmarshalBSONValue (so we use default(struct))
-		// Use mongoext.CreateGoExtBsonRegistry if you need to unmarsh pointer values
-		// https://stackoverflow.com/questions/75167597
-		// https://jira.mongodb.org/browse/GODRIVER-2252
-		*e = ErrorCategory{}
-		return nil
-	}
-	if bt != bson.TypeString {
-		return errors.New(fmt.Sprintf("cannot unmarshal %v into String", bt))
-	}
-	var tt string
-	err := bson.RawValue{Type: bt, Value: data}.Unmarshal(&tt)
-	if err != nil {
-		return err
-	}
-	*e = ErrorCategory{tt}
-	return nil
-}
-
-func (e ErrorCategory) MarshalBSONValue() (bsontype.Type, []byte, error) {
-	return bson.MarshalValue(e.Category)
-}
-
-func (e ErrorCategory) DecodeValue(dc bsoncodec.DecodeContext, vr bsonrw.ValueReader, val reflect.Value) error {
-	if val.Kind() == reflect.Ptr && val.IsNil() {
-		if !val.CanSet() {
-			return errors.New("ValueUnmarshalerDecodeValue")
-		}
-		val.Set(reflect.New(val.Type().Elem()))
-	}
-
-	tp, src, err := bsonrw.Copier{}.CopyValueToBytes(vr)
-	if err != nil {
-		return err
-	}
-
-	if val.Kind() == reflect.Ptr && len(src) == 0 {
-		val.Set(reflect.Zero(val.Type()))
-		return nil
-	}
-
-	err = e.UnmarshalBSONValue(tp, src)
-	if err != nil {
-		return err
-	}
-
-	if val.Kind() == reflect.Ptr {
-		val.Set(reflect.ValueOf(&e))
-	} else {
-		val.Set(reflect.ValueOf(e))
-	}
-
-	return nil
-}
-
-//goland:noinspection GoUnusedGlobalVariable
-var AllCategories = []ErrorCategory{CatWrap, CatSystem, CatUser, CatForeign}

exerr/dataSeverity.go

@@ -1,91 +0,0 @@
-package exerr
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/bson/bsoncodec"
-	"go.mongodb.org/mongo-driver/bson/bsonrw"
-	"go.mongodb.org/mongo-driver/bson/bsontype"
-	"reflect"
-)
-
-type ErrorSeverity struct{ Severity string }
-
-var (
-	SevTrace = ErrorSeverity{"Trace"}
-	SevDebug = ErrorSeverity{"Debug"}
-	SevInfo  = ErrorSeverity{"Info"}
-	SevWarn  = ErrorSeverity{"Warn"}
-	SevErr   = ErrorSeverity{"Err"}
-	SevFatal = ErrorSeverity{"Fatal"}
-)
-
-func (e *ErrorSeverity) UnmarshalJSON(bytes []byte) error {
-	return json.Unmarshal(bytes, &e.Severity)
-}
-
-func (e ErrorSeverity) MarshalJSON() ([]byte, error) {
-	return json.Marshal(e.Severity)
-}
-
-func (e *ErrorSeverity) UnmarshalBSONValue(bt bsontype.Type, data []byte) error {
-	if bt == bson.TypeNull {
-		// we can't set nil in UnmarshalBSONValue (so we use default(struct))
-		// Use mongoext.CreateGoExtBsonRegistry if you need to unmarsh pointer values
-		// https://stackoverflow.com/questions/75167597
-		// https://jira.mongodb.org/browse/GODRIVER-2252
-		*e = ErrorSeverity{}
-		return nil
-	}
-	if bt != bson.TypeString {
-		return errors.New(fmt.Sprintf("cannot unmarshal %v into String", bt))
-	}
-	var tt string
-	err := bson.RawValue{Type: bt, Value: data}.Unmarshal(&tt)
-	if err != nil {
-		return err
-	}
-	*e = ErrorSeverity{tt}
-	return nil
-}
-
-func (e ErrorSeverity) MarshalBSONValue() (bsontype.Type, []byte, error) {
-	return bson.MarshalValue(e.Severity)
-}
-
-func (e ErrorSeverity) DecodeValue(dc bsoncodec.DecodeContext, vr bsonrw.ValueReader, val reflect.Value) error {
-	if val.Kind() == reflect.Ptr && val.IsNil() {
-		if !val.CanSet() {
-			return errors.New("ValueUnmarshalerDecodeValue")
-		}
-		val.Set(reflect.New(val.Type().Elem()))
-	}
-
-	tp, src, err := bsonrw.Copier{}.CopyValueToBytes(vr)
-	if err != nil {
-		return err
-	}
-
-	if val.Kind() == reflect.Ptr && len(src) == 0 {
-		val.Set(reflect.Zero(val.Type()))
-		return nil
-	}
-
-	err = e.UnmarshalBSONValue(tp, src)
-	if err != nil {
-		return err
-	}
-
-	if val.Kind() == reflect.Ptr {
-		val.Set(reflect.ValueOf(&e))
-	} else {
-		val.Set(reflect.ValueOf(e))
-	}
-
-	return nil
-}
-
-//goland:noinspection GoUnusedGlobalVariable
-var AllSeverities = []ErrorSeverity{SevTrace, SevDebug, SevInfo, SevWarn, SevErr, SevFatal}

exerr/dataType.go

@@ -1,156 +0,0 @@
-package exerr
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/bson/bsoncodec"
-	"go.mongodb.org/mongo-driver/bson/bsonrw"
-	"go.mongodb.org/mongo-driver/bson/bsontype"
-	"git.blackforestbytes.com/BlackForestBytes/goext/dataext"
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
-	"reflect"
-)
-
-type ErrorType struct {
-	Key               string
-	DefaultStatusCode *int
-}
-
-//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))
-
-	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))
-
-	TypeSQLQuery  = NewType("SQL_QUERY", langext.Ptr(500))
-	TypeSQLBuild  = NewType("SQL_BUILD", langext.Ptr(500))
-	TypeSQLDecode = NewType("SQL_DECODE", langext.Ptr(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))
-
-	TypeMarshalEntityID = NewType("MARSHAL_ENTITY_ID", langext.Ptr(400))
-	TypeInvalidCSID     = NewType("INVALID_CSID", langext.Ptr(400))
-
-	TypeGoogleStatuscode = NewType("GOOGLE_STATUSCODE", langext.Ptr(400))
-	TypeGoogleResponse   = NewType("GOOGLE_RESPONSE", langext.Ptr(400))
-
-	TypeUnauthorized = NewType("UNAUTHORIZED", langext.Ptr(401))
-	TypeAuthFailed   = NewType("AUTH_FAILED", langext.Ptr(401))
-
-	TypeInvalidImage    = NewType("IMAGEEXT_INVALID_IMAGE", langext.Ptr(400))
-	TypeInvalidMimeType = NewType("IMAGEEXT_INVALID_MIMETYPE", langext.Ptr(400))
-
-	// other values come from the downstream application that uses goext
-)
-
-func (e *ErrorType) UnmarshalJSON(bytes []byte) error {
-	var k string
-	err := json.Unmarshal(bytes, &k)
-	if err != nil {
-		return err
-	}
-
-	if d, ok := registeredTypes.Get(k); ok {
-		*e = d
-		return nil
-	} else {
-		*e = ErrorType{k, nil}
-		return nil
-	}
-}
-
-func (e ErrorType) MarshalJSON() ([]byte, error) {
-	return json.Marshal(e.Key)
-}
-
-func (e *ErrorType) UnmarshalBSONValue(bt bsontype.Type, data []byte) error {
-	if bt == bson.TypeNull {
-		// we can't set nil in UnmarshalBSONValue (so we use default(struct))
-		// Use mongoext.CreateGoExtBsonRegistry if you need to unmarsh pointer values
-		// https://stackoverflow.com/questions/75167597
-		// https://jira.mongodb.org/browse/GODRIVER-2252
-		*e = ErrorType{}
-		return nil
-	}
-	if bt != bson.TypeString {
-		return errors.New(fmt.Sprintf("cannot unmarshal %v into String", bt))
-	}
-	var tt string
-	err := bson.RawValue{Type: bt, Value: data}.Unmarshal(&tt)
-	if err != nil {
-		return err
-	}
-
-	if d, ok := registeredTypes.Get(tt); ok {
-		*e = d
-		return nil
-	} else {
-		*e = ErrorType{tt, nil}
-		return nil
-	}
-}
-
-func (e ErrorType) MarshalBSONValue() (bsontype.Type, []byte, error) {
-	return bson.MarshalValue(e.Key)
-}
-
-func (e ErrorType) DecodeValue(dc bsoncodec.DecodeContext, vr bsonrw.ValueReader, val reflect.Value) error {
-	if val.Kind() == reflect.Ptr && val.IsNil() {
-		if !val.CanSet() {
-			return errors.New("ValueUnmarshalerDecodeValue")
-		}
-		val.Set(reflect.New(val.Type().Elem()))
-	}
-
-	tp, src, err := bsonrw.Copier{}.CopyValueToBytes(vr)
-	if err != nil {
-		return err
-	}
-
-	if val.Kind() == reflect.Ptr && len(src) == 0 {
-		val.Set(reflect.Zero(val.Type()))
-		return nil
-	}
-
-	err = e.UnmarshalBSONValue(tp, src)
-	if err != nil {
-		return err
-	}
-
-	if val.Kind() == reflect.Ptr {
-		val.Set(reflect.ValueOf(&e))
-	} else {
-		val.Set(reflect.ValueOf(e))
-	}
-
-	return nil
-}
-
-var registeredTypes = dataext.SyncMap[string, ErrorType]{}
-
-func NewType(key string, defStatusCode *int) ErrorType {
-	et := ErrorType{key, defStatusCode}
-
-	registeredTypes.Set(key, et)
-
-	return et
-}
-
-func ListRegisteredTypes() []ErrorType {
-	return registeredTypes.GetAllValues()
-}

exerr/data_test.go

@@ -1,153 +0,0 @@
-package exerr
-
-import (
-	"context"
-	"encoding/json"
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/bson/primitive"
-	"go.mongodb.org/mongo-driver/mongo"
-	"git.blackforestbytes.com/BlackForestBytes/goext/tst"
-	"testing"
-	"time"
-)
-
-func TestJSONMarshalErrorCategory(t *testing.T) {
-
-	c1 := CatSystem
-
-	jsonbin := tst.Must(json.Marshal(c1))(t)
-
-	var c2 ErrorCategory
-	tst.AssertNoErr(t, json.Unmarshal(jsonbin, &c2))
-
-	tst.AssertEqual(t, c1, c2)
-
-	tst.AssertEqual(t, string(jsonbin), "\"System\"")
-}
-
-func TestJSONMarshalErrorSeverity(t *testing.T) {
-
-	c1 := SevErr
-
-	jsonbin := tst.Must(json.Marshal(c1))(t)
-
-	var c2 ErrorSeverity
-	tst.AssertNoErr(t, json.Unmarshal(jsonbin, &c2))
-
-	tst.AssertEqual(t, c1, c2)
-
-	tst.AssertEqual(t, string(jsonbin), "\"Err\"")
-}
-
-func TestJSONMarshalErrorType(t *testing.T) {
-
-	c1 := TypeNotImplemented
-
-	jsonbin := tst.Must(json.Marshal(c1))(t)
-
-	var c2 ErrorType
-	tst.AssertNoErr(t, json.Unmarshal(jsonbin, &c2))
-
-	tst.AssertEqual(t, c1, c2)
-
-	tst.AssertEqual(t, string(jsonbin), "\"NOT_IMPLEMENTED\"")
-}
-
-func TestBSONMarshalErrorCategory(t *testing.T) {
-	ctx, cancel := context.WithTimeout(context.Background(), 350*time.Millisecond)
-	defer cancel()
-
-	client, err := mongo.Connect(ctx)
-	if err != nil {
-		t.Skip("Skip test - no local mongo found")
-		return
-	}
-	err = client.Ping(ctx, nil)
-	if err != nil {
-		t.Skip("Skip test - no local mongo found")
-		return
-	}
-
-	primimd := primitive.NewObjectID()
-
-	_, err = client.Database("_test").Collection("goext-cicd").InsertOne(ctx, bson.M{"_id": primimd, "val": CatSystem})
-	tst.AssertNoErr(t, err)
-
-	cursor := client.Database("_test").Collection("goext-cicd").FindOne(ctx, bson.M{"_id": primimd, "val": bson.M{"$type": "string"}})
-
-	var c1 struct {
-		ID  primitive.ObjectID `bson:"_id"`
-		Val ErrorCategory      `bson:"val"`
-	}
-
-	err = cursor.Decode(&c1)
-	tst.AssertNoErr(t, err)
-
-	tst.AssertEqual(t, c1.Val, CatSystem)
-}
-
-func TestBSONMarshalErrorSeverity(t *testing.T) {
-	ctx, cancel := context.WithTimeout(context.Background(), 350*time.Millisecond)
-	defer cancel()
-
-	client, err := mongo.Connect(ctx)
-	if err != nil {
-		t.Skip("Skip test - no local mongo found")
-		return
-	}
-	err = client.Ping(ctx, nil)
-	if err != nil {
-		t.Skip("Skip test - no local mongo found")
-		return
-	}
-
-	primimd := primitive.NewObjectID()
-
-	_, err = client.Database("_test").Collection("goext-cicd").InsertOne(ctx, bson.M{"_id": primimd, "val": SevErr})
-	tst.AssertNoErr(t, err)
-
-	cursor := client.Database("_test").Collection("goext-cicd").FindOne(ctx, bson.M{"_id": primimd, "val": bson.M{"$type": "string"}})
-
-	var c1 struct {
-		ID  primitive.ObjectID `bson:"_id"`
-		Val ErrorSeverity      `bson:"val"`
-	}
-
-	err = cursor.Decode(&c1)
-	tst.AssertNoErr(t, err)
-
-	tst.AssertEqual(t, c1.Val, SevErr)
-}
-
-func TestBSONMarshalErrorType(t *testing.T) {
-	ctx, cancel := context.WithTimeout(context.Background(), 350*time.Millisecond)
-	defer cancel()
-
-	client, err := mongo.Connect(ctx)
-	if err != nil {
-		t.Skip("Skip test - no local mongo found")
-		return
-	}
-	err = client.Ping(ctx, nil)
-	if err != nil {
-		t.Skip("Skip test - no local mongo found")
-		return
-	}
-
-	primimd := primitive.NewObjectID()
-
-	_, err = client.Database("_test").Collection("goext-cicd").InsertOne(ctx, bson.M{"_id": primimd, "val": TypeNotImplemented})
-	tst.AssertNoErr(t, err)
-
-	cursor := client.Database("_test").Collection("goext-cicd").FindOne(ctx, bson.M{"_id": primimd, "val": bson.M{"$type": "string"}})
-
-	var c1 struct {
-		ID  primitive.ObjectID `bson:"_id"`
-		Val ErrorType          `bson:"val"`
-	}
-
-	err = cursor.Decode(&c1)
-	tst.AssertNoErr(t, err)
-
-	tst.AssertEqual(t, c1.Val, TypeNotImplemented)
-}

exerr/errinit.go

@@ -1,138 +0,0 @@
-package exerr
-
-import (
-	"context"
-	"fmt"
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
-	"github.com/gin-gonic/gin"
-	"github.com/rs/zerolog"
-	"net/http"
-	"os"
-)
-
-type ErrorPackageConfig struct {
-	ZeroLogErrTraces       bool                                                                     // autom print zerolog logs on .Build()  (for SevErr and SevFatal)
-	ZeroLogAllTraces       bool                                                                     // autom print zerolog logs on .Build()  (for all Severities)
-	RecursiveErrors        bool                                                                     // errors contains their Origin-Error
-	ExtendedGinOutput      bool                                                                     // Log extended data (trace, meta, ...) to gin in err.Output()
-	IncludeMetaInGinOutput bool                                                                     // Log meta fields ( from e.g. `.Str(key, val).Build()` ) to gin in err.Output()
-	ExtendGinOutput        func(err *ExErr, json map[string]any)                                    // (Optionally) extend the gin output with more fields
-	ExtendGinDataOutput    func(err *ExErr, depth int, json map[string]any)                         // (Optionally) extend the gin `__data` output with more fields
-	DisableErrorWrapping   bool                                                                     // Disables the exerr.Wrap()...Build() function - will always return the original error
-	ZeroLogErrGinOutput    bool                                                                     // autom print zerolog logs on ginext.Error() / .Output(gin)  (for SevErr and SevFatal)
-	ZeroLogAllGinOutput    bool                                                                     // autom print zerolog logs on ginext.Error() / .Output(gin)  (for all Severities)
-	ExtendGinMeta          func(ctx context.Context, b *Builder, g *gin.Context, req *http.Request) // (Optionally) extend the final error meta values with additional data from the gin context (a few are automatically added, here more can be included)
-	ExtendContextMeta      func(b *Builder, method Method, dctx context.Context)                    // (Optionally) extend the final error meta values with additional data from the context (a few are automatically added, here more can be included)
-	ZeroLogger             zerolog.Logger                                                           // The logger used to print exerr log messages
-}
-
-type ErrorPackageConfigInit struct {
-	ZeroLogErrTraces       *bool
-	ZeroLogAllTraces       *bool
-	RecursiveErrors        *bool
-	ExtendedGinOutput      *bool
-	IncludeMetaInGinOutput *bool
-	ExtendGinOutput        func(err *ExErr, json map[string]any)
-	ExtendGinDataOutput    func(err *ExErr, depth int, json map[string]any)
-	DisableErrorWrapping   *bool
-	ZeroLogErrGinOutput    *bool
-	ZeroLogAllGinOutput    *bool
-	ExtendGinMeta          func(ctx context.Context, b *Builder, g *gin.Context, req *http.Request)
-	ExtendContextMeta      func(b *Builder, method Method, dctx context.Context)
-	ZeroLogger             *zerolog.Logger
-}
-
-var initialized = false
-
-var pkgconfig = ErrorPackageConfig{
-	ZeroLogErrTraces:       true,
-	ZeroLogAllTraces:       false,
-	RecursiveErrors:        true,
-	ExtendedGinOutput:      false,
-	IncludeMetaInGinOutput: true,
-	ExtendGinOutput:        func(err *ExErr, json map[string]any) {},
-	ExtendGinDataOutput:    func(err *ExErr, depth int, json map[string]any) {},
-	DisableErrorWrapping:   false,
-	ZeroLogErrGinOutput:    true,
-	ZeroLogAllGinOutput:    false,
-	ExtendGinMeta:          func(ctx context.Context, b *Builder, g *gin.Context, req *http.Request) {},
-	ExtendContextMeta:      func(b *Builder, method Method, dctx context.Context) {},
-}
-
-// Init initializes the exerr packages
-// Must be called at the program start, before (!) any errors
-// Is not thread-safe
-func Init(cfg ErrorPackageConfigInit) {
-	if initialized {
-		panic("Cannot re-init error package")
-	}
-
-	ego := func(err *ExErr, json map[string]any) {}
-	egdo := func(err *ExErr, depth int, json map[string]any) {}
-	egm := func(ctx context.Context, b *Builder, g *gin.Context, req *http.Request) {}
-	egcm := func(b *Builder, method Method, dctx context.Context) {}
-
-	if cfg.ExtendGinOutput != nil {
-		ego = cfg.ExtendGinOutput
-	}
-	if cfg.ExtendGinDataOutput != nil {
-		egdo = cfg.ExtendGinDataOutput
-	}
-	if cfg.ExtendGinMeta != nil {
-		egm = cfg.ExtendGinMeta
-	}
-	if cfg.ExtendContextMeta != nil {
-		egcm = cfg.ExtendContextMeta
-	}
-
-	var logger zerolog.Logger
-	if cfg.ZeroLogger != nil {
-		logger = *cfg.ZeroLogger
-	} else {
-		logger = newDefaultLogger()
-	}
-
-	pkgconfig = ErrorPackageConfig{
-		ZeroLogErrTraces:       langext.Coalesce(cfg.ZeroLogErrTraces, pkgconfig.ZeroLogErrTraces),
-		ZeroLogAllTraces:       langext.Coalesce(cfg.ZeroLogAllTraces, pkgconfig.ZeroLogAllTraces),
-		RecursiveErrors:        langext.Coalesce(cfg.RecursiveErrors, pkgconfig.RecursiveErrors),
-		ExtendedGinOutput:      langext.Coalesce(cfg.ExtendedGinOutput, pkgconfig.ExtendedGinOutput),
-		IncludeMetaInGinOutput: langext.Coalesce(cfg.IncludeMetaInGinOutput, pkgconfig.IncludeMetaInGinOutput),
-		ExtendGinOutput:        ego,
-		ExtendGinDataOutput:    egdo,
-		DisableErrorWrapping:   langext.Coalesce(cfg.DisableErrorWrapping, pkgconfig.DisableErrorWrapping),
-		ZeroLogAllGinOutput:    langext.Coalesce(cfg.ZeroLogAllGinOutput, pkgconfig.ZeroLogAllGinOutput),
-		ZeroLogErrGinOutput:    langext.Coalesce(cfg.ZeroLogErrGinOutput, pkgconfig.ZeroLogErrGinOutput),
-		ExtendGinMeta:          egm,
-		ExtendContextMeta:      egcm,
-		ZeroLogger:             logger,
-	}
-
-	initialized = true
-}
-
-func newDefaultLogger() zerolog.Logger {
-	cw := zerolog.ConsoleWriter{
-		Out:        os.Stdout,
-		TimeFormat: "2006-01-02 15:04:05 Z07:00",
-	}
-
-	multi := zerolog.MultiLevelWriter(cw)
-
-	return zerolog.New(multi).With().Timestamp().CallerWithSkipFrameCount(5).Logger()
-}
-
-func Initialized() bool {
-	return initialized
-}
-
-func warnOnPkgConfigNotInitialized() {
-	if !initialized {
-		fmt.Printf("\n")
-		fmt.Printf("%s\n", langext.StrRepeat("=", 80))
-		fmt.Printf("%s\n", "[WARNING] exerr package used without initializiation")
-		fmt.Printf("%s\n", "          call exerr.Init() in your main() function")
-		fmt.Printf("%s\n", langext.StrRepeat("=", 80))
-		fmt.Printf("\n")
-	}
-}

exerr/exerr.go

@@ -1,436 +0,0 @@
-package exerr
-
-import (
-	"fmt"
-	"github.com/rs/xid"
-	"github.com/rs/zerolog"
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
-	"reflect"
-	"strings"
-	"time"
-)
-
-type ExErr struct {
-	UniqueID string `json:"uniqueID"`
-
-	Timestamp time.Time     `json:"timestamp"`
-	Category  ErrorCategory `json:"category"`
-	Severity  ErrorSeverity `json:"severity"`
-	Type      ErrorType     `json:"type"`
-
-	StatusCode *int `json:"statusCode"`
-
-	Message        string `json:"message"`
-	WrappedErrType string `json:"wrappedErrType"`
-	WrappedErr     any    `json:"-"`
-	Caller         string `json:"caller"`
-
-	OriginalError *ExErr `json:"originalError"`
-
-	Extra map[string]any `json:"extra"`
-	Meta  MetaMap        `json:"meta"`
-}
-
-func (ee *ExErr) Error() string {
-	return ee.RecursiveMessage()
-}
-
-// Unwrap must be implemented so that some error.XXX methods work
-func (ee *ExErr) Unwrap() error {
-	if ee.OriginalError == nil {
-
-		if ee.WrappedErr != nil {
-			if werr, ok := ee.WrappedErr.(error); ok {
-				return werr
-			}
-		}
-
-		return nil // this is neccessary - otherwise we return a wrapped nil and the `x == nil` comparison fails (= panic in errors.Is and other failures)
-	}
-	return ee.OriginalError
-}
-
-// Is must be implemented so that error.Is(x) works
-func (ee *ExErr) Is(e error) bool {
-	return IsFrom(ee, e)
-}
-
-// As must be implemented so that error.As(x) works
-//
-//goland:noinspection GoTypeAssertionOnErrors
-func (ee *ExErr) As(target any) bool {
-	if dstErr, ok := target.(*ExErr); ok {
-
-		if dst0, ok := ee.contains(dstErr); ok {
-			dstErr = dst0
-			return true
-		} else {
-			return false
-		}
-
-	} else {
-
-		val := reflect.ValueOf(target)
-
-		typStr := val.Type().Elem().String()
-
-		for curr := ee; curr != nil; curr = curr.OriginalError {
-			if curr.Category == CatForeign && curr.WrappedErrType == typStr && curr.WrappedErr != nil {
-				val.Elem().Set(reflect.ValueOf(curr.WrappedErr))
-				return true
-			}
-		}
-
-		return false
-	}
-}
-
-func (ee *ExErr) Log(evt *zerolog.Event) {
-	evt.Msg(ee.FormatLog(LogPrintFull))
-}
-
-func (ee *ExErr) FormatLog(lvl LogPrintLevel) string {
-
-	// [LogPrintShort]
-	//
-	// - Only print message and type
-	// - Used e.g. for logging to the console when Build is called
-	// - also used in Print() if level == Warn/Info
-	//
-	// [LogPrintOverview]
-	//
-	// - print message, extra and errortrace
-	//
-	// [LogPrintFull]
-	//
-	// - print full error, with meta and extra, and trace, etc
-	// - Used in Output() and Print()
-	//
-
-	if lvl == LogPrintShort {
-
-		msg := ee.Message
-		if msg == "" {
-			msg = ee.RecursiveMessage()
-		}
-		if ee.OriginalError != nil && ee.OriginalError.Category == CatForeign {
-			msg = msg + " (" + strings.ReplaceAll(ee.OriginalError.Message, "\n", " ") + ")"
-		}
-
-		if ee.Type != TypeWrap {
-			return "[" + ee.Type.Key + "] " + msg
-		} else {
-			return msg
-		}
-
-	} else if lvl == LogPrintOverview {
-
-		str := "[" + 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)
-		}
-
-		indent := ""
-		for curr := ee; curr != nil; curr = curr.OriginalError {
-			indent += "  "
-
-			str += indent
-			str += "-> "
-			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"
-
-		}
-		return str
-
-	} else if lvl == LogPrintFull {
-
-		str := "[" + 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)
-		}
-
-		indent := ""
-		for curr := ee; curr != nil; curr = curr.OriginalError {
-			indent += "  "
-
-			etype := curr.Type.Key
-			if curr.Type == TypeWrap {
-				etype = "~"
-			}
-
-			str += indent
-			str += "-> ["
-			str += etype
-			if curr.Category == CatForeign {
-				str += "|Foreign"
-			}
-			str += "] "
-			str += strings.ReplaceAll(curr.Message, "\n", " ")
-			if curr.Caller != "" {
-				str += " (@ "
-				str += curr.Caller
-				str += ")"
-			}
-			str += "\n"
-
-			if curr.Meta.Any() {
-				meta := indent + "   {" + curr.Meta.FormatOneLine(240) + "}"
-				if len(meta) < 200 {
-					str += meta
-					str += "\n"
-				} else {
-					str += curr.Meta.FormatMultiLine(indent+"   ", "  ", 1024)
-					str += "\n"
-				}
-			}
-		}
-		return str
-
-	} else {
-
-		return "[?[" + ee.UniqueID + "]?]"
-
-	}
-}
-
-func (ee *ExErr) ShortLog(evt *zerolog.Event) {
-	ee.Meta.Apply(evt, langext.Ptr(240)).Msg(ee.FormatLog(LogPrintShort))
-}
-
-// RecursiveMessage returns the message to show
-// = first error (top-down) that is not foreign/empty
-// = lowest level error (that is not empty)
-// = fallback to self.message
-func (ee *ExErr) RecursiveMessage() string {
-
-	// ==== [1] ==== first error (top-down) that is not wrapping/foreign/empty
-
-	for curr := ee; curr != nil; curr = curr.OriginalError {
-		if curr.Message != "" && curr.Category != CatForeign {
-			return curr.Message
-		}
-	}
-
-	// ==== [2] ==== lowest level error (that is not empty)
-
-	deepestMsg := ""
-	for curr := ee; curr != nil; curr = curr.OriginalError {
-		if curr.Message != "" {
-			deepestMsg = curr.Message
-		}
-	}
-	if deepestMsg != "" {
-		return deepestMsg
-	}
-
-	// ==== [3] ==== fallback to self.message
-
-	return ee.Message
-}
-
-// RecursiveType returns the statuscode to use
-// = first error (top-down) that is not wrapping/empty
-func (ee *ExErr) RecursiveType() ErrorType {
-	for curr := ee; curr != nil; curr = curr.OriginalError {
-		if curr.Type != TypeWrap {
-			return curr.Type
-		}
-
-	}
-
-	// fallback to self
-	return ee.Type
-}
-
-// RecursiveStatuscode returns the HTTP Statuscode to use
-// = first error (top-down) that has a statuscode set
-func (ee *ExErr) RecursiveStatuscode() *int {
-	for curr := ee; curr != nil; curr = curr.OriginalError {
-		if curr.StatusCode != nil {
-			return langext.Ptr(*curr.StatusCode)
-		}
-	}
-
-	return nil
-}
-
-// RecursiveCategory returns the ErrorCategory to use
-// = first error (top-down) that has a statuscode set
-func (ee *ExErr) RecursiveCategory() ErrorCategory {
-	for curr := ee; curr != nil; curr = curr.OriginalError {
-		if curr.Category != CatWrap {
-			return curr.Category
-		}
-	}
-
-	// fallback to <empty>
-	return ee.Category
-}
-
-// RecursiveMeta searches (top-down) for teh first error that has a meta value with teh specified key
-// and returns its value (or nil)
-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 nil
-}
-
-// Depth returns the depth of recursively contained errors
-func (ee *ExErr) Depth() int {
-	if ee.OriginalError == nil {
-		return 1
-	} else {
-		return ee.OriginalError.Depth() + 1
-	}
-}
-
-// GetMeta returns the meta value with the specified key
-// this method recurses through all wrapped errors and returns the first matching meta value
-func (ee *ExErr) GetMeta(key string) (any, bool) {
-	for curr := ee; curr != nil; curr = curr.OriginalError {
-		if v, ok := curr.Meta[key]; ok {
-			return v.Value, true
-		}
-	}
-
-	return nil, false
-}
-
-// GetMetaString functions the same as GetMeta, but returns false if the type does not match
-func (ee *ExErr) GetMetaString(key string) (string, bool) {
-	if v1, ok := ee.GetMeta(key); ok {
-		if v2, ok := v1.(string); ok {
-			return v2, true
-		}
-	}
-	return "", false
-}
-
-func (ee *ExErr) GetMetaBool(key string) (bool, bool) {
-	if v1, ok := ee.GetMeta(key); ok {
-		if v2, ok := v1.(bool); ok {
-			return v2, true
-		}
-	}
-	return false, false
-}
-
-func (ee *ExErr) GetMetaInt(key string) (int, bool) {
-	if v1, ok := ee.GetMeta(key); ok {
-		if v2, ok := v1.(int); ok {
-			return v2, true
-		}
-	}
-	return 0, false
-}
-
-func (ee *ExErr) GetMetaFloat32(key string) (float32, bool) {
-	if v1, ok := ee.GetMeta(key); ok {
-		if v2, ok := v1.(float32); ok {
-			return v2, true
-		}
-	}
-	return 0, false
-}
-
-func (ee *ExErr) GetMetaFloat64(key string) (float64, bool) {
-	if v1, ok := ee.GetMeta(key); ok {
-		if v2, ok := v1.(float64); ok {
-			return v2, true
-		}
-	}
-	return 0, false
-}
-
-func (ee *ExErr) GetMetaTime(key string) (time.Time, bool) {
-	if v1, ok := ee.GetMeta(key); ok {
-		if v2, ok := v1.(time.Time); ok {
-			return v2, true
-		}
-	}
-	return time.Time{}, false
-}
-
-func (ee *ExErr) GetExtra(key string) (any, bool) {
-	if v, ok := ee.Extra[key]; ok {
-		return v, true
-	}
-
-	return nil, false
-}
-
-func (ee *ExErr) UniqueIDs() []string {
-	ids := make([]string, 0, 1)
-	for curr := ee; curr != nil; curr = curr.OriginalError {
-		ids = append(ids, curr.UniqueID)
-	}
-	return ids
-}
-
-// contains test if the supplied error is contained in this error (anywhere in the chain)
-func (ee *ExErr) contains(original *ExErr) (*ExErr, bool) {
-	if original == nil {
-		return nil, false
-	}
-
-	if ee == original {
-		return ee, true
-	}
-
-	for curr := ee; curr != nil; curr = curr.OriginalError {
-		if curr.equalsDirectProperties(curr) {
-			return curr, true
-		}
-	}
-
-	return nil, false
-}
-
-// equalsDirectProperties tests if ee and other are equals, but only looks at primary properties (not `OriginalError` or `Meta`)
-func (ee *ExErr) equalsDirectProperties(other *ExErr) bool {
-
-	if ee.UniqueID != other.UniqueID {
-		return false
-	}
-	if ee.Timestamp != other.Timestamp {
-		return false
-	}
-	if ee.Category != other.Category {
-		return false
-	}
-	if ee.Severity != other.Severity {
-		return false
-	}
-	if ee.Type != other.Type {
-		return false
-	}
-	if ee.StatusCode != other.StatusCode {
-		return false
-	}
-	if ee.Message != other.Message {
-		return false
-	}
-	if ee.WrappedErrType != other.WrappedErrType {
-		return false
-	}
-	if ee.Caller != other.Caller {
-		return false
-	}
-
-	return true
-}
-
-func newID() string {
-	return xid.New().String()
-}

exerr/exerr_test.go

@@ -1,102 +0,0 @@
-package exerr
-
-import (
-	"errors"
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
-	"git.blackforestbytes.com/BlackForestBytes/goext/tst"
-	"os"
-	"testing"
-)
-
-func TestMain(m *testing.M) {
-	if !Initialized() {
-		Init(ErrorPackageConfigInit{ZeroLogErrTraces: langext.PFalse, ZeroLogAllTraces: langext.PFalse})
-	}
-	os.Exit(m.Run())
-}
-
-type golangErr struct {
-	Message string
-}
-
-func (g golangErr) Error() string {
-	return g.Message
-}
-
-type golangErr2 struct {
-	Message string
-}
-
-func (g golangErr2) Error() string {
-	return g.Message
-}
-
-type simpleError struct {
-}
-
-func (g simpleError) Error() string {
-	return "Something simple went wroong"
-}
-
-type simpleError2 struct {
-}
-
-func (g simpleError2) Error() string {
-	return "Something simple went wroong"
-}
-
-func TestExErrIs1(t *testing.T) {
-	e0 := simpleError{}
-
-	wrap := Wrap(e0, "something went wrong").Str("test", "123").Build()
-
-	tst.AssertTrue(t, errors.Is(wrap, simpleError{}))
-	tst.AssertFalse(t, errors.Is(wrap, golangErr{}))
-	tst.AssertFalse(t, errors.Is(wrap, golangErr{"error1"}))
-}
-
-func TestExErrIs2(t *testing.T) {
-	e0 := golangErr{"error1"}
-
-	wrap := Wrap(e0, "something went wrong").Str("test", "123").Build()
-
-	tst.AssertTrue(t, errors.Is(wrap, e0))
-	tst.AssertTrue(t, errors.Is(wrap, golangErr{"error1"}))
-	tst.AssertFalse(t, errors.Is(wrap, golangErr{"error2"}))
-	tst.AssertFalse(t, errors.Is(wrap, simpleError{}))
-}
-
-func TestExErrAs(t *testing.T) {
-
-	e0 := golangErr{"error1"}
-
-	w0 := Wrap(e0, "something went wrong").Str("test", "123").Build()
-
-	{
-		out := golangErr{}
-		ok := errors.As(w0, &out)
-		tst.AssertTrue(t, ok)
-		tst.AssertEqual(t, out.Message, "error1")
-	}
-
-	w1 := Wrap(w0, "outher error").Build()
-
-	{
-		out := golangErr{}
-		ok := errors.As(w1, &out)
-		tst.AssertTrue(t, ok)
-		tst.AssertEqual(t, out.Message, "error1")
-	}
-
-	{
-		out := golangErr2{}
-		ok := errors.As(w1, &out)
-		tst.AssertFalse(t, ok)
-	}
-
-	{
-		out := simpleError2{}
-		ok := errors.As(w1, &out)
-		tst.AssertFalse(t, ok)
-	}
-}

exerr/gin.go

@@ -1,175 +0,0 @@
-package exerr
-
-import (
-	json "git.blackforestbytes.com/BlackForestBytes/goext/gojson"
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
-	"github.com/gin-gonic/gin"
-	"net/http"
-	"time"
-)
-
-func (ee *ExErr) toJson(depth int, applyExtendListener bool, outputMeta bool) langext.H {
-	ginJson := langext.H{}
-
-	if ee.UniqueID != "" {
-		ginJson["id"] = ee.UniqueID
-	}
-	if ee.Category != CatWrap {
-		ginJson["category"] = ee.Category.Category
-	}
-	if ee.Type != TypeWrap {
-		ginJson["type"] = ee.Type.Key
-	}
-	if ee.StatusCode != nil {
-		ginJson["statuscode"] = ee.StatusCode
-	}
-	if ee.Message != "" {
-		ginJson["message"] = ee.Message
-	}
-	if ee.Caller != "" {
-		ginJson["caller"] = ee.Caller
-	}
-	if ee.Severity != SevErr {
-		ginJson["severity"] = ee.Severity.Severity
-	}
-	if ee.Timestamp != (time.Time{}) {
-		ginJson["time"] = ee.Timestamp.Format(time.RFC3339)
-	}
-	if ee.WrappedErrType != "" {
-		ginJson["wrappedErrType"] = ee.WrappedErrType
-	}
-	if ee.OriginalError != nil {
-		ginJson["original"] = ee.OriginalError.toJson(depth+1, applyExtendListener, outputMeta)
-	}
-
-	if outputMeta {
-		metaJson := langext.H{}
-		for metaKey, metaVal := range ee.Meta {
-			metaJson[metaKey] = metaVal.rawValueForJson()
-		}
-		ginJson["meta"] = metaJson
-
-		extraJson := langext.H{}
-		for extraKey, extraVal := range ee.Extra {
-			extraJson[extraKey] = extraVal
-		}
-		ginJson["extra"] = extraJson
-	}
-
-	if applyExtendListener {
-		pkgconfig.ExtendGinDataOutput(ee, depth, ginJson)
-	}
-
-	return ginJson
-}
-
-func (ee *ExErr) ToDefaultAPIJson() (string, error) {
-
-	gjr := json.GoJsonRender{Data: ee.ToAPIJson(true, pkgconfig.ExtendedGinOutput, pkgconfig.IncludeMetaInGinOutput), NilSafeSlices: true, NilSafeMaps: true}
-
-	r, err := gjr.RenderString()
-	if err != nil {
-		return "", err
-	}
-
-	return r, nil
-}
-
-// ToAPIJson converts the ExError to a json object
-// (the same object as used in the Output(gin) method)
-//
-// Parameters:
-//   - [applyExtendListener]:  if false the pkgconfig.ExtendGinOutput / pkgconfig.ExtendGinDataOutput will not be applied
-//   - [includeWrappedErrors]: if false we do not include the recursive/wrapped errors in `__data`
-//   - [includeMetaFields]:    if true  we also include meta-values (aka from `.Str(key, value).Build()`), needs includeWrappedErrors=true
-func (ee *ExErr) ToAPIJson(applyExtendListener bool, includeWrappedErrors bool, includeMetaFields bool) langext.H {
-
-	apiOutput := langext.H{
-		"errorid":   ee.UniqueID,
-		"message":   ee.RecursiveMessage(),
-		"errorcode": ee.RecursiveType().Key,
-		"category":  ee.RecursiveCategory().Category,
-	}
-
-	if includeWrappedErrors {
-		apiOutput["__data"] = ee.toJson(0, applyExtendListener, includeMetaFields)
-	}
-
-	for exkey, exval := range ee.Extra {
-
-		// ensure we do not override existing values
-		for {
-			if _, ok := apiOutput[exkey]; ok {
-				exkey = "_" + exkey
-			} else {
-				break
-			}
-		}
-
-		apiOutput[exkey] = exval
-	}
-
-	if applyExtendListener {
-		pkgconfig.ExtendGinOutput(ee, apiOutput)
-	}
-
-	return apiOutput
-}
-
-func (ee *ExErr) Output(g *gin.Context) {
-
-	warnOnPkgConfigNotInitialized()
-
-	var statuscode = http.StatusInternalServerError
-
-	var baseCat = ee.RecursiveCategory()
-	var baseType = ee.RecursiveType()
-	var baseStatuscode = ee.RecursiveStatuscode()
-
-	if baseCat == CatUser {
-		statuscode = http.StatusBadRequest
-	} else if baseCat == CatSystem {
-		statuscode = http.StatusInternalServerError
-	}
-
-	if baseStatuscode != nil {
-		statuscode = *ee.StatusCode
-	} else if baseType.DefaultStatusCode != nil {
-		statuscode = *baseType.DefaultStatusCode
-	}
-
-	ginOutput := ee.ToAPIJson(true, pkgconfig.ExtendedGinOutput, pkgconfig.IncludeMetaInGinOutput)
-
-	g.Render(statuscode, json.GoJsonRender{Data: ginOutput, NilSafeSlices: true, NilSafeMaps: true})
-}
-
-func (ee *ExErr) OutputRaw(w http.ResponseWriter) {
-
-	warnOnPkgConfigNotInitialized()
-
-	var statuscode = http.StatusInternalServerError
-
-	var baseCat = ee.RecursiveCategory()
-	var baseType = ee.RecursiveType()
-	var baseStatuscode = ee.RecursiveStatuscode()
-
-	if baseCat == CatUser {
-		statuscode = http.StatusBadRequest
-	} else if baseCat == CatSystem {
-		statuscode = http.StatusInternalServerError
-	}
-
-	if baseStatuscode != nil {
-		statuscode = *ee.StatusCode
-	} else if baseType.DefaultStatusCode != nil {
-		statuscode = *baseType.DefaultStatusCode
-	}
-
-	ginOutput, err := ee.ToDefaultAPIJson()
-	if err != nil {
-		panic(err) // cannot happen
-	}
-
-	w.WriteHeader(statuscode)
-	_, _ = w.Write([]byte(ginOutput))
-}

exerr/helper.go

@@ -1,126 +0,0 @@
-package exerr
-
-import "fmt"
-
-// IsType test if the supplied error is of the specified ErrorType.
-func IsType(err error, errType ErrorType) bool {
-	if err == nil {
-		return false
-	}
-
-	bmerr := FromError(err)
-	for bmerr != nil {
-		if bmerr.Type == errType {
-			return true
-		}
-		bmerr = bmerr.OriginalError
-	}
-
-	return false
-}
-
-// IsFrom test if the supplied error stems originally from original
-func IsFrom(e error, original error) bool {
-	if e == nil {
-		return false
-	}
-
-	//goland:noinspection GoDirectComparisonOfErrors
-	if e == original {
-		return true
-	}
-
-	bmerr := FromError(e)
-	for bmerr == nil {
-		return false
-	}
-
-	for curr := bmerr; curr != nil; curr = curr.OriginalError {
-		if curr.Category == CatForeign && curr.Message == original.Error() && curr.WrappedErrType == fmt.Sprintf("%T", original) {
-			return true
-		}
-	}
-
-	return false
-}
-
-// HasSourceMessage tests if the supplied error stems originally from an error with the message msg
-func HasSourceMessage(e error, msg string) bool {
-	if e == nil {
-		return false
-	}
-
-	bmerr := FromError(e)
-	for bmerr == nil {
-		return false
-	}
-
-	for curr := bmerr; curr != nil; curr = curr.OriginalError {
-		if curr.OriginalError == nil && curr.Message == msg {
-			return true
-		}
-	}
-
-	return false
-}
-
-func MessageMatch(e error, matcher func(string) bool) bool {
-	if e == nil {
-		return false
-	}
-
-	if matcher(e.Error()) {
-		return true
-	}
-
-	bmerr := FromError(e)
-	for bmerr == nil {
-		return false
-	}
-
-	for curr := bmerr; curr != nil; curr = curr.OriginalError {
-		if matcher(curr.Message) {
-			return true
-		}
-	}
-
-	return false
-}
-
-// OriginalError returns the lowest level error, probably the original/external error that was originally wrapped
-func OriginalError(e error) error {
-	if e == nil {
-		return nil
-	}
-
-	//goland:noinspection GoTypeAssertionOnErrors
-	bmerr, ok := e.(*ExErr)
-	for !ok {
-		return e
-	}
-
-	for bmerr.OriginalError != nil {
-		bmerr = bmerr.OriginalError
-	}
-
-	if bmerr.WrappedErr != nil {
-		if werr, ok := bmerr.WrappedErr.(error); ok {
-			return werr
-		}
-	}
-
-	return bmerr
-}
-
-func UniqueID(v error) *string {
-	if v == nil {
-		return nil
-	}
-
-	//goland:noinspection GoTypeAssertionOnErrors
-	if verr, ok := v.(*ExErr); ok {
-		return &verr.UniqueID
-	}
-
-	return nil
-}

exerr/listener.go

@@ -1,30 +0,0 @@
-package exerr
-
-import (
-	"sync"
-)
-
-type ListenerOpt struct {
-	NoLog bool
-}
-
-type Listener = func(method Method, v *ExErr, opt ListenerOpt)
-
-var listenerLock = sync.Mutex{}
-var listener = make([]Listener, 0)
-
-func RegisterListener(l Listener) {
-	listenerLock.Lock()
-	defer listenerLock.Unlock()
-
-	listener = append(listener, l)
-}
-
-func (ee *ExErr) CallListener(m Method, opt ListenerOpt) {
-	listenerLock.Lock()
-	defer listenerLock.Unlock()
-
-	for _, v := range listener {
-		v(m, ee, opt)
-	}
-}

exerr/meta.go

@@ -1,762 +0,0 @@
-package exerr
-
-import (
-	"encoding/hex"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
-	"github.com/rs/zerolog"
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/bson/primitive"
-	"math"
-	"strconv"
-	"strings"
-	"time"
-)
-
-// This is a buffed up map[string]any
-// we also save type information of the map-values
-// which allows us to deserialize them back into te correct types later
-
-type MetaMap map[string]MetaValue
-
-type metaDataType string
-
-const (
-	MDTString      metaDataType = "String"
-	MDTStringPtr   metaDataType = "StringPtr"
-	MDTInt         metaDataType = "Int"
-	MDTInt8        metaDataType = "Int8"
-	MDTInt16       metaDataType = "Int16"
-	MDTInt32       metaDataType = "Int32"
-	MDTInt64       metaDataType = "Int64"
-	MDTFloat32     metaDataType = "Float32"
-	MDTFloat64     metaDataType = "Float64"
-	MDTBool        metaDataType = "Bool"
-	MDTBytes       metaDataType = "Bytes"
-	MDTObjectID    metaDataType = "ObjectID"
-	MDTTime        metaDataType = "Time"
-	MDTDuration    metaDataType = "Duration"
-	MDTStringArray metaDataType = "StringArr"
-	MDTIntArray    metaDataType = "IntArr"
-	MDTInt32Array  metaDataType = "Int32Arr"
-	MDTID          metaDataType = "ID"
-	MDTAny         metaDataType = "Interface"
-	MDTNil         metaDataType = "Nil"
-	MDTEnum        metaDataType = "Enum"
-)
-
-type MetaValue struct {
-	DataType metaDataType `json:"dataType"`
-	Value    interface{}  `json:"value"`
-}
-
-type metaValueSerialization struct {
-	DataType metaDataType `bson:"dataType"`
-	Value    string       `bson:"value"`
-	Raw      interface{}  `bson:"raw"`
-}
-
-func (v MetaValue) SerializeValue() (string, error) {
-	switch v.DataType {
-	case MDTString:
-		return v.Value.(string), nil
-	case MDTID:
-		return v.Value.(IDWrap).Serialize(), nil
-	case MDTAny:
-		return v.Value.(AnyWrap).Serialize(), nil
-	case MDTStringPtr:
-		if langext.IsNil(v.Value) {
-			return "#", nil
-		}
-		r := v.Value.(*string)
-		if r != nil {
-			return "*" + *r, nil
-		} else {
-			return "#", nil
-		}
-	case MDTInt:
-		return strconv.Itoa(v.Value.(int)), nil
-	case MDTInt8:
-		return strconv.FormatInt(int64(v.Value.(int8)), 10), nil
-	case MDTInt16:
-		return strconv.FormatInt(int64(v.Value.(int16)), 10), nil
-	case MDTInt32:
-		return strconv.FormatInt(int64(v.Value.(int32)), 10), nil
-	case MDTInt64:
-		return strconv.FormatInt(v.Value.(int64), 10), nil
-	case MDTFloat32:
-		return strconv.FormatFloat(float64(v.Value.(float32)), 'X', -1, 32), nil
-	case MDTFloat64:
-		return strconv.FormatFloat(v.Value.(float64), 'X', -1, 64), nil
-	case MDTBool:
-		if v.Value.(bool) {
-			return "true", nil
-		} else {
-			return "false", nil
-		}
-	case MDTBytes:
-		return hex.EncodeToString(v.Value.([]byte)), nil
-	case MDTObjectID:
-		return v.Value.(primitive.ObjectID).Hex(), nil
-	case MDTTime:
-		return strconv.FormatInt(v.Value.(time.Time).Unix(), 10) + "|" + strconv.FormatInt(int64(v.Value.(time.Time).Nanosecond()), 10), nil
-	case MDTDuration:
-		return v.Value.(time.Duration).String(), nil
-	case MDTStringArray:
-		if langext.IsNil(v.Value) {
-			return "#", nil
-		}
-		r, err := json.Marshal(v.Value.([]string))
-		if err != nil {
-			return "", err
-		}
-		return string(r), nil
-	case MDTIntArray:
-		if langext.IsNil(v.Value) {
-			return "#", nil
-		}
-		r, err := json.Marshal(v.Value.([]int))
-		if err != nil {
-			return "", err
-		}
-		return string(r), nil
-	case MDTInt32Array:
-		if langext.IsNil(v.Value) {
-			return "#", nil
-		}
-		r, err := json.Marshal(v.Value.([]int32))
-		if err != nil {
-			return "", err
-		}
-		return string(r), nil
-	case MDTNil:
-		return "", nil
-	case MDTEnum:
-		return v.Value.(EnumWrap).Serialize(), nil
-	}
-	return "", errors.New("Unknown type: " + string(v.DataType))
-}
-
-func (v MetaValue) ShortString(lim int) string {
-	switch v.DataType {
-	case MDTString:
-		r := strings.ReplaceAll(v.Value.(string), "\r", "")
-		r = strings.ReplaceAll(r, "\n", "\\n")
-		r = strings.ReplaceAll(r, "\t", "\\t")
-		return langext.StrLimit(r, lim, "...")
-	case MDTID:
-		return v.Value.(IDWrap).String()
-	case MDTAny:
-		return v.Value.(AnyWrap).String()
-	case MDTStringPtr:
-		if langext.IsNil(v.Value) {
-			return "<<null>>"
-		}
-		r := langext.CoalesceString(v.Value.(*string), "<<null>>")
-		r = strings.ReplaceAll(r, "\r", "")
-		r = strings.ReplaceAll(r, "\n", "\\n")
-		r = strings.ReplaceAll(r, "\t", "\\t")
-		return langext.StrLimit(r, lim, "...")
-	case MDTInt:
-		return strconv.Itoa(v.Value.(int))
-	case MDTInt8:
-		return strconv.FormatInt(int64(v.Value.(int8)), 10)
-	case MDTInt16:
-		return strconv.FormatInt(int64(v.Value.(int16)), 10)
-	case MDTInt32:
-		return strconv.FormatInt(int64(v.Value.(int32)), 10)
-	case MDTInt64:
-		return strconv.FormatInt(v.Value.(int64), 10)
-	case MDTFloat32:
-		return strconv.FormatFloat(float64(v.Value.(float32)), 'g', 4, 32)
-	case MDTFloat64:
-		return strconv.FormatFloat(v.Value.(float64), 'g', 4, 64)
-	case MDTBool:
-		return fmt.Sprintf("%v", v.Value.(bool))
-	case MDTBytes:
-		return langext.StrLimit(hex.EncodeToString(v.Value.([]byte)), lim, "...")
-	case MDTObjectID:
-		return v.Value.(primitive.ObjectID).Hex()
-	case MDTTime:
-		return v.Value.(time.Time).Format(time.RFC3339)
-	case MDTDuration:
-		return v.Value.(time.Duration).String()
-	case MDTStringArray:
-		if langext.IsNil(v.Value) {
-			return "<<null>>"
-		}
-		r, err := json.Marshal(v.Value.([]string))
-		if err != nil {
-			return "(err)"
-		}
-		return langext.StrLimit(string(r), lim, "...")
-	case MDTIntArray:
-		if langext.IsNil(v.Value) {
-			return "<<null>>"
-		}
-		r, err := json.Marshal(v.Value.([]int))
-		if err != nil {
-			return "(err)"
-		}
-		return langext.StrLimit(string(r), lim, "...")
-	case MDTInt32Array:
-		if langext.IsNil(v.Value) {
-			return "<<null>>"
-		}
-		r, err := json.Marshal(v.Value.([]int32))
-		if err != nil {
-			return "(err)"
-		}
-		return langext.StrLimit(string(r), lim, "...")
-	case MDTNil:
-		return "<<null>>"
-	case MDTEnum:
-		return v.Value.(EnumWrap).String()
-	}
-	return "(err)"
-}
-
-func (v MetaValue) Apply(key string, evt *zerolog.Event, limitLen *int) *zerolog.Event {
-	switch v.DataType {
-	case MDTString:
-		if limitLen == nil {
-			return evt.Str(key, v.Value.(string))
-		} else {
-			return evt.Str(key, langext.StrLimit(v.Value.(string), *limitLen, "..."))
-		}
-	case MDTID:
-		return evt.Str(key, v.Value.(IDWrap).Value)
-	case MDTAny:
-		if v.Value.(AnyWrap).IsError {
-			return evt.Str(key, "(err)")
-		} else {
-			if limitLen == nil {
-				return evt.Str(key, v.Value.(AnyWrap).Json)
-			} else {
-				return evt.Str(key, langext.StrLimit(v.Value.(AnyWrap).Json, *limitLen, "..."))
-			}
-		}
-	case MDTStringPtr:
-		if langext.IsNil(v.Value) {
-			return evt.Str(key, "<<null>>")
-		}
-		if limitLen == nil {
-			return evt.Str(key, langext.CoalesceString(v.Value.(*string), "<<null>>"))
-		} else {
-			return evt.Str(key, langext.StrLimit(langext.CoalesceString(v.Value.(*string), "<<null>>"), *limitLen, "..."))
-		}
-	case MDTInt:
-		return evt.Int(key, v.Value.(int))
-	case MDTInt8:
-		return evt.Int8(key, v.Value.(int8))
-	case MDTInt16:
-		return evt.Int16(key, v.Value.(int16))
-	case MDTInt32:
-		return evt.Int32(key, v.Value.(int32))
-	case MDTInt64:
-		return evt.Int64(key, v.Value.(int64))
-	case MDTFloat32:
-		return evt.Float32(key, v.Value.(float32))
-	case MDTFloat64:
-		return evt.Float64(key, v.Value.(float64))
-	case MDTBool:
-		return evt.Bool(key, v.Value.(bool))
-	case MDTBytes:
-		return evt.Bytes(key, v.Value.([]byte))
-	case MDTObjectID:
-		return evt.Str(key, v.Value.(primitive.ObjectID).Hex())
-	case MDTTime:
-		return evt.Time(key, v.Value.(time.Time))
-	case MDTDuration:
-		return evt.Dur(key, v.Value.(time.Duration))
-	case MDTStringArray:
-		if langext.IsNil(v.Value) {
-			return evt.Strs(key, nil)
-		}
-		return evt.Strs(key, v.Value.([]string))
-	case MDTIntArray:
-		if langext.IsNil(v.Value) {
-			return evt.Ints(key, nil)
-		}
-		return evt.Ints(key, v.Value.([]int))
-	case MDTInt32Array:
-		if langext.IsNil(v.Value) {
-			return evt.Ints32(key, nil)
-		}
-		return evt.Ints32(key, v.Value.([]int32))
-	case MDTNil:
-		return evt.Str(key, "<<null>>")
-	case MDTEnum:
-		if v.Value.(EnumWrap).IsNil {
-			return evt.Any(key, nil)
-		} else if v.Value.(EnumWrap).ValueRaw != nil {
-			return evt.Any(key, v.Value.(EnumWrap).ValueRaw)
-		} else {
-			return evt.Str(key, v.Value.(EnumWrap).ValueString)
-		}
-	}
-	return evt.Str(key, "(err)")
-}
-
-func (v MetaValue) MarshalJSON() ([]byte, error) {
-	str, err := v.SerializeValue()
-	if err != nil {
-		return nil, err
-	}
-	return json.Marshal(string(v.DataType) + ":" + str)
-}
-
-func (v *MetaValue) UnmarshalJSON(data []byte) error {
-	var str = ""
-	err := json.Unmarshal(data, &str)
-	if err != nil {
-		return err
-	}
-
-	split := strings.SplitN(str, ":", 2)
-	if len(split) != 2 {
-		return errors.New("failed to decode MetaValue: '" + str + "'")
-	}
-
-	return v.Deserialize(split[1], metaDataType(split[0]))
-}
-
-func (v MetaValue) MarshalBSON() ([]byte, error) {
-	serval, err := v.SerializeValue()
-	if err != nil {
-		return nil, Wrap(err, "failed to bson-marshal MetaValue (serialize)").Build()
-	}
-
-	// this is an kinda ugly hack - but serialization to mongodb and back can loose the correct type information....
-	bin, err := bson.Marshal(metaValueSerialization{
-		DataType: v.DataType,
-		Value:    serval,
-		Raw:      v.Value,
-	})
-	if err != nil {
-		return nil, Wrap(err, "failed to bson-marshal MetaValue (marshal)").Build()
-	}
-
-	return bin, nil
-}
-
-func (v *MetaValue) UnmarshalBSON(bytes []byte) error {
-	var serval metaValueSerialization
-	err := bson.Unmarshal(bytes, &serval)
-	if err != nil {
-		return Wrap(err, "failed to bson-unmarshal MetaValue (unmarshal)").Build()
-	}
-
-	err = v.Deserialize(serval.Value, serval.DataType)
-	if err != nil {
-		return Wrap(err, "failed to deserialize MetaValue from bson").Str("raw", serval.Value).Build()
-	}
-
-	return nil
-}
-
-func (v *MetaValue) Deserialize(value string, datatype metaDataType) error {
-	switch datatype {
-	case MDTString:
-		v.Value = value
-		v.DataType = datatype
-		return nil
-	case MDTID:
-		v.Value = deserializeIDWrap(value)
-		v.DataType = datatype
-		return nil
-	case MDTAny:
-		v.Value = deserializeAnyWrap(value)
-		v.DataType = datatype
-		return nil
-	case MDTStringPtr:
-		if len(value) <= 0 || (value[0] != '*' && value[0] != '#') {
-			return errors.New("Invalid StringPtr: " + value)
-		} else if value == "#" {
-			v.Value = nil
-			v.DataType = datatype
-			return nil
-		} else {
-			v.Value = langext.Ptr(value[1:])
-			v.DataType = datatype
-			return nil
-		}
-	case MDTInt:
-		pv, err := strconv.ParseInt(value, 10, 0)
-		if err != nil {
-			return err
-		}
-		v.Value = int(pv)
-		v.DataType = datatype
-		return nil
-	case MDTInt8:
-		pv, err := strconv.ParseInt(value, 10, 8)
-		if err != nil {
-			return err
-		}
-		v.Value = int8(pv)
-		v.DataType = datatype
-		return nil
-	case MDTInt16:
-		pv, err := strconv.ParseInt(value, 10, 16)
-		if err != nil {
-			return err
-		}
-		v.Value = int16(pv)
-		v.DataType = datatype
-		return nil
-	case MDTInt32:
-		pv, err := strconv.ParseInt(value, 10, 32)
-		if err != nil {
-			return err
-		}
-		v.Value = int32(pv)
-		v.DataType = datatype
-		return nil
-	case MDTInt64:
-		pv, err := strconv.ParseInt(value, 10, 64)
-		if err != nil {
-			return err
-		}
-		v.Value = pv
-		v.DataType = datatype
-		return nil
-	case MDTFloat32:
-		pv, err := strconv.ParseFloat(value, 64)
-		if err != nil {
-			return err
-		}
-		v.Value = float32(pv)
-		v.DataType = datatype
-		return nil
-	case MDTFloat64:
-		pv, err := strconv.ParseFloat(value, 64)
-		if err != nil {
-			return err
-		}
-		v.Value = pv
-		v.DataType = datatype
-		return nil
-	case MDTBool:
-		if value == "true" {
-			v.Value = true
-			v.DataType = datatype
-			return nil
-		}
-		if value == "false" {
-			v.Value = false
-			v.DataType = datatype
-			return nil
-		}
-		return errors.New("invalid bool value: " + value)
-	case MDTBytes:
-		r, err := hex.DecodeString(value)
-		if err != nil {
-			return err
-		}
-		v.Value = r
-		v.DataType = datatype
-		return nil
-	case MDTObjectID:
-		r, err := primitive.ObjectIDFromHex(value)
-		if err != nil {
-			return err
-		}
-		v.Value = r
-		v.DataType = datatype
-		return nil
-	case MDTTime:
-		ps := strings.Split(value, "|")
-		if len(ps) != 2 {
-			return errors.New("invalid time.time: " + value)
-		}
-		p1, err := strconv.ParseInt(ps[0], 10, 64)
-		if err != nil {
-			return err
-		}
-		p2, err := strconv.ParseInt(ps[1], 10, 32)
-		if err != nil {
-			return err
-		}
-		v.Value = time.Unix(p1, p2)
-		v.DataType = datatype
-		return nil
-	case MDTDuration:
-		r, err := time.ParseDuration(value)
-		if err != nil {
-			return err
-		}
-		v.Value = r
-		v.DataType = datatype
-		return nil
-	case MDTStringArray:
-		if value == "#" {
-			v.Value = nil
-			v.DataType = datatype
-			return nil
-		}
-		pj := make([]string, 0)
-		err := json.Unmarshal([]byte(value), &pj)
-		if err != nil {
-			return err
-		}
-		v.Value = pj
-		v.DataType = datatype
-		return nil
-	case MDTIntArray:
-		if value == "#" {
-			v.Value = nil
-			v.DataType = datatype
-			return nil
-		}
-		pj := make([]int, 0)
-		err := json.Unmarshal([]byte(value), &pj)
-		if err != nil {
-			return err
-		}
-		v.Value = pj
-		v.DataType = datatype
-		return nil
-	case MDTInt32Array:
-		if value == "#" {
-			v.Value = nil
-			v.DataType = datatype
-			return nil
-		}
-		pj := make([]int32, 0)
-		err := json.Unmarshal([]byte(value), &pj)
-		if err != nil {
-			return err
-		}
-		v.Value = pj
-		v.DataType = datatype
-		return nil
-	case MDTNil:
-		v.Value = nil
-		v.DataType = datatype
-		return nil
-	case MDTEnum:
-		v.Value = deserializeEnumWrap(value)
-		v.DataType = datatype
-		return nil
-	}
-	return errors.New("Unknown type: " + string(datatype))
-}
-
-func (v MetaValue) ValueString() string {
-	switch v.DataType {
-	case MDTString:
-		return v.Value.(string)
-	case MDTID:
-		return v.Value.(IDWrap).String()
-	case MDTAny:
-		return v.Value.(AnyWrap).String()
-	case MDTStringPtr:
-		if langext.IsNil(v.Value) {
-			return "<<null>>"
-		}
-		return langext.CoalesceString(v.Value.(*string), "<<null>>")
-	case MDTInt:
-		return strconv.Itoa(v.Value.(int))
-	case MDTInt8:
-		return strconv.FormatInt(int64(v.Value.(int8)), 10)
-	case MDTInt16:
-		return strconv.FormatInt(int64(v.Value.(int16)), 10)
-	case MDTInt32:
-		return strconv.FormatInt(int64(v.Value.(int32)), 10)
-	case MDTInt64:
-		return strconv.FormatInt(v.Value.(int64), 10)
-	case MDTFloat32:
-		return strconv.FormatFloat(float64(v.Value.(float32)), 'g', 4, 32)
-	case MDTFloat64:
-		return strconv.FormatFloat(v.Value.(float64), 'g', 4, 64)
-	case MDTBool:
-		return fmt.Sprintf("%v", v.Value.(bool))
-	case MDTBytes:
-		return hex.EncodeToString(v.Value.([]byte))
-	case MDTObjectID:
-		return v.Value.(primitive.ObjectID).Hex()
-	case MDTTime:
-		return v.Value.(time.Time).Format(time.RFC3339Nano)
-	case MDTDuration:
-		return v.Value.(time.Duration).String()
-	case MDTStringArray:
-		if langext.IsNil(v.Value) {
-			return "<<null>>"
-		}
-		r, err := json.MarshalIndent(v.Value.([]string), "", "  ")
-		if err != nil {
-			return "(err)"
-		}
-		return string(r)
-	case MDTIntArray:
-		if langext.IsNil(v.Value) {
-			return "<<null>>"
-		}
-		r, err := json.MarshalIndent(v.Value.([]int), "", "  ")
-		if err != nil {
-			return "(err)"
-		}
-		return string(r)
-	case MDTInt32Array:
-		if langext.IsNil(v.Value) {
-			return "<<null>>"
-		}
-		r, err := json.MarshalIndent(v.Value.([]int32), "", "  ")
-		if err != nil {
-			return "(err)"
-		}
-		return string(r)
-	case MDTNil:
-		return "<<null>>"
-	case MDTEnum:
-		return v.Value.(EnumWrap).String()
-	}
-	return "(err)"
-}
-
-// rawValueForJson returns most-of-the-time the `Value` field
-// but for some datatyes we do special processing
-// all, so we can pluck the output value in json.Marshal without any suprises
-func (v MetaValue) rawValueForJson() any {
-	if v.DataType == MDTAny {
-		if v.Value.(AnyWrap).IsNil {
-			return nil
-		}
-		if v.Value.(AnyWrap).IsError {
-			return bson.M{"@error": true}
-		}
-		jsonobj := primitive.M{}
-		jsonarr := primitive.A{}
-		if err := json.Unmarshal([]byte(v.Value.(AnyWrap).Json), &jsonobj); err == nil {
-			return jsonobj
-		} else if err := json.Unmarshal([]byte(v.Value.(AnyWrap).Json), &jsonarr); err == nil {
-			return jsonarr
-		} else {
-			return bson.M{"type": v.Value.(AnyWrap).Type, "data": v.Value.(AnyWrap).Json}
-		}
-	}
-	if v.DataType == MDTID {
-		if v.Value.(IDWrap).IsNil {
-			return nil
-		}
-		return v.Value.(IDWrap).Value
-	}
-	if v.DataType == MDTBytes {
-		return hex.EncodeToString(v.Value.([]byte))
-	}
-	if v.DataType == MDTDuration {
-		return v.Value.(time.Duration).String()
-	}
-	if v.DataType == MDTTime {
-		return v.Value.(time.Time).Format(time.RFC3339Nano)
-	}
-	if v.DataType == MDTObjectID {
-		return v.Value.(primitive.ObjectID).Hex()
-	}
-	if v.DataType == MDTNil {
-		return nil
-	}
-	if v.DataType == MDTEnum {
-		if v.Value.(EnumWrap).IsNil {
-			return nil
-		}
-		if v.Value.(EnumWrap).ValueRaw != nil {
-			return v.Value.(EnumWrap).ValueRaw
-		}
-		return v.Value.(EnumWrap).ValueString
-	}
-	if v.DataType == MDTFloat32 {
-		if math.IsNaN(float64(v.Value.(float32))) {
-			return "float64::NaN"
-		} else if math.IsInf(float64(v.Value.(float32)), +1) {
-			return "float64::+inf"
-		} else if math.IsInf(float64(v.Value.(float32)), -1) {
-			return "float64::-inf"
-		} else {
-			return v.Value
-		}
-	}
-	if v.DataType == MDTFloat64 {
-		if math.IsNaN(v.Value.(float64)) {
-			return "float64::NaN"
-		} else if math.IsInf(v.Value.(float64), +1) {
-			return "float64::+inf"
-		} else if math.IsInf(v.Value.(float64), -1) {
-			return "float64::-inf"
-		} else {
-			return v.Value
-		}
-	}
-	return v.Value
-}
-
-func (mm MetaMap) FormatOneLine(singleMaxLen int) string {
-	r := ""
-
-	i := 0
-	for key, val := range mm {
-		if i > 0 {
-			r += ", "
-		}
-
-		r += "\"" + key + "\""
-		r += ": "
-		r += "\"" + val.ShortString(singleMaxLen) + "\""
-
-		i++
-	}
-
-	return r
-}
-
-func (mm MetaMap) FormatMultiLine(indentFront string, indentKeys string, maxLenValue int) string {
-	r := ""
-
-	r += indentFront + "{" + "\n"
-	for key, val := range mm {
-		if key == "gin.body" {
-			continue
-		}
-		if key == "gin_body" {
-			continue
-		}
-
-		r += indentFront
-		r += indentKeys
-		r += "\"" + key + "\""
-		r += ": "
-		r += "\"" + val.ShortString(maxLenValue) + "\""
-		r += ",\n"
-	}
-	r += indentFront + "}"
-
-	return r
-}
-
-func (mm MetaMap) Any() bool {
-	return len(mm) > 0
-}
-
-func (mm MetaMap) Apply(evt *zerolog.Event, limitLen *int) *zerolog.Event {
-	for key, val := range mm {
-		evt = val.Apply(key, evt, limitLen)
-	}
-	return evt
-}
-
-func (mm MetaMap) add(key string, mdtype metaDataType, val interface{}) {
-	if _, ok := mm[key]; !ok {
-		mm[key] = MetaValue{DataType: mdtype, Value: val}
-		return
-	}
-	for i := 2; ; i++ {
-		realkey := key + "-" + strconv.Itoa(i)
-		if _, ok := mm[realkey]; !ok {
-			mm[realkey] = MetaValue{DataType: mdtype, Value: val}
-			return
-		}
-	}
-}

exerr/proxy.go

@@ -1,13 +0,0 @@
-package exerr
-
-type Proxy struct {
-	v ExErr
-}
-
-func (p *Proxy) UniqueID() string {
-	return p.v.UniqueID
-}
-
-func (p *Proxy) Get() ExErr {
-	return p.v
-}

exerr/stacktrace.go

@@ -1,14 +0,0 @@
-package exerr
-
-import (
-	"fmt"
-	"runtime"
-)
-
-func callername(skip int) string {
-	pc := make([]uintptr, 15)
-	n := runtime.Callers(skip+2, pc)
-	frames := runtime.CallersFrames(pc[:n])
-	frame, _ := frames.Next()
-	return fmt.Sprintf("%s:%d %s", frame.File, frame.Line, frame.Function)
-}

exerr/typeWrapper.go

@@ -1,189 +0,0 @@
-package exerr
-
-import (
-	"encoding/json"
-	"fmt"
-	"github.com/rs/zerolog/log"
-	"git.blackforestbytes.com/BlackForestBytes/goext/enums"
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
-	"strings"
-)
-
-//
-// These are wrapper objects, because for some metadata-types we need to serialize a bit more complex data
-// (eg thy actual type for ID objects, or the json representation for any types)
-//
-
-type IDWrap struct {
-	Type  string
-	Value string
-	IsNil bool
-}
-
-func newIDWrap(val fmt.Stringer) IDWrap {
-	t := fmt.Sprintf("%T", val)
-	arr := strings.Split(t, ".")
-	if len(arr) > 0 {
-		t = arr[len(arr)-1]
-	}
-
-	if langext.IsNil(val) {
-		return IDWrap{Type: t, Value: "", IsNil: true}
-	}
-
-	v := val.String()
-	return IDWrap{Type: t, Value: v, IsNil: false}
-}
-
-func (w IDWrap) Serialize() string {
-	if w.IsNil {
-		return "!nil" + ":" + w.Type
-	}
-	return w.Type + ":" + w.Value
-}
-
-func (w IDWrap) String() string {
-	if w.IsNil {
-		return w.Type + "<<nil>>"
-	}
-	return w.Type + "(" + w.Value + ")"
-}
-
-func deserializeIDWrap(v string) IDWrap {
-	r := strings.SplitN(v, ":", 2)
-
-	if len(r) == 2 && r[0] == "!nil" {
-		return IDWrap{Type: r[1], Value: v, IsNil: true}
-	}
-
-	if len(r) == 0 {
-		return IDWrap{}
-	} else if len(r) == 1 {
-		return IDWrap{Type: "", Value: v, IsNil: false}
-	} else {
-		return IDWrap{Type: r[0], Value: r[1], IsNil: false}
-	}
-}
-
-type AnyWrap struct {
-	Type    string
-	Json    string
-	IsError bool
-	IsNil   bool
-}
-
-func newAnyWrap(val any) (result AnyWrap) {
-	result = AnyWrap{Type: "", Json: "", IsError: true, IsNil: false} // ensure a return in case of recover()
-
-	defer func() {
-		if err := recover(); err != nil {
-			// send error should never crash our program
-			log.Error().Interface("err", err).Msg("Panic while trying to marshal anywrap ( bmerror.Interface )")
-		}
-	}()
-
-	t := fmt.Sprintf("%T", val)
-
-	if langext.IsNil(val) {
-		return AnyWrap{Type: t, Json: "", IsError: false, IsNil: true}
-	}
-
-	j, err := json.Marshal(val)
-	if err == nil {
-		return AnyWrap{Type: t, Json: string(j), IsError: false, IsNil: false}
-	} else {
-		return AnyWrap{Type: t, Json: "", IsError: true, IsNil: false}
-	}
-}
-
-func (w AnyWrap) Serialize() string {
-	if w.IsError {
-		return "ERR" + ":" + w.Type + ":" + w.Json
-	} else if w.IsNil {
-		return "NIL" + ":" + w.Type + ":" + w.Json
-	} else {
-		return "OK" + ":" + w.Type + ":" + w.Json
-	}
-}
-
-func (w AnyWrap) String() string {
-	if w.IsError {
-		return "(error)"
-	} else if w.IsNil {
-		return "(nil)"
-	} else {
-		return w.Json
-	}
-}
-
-func deserializeAnyWrap(v string) AnyWrap {
-	r := strings.SplitN(v, ":", 3)
-	if len(r) != 3 {
-		return AnyWrap{IsError: true, Type: "", Json: "", IsNil: false}
-	} else {
-		if r[0] == "OK" {
-			return AnyWrap{IsError: false, Type: r[1], Json: r[2], IsNil: false}
-		} else if r[0] == "ERR" {
-			return AnyWrap{IsError: true, Type: r[1], Json: r[2], IsNil: false}
-		} else if r[0] == "NIL" {
-			return AnyWrap{IsError: false, Type: r[1], Json: "", IsNil: true}
-		} else {
-			return AnyWrap{IsError: true, Type: "", Json: "", IsNil: false}
-		}
-	}
-}
-
-type EnumWrap struct {
-	Type        string
-	ValueString string
-	ValueRaw    enums.Enum // `ValueRaw` is lost during serialization roundtrip
-	IsNil       bool
-}
-
-func newEnumWrap(val enums.Enum) EnumWrap {
-	t := fmt.Sprintf("%T", val)
-	arr := strings.Split(t, ".")
-	if len(arr) > 0 {
-		t = arr[len(arr)-1]
-	}
-
-	if langext.IsNil(val) {
-		return EnumWrap{Type: t, ValueString: "", ValueRaw: val, IsNil: true}
-	}
-
-	if enumstr, ok := val.(enums.StringEnum); ok {
-		return EnumWrap{Type: t, ValueString: enumstr.String(), ValueRaw: val, IsNil: false}
-	}
-
-	return EnumWrap{Type: t, ValueString: fmt.Sprintf("%v", val), ValueRaw: val, IsNil: false}
-}
-
-func (w EnumWrap) Serialize() string {
-	if w.IsNil {
-		return "!nil" + ":" + w.Type
-	}
-	return w.Type + ":" + w.ValueString
-}
-
-func (w EnumWrap) String() string {
-	if w.IsNil {
-		return w.Type + "<<nil>>"
-	}
-	return "[" + w.Type + "] " + w.ValueString
-}
-
-func deserializeEnumWrap(v string) EnumWrap {
-	r := strings.SplitN(v, ":", 2)
-
-	if len(r) == 2 && r[0] == "!nil" {
-		return EnumWrap{Type: r[1], ValueString: v, ValueRaw: nil, IsNil: true}
-	}
-
-	if len(r) == 0 {
-		return EnumWrap{}
-	} else if len(r) == 1 {
-		return EnumWrap{Type: "", ValueString: v, ValueRaw: nil, IsNil: false}
-	} else {
-		return EnumWrap{Type: r[0], ValueString: r[1], ValueRaw: nil, IsNil: false}
-	}
-}

fsext/exists.go

@@ -1,36 +0,0 @@
-package fsext
-
-import "os"
-
-func PathExists(fp string) (bool, error) {
-	_, err := os.Stat(fp)
-	if err == nil {
-		return true, nil
-	}
-	if os.IsNotExist(err) {
-		return false, nil
-	}
-	return false, err
-}
-
-func FileExists(fp string) (bool, error) {
-	stat, err := os.Stat(fp)
-	if err == nil {
-		return !stat.IsDir(), nil
-	}
-	if os.IsNotExist(err) {
-		return false, nil
-	}
-	return false, err
-}
-
-func DirectoryExists(fp string) (bool, error) {
-	stat, err := os.Stat(fp)
-	if err == nil {
-		return stat.IsDir(), nil
-	}
-	if os.IsNotExist(err) {
-		return false, nil
-	}
-	return false, err
-}

ginext/appContext.go

@@ -1,68 +0,0 @@
-package ginext
-
-import (
-	"context"
-	"github.com/gin-gonic/gin"
-	"time"
-)
-
-type AppContext struct {
-	inner      context.Context
-	cancelFunc context.CancelFunc
-	cancelled  bool
-	GinContext *gin.Context
-}
-
-func CreateAppContext(g *gin.Context, innerCtx context.Context, cancelFn context.CancelFunc) *AppContext {
-	for key, value := range g.Keys {
-		innerCtx = context.WithValue(innerCtx, key, value)
-	}
-	return &AppContext{
-		inner:      innerCtx,
-		cancelFunc: cancelFn,
-		cancelled:  false,
-		GinContext: g,
-	}
-}
-
-func CreateBackgroundAppContext() *AppContext {
-	return &AppContext{
-		inner:      context.Background(),
-		cancelFunc: nil,
-		cancelled:  false,
-		GinContext: nil,
-	}
-}
-
-func (ac *AppContext) Deadline() (deadline time.Time, ok bool) {
-	return ac.inner.Deadline()
-}
-
-func (ac *AppContext) Done() <-chan struct{} {
-	return ac.inner.Done()
-}
-
-func (ac *AppContext) Err() error {
-	return ac.inner.Err()
-}
-
-func (ac *AppContext) Value(key any) any {
-	return ac.inner.Value(key)
-}
-
-func (ac *AppContext) Set(key, value any) {
-	ac.inner = context.WithValue(ac.inner, key, value)
-}
-
-func (ac *AppContext) Cancel() {
-	ac.cancelled = true
-	ac.cancelFunc()
-}
-
-func (ac *AppContext) RequestURI() string {
-	if ac.GinContext != nil && ac.GinContext.Request != nil {
-		return ac.GinContext.Request.Method + " :: " + ac.GinContext.Request.RequestURI
-	} else {
-		return ""
-	}
-}

ginext/commonHandler.go

@@ -1,23 +0,0 @@
-package ginext
-
-import (
-	"net/http"
-)
-
-func RedirectFound(newuri string) WHandlerFunc {
-	return func(pctx PreContext) HTTPResponse {
-		return Redirect(http.StatusFound, newuri)
-	}
-}
-
-func RedirectTemporary(newuri string) WHandlerFunc {
-	return func(pctx PreContext) HTTPResponse {
-		return Redirect(http.StatusTemporaryRedirect, newuri)
-	}
-}
-
-func RedirectPermanent(newuri string) WHandlerFunc {
-	return func(pctx PreContext) HTTPResponse {
-		return Redirect(http.StatusPermanentRedirect, newuri)
-	}
-}

ginext/commonMiddlewares.go

@@ -1,12 +0,0 @@
-package ginext
-
-import (
-	"github.com/gin-gonic/gin"
-	"git.blackforestbytes.com/BlackForestBytes/goext/dataext"
-)
-
-func BodyBuffer(g *gin.Context) {
-	if g.Request.Body != nil {
-		g.Request.Body = dataext.NewBufferedReadCloser(g.Request.Body)
-	}
-}

ginext/cors.go

@@ -1,25 +0,0 @@
-package ginext
-
-import (
-	"github.com/gin-gonic/gin"
-	"net/http"
-	"strings"
-)
-
-func CorsMiddleware(allowheader []string, exposeheader []string) gin.HandlerFunc {
-	return func(c *gin.Context) {
-		c.Writer.Header().Set("Access-Control-Allow-Origin", "*")
-		c.Writer.Header().Set("Access-Control-Allow-Credentials", "true")
-		c.Writer.Header().Set("Access-Control-Allow-Headers", strings.Join(allowheader, ", "))
-		if len(exposeheader) > 0 {
-			c.Writer.Header().Set("Access-Control-Expose-Headers", strings.Join(exposeheader, ", "))
-		}
-		c.Writer.Header().Set("Access-Control-Allow-Methods", "OPTIONS, GET, POST, PUT, PATCH, DELETE, COUNT")
-
-		if c.Request.Method == "OPTIONS" {
-			c.AbortWithStatus(http.StatusOK)
-		} else {
-			c.Next()
-		}
-	}
-}

ginext/engine.go

@@ -1,238 +0,0 @@
-package ginext
-
-import (
-	"fmt"
-	"github.com/gin-gonic/gin"
-	"github.com/rs/zerolog/log"
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
-	"git.blackforestbytes.com/BlackForestBytes/goext/mathext"
-	"git.blackforestbytes.com/BlackForestBytes/goext/rext"
-	"net"
-	"net/http"
-	"net/http/httptest"
-	"regexp"
-	"strings"
-	"time"
-)
-
-type GinWrapper struct {
-	engine          *gin.Engine
-	suppressGinLogs bool
-
-	opt                   Options
-	allowCors             bool
-	corsAllowHeader       []string
-	corsExposeHeader      []string
-	ginDebug              bool
-	bufferBody            bool
-	requestTimeout        time.Duration
-	listenerBeforeRequest []func(g *gin.Context)
-	listenerAfterRequest  []func(g *gin.Context, resp HTTPResponse)
-
-	buildRequestBindError func(g *gin.Context, fieldtype string, err error) HTTPResponse
-
-	routeSpecs []ginRouteSpec
-}
-
-type ginRouteSpec struct {
-	Method      string
-	URL         string
-	Middlewares []string
-	Handler     string
-}
-
-type Options struct {
-	AllowCors                *bool                                                          // Add cors handler to allow all CORS requests on the default http methods
-	CorsAllowHeader          *[]string                                                      // override the default values of Access-Control-Allow-Headers (AllowCors must be true)
-	CorsExposeHeader         *[]string                                                      // return Access-Control-Expose-Headers (AllowCors must be true)
-	GinDebug                 *bool                                                          // Set gin.debug to true (adds more logs)
-	SuppressGinLogs          *bool                                                          // Suppress our custom gin logs (even if GinDebug == true)
-	BufferBody               *bool                                                          // Buffers the input body stream, this way the ginext error handler can later include the whole request body
-	Timeout                  *time.Duration                                                 // The default handler timeout
-	ListenerBeforeRequest    []func(g *gin.Context)                                         // Register listener that are called before the handler method
-	ListenerAfterRequest     []func(g *gin.Context, resp HTTPResponse)                      // Register listener that are called after the handler method
-	DebugTrimHandlerPrefixes []string                                                       // Trim these prefixes from the handler names in the debug print
-	DebugReplaceHandlerNames map[string]string                                              // Replace handler names in debug output
-	BuildRequestBindError    func(g *gin.Context, fieldtype string, err error) HTTPResponse // Override function which generates the HTTPResponse errors that are returned by the preContext..Start() methids
-}
-
-// NewEngine creates a new (wrapped) ginEngine
-func NewEngine(opt Options) *GinWrapper {
-	ginDebug := langext.Coalesce(opt.GinDebug, true)
-	if ginDebug {
-		gin.SetMode(gin.DebugMode)
-
-		// do not debug-print routes
-		gin.DebugPrintRouteFunc = func(_, _, _ string, _ int) {}
-
-	} else {
-		gin.SetMode(gin.ReleaseMode)
-
-		// do not debug-print routes
-		gin.DebugPrintRouteFunc = func(_, _, _ string, _ int) {}
-	}
-
-	engine := gin.New()
-
-	wrapper := &GinWrapper{
-		engine:                engine,
-		opt:                   opt,
-		suppressGinLogs:       langext.Coalesce(opt.SuppressGinLogs, false),
-		allowCors:             langext.Coalesce(opt.AllowCors, false),
-		corsAllowHeader:       langext.Coalesce(opt.CorsAllowHeader, []string{"Content-Type", "Content-Length", "Accept-Encoding", "X-CSRF-Token", "Authorization", "accept", "origin", "Cache-Control", "X-Requested-With"}),
-		corsExposeHeader:      langext.Coalesce(opt.CorsExposeHeader, []string{}),
-		ginDebug:              ginDebug,
-		bufferBody:            langext.Coalesce(opt.BufferBody, false),
-		requestTimeout:        langext.Coalesce(opt.Timeout, 24*time.Hour),
-		listenerBeforeRequest: opt.ListenerBeforeRequest,
-		listenerAfterRequest:  opt.ListenerAfterRequest,
-		buildRequestBindError: langext.Conditional(opt.BuildRequestBindError == nil, defaultBuildRequestBindError, opt.BuildRequestBindError),
-	}
-
-	engine.RedirectFixedPath = false
-	engine.RedirectTrailingSlash = false
-
-	if wrapper.allowCors {
-		engine.Use(CorsMiddleware(wrapper.corsAllowHeader, wrapper.corsExposeHeader))
-	}
-
-	if ginDebug && !wrapper.suppressGinLogs {
-		ginlogger := gin.Logger()
-		engine.Use(func(context *gin.Context) { ginlogger(context) })
-	}
-	return wrapper
-}
-
-func (w *GinWrapper) ListenAndServeHTTP(addr string, postInit func(port string)) (chan error, *http.Server) {
-
-	w.DebugPrintRoutes()
-
-	httpserver := &http.Server{
-		Addr:    addr,
-		Handler: w.engine,
-	}
-
-	errChan := make(chan error)
-
-	go func() {
-
-		ln, err := net.Listen("tcp", httpserver.Addr)
-		if err != nil {
-			errChan <- err
-			return
-		}
-
-		_, port, err := net.SplitHostPort(ln.Addr().String())
-		if err != nil {
-			errChan <- err
-			return
-		}
-
-		log.Info().Str("address", httpserver.Addr).Msg("HTTP-Server started on http://localhost:" + port)
-
-		if postInit != nil {
-			postInit(port) // the net.Listener a few lines above is at this point actually already buffering requests
-		}
-
-		errChan <- httpserver.Serve(ln)
-	}()
-
-	return errChan, httpserver
-}
-
-func (w *GinWrapper) DebugPrintRoutes() {
-	if !w.ginDebug {
-		return
-	}
-
-	lines := make([][4]string, 0)
-
-	pad := [4]int{0, 0, 0, 0}
-
-	for _, spec := range w.routeSpecs {
-
-		line := [4]string{
-			spec.Method,
-			spec.URL,
-			strings.Join(langext.ArrMap(spec.Middlewares, w.cleanMiddlewareName), " -> "),
-			w.cleanMiddlewareName(spec.Handler),
-		}
-
-		lines = append(lines, line)
-
-		pad[0] = mathext.Max(pad[0], len(line[0]))
-		pad[1] = mathext.Max(pad[1], len(line[1]))
-		pad[2] = mathext.Max(pad[2], len(line[2]))
-		pad[3] = mathext.Max(pad[3], len(line[3]))
-	}
-
-	fmt.Printf("Gin-Routes:\n")
-	fmt.Printf("{\n")
-	for _, line := range lines {
-
-		fmt.Printf(" %s  %s  -->  %s  -->  %s\n",
-			langext.StrPadRight("["+line[0]+"]", " ", pad[0]+2),
-			langext.StrPadRight(line[1], " ", pad[1]),
-			langext.StrPadRight(line[2], " ", pad[2]),
-			langext.StrPadRight(line[3], " ", pad[3]))
-	}
-	fmt.Printf("}\n")
-}
-
-func (w *GinWrapper) cleanMiddlewareName(fname string) string {
-
-	funcSuffix := rext.W(regexp.MustCompile(`\.func[0-9]+(?:\.[0-9]+)*$`))
-	if match, ok := funcSuffix.MatchFirst(fname); ok {
-		fname = fname[:len(fname)-match.FullMatch().Length()]
-	}
-
-	if strings.HasSuffix(fname, ".(*GinRoutesWrapper).WithJSONFilter") {
-		fname = "[JSONFilter]"
-	}
-
-	if fname == "ginext.BodyBuffer" {
-		fname = "[BodyBuffer]"
-	}
-
-	skipPrefixes := []string{"api.(*Handler).", "api.", "ginext.", "handler.", "admin-app.", "employee-app.", "employer-app."}
-	for _, pfx := range skipPrefixes {
-		if strings.HasPrefix(fname, pfx) {
-			fname = fname[len(pfx):]
-		}
-	}
-
-	for _, pfx := range w.opt.DebugTrimHandlerPrefixes {
-		if strings.HasPrefix(fname, pfx) {
-			fname = fname[len(pfx):]
-		}
-	}
-
-	for k, v := range langext.ForceMap(w.opt.DebugReplaceHandlerNames) {
-		if strings.EqualFold(fname, k) {
-			fname = v
-		}
-	}
-
-	return fname
-}
-
-// ServeHTTP only used for unit tests
-func (w *GinWrapper) ServeHTTP(req *http.Request) *httptest.ResponseRecorder {
-	respRec := httptest.NewRecorder()
-	w.engine.ServeHTTP(respRec, req)
-	return respRec
-}
-
-// ForwardRequest manually inserts a request into this router
-// = behaves as if the request came from the outside (and writes the response to `writer`)
-func (w *GinWrapper) ForwardRequest(writer http.ResponseWriter, req *http.Request) {
-	w.engine.ServeHTTP(writer, req)
-}
-
-func (w *GinWrapper) ListRoutes() []gin.RouteInfo {
-	return w.engine.Routes()
-}
-
-func defaultBuildRequestBindError(g *gin.Context, fieldtype string, err error) HTTPResponse {
-	return Error(err)
-}

ginext/funcWrapper.go

@@ -1,89 +0,0 @@
-package ginext
-
-import (
-	"fmt"
-	"git.blackforestbytes.com/BlackForestBytes/goext/exerr"
-	"github.com/gin-gonic/gin"
-	"net/http"
-)
-
-type WHandlerFunc func(PreContext) HTTPResponse
-
-func Wrap(w *GinWrapper, fn WHandlerFunc) gin.HandlerFunc {
-
-	return func(g *gin.Context) {
-
-		reqctx := g.Request.Context()
-
-		pctx := PreContext{
-			wrapper:        w,
-			ginCtx:         g,
-			persistantData: &preContextData{},
-		}
-
-		for _, lstr := range w.listenerBeforeRequest {
-			lstr(g)
-		}
-
-		wrap, stackTrace, panicObj := callPanicSafe(fn, pctx)
-		if panicObj != nil {
-
-			fmt.Printf("\n======== ======== STACKTRACE ======== ========\n%s\n======== ======== ======== ========\n\n", stackTrace)
-
-			err := exerr.
-				New(exerr.TypePanic, "Panic occured (in gin handler)").
-				Any("panicObj", panicObj).
-				Str("trace", stackTrace).
-				Build()
-
-			wrap = Error(err)
-		}
-
-		if g.Writer.Written() {
-			panic("Writing in WrapperFunc is not supported")
-		}
-
-		if pctx.persistantData.sessionObj != nil {
-			err := pctx.persistantData.sessionObj.Finish(reqctx, wrap)
-			if err != nil {
-				wrap = Error(exerr.Wrap(err, "Failed to finish session").Any("originalResponse", wrap).Build())
-			}
-		}
-
-		for _, lstr := range w.listenerAfterRequest {
-			lstr(g, wrap)
-		}
-
-		if reqctx.Err() == nil {
-			wrap.Write(g)
-		}
-	}
-}
-
-func WrapHTTPHandler(w *GinWrapper, fn http.Handler) gin.HandlerFunc {
-	return func(g *gin.Context) {
-		for _, lstr := range w.listenerBeforeRequest {
-			lstr(g)
-		}
-
-		fn.ServeHTTP(g.Writer, g.Request)
-
-		for _, lstr := range w.listenerAfterRequest {
-			lstr(g, nil)
-		}
-	}
-}
-
-func WrapHTTPHandlerFunc(w *GinWrapper, fn http.HandlerFunc) gin.HandlerFunc {
-	return func(g *gin.Context) {
-		for _, lstr := range w.listenerBeforeRequest {
-			lstr(g)
-		}
-
-		fn(g.Writer, g.Request)
-
-		for _, lstr := range w.listenerAfterRequest {
-			lstr(g, nil)
-		}
-	}
-}

ginext/jsonFilter.go

@@ -1,9 +0,0 @@
-package ginext
-
-import "github.com/gin-gonic/gin"
-
-var jsonFilterKey = "goext.jsonfilter"
-
-func SetJSONFilter(g *gin.Context, filter string) {
-	g.Set(jsonFilterKey, filter)
-}

ginext/preContext.go

@@ -1,211 +0,0 @@
-package ginext
-
-import (
-	"bytes"
-	"context"
-	"fmt"
-	"github.com/gin-gonic/gin"
-	"github.com/gin-gonic/gin/binding"
-	"git.blackforestbytes.com/BlackForestBytes/goext/dataext"
-	"git.blackforestbytes.com/BlackForestBytes/goext/exerr"
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
-	"io"
-	"runtime/debug"
-	"time"
-)
-
-type PreContext struct {
-	ginCtx                 *gin.Context
-	wrapper                *GinWrapper
-	uri                    any
-	query                  any
-	body                   any
-	rawbody                *[]byte
-	form                   any
-	header                 any
-	timeout                *time.Duration
-	persistantData         *preContextData // must be a ptr, so that we can get the values back in out Wrap func
-	ignoreWrongContentType bool
-}
-
-type preContextData struct {
-	sessionObj SessionObject
-}
-
-func (pctx *PreContext) URI(uri any) *PreContext {
-	pctx.uri = uri
-	return pctx
-}
-
-func (pctx *PreContext) Query(query any) *PreContext {
-	pctx.query = query
-	return pctx
-}
-
-func (pctx *PreContext) Body(body any) *PreContext {
-	pctx.body = body
-	return pctx
-}
-
-func (pctx *PreContext) RawBody(rawbody *[]byte) *PreContext {
-	pctx.rawbody = rawbody
-	return pctx
-}
-
-func (pctx *PreContext) Form(form any) *PreContext {
-	pctx.form = form
-	return pctx
-}
-
-func (pctx *PreContext) Header(header any) *PreContext {
-	pctx.header = header
-	return pctx
-}
-
-func (pctx *PreContext) WithTimeout(to time.Duration) *PreContext {
-	pctx.timeout = &to
-	return pctx
-}
-
-func (pctx *PreContext) WithSession(sessionObj SessionObject) *PreContext {
-	pctx.persistantData.sessionObj = sessionObj
-	return pctx
-}
-
-func (pctx *PreContext) IgnoreWrongContentType() *PreContext {
-	pctx.ignoreWrongContentType = true
-	return pctx
-}
-
-func (pctx PreContext) Start() (*AppContext, *gin.Context, *HTTPResponse) {
-	if pctx.uri != nil {
-		if err := pctx.ginCtx.ShouldBindUri(pctx.uri); err != nil {
-			err = exerr.Wrap(err, "Failed to read uri").
-				WithType(exerr.TypeBindFailURI).
-				Str("struct_type", fmt.Sprintf("%T", pctx.uri)).
-				Build()
-			return CreateBackgroundAppContext(), nil, langext.Ptr(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "URI", err))
-		}
-	}
-
-	if pctx.query != nil {
-		if err := pctx.ginCtx.ShouldBindQuery(pctx.query); err != nil {
-			err = exerr.Wrap(err, "Failed to read query").
-				WithType(exerr.TypeBindFailQuery).
-				Str("struct_type", fmt.Sprintf("%T", pctx.query)).
-				Build()
-			return CreateBackgroundAppContext(), nil, langext.Ptr(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "QUERY", err))
-		}
-	}
-
-	if pctx.body != nil {
-		if pctx.ginCtx.ContentType() == "application/json" {
-			if brc, ok := pctx.body.(dataext.BufferedReadCloser); ok {
-				// Ensures a fully reset (offset=0) buffer before parsing
-				err := brc.Reset()
-				if err != nil {
-					err = exerr.Wrap(err, "Failed to read (brc.reset) json-body").
-						WithType(exerr.TypeBindFailJSON).
-						Str("struct_type", fmt.Sprintf("%T", pctx.body)).
-						Build()
-					return CreateBackgroundAppContext(), nil, langext.Ptr(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "JSON", err))
-				}
-			}
-			if err := pctx.ginCtx.ShouldBindJSON(pctx.body); err != nil {
-				err = exerr.Wrap(err, "Failed to read json-body").
-					WithType(exerr.TypeBindFailJSON).
-					Str("struct_type", fmt.Sprintf("%T", pctx.body)).
-					Build()
-				return CreateBackgroundAppContext(), nil, langext.Ptr(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "JSON", err))
-			}
-		} else {
-			if !pctx.ignoreWrongContentType {
-				err := exerr.New(exerr.TypeBindFailJSON, "missing JSON body").
-					Str("struct_type", fmt.Sprintf("%T", pctx.body)).
-					Build()
-				return CreateBackgroundAppContext(), nil, langext.Ptr(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "JSON", err))
-			}
-		}
-	}
-
-	if pctx.rawbody != nil {
-		if brc, ok := pctx.ginCtx.Request.Body.(dataext.BufferedReadCloser); ok {
-			v, err := brc.BufferedAll()
-			if err != nil {
-				return CreateBackgroundAppContext(), nil, langext.Ptr(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "BODY", err))
-			}
-			*pctx.rawbody = v
-		} else {
-			buf := &bytes.Buffer{}
-			_, err := io.Copy(buf, pctx.ginCtx.Request.Body)
-			if err != nil {
-				return CreateBackgroundAppContext(), nil, langext.Ptr(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "BODY", err))
-			}
-			*pctx.rawbody = buf.Bytes()
-		}
-	}
-
-	if pctx.form != nil {
-		if pctx.ginCtx.ContentType() == "multipart/form-data" {
-			if err := pctx.ginCtx.ShouldBindWith(pctx.form, binding.Form); err != nil {
-				err = exerr.Wrap(err, "Failed to read multipart-form").
-					WithType(exerr.TypeBindFailFormData).
-					Str("struct_type", fmt.Sprintf("%T", pctx.form)).
-					Build()
-				return CreateBackgroundAppContext(), nil, langext.Ptr(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "FORM", err))
-			}
-		} else if pctx.ginCtx.ContentType() == "application/x-www-form-urlencoded" {
-			if err := pctx.ginCtx.ShouldBindWith(pctx.form, binding.Form); err != nil {
-				err = exerr.Wrap(err, "Failed to read urlencoded-form").
-					WithType(exerr.TypeBindFailFormData).
-					Str("struct_type", fmt.Sprintf("%T", pctx.form)).
-					Build()
-				return CreateBackgroundAppContext(), nil, langext.Ptr(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "FORM", err))
-			}
-		} else {
-			if !pctx.ignoreWrongContentType {
-				err := exerr.New(exerr.TypeBindFailFormData, "missing form body").
-					Str("struct_type", fmt.Sprintf("%T", pctx.form)).
-					Build()
-				return CreateBackgroundAppContext(), nil, langext.Ptr(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "FORM", err))
-			}
-		}
-	}
-
-	if pctx.header != nil {
-		if err := pctx.ginCtx.ShouldBindHeader(pctx.header); err != nil {
-			err = exerr.Wrap(err, "Failed to read header").
-				WithType(exerr.TypeBindFailHeader).
-				Str("struct_type", fmt.Sprintf("%T", pctx.query)).
-				Build()
-			return CreateBackgroundAppContext(), nil, langext.Ptr(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "HEADER", err))
-		}
-	}
-
-	ictx, cancel := context.WithTimeout(context.Background(), langext.Coalesce(pctx.timeout, pctx.wrapper.requestTimeout))
-
-	actx := CreateAppContext(pctx.ginCtx, ictx, cancel)
-
-	if pctx.persistantData.sessionObj != nil {
-		err := pctx.persistantData.sessionObj.Init(pctx.ginCtx, actx)
-		if err != nil {
-			actx.Cancel()
-			return CreateBackgroundAppContext(), nil, langext.Ptr(pctx.wrapper.buildRequestBindError(pctx.ginCtx, "INIT", err))
-		}
-	}
-
-	return actx, pctx.ginCtx, nil
-}
-
-func callPanicSafe(fn WHandlerFunc, pctx PreContext) (res HTTPResponse, stackTrace string, panicObj any) {
-	defer func() {
-		if rec := recover(); rec != nil {
-			res = nil
-			stackTrace = string(debug.Stack())
-			panicObj = rec
-		}
-	}()
-
-	res = fn(pctx)
-	return res, "", nil
-}

ginext/response.go

@@ -1,47 +0,0 @@
-package ginext
-
-import (
-	"github.com/gin-gonic/gin"
-	"git.blackforestbytes.com/BlackForestBytes/goext/exerr"
-)
-
-type cookieval struct {
-	name     string
-	value    string
-	maxAge   int
-	path     string
-	domain   string
-	secure   bool
-	httpOnly bool
-}
-
-type headerval struct {
-	Key string
-	Val string
-}
-
-type HTTPResponse interface {
-	Write(g *gin.Context)
-	WithHeader(k string, v string) HTTPResponse
-	WithCookie(name string, value string, maxAge int, path string, domain string, secure bool, httpOnly bool) HTTPResponse
-	IsSuccess() bool
-}
-
-type InspectableHTTPResponse interface {
-	HTTPResponse
-
-	Statuscode() int
-	BodyString(g *gin.Context) *string
-	ContentType() string
-	Headers() []string
-}
-
-type HTTPErrorResponse interface {
-	HTTPResponse
-
-	Error() error
-}
-
-func NotImplemented() HTTPResponse {
-	return Error(exerr.New(exerr.TypeNotImplemented, "").Build())
-}

ginext/responseData.go

@@ -1,58 +0,0 @@
-package ginext
-
-import (
-	"github.com/gin-gonic/gin"
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
-)
-
-type dataHTTPResponse struct {
-	statusCode  int
-	data        []byte
-	contentType string
-	headers     []headerval
-	cookies     []cookieval
-}
-
-func (j dataHTTPResponse) Write(g *gin.Context) {
-	for _, v := range j.headers {
-		g.Header(v.Key, v.Val)
-	}
-	for _, v := range j.cookies {
-		g.SetCookie(v.name, v.value, v.maxAge, v.path, v.domain, v.secure, v.httpOnly)
-	}
-	g.Data(j.statusCode, j.contentType, j.data)
-}
-
-func (j dataHTTPResponse) WithHeader(k string, v string) HTTPResponse {
-	j.headers = append(j.headers, headerval{k, v})
-	return j
-}
-
-func (j dataHTTPResponse) WithCookie(name string, value string, maxAge int, path string, domain string, secure bool, httpOnly bool) HTTPResponse {
-	j.cookies = append(j.cookies, cookieval{name, value, maxAge, path, domain, secure, httpOnly})
-	return j
-}
-
-func (j dataHTTPResponse) IsSuccess() bool {
-	return j.statusCode >= 200 && j.statusCode <= 399
-}
-
-func (j dataHTTPResponse) Statuscode() int {
-	return j.statusCode
-}
-
-func (j dataHTTPResponse) BodyString(*gin.Context) *string {
-	return langext.Ptr(string(j.data))
-}
-
-func (j dataHTTPResponse) ContentType() string {
-	return j.contentType
-}
-
-func (j dataHTTPResponse) Headers() []string {
-	return langext.ArrMap(j.headers, func(v headerval) string { return v.Key + "=" + v.Val })
-}
-
-func Data(sc int, contentType string, data []byte) HTTPResponse {
-	return &dataHTTPResponse{statusCode: sc, contentType: contentType, data: data}
-}

ginext/responseDownload.go

@@ -1,64 +0,0 @@
-package ginext
-
-import (
-	"fmt"
-	"github.com/gin-gonic/gin"
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
-)
-
-type downloadDataHTTPResponse struct {
-	statusCode int
-	mimetype   string
-	data       []byte
-	filename   *string
-	headers    []headerval
-	cookies    []cookieval
-}
-
-func (j downloadDataHTTPResponse) Write(g *gin.Context) {
-	g.Header("Content-Type", j.mimetype) // if we don't set it here gin does weird file-sniffing later...
-	if j.filename != nil {
-		g.Header("Content-Disposition", fmt.Sprintf("attachment; filename=\"%s\"", *j.filename))
-	}
-	for _, v := range j.headers {
-		g.Header(v.Key, v.Val)
-	}
-	for _, v := range j.cookies {
-		g.SetCookie(v.name, v.value, v.maxAge, v.path, v.domain, v.secure, v.httpOnly)
-	}
-	g.Data(j.statusCode, j.mimetype, j.data)
-}
-
-func (j downloadDataHTTPResponse) WithHeader(k string, v string) HTTPResponse {
-	j.headers = append(j.headers, headerval{k, v})
-	return j
-}
-
-func (j downloadDataHTTPResponse) WithCookie(name string, value string, maxAge int, path string, domain string, secure bool, httpOnly bool) HTTPResponse {
-	j.cookies = append(j.cookies, cookieval{name, value, maxAge, path, domain, secure, httpOnly})
-	return j
-}
-
-func (j downloadDataHTTPResponse) IsSuccess() bool {
-	return j.statusCode >= 200 && j.statusCode <= 399
-}
-
-func (j downloadDataHTTPResponse) Statuscode() int {
-	return j.statusCode
-}
-
-func (j downloadDataHTTPResponse) BodyString(*gin.Context) *string {
-	return langext.Ptr(string(j.data))
-}
-
-func (j downloadDataHTTPResponse) ContentType() string {
-	return j.mimetype
-}
-
-func (j downloadDataHTTPResponse) Headers() []string {
-	return langext.ArrMap(j.headers, func(v headerval) string { return v.Key + "=" + v.Val })
-}
-
-func DownloadData(status int, mimetype string, filename string, data []byte) HTTPResponse {
-	return &downloadDataHTTPResponse{statusCode: status, mimetype: mimetype, data: data, filename: &filename}
-}

ginext/responseEmpty.go

@@ -1,56 +0,0 @@
-package ginext
-
-import (
-	"github.com/gin-gonic/gin"
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
-)
-
-type emptyHTTPResponse struct {
-	statusCode int
-	headers    []headerval
-	cookies    []cookieval
-}
-
-func (j emptyHTTPResponse) Write(g *gin.Context) {
-	for _, v := range j.headers {
-		g.Header(v.Key, v.Val)
-	}
-	for _, v := range j.cookies {
-		g.SetCookie(v.name, v.value, v.maxAge, v.path, v.domain, v.secure, v.httpOnly)
-	}
-	g.Status(j.statusCode)
-}
-
-func (j emptyHTTPResponse) WithHeader(k string, v string) HTTPResponse {
-	j.headers = append(j.headers, headerval{k, v})
-	return j
-}
-
-func (j emptyHTTPResponse) WithCookie(name string, value string, maxAge int, path string, domain string, secure bool, httpOnly bool) HTTPResponse {
-	j.cookies = append(j.cookies, cookieval{name, value, maxAge, path, domain, secure, httpOnly})
-	return j
-}
-
-func (j emptyHTTPResponse) IsSuccess() bool {
-	return j.statusCode >= 200 && j.statusCode <= 399
-}
-
-func (j emptyHTTPResponse) Statuscode() int {
-	return j.statusCode
-}
-
-func (j emptyHTTPResponse) BodyString(*gin.Context) *string {
-	return nil
-}
-
-func (j emptyHTTPResponse) ContentType() string {
-	return ""
-}
-
-func (j emptyHTTPResponse) Headers() []string {
-	return langext.ArrMap(j.headers, func(v headerval) string { return v.Key + "=" + v.Val })
-}
-
-func Status(sc int) HTTPResponse {
-	return &emptyHTTPResponse{statusCode: sc}
-}

ginext/responseFile.go

@@ -1,73 +0,0 @@
-package ginext
-
-import (
-	"fmt"
-	"github.com/gin-gonic/gin"
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
-	"os"
-)
-
-type fileHTTPResponse struct {
-	mimetype string
-	filepath string
-	filename *string
-	headers  []headerval
-	cookies  []cookieval
-}
-
-func (j fileHTTPResponse) Write(g *gin.Context) {
-	g.Header("Content-Type", j.mimetype) // if we don't set it here gin does weird file-sniffing later...
-	if j.filename != nil {
-		g.Header("Content-Disposition", fmt.Sprintf("attachment; filename=\"%s\"", *j.filename))
-
-	}
-	for _, v := range j.headers {
-		g.Header(v.Key, v.Val)
-	}
-	for _, v := range j.cookies {
-		g.SetCookie(v.name, v.value, v.maxAge, v.path, v.domain, v.secure, v.httpOnly)
-	}
-	g.File(j.filepath)
-}
-
-func (j fileHTTPResponse) WithHeader(k string, v string) HTTPResponse {
-	j.headers = append(j.headers, headerval{k, v})
-	return j
-}
-
-func (j fileHTTPResponse) WithCookie(name string, value string, maxAge int, path string, domain string, secure bool, httpOnly bool) HTTPResponse {
-	j.cookies = append(j.cookies, cookieval{name, value, maxAge, path, domain, secure, httpOnly})
-	return j
-}
-
-func (j fileHTTPResponse) IsSuccess() bool {
-	return true
-}
-
-func (j fileHTTPResponse) Statuscode() int {
-	return 200
-}
-
-func (j fileHTTPResponse) BodyString(*gin.Context) *string {
-	data, err := os.ReadFile(j.filepath)
-	if err != nil {
-		return nil
-	}
-	return langext.Ptr(string(data))
-}
-
-func (j fileHTTPResponse) ContentType() string {
-	return j.mimetype
-}
-
-func (j fileHTTPResponse) Headers() []string {
-	return langext.ArrMap(j.headers, func(v headerval) string { return v.Key + "=" + v.Val })
-}
-
-func File(mimetype string, filepath string) HTTPResponse {
-	return &fileHTTPResponse{mimetype: mimetype, filepath: filepath}
-}
-
-func Download(mimetype string, filepath string, filename string) HTTPResponse {
-	return &fileHTTPResponse{mimetype: mimetype, filepath: filepath, filename: &filename}
-}

ginext/responseJson.go

@@ -1,78 +0,0 @@
-package ginext
-
-import (
-	"github.com/gin-gonic/gin"
-	json "git.blackforestbytes.com/BlackForestBytes/goext/gojson"
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
-)
-
-type jsonHTTPResponse struct {
-	statusCode     int
-	data           any
-	headers        []headerval
-	cookies        []cookieval
-	filterOverride *string
-}
-
-func (j jsonHTTPResponse) jsonRenderer(g *gin.Context) json.GoJsonRender {
-	var f *string
-	if jsonfilter := g.GetString(jsonFilterKey); jsonfilter != "" {
-		f = &jsonfilter
-	}
-	if j.filterOverride != nil {
-		f = j.filterOverride
-	}
-	return json.GoJsonRender{Data: j.data, NilSafeSlices: true, NilSafeMaps: true, Filter: f}
-}
-
-func (j jsonHTTPResponse) Write(g *gin.Context) {
-	for _, v := range j.headers {
-		g.Header(v.Key, v.Val)
-	}
-	for _, v := range j.cookies {
-		g.SetCookie(v.name, v.value, v.maxAge, v.path, v.domain, v.secure, v.httpOnly)
-	}
-	g.Render(j.statusCode, j.jsonRenderer(g))
-}
-
-func (j jsonHTTPResponse) WithHeader(k string, v string) HTTPResponse {
-	j.headers = append(j.headers, headerval{k, v})
-	return j
-}
-
-func (j jsonHTTPResponse) WithCookie(name string, value string, maxAge int, path string, domain string, secure bool, httpOnly bool) HTTPResponse {
-	j.cookies = append(j.cookies, cookieval{name, value, maxAge, path, domain, secure, httpOnly})
-	return j
-}
-
-func (j jsonHTTPResponse) IsSuccess() bool {
-	return j.statusCode >= 200 && j.statusCode <= 399
-}
-
-func (j jsonHTTPResponse) Statuscode() int {
-	return j.statusCode
-}
-
-func (j jsonHTTPResponse) BodyString(g *gin.Context) *string {
-	if str, err := j.jsonRenderer(g).RenderString(); err == nil {
-		return &str
-	} else {
-		return nil
-	}
-}
-
-func (j jsonHTTPResponse) ContentType() string {
-	return "application/json"
-}
-
-func (j jsonHTTPResponse) Headers() []string {
-	return langext.ArrMap(j.headers, func(v headerval) string { return v.Key + "=" + v.Val })
-}
-
-func JSON(sc int, data any) HTTPResponse {
-	return &jsonHTTPResponse{statusCode: sc, data: data}
-}
-
-func JSONWithFilter(sc int, data any, f string) HTTPResponse {
-	return &jsonHTTPResponse{statusCode: sc, data: data, filterOverride: &f}
-}

ginext/responseJsonAPI.go

@@ -1,81 +0,0 @@
-package ginext
-
-import (
-	"context"
-	"github.com/gin-gonic/gin"
-	"git.blackforestbytes.com/BlackForestBytes/goext/exerr"
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
-)
-
-type jsonAPIErrResponse struct {
-	err     *exerr.ExErr
-	headers []headerval
-	cookies []cookieval
-}
-
-func (j jsonAPIErrResponse) Error() error {
-	return j.err
-}
-
-func (j jsonAPIErrResponse) Write(g *gin.Context) {
-	for _, v := range j.headers {
-		g.Header(v.Key, v.Val)
-	}
-	for _, v := range j.cookies {
-		g.SetCookie(v.name, v.value, v.maxAge, v.path, v.domain, v.secure, v.httpOnly)
-	}
-
-	exerr.Get(j.err).Output(context.Background(), g)
-
-	j.err.CallListener(exerr.MethodOutput, exerr.ListenerOpt{NoLog: false})
-}
-
-func (j jsonAPIErrResponse) WithHeader(k string, v string) HTTPResponse {
-	j.headers = append(j.headers, headerval{k, v})
-	return j
-}
-
-func (j jsonAPIErrResponse) WithCookie(name string, value string, maxAge int, path string, domain string, secure bool, httpOnly bool) HTTPResponse {
-	j.cookies = append(j.cookies, cookieval{name, value, maxAge, path, domain, secure, httpOnly})
-	return j
-}
-
-func (j jsonAPIErrResponse) IsSuccess() bool {
-	return false
-}
-
-func (j jsonAPIErrResponse) Statuscode() int {
-	return langext.Coalesce(j.err.RecursiveStatuscode(), 0)
-}
-
-func (j jsonAPIErrResponse) BodyString(*gin.Context) *string {
-	if str, err := j.err.ToDefaultAPIJson(); err == nil {
-		return &str
-	} else {
-		return nil
-	}
-}
-
-func (j jsonAPIErrResponse) ContentType() string {
-	return "application/json"
-}
-
-func (j jsonAPIErrResponse) Headers() []string {
-	return langext.ArrMap(j.headers, func(v headerval) string { return v.Key + "=" + v.Val })
-}
-
-func (j jsonAPIErrResponse) Unwrap() error {
-	return j.err
-}
-
-func Error(e error) HTTPResponse {
-	return &jsonAPIErrResponse{
-		err: exerr.FromError(e),
-	}
-}
-
-func ErrWrap(e error, errorType exerr.ErrorType, msg string) HTTPResponse {
-	return &jsonAPIErrResponse{
-		err: exerr.FromError(exerr.Wrap(e, msg).WithType(errorType).Build()),
-	}
-}

ginext/responseRedirect.go

@@ -1,57 +0,0 @@
-package ginext
-
-import (
-	"github.com/gin-gonic/gin"
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
-)
-
-type redirectHTTPResponse struct {
-	statusCode int
-	url        string
-	headers    []headerval
-	cookies    []cookieval
-}
-
-func (j redirectHTTPResponse) Write(g *gin.Context) {
-	for _, v := range j.headers {
-		g.Header(v.Key, v.Val)
-	}
-	for _, v := range j.cookies {
-		g.SetCookie(v.name, v.value, v.maxAge, v.path, v.domain, v.secure, v.httpOnly)
-	}
-	g.Redirect(j.statusCode, j.url)
-}
-
-func (j redirectHTTPResponse) WithHeader(k string, v string) HTTPResponse {
-	j.headers = append(j.headers, headerval{k, v})
-	return j
-}
-
-func (j redirectHTTPResponse) WithCookie(name string, value string, maxAge int, path string, domain string, secure bool, httpOnly bool) HTTPResponse {
-	j.cookies = append(j.cookies, cookieval{name, value, maxAge, path, domain, secure, httpOnly})
-	return j
-}
-
-func (j redirectHTTPResponse) IsSuccess() bool {
-	return j.statusCode >= 200 && j.statusCode <= 399
-}
-
-func (j redirectHTTPResponse) Statuscode() int {
-	return j.statusCode
-}
-
-func (j redirectHTTPResponse) BodyString(*gin.Context) *string {
-	return nil
-}
-
-func (j redirectHTTPResponse) ContentType() string {
-	return ""
-}
-
-func (j redirectHTTPResponse) Headers() []string {
-	return langext.ArrMap(j.headers, func(v headerval) string { return v.Key + "=" + v.Val })
-}
-
-func Redirect(sc int, newURL string) HTTPResponse {
-	return &redirectHTTPResponse{statusCode: sc, url: newURL}
-}

ginext/responseSeekable.go

@@ -1,72 +0,0 @@
-package ginext
-
-import (
-	"github.com/gin-gonic/gin"
-	"git.blackforestbytes.com/BlackForestBytes/goext/exerr"
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
-	"io"
-	"net/http"
-	"time"
-)
-
-type seekableResponse struct {
-	data        io.ReadSeeker
-	contentType string
-	filename    string
-	headers     []headerval
-	cookies     []cookieval
-}
-
-func (j seekableResponse) Write(g *gin.Context) {
-	g.Header("Content-Type", j.contentType) // if we don't set it here http.ServeContent does weird sniffing later...
-
-	for _, v := range j.headers {
-		g.Header(v.Key, v.Val)
-	}
-	for _, v := range j.cookies {
-		g.SetCookie(v.name, v.value, v.maxAge, v.path, v.domain, v.secure, v.httpOnly)
-	}
-
-	http.ServeContent(g.Writer, g.Request, j.filename, time.Unix(0, 0), j.data)
-
-	if clsr, ok := j.data.(io.ReadSeekCloser); ok {
-		err := clsr.Close()
-		if err != nil {
-			exerr.Wrap(err, "failed to close io.ReadSeerkClose in ginext.Seekable").Str("filename", j.filename).Print()
-		}
-	}
-}
-
-func (j seekableResponse) WithHeader(k string, v string) HTTPResponse {
-	j.headers = append(j.headers, headerval{k, v})
-	return j
-}
-
-func (j seekableResponse) WithCookie(name string, value string, maxAge int, path string, domain string, secure bool, httpOnly bool) HTTPResponse {
-	j.cookies = append(j.cookies, cookieval{name, value, maxAge, path, domain, secure, httpOnly})
-	return j
-}
-
-func (j seekableResponse) IsSuccess() bool {
-	return true
-}
-
-func (j seekableResponse) Statuscode() int {
-	return 200
-}
-
-func (j seekableResponse) BodyString(*gin.Context) *string {
-	return langext.Ptr("(seekable)")
-}
-
-func (j seekableResponse) ContentType() string {
-	return j.contentType
-}
-
-func (j seekableResponse) Headers() []string {
-	return langext.ArrMap(j.headers, func(v headerval) string { return v.Key + "=" + v.Val })
-}
-
-func Seekable(filename string, contentType string, data io.ReadSeeker) HTTPResponse {
-	return &seekableResponse{filename: filename, contentType: contentType, data: data}
-}

ginext/responseText.go

@@ -1,57 +0,0 @@
-package ginext
-
-import (
-	"github.com/gin-gonic/gin"
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
-)
-
-type textHTTPResponse struct {
-	statusCode int
-	data       string
-	headers    []headerval
-	cookies    []cookieval
-}
-
-func (j textHTTPResponse) Write(g *gin.Context) {
-	for _, v := range j.headers {
-		g.Header(v.Key, v.Val)
-	}
-	for _, v := range j.cookies {
-		g.SetCookie(v.name, v.value, v.maxAge, v.path, v.domain, v.secure, v.httpOnly)
-	}
-	g.String(j.statusCode, "%s", j.data)
-}
-
-func (j textHTTPResponse) WithHeader(k string, v string) HTTPResponse {
-	j.headers = append(j.headers, headerval{k, v})
-	return j
-}
-
-func (j textHTTPResponse) WithCookie(name string, value string, maxAge int, path string, domain string, secure bool, httpOnly bool) HTTPResponse {
-	j.cookies = append(j.cookies, cookieval{name, value, maxAge, path, domain, secure, httpOnly})
-	return j
-}
-
-func (j textHTTPResponse) IsSuccess() bool {
-	return j.statusCode >= 200 && j.statusCode <= 399
-}
-
-func (j textHTTPResponse) Statuscode() int {
-	return j.statusCode
-}
-
-func (j textHTTPResponse) BodyString(*gin.Context) *string {
-	return langext.Ptr(j.data)
-}
-
-func (j textHTTPResponse) ContentType() string {
-	return "text/plain"
-}
-
-func (j textHTTPResponse) Headers() []string {
-	return langext.ArrMap(j.headers, func(v headerval) string { return v.Key + "=" + v.Val })
-}
-
-func Text(sc int, data string) HTTPResponse {
-	return &textHTTPResponse{statusCode: sc, data: data}
-}

ginext/routes.go

@@ -1,273 +0,0 @@
-package ginext
-
-import (
-	"git.blackforestbytes.com/BlackForestBytes/goext/langext"
-	"github.com/gin-gonic/gin"
-	"net/http"
-	"path"
-	"reflect"
-	"runtime"
-	"strings"
-)
-
-var anyMethods = []string{
-	http.MethodGet, http.MethodPost, http.MethodPut, http.MethodPatch,
-	http.MethodHead, http.MethodOptions, http.MethodDelete, http.MethodConnect,
-	http.MethodTrace,
-}
-
-type GinRoutesWrapper struct {
-	wrapper        *GinWrapper
-	routes         gin.IRouter
-	absPath        string
-	defaultHandler []gin.HandlerFunc
-}
-
-type GinRouteBuilder struct {
-	routes *GinRoutesWrapper
-
-	method   string
-	relPath  string
-	absPath  string
-	handlers []gin.HandlerFunc
-}
-
-func (w *GinWrapper) Routes() *GinRoutesWrapper {
-	return &GinRoutesWrapper{
-		wrapper:        w,
-		routes:         w.engine,
-		absPath:        "",
-		defaultHandler: make([]gin.HandlerFunc, 0),
-	}
-}
-
-func (w *GinRoutesWrapper) Group(relativePath string) *GinRoutesWrapper {
-	return &GinRoutesWrapper{
-		wrapper:        w.wrapper,
-		routes:         w.routes.Group(relativePath),
-		defaultHandler: langext.ArrCopy(w.defaultHandler),
-		absPath:        joinPaths(w.absPath, relativePath),
-	}
-}
-
-func (w *GinRoutesWrapper) Use(middleware ...gin.HandlerFunc) *GinRoutesWrapper {
-	defHandler := langext.ArrCopy(w.defaultHandler)
-	defHandler = append(defHandler, middleware...)
-	return &GinRoutesWrapper{wrapper: w.wrapper, routes: w.routes, defaultHandler: defHandler, absPath: w.absPath}
-}
-
-func (w *GinRoutesWrapper) WithJSONFilter(filter string) *GinRoutesWrapper {
-	return w.Use(func(g *gin.Context) { g.Set(jsonFilterKey, filter) })
-}
-
-func (w *GinRoutesWrapper) GET(relativePath string) *GinRouteBuilder {
-	return w._route(http.MethodGet, relativePath)
-}
-
-func (w *GinRoutesWrapper) POST(relativePath string) *GinRouteBuilder {
-	return w._route(http.MethodPost, relativePath)
-}
-
-func (w *GinRoutesWrapper) DELETE(relativePath string) *GinRouteBuilder {
-	return w._route(http.MethodDelete, relativePath)
-}
-
-func (w *GinRoutesWrapper) PATCH(relativePath string) *GinRouteBuilder {
-	return w._route(http.MethodPatch, relativePath)
-}
-
-func (w *GinRoutesWrapper) PUT(relativePath string) *GinRouteBuilder {
-	return w._route(http.MethodPut, relativePath)
-}
-
-func (w *GinRoutesWrapper) OPTIONS(relativePath string) *GinRouteBuilder {
-	return w._route(http.MethodOptions, relativePath)
-}
-
-func (w *GinRoutesWrapper) HEAD(relativePath string) *GinRouteBuilder {
-	return w._route(http.MethodHead, relativePath)
-}
-
-func (w *GinRoutesWrapper) COUNT(relativePath string) *GinRouteBuilder {
-	return w._route("COUNT", relativePath)
-}
-
-func (w *GinRoutesWrapper) Any(relativePath string) *GinRouteBuilder {
-	return w._route("*", relativePath)
-}
-
-func (w *GinRoutesWrapper) _route(method string, relativePath string) *GinRouteBuilder {
-	return &GinRouteBuilder{
-		routes:   w,
-		method:   method,
-		relPath:  relativePath,
-		absPath:  joinPaths(w.absPath, relativePath),
-		handlers: langext.ArrCopy(w.defaultHandler),
-	}
-}
-
-func (w *GinRouteBuilder) Use(middleware ...gin.HandlerFunc) *GinRouteBuilder {
-	w.handlers = append(w.handlers, middleware...)
-	return w
-}
-
-func (w *GinRouteBuilder) WithJSONFilter(filter string) *GinRouteBuilder {
-	return w.Use(func(g *gin.Context) { g.Set(jsonFilterKey, filter) })
-}
-
-func (w *GinRouteBuilder) Handle(handler WHandlerFunc) {
-
-	if w.routes.wrapper.bufferBody {
-		arr := make([]gin.HandlerFunc, 0, len(w.handlers)+1)
-		arr = append(arr, BodyBuffer)
-		arr = append(arr, w.handlers...)
-		w.handlers = arr
-	}
-
-	middlewareNames := langext.ArrMap(w.handlers, func(v gin.HandlerFunc) string { return nameOfFunction(v) })
-	handlerName := nameOfFunction(handler)
-
-	w.handlers = append(w.handlers, Wrap(w.routes.wrapper, handler))
-
-	methodName := w.method
-
-	if w.method == "*" {
-		methodName = "ANY"
-		for _, method := range anyMethods {
-			w.routes.routes.Handle(method, w.relPath, w.handlers...)
-		}
-	} else {
-		w.routes.routes.Handle(w.method, w.relPath, w.handlers...)
-	}
-
-	w.routes.wrapper.routeSpecs = append(w.routes.wrapper.routeSpecs, ginRouteSpec{
-		Method:      methodName,
-		URL:         w.absPath,
-		Middlewares: middlewareNames,
-		Handler:     handlerName,
-	})
-}
-
-func (w *GinRouteBuilder) HandleRawHTTPHandler(f http.Handler) {
-	if w.routes.wrapper.bufferBody {
-		arr := make([]gin.HandlerFunc, 0, len(w.handlers)+1)
-		arr = append(arr, BodyBuffer)
-		arr = append(arr, w.handlers...)
-		w.handlers = arr
-	}
-
-	middlewareNames := langext.ArrMap(w.handlers, func(v gin.HandlerFunc) string { return nameOfFunction(v) })
-
-	w.handlers = append(w.handlers, WrapHTTPHandler(w.routes.wrapper, f))
-
-	methodName := w.method
-
-	if w.method == "*" {
-		methodName = "ANY"
-		for _, method := range anyMethods {
-			w.routes.routes.Handle(method, w.relPath, w.handlers...)
-		}
-	} else {
-		w.routes.routes.Handle(w.method, w.relPath, w.handlers...)
-	}
-
-	w.routes.wrapper.routeSpecs = append(w.routes.wrapper.routeSpecs, ginRouteSpec{
-		Method:      methodName,
-		URL:         w.absPath,
-		Middlewares: middlewareNames,
-		Handler:     "[HTTPHandler]",
-	})
-}
-
-func (w *GinRouteBuilder) HandleRawHTTPHandlerFunc(f http.HandlerFunc) {
-	if w.routes.wrapper.bufferBody {
-		arr := make([]gin.HandlerFunc, 0, len(w.handlers)+1)
-		arr = append(arr, BodyBuffer)
-		arr = append(arr, w.handlers...)
-		w.handlers = arr
-	}
-
-	middlewareNames := langext.ArrMap(w.handlers, func(v gin.HandlerFunc) string { return nameOfFunction(v) })
-
-	w.handlers = append(w.handlers, WrapHTTPHandlerFunc(w.routes.wrapper, f))
-
-	methodName := w.method
-
-	if w.method == "*" {
-		methodName = "ANY"
-		for _, method := range anyMethods {
-			w.routes.routes.Handle(method, w.relPath, w.handlers...)
-		}
-	} else {
-		w.routes.routes.Handle(w.method, w.relPath, w.handlers...)
-	}
-
-	w.routes.wrapper.routeSpecs = append(w.routes.wrapper.routeSpecs, ginRouteSpec{
-		Method:      methodName,
-		URL:         w.absPath,
-		Middlewares: middlewareNames,
-		Handler:     "[HTTPHandlerFunc]",
-	})
-}
-
-func (w *GinWrapper) NoRoute(handler WHandlerFunc) {
-
-	handlers := make([]gin.HandlerFunc, 0)
-
-	if w.bufferBody {
-		handlers = append(handlers, BodyBuffer)
-	}
-
-	middlewareNames := langext.ArrMap(handlers, func(v gin.HandlerFunc) string { return nameOfFunction(v) })
-	handlerName := nameOfFunction(handler)
-
-	handlers = append(handlers, Wrap(w, handler))
-
-	w.engine.NoRoute(handlers...)
-
-	w.routeSpecs = append(w.routeSpecs, ginRouteSpec{
-		Method:      "ANY",
-		URL:         "[NO_ROUTE]",
-		Middlewares: middlewareNames,
-		Handler:     handlerName,
-	})
-}
-
-func nameOfFunction(f any) string {
-
-	fname := runtime.FuncForPC(reflect.ValueOf(f).Pointer()).Name()
-
-	split := strings.Split(fname, "/")
-	if len(split) == 0 {
-		return ""
-	}
-
-	fname = split[len(split)-1]
-
-	// https://stackoverflow.com/a/32925345/1761622
-	if strings.HasSuffix(fname, "-fm") {
-		fname = fname[:len(fname)-len("-fm")]
-	}
-
-	return fname
-}
-
-// joinPaths is copied verbatim from gin@v1.9.1/gin.go
-func joinPaths(absolutePath, relativePath string) string {
-	if relativePath == "" {
-		return absolutePath
-	}
-
-	finalPath := path.Join(absolutePath, relativePath)
-	if lastChar(relativePath) == '/' && lastChar(finalPath) != '/' {
-		return finalPath + "/"
-	}
-	return finalPath
-}
-
-func lastChar(str string) uint8 {
-	if str == "" {
-		panic("The length of the string can't be 0")
-	}
-	return str[len(str)-1]
-}