Compare commits
	
		
			145 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 9e5bc0d3ea | |||
| 6d3bd13f61 | |||
| b5ca475b3f | |||
| a75b1291cb | |||
| 21cd1ee066 | |||
| ae43cbb623 | |||
| 9b752a911c | |||
| ec9ac26a4c | |||
| 39a0b73d56 | |||
| 2e2e15d4d2 | |||
| 0d16946aba | |||
| 14441c2378 | |||
| f6bcdc9903 | |||
| a95053211c | |||
| 813ce71e3e | |||
| 56ae0cfc6c | |||
| 202afc9068 | |||
| 56094b3cb6 | |||
| 0da098e9f9 | |||
| f0881c9fd6 | |||
| 029b408749 | |||
| 84b2be3169 | |||
| c872cecc67 | |||
| 99cd92729e | |||
| ac416f7b69 | |||
| e10140e143 | |||
| e165f0f62f | |||
| 655d4daad9 | |||
| 87a004e577 | |||
| 376c6cab50 | |||
| 4a3f25baa0 | |||
| aa33bc8df3 | |||
| 96b3718375 | |||
| 5f9b55933b | |||
| 74d42637e7 | |||
| 0c05bcf29b | |||
| 9136143f2f | |||
| 2f1b784dc2 | |||
| 190584e0e6 | |||
| b7003b9ec9 | |||
| 4f871271e8 | |||
| 91f4793678 | |||
| 3b30bb049e | |||
| f0c5b36ea9 | |||
| 647ec64c3b | |||
| b5f9b6b638 | |||
| c7949febf2 | |||
| 15a4b2a713 | |||
| 493c6ebae8 | |||
| fb847b03af | |||
| f826633e6e | |||
| edeae23bf1 | |||
| a038b86147 | |||
| ede0b99d3a | |||
| d04ce18eb0 | |||
| 8ae9a0f107 | |||
| a259bb6dbc | |||
| adf32568ee | |||
| 0cfa159cb1 | |||
| 0ead99608a | |||
| 7fe3e66cad | |||
| a73d7d1654 | |||
| bbd7a7bc2c | |||
| f5151eb214 | |||
| eefb9ac9f5 | |||
| 468a7d212d | |||
| a4def75d06 | |||
| 16c66ee28c | |||
| 2e6ca48d22 | |||
| b1d6509294 | |||
| e909d656d9 | |||
| 0971f60c30 | |||
| d8270e53ed | |||
| 1ee127937a | |||
| 56684b2c0b | |||
| 1ea6695f82 | |||
| 5273ff7600 | |||
| caa69c3629 | |||
| 0ff5f0aa28 | |||
| d5cb1e48ed | |||
| 1c2d3f541f | |||
| ec62ad436f | |||
| 8d0ef0f002 | |||
| d78550672e | |||
| 1d629f6db8 | |||
| f7d291056d | |||
| 710c257c64 | |||
| c320bb3d90 | |||
| 2f01a1d50f | |||
| ffc57b7e89 | |||
| d88cd3c22b | |||
| ac5ad640bd | |||
| 21d241f9b1 | |||
| 2569c165f8 | |||
| ee262a94fb | |||
| 7977c0e59c | |||
| ceff0161c6 | |||
| a30da61419 | |||
| b613b122e3 | |||
| d017530444 | |||
| 8de83cc290 | |||
| 603ec82b83 | |||
| 93c4cf31a8 | |||
| dc2d8a9103 | |||
| 6589e8d5cd | |||
| 0006c6859d | |||
| 827b3fc1b7 | |||
| f7dce4a102 | |||
| 45d4fd7101 | |||
| c7df9d2264 | |||
| d0954bf133 | |||
| 8affa81bb9 | |||
| fe9ebf0bab | |||
| a4b5f33d15 | |||
| e89e2c18f2 | |||
| b16d5152c7 | |||
| 5fb2f8a312 | |||
| 2ad820be8d | |||
| 555096102a | |||
| d76d7b5cb9 | |||
| 6622c9003d | |||
| b02e1d2e85 | |||
| c338d23070 | |||
| 1fbae343a4 | |||
| 31418bf0e6 | |||
| 6d45f6f667 | |||
| f610a2202c | |||
| 2807299d46 | |||
| e872dbccec | |||
| 9daf71e2ed | |||
| fe278f7772 | |||
| 8ebda6fb3a | |||
| b0d3ce8c1c | |||
| 021465e524 | |||
| cf9c73aa4a | |||
| 0652bf22dc | |||
| b196adffc7 | |||
| 717065e62d | |||
| e7b2b040b2 | |||
| 05d0f9e469 | |||
| ccd03e50c8 | |||
| 1c77c2b8e8 | |||
| 9f6f967299 | |||
| 18c83f0f76 | |||
| a64f336e24 | 
							
								
								
									
										9
									
								
								.gitea/workflows/Dockerfile_tests
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								.gitea/workflows/Dockerfile_tests
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,9 @@ | ||||
| FROM golang:latest | ||||
|  | ||||
| RUN apt install -y make curl python3 && go install gotest.tools/gotestsum@latest | ||||
|  | ||||
| COPY . /source | ||||
|  | ||||
| WORKDIR /source | ||||
|  | ||||
| CMD ["make", "test"] | ||||
							
								
								
									
										30
									
								
								.gitea/workflows/tests.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										30
									
								
								.gitea/workflows/tests.yml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,30 @@ | ||||
|  | ||||
| # 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] | ||||
|  | ||||
| jobs: | ||||
|   run_tests: | ||||
|     name: Run goext test-suite | ||||
|     runs-on: bfb-cicd-latest | ||||
|     steps: | ||||
|  | ||||
|       - name: Check out code | ||||
|         uses: actions/checkout@v3 | ||||
|  | ||||
|       - name: Build test docker | ||||
|         id: build_docker | ||||
|         run: echo "DOCKER_IMG_ID=$(docker build -q . -f .gitea/workflows/Dockerfile_tests || echo __err_build__)" >> $GITHUB_OUTPUT | ||||
|  | ||||
|       - name: Run tests | ||||
|         run: docker run --rm "${{ steps.build_docker.outputs.DOCKER_IMG_ID }}" | ||||
|  | ||||
|       - name: Cleanup | ||||
|         if: always() | ||||
|         run: docker image rm "${{ steps.build_docker.outputs.DOCKER_IMG_ID }}" | ||||
|  | ||||
							
								
								
									
										6
									
								
								.idea/goext.iml
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										6
									
								
								.idea/goext.iml
									
									
									
										generated
									
									
									
								
							| @@ -1,6 +1,10 @@ | ||||
| <?xml version="1.0" encoding="UTF-8"?> | ||||
| <module type="WEB_MODULE" version="4"> | ||||
|   <component name="Go" enabled="true" /> | ||||
|   <component name="Go" enabled="true"> | ||||
|     <buildTags> | ||||
|       <option name="goVersion" value="1.19" /> | ||||
|     </buildTags> | ||||
|   </component> | ||||
|   <component name="NewModuleRootManager"> | ||||
|     <content url="file://$MODULE_DIR$" /> | ||||
|     <orderEntry type="inheritedJdk" /> | ||||
|   | ||||
							
								
								
									
										4
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								Makefile
									
									
									
									
									
								
							| @@ -3,7 +3,9 @@ run: | ||||
| 	echo "This is a library - can't be run" && false | ||||
|  | ||||
| test: | ||||
| 	go test ./... | ||||
| 	# go test ./... | ||||
| 	which gotestsum || go install gotest.tools/gotestsum@latest | ||||
| 	gotestsum --format "testname" -- -tags="timetzdata sqlite_fts5 sqlite_foreign_keys" "./..." | ||||
|  | ||||
| version: | ||||
| 	_data/version.sh | ||||
							
								
								
									
										35
									
								
								README.md
									
									
									
									
									
								
							
							
						
						
									
										35
									
								
								README.md
									
									
									
									
									
								
							| @@ -5,4 +5,37 @@ 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="gogs.mikescher.com"` | ||||
| Potentially needs `export GOPRIVATE="gogs.mikescher.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 golagn reflection                                                                                 | | ||||
| |              |            |                                                                                                               | | ||||
| | mongoext     | Mike       | Utility/Helper functions for mongodb                                                                          | | ||||
| | cursortoken  | Mike       | MongoDB cursortoken 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                                                                     | | ||||
| | 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                                                          | | ||||
| |              |            |                                                                                                               | | ||||
							
								
								
									
										13
									
								
								TODO.md
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										13
									
								
								TODO.md
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,13 @@ | ||||
|  | ||||
|  | ||||
|  - cronext | ||||
|  | ||||
|  - cursortoken | ||||
|  | ||||
|  - typed/geenric mongo wrapper | ||||
|  | ||||
|  - error package | ||||
|  | ||||
| - rfctime.DateOnly | ||||
| - rfctime.HMSTimeOnly | ||||
| - rfctime.NanoTimeOnly | ||||
| @@ -21,8 +21,15 @@ 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}') | ||||
| @@ -32,10 +39,17 @@ 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 | ||||
|   | ||||
							
								
								
									
										
											BIN
										
									
								
								bfcodegen/_test_example.tgz
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								bfcodegen/_test_example.tgz
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										335
									
								
								bfcodegen/enum-generate.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										335
									
								
								bfcodegen/enum-generate.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,335 @@ | ||||
| package bfcodegen | ||||
|  | ||||
| import ( | ||||
| 	"errors" | ||||
| 	"fmt" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/cmdext" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/cryptext" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/langext" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/rext" | ||||
| 	"io" | ||||
| 	"os" | ||||
| 	"path" | ||||
| 	"path/filepath" | ||||
| 	"regexp" | ||||
| 	"strings" | ||||
| 	"time" | ||||
| ) | ||||
|  | ||||
| type EnumDefVal struct { | ||||
| 	VarName     string | ||||
| 	Value       string | ||||
| 	Description *string | ||||
| } | ||||
|  | ||||
| type EnumDef struct { | ||||
| 	File         string | ||||
| 	FileRelative string | ||||
| 	EnumTypeName string | ||||
| 	Type         string | ||||
| 	Values       []EnumDefVal | ||||
| } | ||||
|  | ||||
| var rexPackage = 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 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 rexChecksumConst = rext.W(regexp.MustCompile(`const ChecksumGenerator = "(?P<cs>[A-Za-z0-9_]*)"`)) | ||||
|  | ||||
| func GenerateEnumSpecs(sourceDir string, destFile string) error { | ||||
|  | ||||
| 	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 := rexChecksumConst.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") }) | ||||
| 	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("[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 nil | ||||
| 	} | ||||
|  | ||||
| 	allEnums := make([]EnumDef, 0) | ||||
|  | ||||
| 	pkgname := "" | ||||
|  | ||||
| 	for _, f := range files { | ||||
| 		fmt.Printf("========= %s =========\n\n", f.Name()) | ||||
| 		fileEnums, pn, err := processFile(sourceDir, path.Join(sourceDir, f.Name())) | ||||
| 		if err != nil { | ||||
| 			return err | ||||
| 		} | ||||
|  | ||||
| 		fmt.Printf("\n") | ||||
|  | ||||
| 		allEnums = append(allEnums, fileEnums...) | ||||
|  | ||||
| 		if pn != "" { | ||||
| 			pkgname = pn | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
| 	if pkgname == "" { | ||||
| 		return errors.New("no package name found in any file") | ||||
| 	} | ||||
|  | ||||
| 	err = os.WriteFile(destFile, []byte(fmtOutput(newChecksum, allEnums, pkgname)), 0o755) | ||||
| 	if err != nil { | ||||
| 		return err | ||||
| 	} | ||||
|  | ||||
| 	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 processFile(basedir string, fn string) ([]EnumDef, 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") | ||||
|  | ||||
| 	enums := make([]EnumDef, 0) | ||||
|  | ||||
| 	pkgname := "" | ||||
|  | ||||
| 	for i, line := range lines { | ||||
| 		if i == 0 && strings.HasPrefix(line, "// Code generated by") { | ||||
| 			break | ||||
| 		} | ||||
|  | ||||
| 		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) | ||||
| 			fmt.Printf("Found enum definition { '%s' -> '%s' }\n", def.EnumTypeName, def.Type) | ||||
| 		} | ||||
|  | ||||
| 		if match, ok := rexValueDef.MatchFirst(line); ok { | ||||
| 			typename := match.GroupByName("type").Value() | ||||
| 			def := EnumDefVal{ | ||||
| 				VarName:     match.GroupByName("name").Value(), | ||||
| 				Value:       match.GroupByName("value").Value(), | ||||
| 				Description: match.GroupByNameOrEmpty("descr").ValueOrNil(), | ||||
| 			} | ||||
|  | ||||
| 			found := false | ||||
| 			for i, v := range enums { | ||||
| 				if v.EnumTypeName == typename { | ||||
| 					enums[i].Values = append(enums[i].Values, def) | ||||
| 					found = true | ||||
| 					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 { | ||||
| 				fmt.Printf("Found non-enum value [%s] for '%s' ( looks like enum value, but no matching @enum:type )\n", def.Value, def.VarName) | ||||
| 			} | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
| 	return enums, pkgname, nil | ||||
| } | ||||
|  | ||||
| func fmtOutput(cs string, enums []EnumDef, pkgname string) string { | ||||
| 	str := "// Code generated by enum-generate.go DO NOT EDIT.\n" | ||||
| 	str += "\n" | ||||
| 	str += "package " + pkgname + "\n" | ||||
| 	str += "\n" | ||||
|  | ||||
| 	str += "import \"gogs.mikescher.com/BlackForestBytes/goext/langext\"" + "\n" | ||||
| 	str += "import \"gogs.mikescher.com/BlackForestBytes/goext/enums\"" + "\n" | ||||
| 	str += "\n" | ||||
|  | ||||
| 	str += "const ChecksumGenerator = \"" + cs + "\" // GoExtVersion: " + goext.GoextVersion + "\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.FileRelative + "\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" | ||||
|  | ||||
| 		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" | ||||
| 		} | ||||
|  | ||||
| 		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" | ||||
|  | ||||
| 		str += "func (e " + enumdef.EnumTypeName + ") Valid() bool {" + "\n" | ||||
| 		str += "    return langext.InArray(e, __" + enumdef.EnumTypeName + "Values)" + "\n" | ||||
| 		str += "}" + "\n" | ||||
| 		str += "" + "\n" | ||||
|  | ||||
| 		str += "func (e " + enumdef.EnumTypeName + ") Values() []" + enumdef.EnumTypeName + " {" + "\n" | ||||
| 		str += "    return __" + enumdef.EnumTypeName + "Values" + "\n" | ||||
| 		str += "}" + "\n" | ||||
| 		str += "" + "\n" | ||||
|  | ||||
| 		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() []enums.EnumMetaValue {" + "\n" | ||||
| 		str += "    return " + enumdef.EnumTypeName + "ValuesMeta()" | ||||
| 		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 (e " + enumdef.EnumTypeName + ") Meta() enums.EnumMetaValue {" + "\n" | ||||
| 		if hasDescr { | ||||
| 			str += "    return enums.EnumMetaValue{VarName: e.VarName(), Value: e, Description: langext.Ptr(e.Description())}" | ||||
| 		} else { | ||||
| 			str += "    return enums.EnumMetaValue{VarName: e.VarName(), Value: e, Description: nil}" | ||||
| 		} | ||||
| 		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() []enums.EnumMetaValue {" + "\n" | ||||
| 		str += "    return []enums.EnumMetaValue{" + "\n" | ||||
| 		for _, v := range enumdef.Values { | ||||
| 			str += "        " + v.VarName + ".Meta(),\n" | ||||
| 		} | ||||
| 		str += "    }" + "\n" | ||||
| 		str += "}" + "\n" | ||||
| 		str += "" + "\n" | ||||
|  | ||||
| 	} | ||||
|  | ||||
| 	return str | ||||
| } | ||||
							
								
								
									
										42
									
								
								bfcodegen/enum-generate_test.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										42
									
								
								bfcodegen/enum-generate_test.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,42 @@ | ||||
| package bfcodegen | ||||
|  | ||||
| import ( | ||||
| 	_ "embed" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/cmdext" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/langext" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/tst" | ||||
| 	"os" | ||||
| 	"path/filepath" | ||||
| 	"testing" | ||||
| 	"time" | ||||
| ) | ||||
|  | ||||
| //go:embed _test_example.tgz | ||||
| var ExampleModels []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, ExampleModels, 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 = GenerateEnumSpecs(tmpDir, tmpDir+"/enums_gen.go") | ||||
| 	tst.AssertNoErr(t, err) | ||||
|  | ||||
| 	err = GenerateEnumSpecs(tmpDir, tmpDir+"/enums_gen.go") | ||||
| 	tst.AssertNoErr(t, err) | ||||
|  | ||||
| } | ||||
| @@ -14,6 +14,7 @@ type CommandRunner struct { | ||||
| 	listener         []CommandListener | ||||
| 	enforceExitCodes *[]int | ||||
| 	enforceNoTimeout bool | ||||
| 	enforceNoStderr  bool | ||||
| } | ||||
|  | ||||
| func Runner(program string) *CommandRunner { | ||||
| @@ -25,6 +26,7 @@ func Runner(program string) *CommandRunner { | ||||
| 		listener:         make([]CommandListener, 0), | ||||
| 		enforceExitCodes: nil, | ||||
| 		enforceNoTimeout: false, | ||||
| 		enforceNoStderr:  false, | ||||
| 	} | ||||
| } | ||||
|  | ||||
| @@ -73,6 +75,11 @@ 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 | ||||
|   | ||||
| @@ -11,6 +11,7 @@ import ( | ||||
|  | ||||
| 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 | ||||
| @@ -53,12 +54,27 @@ 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 | ||||
|  | ||||
| 		stdout, stderr, stdcombined, err := preader.Read(opt.listener) | ||||
| 		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) | ||||
| 		if err != nil { | ||||
| 			outputChan <- resultObj{stdout, stderr, stdcombined, err} | ||||
| 			_ = cmd.Process.Kill() | ||||
| @@ -115,6 +131,34 @@ func run(opt CommandRunner) (CommandResult, error) { | ||||
| 			return res, nil | ||||
| 		} | ||||
|  | ||||
| 	case <-stderrFailChan: | ||||
| 		_ = cmd.Process.Kill() | ||||
| 		for _, lstr := range opt.listener { | ||||
| 			lstr.Timeout() | ||||
| 		} | ||||
|  | ||||
| 		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: | ||||
| 		if exiterr, ok := outobj.err.(*exec.ExitError); ok { | ||||
| 			excode := exiterr.ExitCode() | ||||
|   | ||||
| @@ -1,6 +1,7 @@ | ||||
| package cmdext | ||||
|  | ||||
| import ( | ||||
| 	"errors" | ||||
| 	"fmt" | ||||
| 	"testing" | ||||
| 	"time" | ||||
| @@ -32,7 +33,7 @@ func TestStdout(t *testing.T) { | ||||
|  | ||||
| func TestStderr(t *testing.T) { | ||||
|  | ||||
| 	res1, err := Runner("python").Arg("-c").Arg("import sys; print(\"error\", file=sys.stderr, end='')").Run() | ||||
| 	res1, err := Runner("python3").Arg("-c").Arg("import sys; print(\"error\", file=sys.stderr, end='')").Run() | ||||
| 	if err != nil { | ||||
| 		t.Errorf("%v", err) | ||||
| 	} | ||||
| @@ -55,7 +56,7 @@ func TestStderr(t *testing.T) { | ||||
| } | ||||
|  | ||||
| func TestStdcombined(t *testing.T) { | ||||
| 	res1, err := Runner("python"). | ||||
| 	res1, err := Runner("python3"). | ||||
| 		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() | ||||
| @@ -81,7 +82,7 @@ func TestStdcombined(t *testing.T) { | ||||
| } | ||||
|  | ||||
| func TestPartialRead(t *testing.T) { | ||||
| 	res1, err := Runner("python"). | ||||
| 	res1, err := Runner("python3"). | ||||
| 		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). | ||||
| @@ -105,7 +106,7 @@ func TestPartialRead(t *testing.T) { | ||||
| } | ||||
|  | ||||
| func TestPartialReadStderr(t *testing.T) { | ||||
| 	res1, err := Runner("python"). | ||||
| 	res1, err := Runner("python3"). | ||||
| 		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). | ||||
| @@ -130,7 +131,7 @@ func TestPartialReadStderr(t *testing.T) { | ||||
|  | ||||
| func TestReadUnflushedStdout(t *testing.T) { | ||||
|  | ||||
| 	res1, err := Runner("python").Arg("-c").Arg("import sys; print(\"message101\", file=sys.stdout, end='')").Run() | ||||
| 	res1, err := Runner("python3").Arg("-c").Arg("import sys; print(\"message101\", file=sys.stdout, end='')").Run() | ||||
| 	if err != nil { | ||||
| 		t.Errorf("%v", err) | ||||
| 	} | ||||
| @@ -154,7 +155,7 @@ func TestReadUnflushedStdout(t *testing.T) { | ||||
|  | ||||
| func TestReadUnflushedStderr(t *testing.T) { | ||||
|  | ||||
| 	res1, err := Runner("python").Arg("-c").Arg("import sys; print(\"message101\", file=sys.stderr, end='')").Run() | ||||
| 	res1, err := Runner("python3").Arg("-c").Arg("import sys; print(\"message101\", file=sys.stderr, end='')").Run() | ||||
| 	if err != nil { | ||||
| 		t.Errorf("%v", err) | ||||
| 	} | ||||
| @@ -179,7 +180,7 @@ func TestReadUnflushedStderr(t *testing.T) { | ||||
| func TestPartialReadUnflushed(t *testing.T) { | ||||
| 	t.SkipNow() | ||||
|  | ||||
| 	res1, err := Runner("python"). | ||||
| 	res1, err := Runner("python3"). | ||||
| 		Arg("-c"). | ||||
| 		Arg("import sys; import time; print(\"first message\", end=''); time.sleep(5); print(\"cant see me\", end='');"). | ||||
| 		Timeout(100 * time.Millisecond). | ||||
| @@ -205,7 +206,7 @@ func TestPartialReadUnflushed(t *testing.T) { | ||||
| func TestPartialReadUnflushedStderr(t *testing.T) { | ||||
| 	t.SkipNow() | ||||
|  | ||||
| 	res1, err := Runner("python"). | ||||
| 	res1, err := Runner("python3"). | ||||
| 		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). | ||||
| @@ -230,7 +231,7 @@ func TestPartialReadUnflushedStderr(t *testing.T) { | ||||
|  | ||||
| func TestListener(t *testing.T) { | ||||
|  | ||||
| 	res1, err := Runner("python"). | ||||
| 	res1, err := Runner("python3"). | ||||
| 		Arg("-c"). | ||||
| 		Arg("import sys;" + | ||||
| 			"import time;" + | ||||
| @@ -263,7 +264,7 @@ func TestListener(t *testing.T) { | ||||
|  | ||||
| func TestLongStdout(t *testing.T) { | ||||
|  | ||||
| 	res1, err := Runner("python"). | ||||
| 	res1, err := Runner("python3"). | ||||
| 		Arg("-c"). | ||||
| 		Arg("import sys; import time; print(\"X\" * 125001 + \"\\n\"); print(\"Y\" * 125001 + \"\\n\"); print(\"Z\" * 125001 + \"\\n\");"). | ||||
| 		Timeout(5000 * time.Millisecond). | ||||
| @@ -289,16 +290,40 @@ func TestLongStdout(t *testing.T) { | ||||
| func TestFailOnTimeout(t *testing.T) { | ||||
|  | ||||
| 	_, err := Runner("sleep").Arg("2").Timeout(200 * time.Millisecond).FailOnTimeout().Run() | ||||
| 	if err != ErrTimeout { | ||||
| 	if !errors.Is(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 err != ErrExitCode { | ||||
| 	if !errors.Is(err, ErrExitCode) { | ||||
| 		t.Errorf("wrong err := %v", err) | ||||
| 	} | ||||
|  | ||||
|   | ||||
| @@ -8,6 +8,7 @@ import ( | ||||
| 	"os" | ||||
| 	"reflect" | ||||
| 	"strconv" | ||||
| 	"strings" | ||||
| 	"time" | ||||
| ) | ||||
|  | ||||
| @@ -172,6 +173,20 @@ func parseEnvToValue(envval string, fullEnvKey string, rvtype reflect.Type) (ref | ||||
|  | ||||
| 		return envcvl, nil | ||||
|  | ||||
| 	} else if rvtype.ConvertibleTo(reflect.TypeOf(false)) { | ||||
|  | ||||
| 		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)) == "0" { | ||||
| 			return reflect.ValueOf(false).Convert(rvtype), nil | ||||
| 		} else { | ||||
| 			return reflect.Value{}, errors.New(fmt.Sprintf("Failed to parse env-config variable '%s' to <%s, ,bool> (value := '%s')", rvtype.Name(), fullEnvKey, envval)) | ||||
| 		} | ||||
|  | ||||
| 	} else if rvtype.ConvertibleTo(reflect.TypeOf("")) { | ||||
|  | ||||
| 		envcvl := reflect.ValueOf(envval).Convert(rvtype) | ||||
|   | ||||
| @@ -68,6 +68,7 @@ func TestApplyEnvOverridesSimple(t *testing.T) { | ||||
| 		V7 aliasstring   `env:"TEST_V7"` | ||||
| 		V8 time.Duration `env:"TEST_V8"` | ||||
| 		V9 time.Time     `env:"TEST_V9"` | ||||
| 		VA bool          `env:"TEST_VA"` | ||||
| 	} | ||||
|  | ||||
| 	data := testdata{ | ||||
| @@ -82,6 +83,7 @@ func TestApplyEnvOverridesSimple(t *testing.T) { | ||||
| 		V7: "7", | ||||
| 		V8: 9, | ||||
| 		V9: time.Unix(1671102873, 0), | ||||
| 		VA: false, | ||||
| 	} | ||||
|  | ||||
| 	t.Setenv("TEST_V1", "846") | ||||
| @@ -93,6 +95,7 @@ func TestApplyEnvOverridesSimple(t *testing.T) { | ||||
| 	t.Setenv("TEST_V7", "AAAAAA") | ||||
| 	t.Setenv("TEST_V8", "1min4s") | ||||
| 	t.Setenv("TEST_V9", "2009-11-10T23:00:00Z") | ||||
| 	t.Setenv("TEST_VA", "true") | ||||
|  | ||||
| 	err := ApplyEnvOverrides("", &data, ".") | ||||
| 	if err != nil { | ||||
| @@ -109,6 +112,7 @@ func TestApplyEnvOverridesSimple(t *testing.T) { | ||||
| 	tst.AssertEqual(t, data.V7, "AAAAAA") | ||||
| 	tst.AssertEqual(t, data.V8, time.Second*64) | ||||
| 	tst.AssertEqual(t, data.V9, time.Unix(1257894000, 0).UTC()) | ||||
| 	tst.AssertEqual(t, data.VA, true) | ||||
| } | ||||
|  | ||||
| func TestApplyEnvOverridesRecursive(t *testing.T) { | ||||
|   | ||||
| @@ -3,6 +3,7 @@ package cryptext | ||||
| import ( | ||||
| 	"crypto/rand" | ||||
| 	"crypto/sha256" | ||||
| 	"crypto/sha512" | ||||
| 	"encoding/base64" | ||||
| 	"encoding/hex" | ||||
| 	"errors" | ||||
| @@ -14,14 +15,15 @@ import ( | ||||
| 	"strings" | ||||
| ) | ||||
|  | ||||
| const LatestPassHashVersion = 4 | ||||
| const LatestPassHashVersion = 5 | ||||
|  | ||||
| // PassHash | ||||
| // - [v0]: plaintext password ( `0|...` ) | ||||
| // - [v1]: sha256(plaintext) | ||||
| // - [v2]: seed | sha256<seed>(plaintext) | ||||
| // - [v3]: seed | sha256<seed>(plaintext) | [hex(totp)] | ||||
| // - [v4]: bcrypt(plaintext) | [hex(totp)] | ||||
| // - [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) | ||||
| type PassHash string | ||||
|  | ||||
| func (ph PassHash) Valid() bool { | ||||
| @@ -109,7 +111,21 @@ 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[3]) | ||||
| 			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]) | ||||
| 			totp = true | ||||
| 		} | ||||
| 		return int(version), nil, payload, totp, totpsecret, true | ||||
| @@ -156,6 +172,14 @@ 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 | ||||
| } | ||||
|  | ||||
| @@ -209,6 +233,12 @@ 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") | ||||
| } | ||||
|  | ||||
| @@ -242,6 +272,12 @@ 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") | ||||
| } | ||||
|  | ||||
| @@ -271,6 +307,10 @@ 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") | ||||
| } | ||||
|  | ||||
| @@ -279,7 +319,24 @@ func (ph PassHash) String() string { | ||||
| } | ||||
|  | ||||
| func HashPassword(plainpass string, totpSecret []byte) (PassHash, error) { | ||||
| 	return HashPasswordV4(plainpass, totpSecret) | ||||
| 	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 | ||||
| } | ||||
|  | ||||
| func HashPasswordV4(plainpass string, totpSecret []byte) (PassHash, error) { | ||||
| @@ -340,6 +397,13 @@ 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)) | ||||
|   | ||||
							
								
								
									
										210
									
								
								cryptext/passHash_test.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										210
									
								
								cryptext/passHash_test.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,210 @@ | ||||
| package cryptext | ||||
|  | ||||
| import ( | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/langext" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/totpext" | ||||
| 	"gogs.mikescher.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)) | ||||
| } | ||||
							
								
								
									
										8
									
								
								cursortoken/direction.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										8
									
								
								cursortoken/direction.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,8 @@ | ||||
| package cursortoken | ||||
|  | ||||
| type SortDirection string //@enum:type | ||||
|  | ||||
| const ( | ||||
| 	SortASC  SortDirection = "ASC" | ||||
| 	SortDESC SortDirection = "DESC" | ||||
| ) | ||||
							
								
								
									
										10
									
								
								cursortoken/filter.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										10
									
								
								cursortoken/filter.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,10 @@ | ||||
| package cursortoken | ||||
|  | ||||
| import ( | ||||
| 	"go.mongodb.org/mongo-driver/mongo" | ||||
| ) | ||||
|  | ||||
| type Filter interface { | ||||
| 	FilterQuery() mongo.Pipeline | ||||
| 	Pagination() (string, SortDirection, string, SortDirection) | ||||
| } | ||||
							
								
								
									
										184
									
								
								cursortoken/token.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										184
									
								
								cursortoken/token.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,184 @@ | ||||
| package cursortoken | ||||
|  | ||||
| import ( | ||||
| 	"encoding/base32" | ||||
| 	"encoding/json" | ||||
| 	"errors" | ||||
| 	"go.mongodb.org/mongo-driver/bson/primitive" | ||||
| 	"strings" | ||||
| 	"time" | ||||
| ) | ||||
|  | ||||
| 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 | ||||
| } | ||||
|  | ||||
| type CursorToken struct { | ||||
| 	Mode               Mode | ||||
| 	ValuePrimary       string | ||||
| 	ValueSecondary     string | ||||
| 	Direction          SortDirection | ||||
| 	DirectionSecondary SortDirection | ||||
| 	PageSize           int | ||||
| 	Extra              Extra | ||||
| } | ||||
|  | ||||
| type cursorTokenSerialize 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 Start() CursorToken { | ||||
| 	return CursorToken{ | ||||
| 		Mode:               CTMStart, | ||||
| 		ValuePrimary:       "", | ||||
| 		ValueSecondary:     "", | ||||
| 		Direction:          "", | ||||
| 		DirectionSecondary: "", | ||||
| 		PageSize:           0, | ||||
| 		Extra:              Extra{}, | ||||
| 	} | ||||
| } | ||||
|  | ||||
| func End() CursorToken { | ||||
| 	return CursorToken{ | ||||
| 		Mode:               CTMEnd, | ||||
| 		ValuePrimary:       "", | ||||
| 		ValueSecondary:     "", | ||||
| 		Direction:          "", | ||||
| 		DirectionSecondary: "", | ||||
| 		PageSize:           0, | ||||
| 		Extra:              Extra{}, | ||||
| 	} | ||||
| } | ||||
|  | ||||
| func (c *CursorToken) 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 := cursorTokenSerialize{} | ||||
|  | ||||
| 	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 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.HasPrefix(tok, "tok_") { | ||||
| 		return CursorToken{}, errors.New("could not decode token, missing prefix") | ||||
| 	} | ||||
|  | ||||
| 	body, err := base32.StdEncoding.DecodeString(tok[len("tok_"):]) | ||||
| 	if err != nil { | ||||
| 		return CursorToken{}, err | ||||
| 	} | ||||
|  | ||||
| 	var tokenDeserialize cursorTokenSerialize | ||||
| 	err = json.Unmarshal(body, &tokenDeserialize) | ||||
| 	if err != nil { | ||||
| 		return CursorToken{}, err | ||||
| 	} | ||||
|  | ||||
| 	token := CursorToken{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 | ||||
| } | ||||
|  | ||||
| func (c *CursorToken) ValuePrimaryObjectId() (primitive.ObjectID, bool) { | ||||
| 	if oid, err := primitive.ObjectIDFromHex(c.ValuePrimary); err == nil { | ||||
| 		return oid, true | ||||
| 	} else { | ||||
| 		return primitive.ObjectID{}, false | ||||
| 	} | ||||
| } | ||||
|  | ||||
| func (c *CursorToken) ValueSecondaryObjectId() (primitive.ObjectID, bool) { | ||||
| 	if oid, err := primitive.ObjectIDFromHex(c.ValueSecondary); err == nil { | ||||
| 		return oid, true | ||||
| 	} else { | ||||
| 		return primitive.ObjectID{}, false | ||||
| 	} | ||||
| } | ||||
| @@ -7,6 +7,9 @@ type SyncSet[TData comparable] struct { | ||||
| 	lock sync.Mutex | ||||
| } | ||||
|  | ||||
| // Add adds `value` to the set | ||||
| // returns true  if the value was actually inserted | ||||
| // returns false if the value already existed | ||||
| func (s *SyncSet[TData]) Add(value TData) bool { | ||||
| 	s.lock.Lock() | ||||
| 	defer s.lock.Unlock() | ||||
| @@ -15,10 +18,10 @@ func (s *SyncSet[TData]) Add(value TData) bool { | ||||
| 		s.data = make(map[TData]bool) | ||||
| 	} | ||||
|  | ||||
| 	_, ok := s.data[value] | ||||
| 	_, existsInPreState := s.data[value] | ||||
| 	s.data[value] = true | ||||
|  | ||||
| 	return !ok | ||||
| 	return !existsInPreState | ||||
| } | ||||
|  | ||||
| func (s *SyncSet[TData]) AddAll(values []TData) { | ||||
|   | ||||
							
								
								
									
										24
									
								
								enums/enum.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										24
									
								
								enums/enum.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,24 @@ | ||||
| package enums | ||||
|  | ||||
| type Enum interface { | ||||
| 	Valid() bool | ||||
| 	ValuesAny() []any | ||||
| 	ValuesMeta() []EnumMetaValue | ||||
| 	VarName() string | ||||
| } | ||||
|  | ||||
| type StringEnum interface { | ||||
| 	Enum | ||||
| 	String() string | ||||
| } | ||||
|  | ||||
| type DescriptionEnum interface { | ||||
| 	Enum | ||||
| 	Description() string | ||||
| } | ||||
|  | ||||
| type EnumMetaValue struct { | ||||
| 	VarName     string  `json:"varName"` | ||||
| 	Value       any     `json:"value"` | ||||
| 	Description *string `json:"description"` | ||||
| } | ||||
							
								
								
									
										477
									
								
								exerr/builder.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										477
									
								
								exerr/builder.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,477 @@ | ||||
| package exerr | ||||
|  | ||||
| import ( | ||||
| 	"bytes" | ||||
| 	"context" | ||||
| 	"encoding/json" | ||||
| 	"fmt" | ||||
| 	"github.com/gin-gonic/gin" | ||||
| 	"github.com/rs/zerolog" | ||||
| 	"go.mongodb.org/mongo-driver/bson/primitive" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/dataext" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/enums" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/langext" | ||||
| 	"net/http" | ||||
| 	"os" | ||||
| 	"runtime/debug" | ||||
| 	"strings" | ||||
| 	"time" | ||||
| ) | ||||
|  | ||||
| // | ||||
| // ==== 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 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 | ||||
| // | ||||
|  | ||||
| var stackSkipLogger zerolog.Logger | ||||
|  | ||||
| func init() { | ||||
| 	cw := zerolog.ConsoleWriter{ | ||||
| 		Out:        os.Stdout, | ||||
| 		TimeFormat: "2006-01-02 15:04:05 Z07:00", | ||||
| 	} | ||||
|  | ||||
| 	multi := zerolog.MultiLevelWriter(cw) | ||||
| 	stackSkipLogger = zerolog.New(multi).With().Timestamp().CallerWithSkipFrameCount(4).Logger() | ||||
| } | ||||
|  | ||||
| type Builder struct { | ||||
| 	errorData       *ExErr | ||||
| 	containsGinData 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 | ||||
| 	} | ||||
|  | ||||
| 	if !pkgconfig.RecursiveErrors { | ||||
| 		v := FromError(err) | ||||
| 		v.Message = msg | ||||
| 		return &Builder{errorData: v} | ||||
| 	} | ||||
| 	return &Builder{errorData: wrapExErr(FromError(err), 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) WithStackSkip(stacktraceskip int) *Builder { | ||||
| 	b.errorData.Caller = callername(stacktraceskip) | ||||
| 	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) 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 val == nil { | ||||
| 		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.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"))) | ||||
| 					} | ||||
| 				} | ||||
| 			} | ||||
| 		} | ||||
|  | ||||
| 	} | ||||
|  | ||||
| 	b.containsGinData = true | ||||
| 	return b | ||||
| } | ||||
|  | ||||
| func formatHeader(header map[string][]string) string { | ||||
| 	ml := 1 | ||||
| 	for k, _ := range header { | ||||
| 		if len(k) > ml { | ||||
| 			ml = len(k) | ||||
| 		} | ||||
| 	} | ||||
| 	r := "" | ||||
| 	for k, v := range header { | ||||
| 		if r != "" { | ||||
| 			r += "\n" | ||||
| 		} | ||||
| 		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 += langext.StrPadRight(k, " ", ml) + " := " + value | ||||
| 		} | ||||
| 	} | ||||
| 	return r | ||||
| } | ||||
|  | ||||
| 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 | ||||
| } | ||||
|  | ||||
| // ---------------------------------------------------------------------------- | ||||
|  | ||||
| // 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 | ||||
| func (b *Builder) Build() error { | ||||
| 	warnOnPkgConfigNotInitialized() | ||||
|  | ||||
| 	if pkgconfig.ZeroLogErrTraces && (b.errorData.Severity == SevErr || b.errorData.Severity == SevFatal) { | ||||
| 		b.errorData.ShortLog(stackSkipLogger.Error()) | ||||
| 	} else if pkgconfig.ZeroLogAllTraces { | ||||
| 		b.errorData.ShortLog(stackSkipLogger.Error()) | ||||
| 	} | ||||
|  | ||||
| 	b.CallListener(MethodBuild) | ||||
|  | ||||
| 	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) { | ||||
| 	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.errorData.Output(g) | ||||
|  | ||||
| 	if b.errorData.Severity == SevErr || b.errorData.Severity == SevFatal { | ||||
| 		b.errorData.Log(stackSkipLogger.Error()) | ||||
| 	} else if b.errorData.Severity == SevWarn { | ||||
| 		b.errorData.Log(stackSkipLogger.Warn()) | ||||
| 	} | ||||
|  | ||||
| 	b.CallListener(MethodOutput) | ||||
| } | ||||
|  | ||||
| // Print prints the error | ||||
| // If the error is SevErr we also send it to the error-service | ||||
| func (b *Builder) Print() { | ||||
| 	if b.errorData.Severity == SevErr || b.errorData.Severity == SevFatal { | ||||
| 		b.errorData.Log(stackSkipLogger.Error()) | ||||
| 	} else if b.errorData.Severity == SevWarn { | ||||
| 		b.errorData.ShortLog(stackSkipLogger.Warn()) | ||||
| 	} | ||||
|  | ||||
| 	b.CallListener(MethodPrint) | ||||
| } | ||||
|  | ||||
| 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() { | ||||
| 	b.errorData.Severity = SevFatal | ||||
| 	b.errorData.Log(stackSkipLogger.WithLevel(zerolog.FatalLevel)) | ||||
|  | ||||
| 	b.CallListener(MethodFatal) | ||||
|  | ||||
| 	os.Exit(1) | ||||
| } | ||||
|  | ||||
| // ---------------------------------------------------------------------------- | ||||
|  | ||||
| func (b *Builder) addMeta(key string, mdtype metaDataType, val interface{}) *Builder { | ||||
| 	b.errorData.Meta.add(key, mdtype, val) | ||||
| 	return b | ||||
| } | ||||
							
								
								
									
										204
									
								
								exerr/constructor.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										204
									
								
								exerr/constructor.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,204 @@ | ||||
| package exerr | ||||
|  | ||||
| import ( | ||||
| 	"encoding/json" | ||||
| 	"fmt" | ||||
| 	"go.mongodb.org/mongo-driver/bson/primitive" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/langext" | ||||
| 	"reflect" | ||||
| 	"time" | ||||
| ) | ||||
|  | ||||
| var reflectTypeStr = reflect.TypeOf("") | ||||
|  | ||||
| func FromError(err error) *ExErr { | ||||
| 	if verr, ok := err.(*ExErr); ok { | ||||
| 		// A simple ExErr | ||||
| 		return verr | ||||
| 	} | ||||
|  | ||||
| 	// 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), | ||||
| 	} | ||||
| } | ||||
|  | ||||
| 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), | ||||
| 	} | ||||
| } | ||||
|  | ||||
| func wrapExErr(e *ExErr, msg string, cat ErrorCategory, stacktraceskip int) *ExErr { | ||||
| 	return &ExErr{ | ||||
| 		UniqueID:       newID(), | ||||
| 		Category:       cat, | ||||
| 		Type:           TypeWrap, | ||||
| 		Severity:       SevErr, | ||||
| 		Timestamp:      time.Now(), | ||||
| 		StatusCode:     e.StatusCode, | ||||
| 		Message:        msg, | ||||
| 		WrappedErrType: "", | ||||
| 		WrappedErr:     nil, | ||||
| 		Caller:         callername(1 + stacktraceskip), | ||||
| 		OriginalError:  e, | ||||
| 		Meta:           make(map[string]MetaValue), | ||||
| 	} | ||||
| } | ||||
|  | ||||
| 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 { | ||||
| 		panic(err) // gets recovered later up | ||||
| 	} | ||||
|  | ||||
| 	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 | ||||
| } | ||||
							
								
								
									
										81
									
								
								exerr/data.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										81
									
								
								exerr/data.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,81 @@ | ||||
| package exerr | ||||
|  | ||||
| import ( | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/dataext" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/langext" | ||||
| ) | ||||
|  | ||||
| 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 | ||||
| ) | ||||
|  | ||||
| //goland:noinspection GoUnusedGlobalVariable | ||||
| var AllCategories = []ErrorCategory{CatWrap, CatSystem, CatUser, CatForeign} | ||||
|  | ||||
| type ErrorSeverity struct{ Severity string } | ||||
|  | ||||
| var ( | ||||
| 	SevTrace = ErrorSeverity{"Trace"} | ||||
| 	SevDebug = ErrorSeverity{"Debug"} | ||||
| 	SevInfo  = ErrorSeverity{"Info"} | ||||
| 	SevWarn  = ErrorSeverity{"Warn"} | ||||
| 	SevErr   = ErrorSeverity{"Err"} | ||||
| 	SevFatal = ErrorSeverity{"Fatal"} | ||||
| ) | ||||
|  | ||||
| //goland:noinspection GoUnusedGlobalVariable | ||||
| var AllSeverities = []ErrorSeverity{SevTrace, SevDebug, SevInfo, SevWarn, SevErr, SevFatal} | ||||
|  | ||||
| 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)) | ||||
|  | ||||
| 	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)) | ||||
|  | ||||
| 	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)) | ||||
|  | ||||
| 	TypeUnauthorized = NewType("UNAUTHORIZED", langext.Ptr(401)) | ||||
| 	TypeAuthFailed   = NewType("AUTH_FAILED", langext.Ptr(401)) | ||||
|  | ||||
| 	// other values come the used package | ||||
| ) | ||||
|  | ||||
| var registeredTypes = dataext.SyncSet[string]{} | ||||
|  | ||||
| func NewType(key string, defStatusCode *int) ErrorType { | ||||
| 	insertOkay := registeredTypes.Add(key) | ||||
| 	if !insertOkay { | ||||
| 		panic("Cannot register same ErrType ('" + key + "') more than once") | ||||
| 	} | ||||
|  | ||||
| 	return ErrorType{key, defStatusCode} | ||||
| } | ||||
|  | ||||
| type LogPrintLevel string | ||||
|  | ||||
| const ( | ||||
| 	LogPrintFull     LogPrintLevel = "Full" | ||||
| 	LogPrintOverview LogPrintLevel = "Overview" | ||||
| 	LogPrintShort    LogPrintLevel = "Short" | ||||
| ) | ||||
							
								
								
									
										80
									
								
								exerr/errinit.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										80
									
								
								exerr/errinit.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,80 @@ | ||||
| package exerr | ||||
|  | ||||
| import ( | ||||
| 	"fmt" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/langext" | ||||
| ) | ||||
|  | ||||
| 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 | ||||
| } | ||||
|  | ||||
| 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) | ||||
| } | ||||
|  | ||||
| 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) {}, | ||||
| } | ||||
|  | ||||
| // 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) {} | ||||
|  | ||||
| 	if cfg.ExtendGinOutput != nil { | ||||
| 		ego = cfg.ExtendGinOutput | ||||
| 	} | ||||
| 	if cfg.ExtendGinDataOutput != nil { | ||||
| 		egdo = cfg.ExtendGinDataOutput | ||||
| 	} | ||||
|  | ||||
| 	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, | ||||
| 	} | ||||
|  | ||||
| 	initialized = true | ||||
| } | ||||
|  | ||||
| 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") | ||||
| 	} | ||||
| } | ||||
							
								
								
									
										314
									
								
								exerr/exerr.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										314
									
								
								exerr/exerr.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,314 @@ | ||||
| package exerr | ||||
|  | ||||
| import ( | ||||
| 	"github.com/rs/xid" | ||||
| 	"github.com/rs/zerolog" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/langext" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/rext" | ||||
| 	"reflect" | ||||
| 	"regexp" | ||||
| 	"strconv" | ||||
| 	"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"` | ||||
|  | ||||
| 	Meta MetaMap `json:"meta"` | ||||
| } | ||||
|  | ||||
| func (ee *ExErr) Error() string { | ||||
| 	return ee.Message | ||||
| } | ||||
|  | ||||
| // Unwrap must be implemented so that some error.XXX methods work | ||||
| func (ee *ExErr) Unwrap() error { | ||||
| 	if ee.OriginalError == nil { | ||||
| 		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) { | ||||
| 	backup := zerolog.CallerMarshalFunc | ||||
| 	zerolog.CallerMarshalFunc = customZerologCallerMarshalFunc | ||||
| 	evt.Msg(ee.FormatLog(LogPrintFull)) | ||||
| 	zerolog.CallerMarshalFunc = backup | ||||
| } | ||||
|  | ||||
| func (ee *ExErr) FormatLog(lvl LogPrintLevel) string { | ||||
| 	if lvl == LogPrintShort { | ||||
|  | ||||
| 		msg := ee.Message | ||||
| 		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" | ||||
|  | ||||
| 		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" | ||||
|  | ||||
| 		indent := "" | ||||
| 		for curr := ee; curr != nil; curr = curr.OriginalError { | ||||
| 			indent += "  " | ||||
|  | ||||
| 			etype := ee.Type.Key | ||||
| 			if ee.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) { | ||||
| 	backup := zerolog.CallerMarshalFunc | ||||
| 	zerolog.CallerMarshalFunc = customZerologCallerMarshalFunc | ||||
| 	ee.Meta.Apply(evt).Msg(ee.FormatLog(LogPrintShort)) | ||||
| 	zerolog.CallerMarshalFunc = backup | ||||
| } | ||||
|  | ||||
| // RecursiveMessage returns the message to show | ||||
| // = first error (top-down) that is not wrapping/foreign/empty | ||||
| func (ee *ExErr) RecursiveMessage() string { | ||||
| 	for curr := ee; curr != nil; curr = curr.OriginalError { | ||||
| 		if curr.Message != "" && curr.Category != CatWrap && curr.Category != CatForeign { | ||||
| 			return curr.Message | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
| 	// fallback to self | ||||
| 	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 | ||||
| 	} | ||||
| } | ||||
|  | ||||
| // 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() | ||||
| } | ||||
|  | ||||
| var regexZerologCallerClean = rext.W(regexp.MustCompile(`^(\.\./)*/?go/pkg/mod/gogs\.(mikescher|blackforestbytes)\.(com|de)/!black!forest!bytes/?`)) | ||||
|  | ||||
| func customZerologCallerMarshalFunc(pc uintptr, file string, line int) string { | ||||
| 	file = regexZerologCallerClean.ReplaceAll(file, "", true) | ||||
| 	return file + ":" + strconv.Itoa(line) | ||||
| } | ||||
							
								
								
									
										93
									
								
								exerr/exerr_test.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										93
									
								
								exerr/exerr_test.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,93 @@ | ||||
| package exerr | ||||
|  | ||||
| import ( | ||||
| 	"errors" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/tst" | ||||
| 	"testing" | ||||
| ) | ||||
|  | ||||
| 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) | ||||
| 	} | ||||
| } | ||||
							
								
								
									
										112
									
								
								exerr/gin.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										112
									
								
								exerr/gin.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,112 @@ | ||||
| package exerr | ||||
|  | ||||
| import ( | ||||
| 	"github.com/gin-gonic/gin" | ||||
| 	json "gogs.mikescher.com/BlackForestBytes/goext/gojson" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/langext" | ||||
| 	"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 | ||||
| 	} | ||||
| 	if ee.Type != TypeWrap { | ||||
| 		ginJson["type"] = ee.Type | ||||
| 	} | ||||
| 	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 | ||||
| 	} | ||||
| 	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 | ||||
| 	} | ||||
|  | ||||
| 	if applyExtendListener { | ||||
| 		pkgconfig.ExtendGinDataOutput(ee, depth, ginJson) | ||||
| 	} | ||||
|  | ||||
| 	return ginJson | ||||
| } | ||||
|  | ||||
| // 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) | ||||
| 	} | ||||
|  | ||||
| 	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}) | ||||
| } | ||||
							
								
								
									
										88
									
								
								exerr/helper.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										88
									
								
								exerr/helper.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,88 @@ | ||||
| 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 | ||||
| } | ||||
							
								
								
									
										37
									
								
								exerr/listener.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										37
									
								
								exerr/listener.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,37 @@ | ||||
| package exerr | ||||
|  | ||||
| import ( | ||||
| 	"sync" | ||||
| ) | ||||
|  | ||||
| type Method string | ||||
|  | ||||
| const ( | ||||
| 	MethodOutput Method = "OUTPUT" | ||||
| 	MethodPrint  Method = "PRINT" | ||||
| 	MethodBuild  Method = "BUILD" | ||||
| 	MethodFatal  Method = "FATAL" | ||||
| ) | ||||
|  | ||||
| type Listener = func(method Method, v *ExErr) | ||||
|  | ||||
| var listenerLock = sync.Mutex{} | ||||
| var listener = make([]Listener, 0) | ||||
|  | ||||
| func RegisterListener(l Listener) { | ||||
| 	listenerLock.Lock() | ||||
| 	defer listenerLock.Unlock() | ||||
|  | ||||
| 	listener = append(listener, l) | ||||
| } | ||||
|  | ||||
| func (b *Builder) CallListener(m Method) { | ||||
| 	valErr := b.errorData | ||||
|  | ||||
| 	listenerLock.Lock() | ||||
| 	defer listenerLock.Unlock() | ||||
|  | ||||
| 	for _, v := range listener { | ||||
| 		v(m, valErr) | ||||
| 	} | ||||
| } | ||||
							
								
								
									
										724
									
								
								exerr/meta.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										724
									
								
								exerr/meta.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,724 @@ | ||||
| package exerr | ||||
|  | ||||
| import ( | ||||
| 	"encoding/hex" | ||||
| 	"encoding/json" | ||||
| 	"errors" | ||||
| 	"fmt" | ||||
| 	"github.com/rs/zerolog" | ||||
| 	"go.mongodb.org/mongo-driver/bson" | ||||
| 	"go.mongodb.org/mongo-driver/bson/primitive" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/langext" | ||||
| 	"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) *zerolog.Event { | ||||
| 	switch v.DataType { | ||||
| 	case MDTString: | ||||
| 		return evt.Str(key, v.Value.(string)) | ||||
| 	case MDTID: | ||||
| 		return evt.Str(key, v.Value.(IDWrap).Value) | ||||
| 	case MDTAny: | ||||
| 		if v.Value.(AnyWrap).IsError { | ||||
| 			return evt.Str(key, "(err)") | ||||
| 		} else { | ||||
| 			return evt.Str(key, v.Value.(AnyWrap).Json) | ||||
| 		} | ||||
| 	case MDTStringPtr: | ||||
| 		if langext.IsNil(v.Value) { | ||||
| 			return evt.Str(key, "<<null>>") | ||||
| 		} | ||||
| 		return evt.Str(key, langext.CoalesceString(v.Value.(*string), "<<null>>")) | ||||
| 	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 | ||||
| 	} | ||||
| 	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 | ||||
| 		} | ||||
|  | ||||
| 		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) *zerolog.Event { | ||||
| 	for key, val := range mm { | ||||
| 		evt = val.Apply(key, evt) | ||||
| 	} | ||||
| 	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 | ||||
| 		} | ||||
| 	} | ||||
| } | ||||
							
								
								
									
										14
									
								
								exerr/stacktrace.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										14
									
								
								exerr/stacktrace.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,14 @@ | ||||
| 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) | ||||
| } | ||||
							
								
								
									
										189
									
								
								exerr/typeWrapper.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										189
									
								
								exerr/typeWrapper.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,189 @@ | ||||
| package exerr | ||||
|  | ||||
| import ( | ||||
| 	"encoding/json" | ||||
| 	"fmt" | ||||
| 	"github.com/rs/zerolog/log" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/enums" | ||||
| 	"gogs.mikescher.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} | ||||
| 	} | ||||
| } | ||||
							
								
								
									
										59
									
								
								ginext/appContext.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										59
									
								
								ginext/appContext.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,59 @@ | ||||
| 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 (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 "" | ||||
| 	} | ||||
| } | ||||
							
								
								
									
										23
									
								
								ginext/commonHandler.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										23
									
								
								ginext/commonHandler.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,23 @@ | ||||
| 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) | ||||
| 	} | ||||
| } | ||||
							
								
								
									
										12
									
								
								ginext/commonMiddlewares.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										12
									
								
								ginext/commonMiddlewares.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,12 @@ | ||||
| package ginext | ||||
|  | ||||
| import ( | ||||
| 	"github.com/gin-gonic/gin" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/dataext" | ||||
| ) | ||||
|  | ||||
| func BodyBuffer(g *gin.Context) { | ||||
| 	if g.Request.Body != nil { | ||||
| 		g.Request.Body = dataext.NewBufferedReadCloser(g.Request.Body) | ||||
| 	} | ||||
| } | ||||
							
								
								
									
										21
									
								
								ginext/cors.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										21
									
								
								ginext/cors.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,21 @@ | ||||
| package ginext | ||||
|  | ||||
| import ( | ||||
| 	"github.com/gin-gonic/gin" | ||||
| 	"net/http" | ||||
| ) | ||||
|  | ||||
| func CorsMiddleware() 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", "Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization, accept, origin, Cache-Control, X-Requested-With") | ||||
| 		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() | ||||
| 		} | ||||
| 	} | ||||
| } | ||||
							
								
								
									
										149
									
								
								ginext/engine.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										149
									
								
								ginext/engine.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,149 @@ | ||||
| package ginext | ||||
|  | ||||
| import ( | ||||
| 	"fmt" | ||||
| 	"github.com/gin-gonic/gin" | ||||
| 	"github.com/rs/zerolog/log" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/langext" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/mathext" | ||||
| 	"net" | ||||
| 	"net/http" | ||||
| 	"strings" | ||||
| 	"time" | ||||
| ) | ||||
|  | ||||
| type GinWrapper struct { | ||||
| 	engine          *gin.Engine | ||||
| 	SuppressGinLogs bool | ||||
|  | ||||
| 	allowCors      bool | ||||
| 	ginDebug       bool | ||||
| 	bufferBody     bool | ||||
| 	requestTimeout time.Duration | ||||
|  | ||||
| 	routeSpecs []ginRouteSpec | ||||
| } | ||||
|  | ||||
| type ginRouteSpec struct { | ||||
| 	Method      string | ||||
| 	URL         string | ||||
| 	Middlewares []string | ||||
| 	Handler     string | ||||
| } | ||||
|  | ||||
| // NewEngine creates a new (wrapped) ginEngine | ||||
| // Parameters are: | ||||
| // - [allowCors]    Add cors handler to allow all CORS requests on the default http methods | ||||
| // - [ginDebug]     Set gin.debug to true (adds more logs) | ||||
| // - [bufferBody]   Buffers the input body stream, this way the ginext error handler can later include the whole request body | ||||
| // - [timeout]      The default handler timeout | ||||
| func NewEngine(allowCors bool, ginDebug bool, bufferBody bool, timeout time.Duration) *GinWrapper { | ||||
| 	engine := gin.New() | ||||
|  | ||||
| 	wrapper := &GinWrapper{ | ||||
| 		engine:          engine, | ||||
| 		SuppressGinLogs: false, | ||||
| 		allowCors:       allowCors, | ||||
| 		ginDebug:        ginDebug, | ||||
| 		bufferBody:      bufferBody, | ||||
| 		requestTimeout:  timeout, | ||||
| 	} | ||||
|  | ||||
| 	engine.RedirectFixedPath = false | ||||
| 	engine.RedirectTrailingSlash = false | ||||
|  | ||||
| 	if allowCors { | ||||
| 		engine.Use(CorsMiddleware()) | ||||
| 	} | ||||
|  | ||||
| 	// do not debug-print routes | ||||
| 	gin.DebugPrintRouteFunc = func(_, _, _ string, _ int) {} | ||||
|  | ||||
| 	if ginDebug { | ||||
| 		gin.SetMode(gin.ReleaseMode) | ||||
|  | ||||
| 		ginlogger := gin.Logger() | ||||
| 		engine.Use(func(context *gin.Context) { | ||||
| 			if !wrapper.SuppressGinLogs { | ||||
| 				ginlogger(context) | ||||
| 			} | ||||
| 		}) | ||||
| 	} else { | ||||
| 		gin.SetMode(gin.DebugMode) | ||||
| 	} | ||||
|  | ||||
| 	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(spec.Middlewares, " -> "), | ||||
| 			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])) | ||||
| 	} | ||||
|  | ||||
| 	for _, line := range lines { | ||||
|  | ||||
| 		fmt.Printf("Gin-Route: %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])) | ||||
| 	} | ||||
| } | ||||
							
								
								
									
										39
									
								
								ginext/funcWrapper.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										39
									
								
								ginext/funcWrapper.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,39 @@ | ||||
| package ginext | ||||
|  | ||||
| import ( | ||||
| 	"fmt" | ||||
| 	"github.com/gin-gonic/gin" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/exerr" | ||||
| ) | ||||
|  | ||||
| type WHandlerFunc func(PreContext) HTTPResponse | ||||
|  | ||||
| func Wrap(w *GinWrapper, fn WHandlerFunc) gin.HandlerFunc { | ||||
|  | ||||
| 	return func(g *gin.Context) { | ||||
|  | ||||
| 		reqctx := g.Request.Context() | ||||
|  | ||||
| 		wrap, stackTrace, panicObj := callPanicSafe(fn, PreContext{wrapper: w, ginCtx: g}) | ||||
| 		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 reqctx.Err() == nil { | ||||
| 			wrap.Write(g) | ||||
| 		} | ||||
| 	} | ||||
| } | ||||
							
								
								
									
										145
									
								
								ginext/preContext.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										145
									
								
								ginext/preContext.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,145 @@ | ||||
| package ginext | ||||
|  | ||||
| import ( | ||||
| 	"context" | ||||
| 	"fmt" | ||||
| 	"github.com/gin-gonic/gin" | ||||
| 	"github.com/gin-gonic/gin/binding" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/exerr" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/langext" | ||||
| 	"runtime/debug" | ||||
| 	"time" | ||||
| ) | ||||
|  | ||||
| type PreContext struct { | ||||
| 	ginCtx  *gin.Context | ||||
| 	wrapper *GinWrapper | ||||
| 	uri     any | ||||
| 	query   any | ||||
| 	body    any | ||||
| 	form    any | ||||
| 	header  any | ||||
| 	timeout *time.Duration | ||||
| } | ||||
|  | ||||
| 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) 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) 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 nil, nil, langext.Ptr(Error(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 nil, nil, langext.Ptr(Error(err)) | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
| 	if pctx.body != nil { | ||||
| 		if pctx.ginCtx.ContentType() == "application/json" { | ||||
| 			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 nil, nil, langext.Ptr(Error(err)) | ||||
| 			} | ||||
| 		} else { | ||||
| 			err := exerr.New(exerr.TypeBindFailJSON, "missing JSON body"). | ||||
| 				Str("struct_type", fmt.Sprintf("%T", pctx.body)). | ||||
| 				Build() | ||||
| 			return nil, nil, langext.Ptr(Error(err)) | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
| 	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 nil, nil, langext.Ptr(Error(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 nil, nil, langext.Ptr(Error(err)) | ||||
| 			} | ||||
| 		} else { | ||||
| 			err := exerr.New(exerr.TypeBindFailFormData, "missing form body"). | ||||
| 				Str("struct_type", fmt.Sprintf("%T", pctx.form)). | ||||
| 				Build() | ||||
| 			return nil, nil, langext.Ptr(Error(err)) | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
| 	if pctx.header != nil { | ||||
| 		if err := pctx.ginCtx.ShouldBindHeader(pctx.query); err != nil { | ||||
| 			err = exerr.Wrap(err, "Failed to read header"). | ||||
| 				WithType(exerr.TypeBindFailHeader). | ||||
| 				Str("struct_type", fmt.Sprintf("%T", pctx.query)). | ||||
| 				Build() | ||||
| 			return nil, nil, langext.Ptr(Error(err)) | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
| 	ictx, cancel := context.WithTimeout(context.Background(), langext.Coalesce(pctx.timeout, pctx.wrapper.requestTimeout)) | ||||
| 	actx := CreateAppContext(pctx.ginCtx, ictx, cancel) | ||||
|  | ||||
| 	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 | ||||
| } | ||||
							
								
								
									
										216
									
								
								ginext/response.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										216
									
								
								ginext/response.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,216 @@ | ||||
| package ginext | ||||
|  | ||||
| import ( | ||||
| 	"fmt" | ||||
| 	"github.com/gin-gonic/gin" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/exerr" | ||||
| 	json "gogs.mikescher.com/BlackForestBytes/goext/gojson" | ||||
| ) | ||||
|  | ||||
| type headerval struct { | ||||
| 	Key string | ||||
| 	Val string | ||||
| } | ||||
|  | ||||
| type HTTPResponse interface { | ||||
| 	Write(g *gin.Context) | ||||
| 	WithHeader(k string, v string) HTTPResponse | ||||
| } | ||||
|  | ||||
| type jsonHTTPResponse struct { | ||||
| 	statusCode int | ||||
| 	data       any | ||||
| 	headers    []headerval | ||||
| } | ||||
|  | ||||
| func (j jsonHTTPResponse) Write(g *gin.Context) { | ||||
| 	for _, v := range j.headers { | ||||
| 		g.Header(v.Key, v.Val) | ||||
| 	} | ||||
| 	g.Render(j.statusCode, json.GoJsonRender{Data: j.data, NilSafeSlices: true, NilSafeMaps: true}) | ||||
| } | ||||
|  | ||||
| func (j jsonHTTPResponse) WithHeader(k string, v string) HTTPResponse { | ||||
| 	j.headers = append(j.headers, headerval{k, v}) | ||||
| 	return j | ||||
| } | ||||
|  | ||||
| type emptyHTTPResponse struct { | ||||
| 	statusCode int | ||||
| 	headers    []headerval | ||||
| } | ||||
|  | ||||
| func (j emptyHTTPResponse) Write(g *gin.Context) { | ||||
| 	for _, v := range j.headers { | ||||
| 		g.Header(v.Key, v.Val) | ||||
| 	} | ||||
| 	g.Status(j.statusCode) | ||||
| } | ||||
|  | ||||
| func (j emptyHTTPResponse) WithHeader(k string, v string) HTTPResponse { | ||||
| 	j.headers = append(j.headers, headerval{k, v}) | ||||
| 	return j | ||||
| } | ||||
|  | ||||
| type textHTTPResponse struct { | ||||
| 	statusCode int | ||||
| 	data       string | ||||
| 	headers    []headerval | ||||
| } | ||||
|  | ||||
| func (j textHTTPResponse) Write(g *gin.Context) { | ||||
| 	for _, v := range j.headers { | ||||
| 		g.Header(v.Key, v.Val) | ||||
| 	} | ||||
| 	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 | ||||
| } | ||||
|  | ||||
| type dataHTTPResponse struct { | ||||
| 	statusCode  int | ||||
| 	data        []byte | ||||
| 	contentType string | ||||
| 	headers     []headerval | ||||
| } | ||||
|  | ||||
| func (j dataHTTPResponse) Write(g *gin.Context) { | ||||
| 	for _, v := range j.headers { | ||||
| 		g.Header(v.Key, v.Val) | ||||
| 	} | ||||
| 	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 | ||||
| } | ||||
|  | ||||
| type fileHTTPResponse struct { | ||||
| 	mimetype string | ||||
| 	filepath string | ||||
| 	filename *string | ||||
| 	headers  []headerval | ||||
| } | ||||
|  | ||||
| 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) | ||||
| 	} | ||||
| 	g.File(j.filepath) | ||||
| } | ||||
|  | ||||
| func (j fileHTTPResponse) WithHeader(k string, v string) HTTPResponse { | ||||
| 	j.headers = append(j.headers, headerval{k, v}) | ||||
| 	return j | ||||
| } | ||||
|  | ||||
| type downloadDataHTTPResponse struct { | ||||
| 	statusCode int | ||||
| 	mimetype   string | ||||
| 	data       []byte | ||||
| 	filename   *string | ||||
| 	headers    []headerval | ||||
| } | ||||
|  | ||||
| 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) | ||||
| 	} | ||||
| 	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 | ||||
| } | ||||
|  | ||||
| type redirectHTTPResponse struct { | ||||
| 	statusCode int | ||||
| 	url        string | ||||
| 	headers    []headerval | ||||
| } | ||||
|  | ||||
| func (j redirectHTTPResponse) Write(g *gin.Context) { | ||||
| 	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 | ||||
| } | ||||
|  | ||||
| type jsonAPIErrResponse struct { | ||||
| 	err     *exerr.ExErr | ||||
| 	headers []headerval | ||||
| } | ||||
|  | ||||
| func (j jsonAPIErrResponse) Write(g *gin.Context) { | ||||
| 	j.err.Output(g) | ||||
| } | ||||
|  | ||||
| func (j jsonAPIErrResponse) WithHeader(k string, v string) HTTPResponse { | ||||
| 	j.headers = append(j.headers, headerval{k, v}) | ||||
| 	return j | ||||
| } | ||||
|  | ||||
| func Status(sc int) HTTPResponse { | ||||
| 	return &emptyHTTPResponse{statusCode: sc} | ||||
| } | ||||
|  | ||||
| func JSON(sc int, data any) HTTPResponse { | ||||
| 	return &jsonHTTPResponse{statusCode: sc, data: data} | ||||
| } | ||||
|  | ||||
| func Data(sc int, contentType string, data []byte) HTTPResponse { | ||||
| 	return &dataHTTPResponse{statusCode: sc, contentType: contentType, data: data} | ||||
| } | ||||
|  | ||||
| func Text(sc int, data string) HTTPResponse { | ||||
| 	return &textHTTPResponse{statusCode: sc, data: data} | ||||
| } | ||||
|  | ||||
| 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} | ||||
| } | ||||
|  | ||||
| func DownloadData(status int, mimetype string, filename string, data []byte) HTTPResponse { | ||||
| 	return &downloadDataHTTPResponse{statusCode: status, mimetype: mimetype, data: data, filename: &filename} | ||||
| } | ||||
|  | ||||
| func Redirect(sc int, newURL string) HTTPResponse { | ||||
| 	return &redirectHTTPResponse{statusCode: sc, url: newURL} | ||||
| } | ||||
|  | ||||
| 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()), | ||||
| 	} | ||||
| } | ||||
|  | ||||
| func NotImplemented() HTTPResponse { | ||||
| 	return Error(exerr.New(exerr.TypeNotImplemented, "").Build()) | ||||
| } | ||||
							
								
								
									
										211
									
								
								ginext/routes.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										211
									
								
								ginext/routes.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,211 @@ | ||||
| package ginext | ||||
|  | ||||
| import ( | ||||
| 	"github.com/gin-gonic/gin" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/langext" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/rext" | ||||
| 	"net/http" | ||||
| 	"path" | ||||
| 	"reflect" | ||||
| 	"regexp" | ||||
| 	"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} | ||||
| } | ||||
|  | ||||
| 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) 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 *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")] | ||||
| 	} | ||||
|  | ||||
| 	suffix := rext.W(regexp.MustCompile(`\.func[0-9]+(?:\.[0-9]+)*$`)) | ||||
|  | ||||
| 	if match, ok := suffix.MatchFirst(fname); ok { | ||||
| 		fname = fname[:len(fname)-match.FullMatch().Length()] | ||||
| 	} | ||||
|  | ||||
| 	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] | ||||
| } | ||||
							
								
								
									
										46
									
								
								go.mod
									
									
									
									
									
								
							
							
						
						
									
										46
									
								
								go.mod
									
									
									
									
									
								
							| @@ -3,12 +3,48 @@ module gogs.mikescher.com/BlackForestBytes/goext | ||||
| go 1.19 | ||||
|  | ||||
| require ( | ||||
| 	golang.org/x/sys v0.3.0 | ||||
| 	golang.org/x/term v0.3.0 | ||||
| 	github.com/gin-gonic/gin v1.9.1 | ||||
| 	github.com/jmoiron/sqlx v1.3.5 | ||||
| 	github.com/rs/xid v1.5.0 | ||||
| 	github.com/rs/zerolog v1.30.0 | ||||
| 	go.mongodb.org/mongo-driver v1.12.1 | ||||
| 	golang.org/x/crypto v0.12.0 | ||||
| 	golang.org/x/sys v0.11.0 | ||||
| 	golang.org/x/term v0.11.0 | ||||
| ) | ||||
|  | ||||
| require ( | ||||
| 	github.com/jmoiron/sqlx v1.3.5 // indirect | ||||
| 	go.mongodb.org/mongo-driver v1.11.1 // indirect | ||||
| 	golang.org/x/crypto v0.4.0 // indirect | ||||
| 	github.com/bytedance/sonic v1.10.0 // indirect | ||||
| 	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect | ||||
| 	github.com/chenzhuoyu/iasm v0.9.0 // indirect | ||||
| 	github.com/gabriel-vasile/mimetype v1.4.2 // indirect | ||||
| 	github.com/gin-contrib/sse v0.1.0 // indirect | ||||
| 	github.com/go-playground/locales v0.14.1 // indirect | ||||
| 	github.com/go-playground/universal-translator v0.18.1 // indirect | ||||
| 	github.com/go-playground/validator/v10 v10.15.1 // indirect | ||||
| 	github.com/goccy/go-json v0.10.2 // indirect | ||||
| 	github.com/golang/snappy v0.0.4 // indirect | ||||
| 	github.com/json-iterator/go v1.1.12 // indirect | ||||
| 	github.com/klauspost/compress v1.16.7 // indirect | ||||
| 	github.com/klauspost/cpuid/v2 v2.2.5 // indirect | ||||
| 	github.com/leodido/go-urn v1.2.4 // indirect | ||||
| 	github.com/mattn/go-colorable v0.1.13 // indirect | ||||
| 	github.com/mattn/go-isatty v0.0.19 // indirect | ||||
| 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect | ||||
| 	github.com/modern-go/reflect2 v1.0.2 // indirect | ||||
| 	github.com/montanaflynn/stats v0.7.1 // indirect | ||||
| 	github.com/pelletier/go-toml/v2 v2.0.9 // indirect | ||||
| 	github.com/pkg/errors v0.9.1 // indirect | ||||
| 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect | ||||
| 	github.com/ugorji/go/codec v1.2.11 // indirect | ||||
| 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect | ||||
| 	github.com/xdg-go/scram v1.1.2 // indirect | ||||
| 	github.com/xdg-go/stringprep v1.0.4 // indirect | ||||
| 	github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect | ||||
| 	golang.org/x/arch v0.4.0 // indirect | ||||
| 	golang.org/x/net v0.14.0 // indirect | ||||
| 	golang.org/x/sync v0.3.0 // indirect | ||||
| 	golang.org/x/text v0.12.0 // indirect | ||||
| 	google.golang.org/protobuf v1.31.0 // indirect | ||||
| 	gopkg.in/yaml.v3 v3.0.1 // indirect | ||||
| ) | ||||
|   | ||||
							
								
								
									
										177
									
								
								go.sum
									
									
									
									
									
								
							
							
						
						
									
										177
									
								
								go.sum
									
									
									
									
									
								
							| @@ -1,50 +1,223 @@ | ||||
| github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM= | ||||
| github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM= | ||||
| github.com/bytedance/sonic v1.10.0-rc2 h1:oDfRZ+4m6AYCOC0GFeOCeYqvBmucy1isvouS2K0cPzo= | ||||
| github.com/bytedance/sonic v1.10.0-rc2/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4= | ||||
| github.com/bytedance/sonic v1.10.0-rc3 h1:uNSnscRapXTwUgTyOF0GVljYD08p9X/Lbr9MweSV3V0= | ||||
| github.com/bytedance/sonic v1.10.0-rc3/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4= | ||||
| github.com/bytedance/sonic v1.10.0 h1:qtNZduETEIWJVIyDl01BeNxur2rW9OwTQ/yBqFRkKEk= | ||||
| github.com/bytedance/sonic v1.10.0/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4= | ||||
| github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY= | ||||
| github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk= | ||||
| github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d h1:77cEq6EriyTZ0g/qfRdp61a3Uu/AWrgIq2s0ClJV1g0= | ||||
| github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpVsBuRksnlj1mLy4AWzRNQYxauNi62uWcE3to6eA= | ||||
| github.com/chenzhuoyu/iasm v0.9.0 h1:9fhXjVzq5hUy2gkhhgHl95zG2cEAhw9OSGs8toWWAwo= | ||||
| github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= | ||||
| github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= | ||||
| github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= | ||||
| github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= | ||||
| github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= | ||||
| github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU= | ||||
| github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA= | ||||
| github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= | ||||
| github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= | ||||
| github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg= | ||||
| github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU= | ||||
| github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= | ||||
| github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= | ||||
| github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= | ||||
| github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= | ||||
| github.com/go-playground/validator/v10 v10.14.1 h1:9c50NUPC30zyuKprjL3vNZ0m5oG+jU0zvx4AqHGnv4k= | ||||
| github.com/go-playground/validator/v10 v10.14.1/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= | ||||
| github.com/go-playground/validator/v10 v10.15.0 h1:nDU5XeOKtB3GEa+uB7GNYwhVKsgjAR7VgKoNB6ryXfw= | ||||
| github.com/go-playground/validator/v10 v10.15.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= | ||||
| github.com/go-playground/validator/v10 v10.15.1 h1:BSe8uhN+xQ4r5guV/ywQI4gO59C2raYcGffYWZEjZzM= | ||||
| github.com/go-playground/validator/v10 v10.15.1/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= | ||||
| github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= | ||||
| github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= | ||||
| github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= | ||||
| github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= | ||||
| github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= | ||||
| github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= | ||||
| github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= | ||||
| github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= | ||||
| github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= | ||||
| github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= | ||||
| github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= | ||||
| github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= | ||||
| github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g= | ||||
| github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ= | ||||
| github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= | ||||
| github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= | ||||
| github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc= | ||||
| github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= | ||||
| github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= | ||||
| github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= | ||||
| github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= | ||||
| github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg= | ||||
| github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= | ||||
| github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M= | ||||
| github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= | ||||
| github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= | ||||
| github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= | ||||
| github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q= | ||||
| github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4= | ||||
| github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= | ||||
| github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= | ||||
| github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= | ||||
| github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= | ||||
| github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= | ||||
| github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= | ||||
| github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= | ||||
| github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= | ||||
| github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= | ||||
| github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= | ||||
| github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= | ||||
| github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= | ||||
| github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= | ||||
| github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= | ||||
| github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= | ||||
| github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= | ||||
| github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe h1:iruDEfMl2E6fbMZ9s0scYfZQ84/6SPL6zC8ACM2oIL0= | ||||
| github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= | ||||
| github.com/montanaflynn/stats v0.7.1 h1:etflOAAHORrCC44V+aR6Ftzort912ZU+YLiSTuV8eaE= | ||||
| github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow= | ||||
| github.com/pelletier/go-toml/v2 v2.0.9 h1:uH2qQXheeefCCkuBBSLi7jCiSmj3VRh2+Goq2N7Xxu0= | ||||
| github.com/pelletier/go-toml/v2 v2.0.9/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= | ||||
| github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= | ||||
| github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= | ||||
| github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= | ||||
| github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= | ||||
| github.com/rs/xid v1.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc= | ||||
| github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= | ||||
| github.com/rs/zerolog v1.29.0 h1:Zes4hju04hjbvkVkOhdl2HpZa+0PmVwigmo8XoORE5w= | ||||
| github.com/rs/zerolog v1.29.0/go.mod h1:NILgTygv/Uej1ra5XxGf82ZFSLk58MFGAUS2o6usyD0= | ||||
| github.com/rs/zerolog v1.29.1 h1:cO+d60CHkknCbvzEWxP0S9K6KqyTjrCNUy1LdQLCGPc= | ||||
| github.com/rs/zerolog v1.29.1/go.mod h1:Le6ESbR7hc+DP6Lt1THiV8CQSdkkNrd3R0XbEgp3ZBU= | ||||
| github.com/rs/zerolog v1.30.0 h1:SymVODrcRsaRaSInD9yQtKbtWqwsfoPcRff/oRXLj4c= | ||||
| github.com/rs/zerolog v1.30.0/go.mod h1:/tk+P47gFdPXq4QYjvCmT5/Gsug2nagsFWBWhAiSi1w= | ||||
| github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= | ||||
| github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= | ||||
| github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= | ||||
| github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= | ||||
| github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= | ||||
| github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= | ||||
| github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= | ||||
| github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= | ||||
| github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= | ||||
| github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= | ||||
| github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= | ||||
| github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= | ||||
| github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= | ||||
| github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= | ||||
| github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU= | ||||
| github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= | ||||
| github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= | ||||
| github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= | ||||
| github.com/xdg-go/scram v1.1.1 h1:VOMT+81stJgXW3CpHyqHN3AXDYIMsx56mEFrB37Mb/E= | ||||
| github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g= | ||||
| github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY= | ||||
| github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4= | ||||
| github.com/xdg-go/stringprep v1.0.3 h1:kdwGpVNwPFtjs98xCGkHjQtGKh86rDcRZN17QEMCOIs= | ||||
| github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8= | ||||
| github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8= | ||||
| github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM= | ||||
| github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d h1:splanxYIlg+5LfHAM6xpdFEAYOk8iySO56hMFq6uLyA= | ||||
| github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= | ||||
| go.mongodb.org/mongo-driver v1.11.1 h1:QP0znIRTuL0jf1oBQoAoM0C6ZJfBK4kx0Uumtv1A7w8= | ||||
| go.mongodb.org/mongo-driver v1.11.1/go.mod h1:s7p5vEtfbeR1gYi6pnj3c3/urpbLv2T5Sfd6Rp2HBB8= | ||||
| github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a h1:fZHgsYlfvtyqToslyjUt3VOPF4J7aK/3MPcK7xp3PDk= | ||||
| github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a/go.mod h1:ul22v+Nro/R083muKhosV54bj5niojjWZvU8xrevuH4= | ||||
| github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= | ||||
| go.mongodb.org/mongo-driver v1.11.2 h1:+1v2rDQUWNcGW7/7E0Jvdz51V38XXxJfhzbV17aNHCw= | ||||
| go.mongodb.org/mongo-driver v1.11.2/go.mod h1:s7p5vEtfbeR1gYi6pnj3c3/urpbLv2T5Sfd6Rp2HBB8= | ||||
| go.mongodb.org/mongo-driver v1.12.0 h1:aPx33jmn/rQuJXPQLZQ8NtfPQG8CaqgLThFtqRb0PiE= | ||||
| go.mongodb.org/mongo-driver v1.12.0/go.mod h1:AZkxhPnFJUoH7kZlFkVKucV20K387miPfm7oimrSmK0= | ||||
| go.mongodb.org/mongo-driver v1.12.1 h1:nLkghSU8fQNaK7oUmDhQFsnrtcoNy7Z6LVFKsEecqgE= | ||||
| go.mongodb.org/mongo-driver v1.12.1/go.mod h1:/rGBTebI3XYboVmgz+Wv3Bcbl3aD0QF9zl6kDDw18rQ= | ||||
| golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= | ||||
| golang.org/x/arch v0.4.0 h1:A8WCeEWhLwPBKNbFi5Wv5UTCBx5zzubnXDlMOFAzFMc= | ||||
| golang.org/x/arch v0.4.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= | ||||
| golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= | ||||
| golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= | ||||
| golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= | ||||
| golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= | ||||
| golang.org/x/crypto v0.4.0 h1:UVQgzMY87xqpKNgb+kDsll2Igd33HszWHFLmpaRMq/8= | ||||
| golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80= | ||||
| golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA= | ||||
| golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= | ||||
| golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk= | ||||
| golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= | ||||
| golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= | ||||
| golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= | ||||
| golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= | ||||
| golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= | ||||
| golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= | ||||
| golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= | ||||
| golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= | ||||
| golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= | ||||
| golang.org/x/net v0.13.0 h1:Nvo8UFsZ8X3BhAC9699Z1j7XQ3rsZnUUm7jfBEk1ueY= | ||||
| golang.org/x/net v0.13.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= | ||||
| golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= | ||||
| golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= | ||||
| golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | ||||
| golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= | ||||
| golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | ||||
| golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= | ||||
| golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= | ||||
| golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= | ||||
| golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= | ||||
| golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | ||||
| golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | ||||
| golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | ||||
| golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | ||||
| golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | ||||
| golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | ||||
| golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | ||||
| golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | ||||
| golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | ||||
| golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U= | ||||
| golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | ||||
| golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ= | ||||
| golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | ||||
| golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= | ||||
| golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | ||||
| golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | ||||
| golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= | ||||
| golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | ||||
| golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= | ||||
| golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | ||||
| golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= | ||||
| golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= | ||||
| golang.org/x/term v0.1.0 h1:g6Z6vPFA9dYBAF7DWcH6sCcOntplXsDKcliusYijMlw= | ||||
| golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= | ||||
| golang.org/x/term v0.3.0 h1:qoo4akIqOcDME5bhc/NgxUdovd6BSS2uMsVjB56q1xI= | ||||
| golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= | ||||
| golang.org/x/term v0.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c= | ||||
| golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o= | ||||
| golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0= | ||||
| golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= | ||||
| golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= | ||||
| golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= | ||||
| golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= | ||||
| golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= | ||||
| golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= | ||||
| golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM= | ||||
| golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= | ||||
| golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= | ||||
| golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= | ||||
| golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= | ||||
| golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= | ||||
| golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= | ||||
| golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= | ||||
| golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= | ||||
| golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= | ||||
| golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= | ||||
| golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= | ||||
| google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= | ||||
| google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= | ||||
| google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= | ||||
| gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= | ||||
| gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= | ||||
| gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= | ||||
| gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= | ||||
| gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= | ||||
| nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50= | ||||
| rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= | ||||
|   | ||||
							
								
								
									
										5
									
								
								goextVersion.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										5
									
								
								goextVersion.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,5 @@ | ||||
| package goext | ||||
|  | ||||
| const GoextVersion = "0.0.253" | ||||
|  | ||||
| const GoextVersionTimestamp = "2023-08-22T10:36:35+0200" | ||||
| @@ -1274,7 +1274,7 @@ func TestMarshalSafeCollections(t *testing.T) { | ||||
| 	} | ||||
|  | ||||
| 	for i, tt := range tests { | ||||
| 		b, err := MarshalSafeCollections(tt.in, true, true) | ||||
| 		b, err := MarshalSafeCollections(tt.in, true, true, nil) | ||||
| 		if err != nil { | ||||
| 			t.Errorf("test %d, unexpected failure: %v", i, err) | ||||
| 		} | ||||
|   | ||||
| @@ -400,7 +400,7 @@ func ArrCastErr[T1 any, T2 any](arr []T1) ([]T2, error) { | ||||
| 		if vcast, ok := any(v).(T2); ok { | ||||
| 			r[i] = vcast | ||||
| 		} else { | ||||
| 			return nil, errors.New(fmt.Sprintf("Cannot cast element %d of type %T to type %s", i, v, *new(T2))) | ||||
| 			return nil, errors.New(fmt.Sprintf("Cannot cast element %d of type %T to type %v", i, v, *new(T2))) | ||||
| 		} | ||||
| 	} | ||||
| 	return r, nil | ||||
| @@ -412,7 +412,7 @@ func ArrCastPanic[T1 any, T2 any](arr []T1) []T2 { | ||||
| 		if vcast, ok := any(v).(T2); ok { | ||||
| 			r[i] = vcast | ||||
| 		} else { | ||||
| 			panic(fmt.Sprintf("Cannot cast element %d of type %T to type %s", i, v, *new(T2))) | ||||
| 			panic(fmt.Sprintf("Cannot cast element %d of type %T to type %v", i, v, *new(T2))) | ||||
| 		} | ||||
| 	} | ||||
| 	return r | ||||
| @@ -433,3 +433,49 @@ func ArrConcat[T any](arr ...[]T) []T { | ||||
| 	} | ||||
| 	return r | ||||
| } | ||||
|  | ||||
| // ArrCopy does a shallow copy of the 'in' array | ||||
| func ArrCopy[T any](in []T) []T { | ||||
| 	out := make([]T, len(in)) | ||||
| 	copy(out, in) | ||||
| 	return out | ||||
| } | ||||
|  | ||||
| func ArrRemove[T comparable](arr []T, needle T) []T { | ||||
| 	idx := ArrFirstIndex(arr, needle) | ||||
| 	if idx >= 0 { | ||||
| 		return append(arr[:idx], arr[idx+1:]...) | ||||
| 	} | ||||
| 	return arr | ||||
| } | ||||
|  | ||||
| func ArrExcept[T comparable](arr []T, needles ...T) []T { | ||||
| 	r := make([]T, 0, len(arr)) | ||||
| 	rmlist := ArrToSet(needles) | ||||
| 	for _, v := range arr { | ||||
| 		if _, ok := rmlist[v]; !ok { | ||||
| 			r = append(r, v) | ||||
| 		} | ||||
| 	} | ||||
| 	return r | ||||
| } | ||||
|  | ||||
| func ArrayToInterface[T any](t []T) []interface{} { | ||||
| 	res := make([]interface{}, 0, len(t)) | ||||
| 	for i, _ := range t { | ||||
| 		res = append(res, t[i]) | ||||
| 	} | ||||
| 	return res | ||||
| } | ||||
|  | ||||
| func JoinString(arr []string, delimiter string) string { | ||||
| 	str := "" | ||||
| 	for i, v := range arr { | ||||
| 		str += v | ||||
| 		if i < len(arr)-1 { | ||||
| 			str += delimiter | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
| 	return str | ||||
| } | ||||
|   | ||||
							
								
								
									
										12
									
								
								langext/array_test.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										12
									
								
								langext/array_test.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,12 @@ | ||||
| package langext | ||||
|  | ||||
| import ( | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/tst" | ||||
| 	"testing" | ||||
| ) | ||||
|  | ||||
| func TestJoinString(t *testing.T) { | ||||
| 	ids := []string{"1", "2", "3"} | ||||
| 	res := JoinString(ids, ",") | ||||
| 	tst.AssertEqual(t, res, "1,2,3") | ||||
| } | ||||
| @@ -1,6 +1,7 @@ | ||||
| package langext | ||||
|  | ||||
| import ( | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/tst" | ||||
| 	"testing" | ||||
| ) | ||||
|  | ||||
| @@ -59,9 +60,3 @@ func TestBase58FlickrDecoding(t *testing.T) { | ||||
| 	tst.AssertEqual(t, _decStr(t, Base58FlickrEncoding, "9aJCVZR"), "Hello") | ||||
| 	tst.AssertEqual(t, _decStr(t, Base58FlickrEncoding, "48638rmBiUzG5NKQoX4KcuE5C8paCFACnE28F7qDx13PRtennAmYSSJQ5gJSRihf5ZDyEQS4UimtihR7uARt4wbty2fW9duTQTM9n1DwUBevreyzGwu6W4YSgrvQgCPDxsiE1mCdZsF8VEBpuHHEiJyw"), "If debugging is the process of removing software bugs, then programming must be the process of putting them in.") | ||||
| } | ||||
|  | ||||
| func tst.AssertEqual(t *testing.T, actual string, expected string) { | ||||
| 	if actual != expected { | ||||
| 		t.Errorf("values differ: Actual: '%v', Expected: '%v'", actual, expected) | ||||
| 	} | ||||
| } | ||||
|   | ||||
| @@ -31,16 +31,16 @@ func CompareIntArr(arr1 []int, arr2 []int) bool { | ||||
| 	return false | ||||
| } | ||||
|  | ||||
| func CompareArr[T OrderedConstraint](arr1 []T, arr2 []T) bool { | ||||
| func CompareArr[T OrderedConstraint](arr1 []T, arr2 []T) int { | ||||
|  | ||||
| 	for i := 0; i < len(arr1) || i < len(arr2); i++ { | ||||
|  | ||||
| 		if i < len(arr1) && i < len(arr2) { | ||||
|  | ||||
| 			if arr1[i] < arr2[i] { | ||||
| 				return true | ||||
| 				return -1 | ||||
| 			} else if arr1[i] > arr2[i] { | ||||
| 				return false | ||||
| 				return +2 | ||||
| 			} else { | ||||
| 				continue | ||||
| 			} | ||||
| @@ -49,15 +49,55 @@ func CompareArr[T OrderedConstraint](arr1 []T, arr2 []T) bool { | ||||
|  | ||||
| 		if i < len(arr1) { | ||||
|  | ||||
| 			return true | ||||
| 			return +1 | ||||
|  | ||||
| 		} else { // if i < len(arr2) | ||||
|  | ||||
| 			return false | ||||
| 			return -1 | ||||
|  | ||||
| 		} | ||||
|  | ||||
| 	} | ||||
|  | ||||
| 	return false | ||||
| 	return 0 | ||||
| } | ||||
|  | ||||
| func CompareString(a, b string) int { | ||||
| 	if a == b { | ||||
| 		return 0 | ||||
| 	} | ||||
| 	if a < b { | ||||
| 		return -1 | ||||
| 	} | ||||
| 	return +1 | ||||
| } | ||||
|  | ||||
| func CompareInt(a, b int) int { | ||||
| 	if a == b { | ||||
| 		return 0 | ||||
| 	} | ||||
| 	if a < b { | ||||
| 		return -1 | ||||
| 	} | ||||
| 	return +1 | ||||
| } | ||||
|  | ||||
| func CompareInt64(a, b int64) int { | ||||
| 	if a == b { | ||||
| 		return 0 | ||||
| 	} | ||||
| 	if a < b { | ||||
| 		return -1 | ||||
| 	} | ||||
| 	return +1 | ||||
| } | ||||
|  | ||||
| func Compare[T OrderedConstraint](a, b T) int { | ||||
| 	if a == b { | ||||
| 		return 0 | ||||
| 	} | ||||
| 	if a < b { | ||||
| 		return -1 | ||||
| 	} | ||||
| 	return +1 | ||||
| } | ||||
|   | ||||
| @@ -1,5 +1,10 @@ | ||||
| package langext | ||||
|  | ||||
| type MapEntry[T comparable, V any] struct { | ||||
| 	Key   T | ||||
| 	Value V | ||||
| } | ||||
|  | ||||
| func MapKeyArr[T comparable, V any](v map[T]V) []T { | ||||
| 	result := make([]T, 0, len(v)) | ||||
| 	for k := range v { | ||||
| @@ -8,6 +13,14 @@ func MapKeyArr[T comparable, V any](v map[T]V) []T { | ||||
| 	return result | ||||
| } | ||||
|  | ||||
| func MapValueArr[T comparable, V any](v map[T]V) []V { | ||||
| 	result := make([]V, 0, len(v)) | ||||
| 	for _, mv := range v { | ||||
| 		result = append(result, mv) | ||||
| 	} | ||||
| 	return result | ||||
| } | ||||
|  | ||||
| func ArrToMap[T comparable, V any](a []V, keyfunc func(V) T) map[T]V { | ||||
| 	result := make(map[T]V, len(a)) | ||||
| 	for _, v := range a { | ||||
| @@ -16,6 +29,25 @@ func ArrToMap[T comparable, V any](a []V, keyfunc func(V) T) map[T]V { | ||||
| 	return result | ||||
| } | ||||
|  | ||||
| func ArrToSet[T comparable](a []T) map[T]bool { | ||||
| 	result := make(map[T]bool, len(a)) | ||||
| 	for _, v := range a { | ||||
| 		result[v] = true | ||||
| 	} | ||||
| 	return result | ||||
| } | ||||
|  | ||||
| func MapToArr[T comparable, V any](v map[T]V) []MapEntry[T, V] { | ||||
| 	result := make([]MapEntry[T, V], 0, len(v)) | ||||
| 	for mk, mv := range v { | ||||
| 		result = append(result, MapEntry[T, V]{ | ||||
| 			Key:   mk, | ||||
| 			Value: mv, | ||||
| 		}) | ||||
| 	} | ||||
| 	return result | ||||
| } | ||||
|  | ||||
| func CopyMap[K comparable, V any](a map[K]V) map[K]V { | ||||
| 	result := make(map[K]V, len(a)) | ||||
| 	for k, v := range a { | ||||
| @@ -23,3 +55,11 @@ func CopyMap[K comparable, V any](a map[K]V) map[K]V { | ||||
| 	} | ||||
| 	return result | ||||
| } | ||||
|  | ||||
| func ForceMap[K comparable, V any](v map[K]V) map[K]V { | ||||
| 	if v == nil { | ||||
| 		return make(map[K]V, 0) | ||||
| 	} else { | ||||
| 		return v | ||||
| 	} | ||||
| } | ||||
|   | ||||
| @@ -4,6 +4,12 @@ import ( | ||||
| 	"reflect" | ||||
| ) | ||||
|  | ||||
| // PTrue := &true | ||||
| var PTrue = Ptr(true) | ||||
|  | ||||
| // PFalse := &false | ||||
| var PFalse = Ptr(false) | ||||
|  | ||||
| func Ptr[T any](v T) *T { | ||||
| 	return &v | ||||
| } | ||||
|   | ||||
| @@ -41,6 +41,14 @@ func NewHexUUID() (string, error) { | ||||
| 	return string(dst), nil | ||||
| } | ||||
|  | ||||
| func MustHexUUID() string { | ||||
| 	v, err := NewHexUUID() | ||||
| 	if err != nil { | ||||
| 		panic(err) | ||||
| 	} | ||||
| 	return v | ||||
| } | ||||
|  | ||||
| func NewUpperHexUUID() (string, error) { | ||||
| 	uuid, err := NewUUID() | ||||
| 	if err != nil { | ||||
| @@ -64,6 +72,14 @@ func NewUpperHexUUID() (string, error) { | ||||
| 	return strings.ToUpper(string(dst)), nil | ||||
| } | ||||
|  | ||||
| func MustUpperHexUUID() string { | ||||
| 	v, err := NewUpperHexUUID() | ||||
| 	if err != nil { | ||||
| 		panic(err) | ||||
| 	} | ||||
| 	return v | ||||
| } | ||||
|  | ||||
| func NewRawHexUUID() (string, error) { | ||||
| 	uuid, err := NewUUID() | ||||
| 	if err != nil { | ||||
| @@ -83,6 +99,14 @@ func NewRawHexUUID() (string, error) { | ||||
| 	return strings.ToUpper(string(dst)), nil | ||||
| } | ||||
|  | ||||
| func MustRawHexUUID() string { | ||||
| 	v, err := NewRawHexUUID() | ||||
| 	if err != nil { | ||||
| 		panic(err) | ||||
| 	} | ||||
| 	return v | ||||
| } | ||||
|  | ||||
| func NewBracesUUID() (string, error) { | ||||
| 	uuid, err := NewUUID() | ||||
| 	if err != nil { | ||||
| @@ -108,6 +132,14 @@ func NewBracesUUID() (string, error) { | ||||
| 	return strings.ToUpper(string(dst)), nil | ||||
| } | ||||
|  | ||||
| func MustBracesUUID() string { | ||||
| 	v, err := NewBracesUUID() | ||||
| 	if err != nil { | ||||
| 		panic(err) | ||||
| 	} | ||||
| 	return v | ||||
| } | ||||
|  | ||||
| func NewParensUUID() (string, error) { | ||||
| 	uuid, err := NewUUID() | ||||
| 	if err != nil { | ||||
| @@ -132,3 +164,11 @@ func NewParensUUID() (string, error) { | ||||
|  | ||||
| 	return strings.ToUpper(string(dst)), nil | ||||
| } | ||||
|  | ||||
| func MustParensUUID() string { | ||||
| 	v, err := NewParensUUID() | ||||
| 	if err != nil { | ||||
| 		panic(err) | ||||
| 	} | ||||
| 	return v | ||||
| } | ||||
|   | ||||
| @@ -22,6 +22,31 @@ func Max[T langext.OrderedConstraint](v1 T, v2 T) T { | ||||
| 	} | ||||
| } | ||||
|  | ||||
| func Max3[T langext.OrderedConstraint](v1 T, v2 T, v3 T) T { | ||||
| 	result := v1 | ||||
| 	if v2 > result { | ||||
| 		result = v2 | ||||
| 	} | ||||
| 	if v3 > result { | ||||
| 		result = v3 | ||||
| 	} | ||||
| 	return result | ||||
| } | ||||
|  | ||||
| func Max4[T langext.OrderedConstraint](v1 T, v2 T, v3 T, v4 T) T { | ||||
| 	result := v1 | ||||
| 	if v2 > result { | ||||
| 		result = v2 | ||||
| 	} | ||||
| 	if v3 > result { | ||||
| 		result = v3 | ||||
| 	} | ||||
| 	if v4 > result { | ||||
| 		result = v4 | ||||
| 	} | ||||
| 	return result | ||||
| } | ||||
|  | ||||
| func Min[T langext.OrderedConstraint](v1 T, v2 T) T { | ||||
| 	if v1 < v2 { | ||||
| 		return v1 | ||||
| @@ -30,6 +55,31 @@ func Min[T langext.OrderedConstraint](v1 T, v2 T) T { | ||||
| 	} | ||||
| } | ||||
|  | ||||
| func Min3[T langext.OrderedConstraint](v1 T, v2 T, v3 T) T { | ||||
| 	result := v1 | ||||
| 	if v2 < result { | ||||
| 		result = v2 | ||||
| 	} | ||||
| 	if v3 < result { | ||||
| 		result = v3 | ||||
| 	} | ||||
| 	return result | ||||
| } | ||||
|  | ||||
| func Min4[T langext.OrderedConstraint](v1 T, v2 T, v3 T, v4 T) T { | ||||
| 	result := v1 | ||||
| 	if v2 < result { | ||||
| 		result = v2 | ||||
| 	} | ||||
| 	if v3 < result { | ||||
| 		result = v3 | ||||
| 	} | ||||
| 	if v4 < result { | ||||
| 		result = v4 | ||||
| 	} | ||||
| 	return result | ||||
| } | ||||
|  | ||||
| func Abs[T langext.NumberConstraint](v T) T { | ||||
| 	if v < 0 { | ||||
| 		return -v | ||||
|   | ||||
							
								
								
									
										49
									
								
								mongoext/pipeline.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										49
									
								
								mongoext/pipeline.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,49 @@ | ||||
| package mongoext | ||||
|  | ||||
| import ( | ||||
| 	"go.mongodb.org/mongo-driver/bson" | ||||
| 	"go.mongodb.org/mongo-driver/mongo" | ||||
| ) | ||||
|  | ||||
| // FixTextSearchPipeline moves {$match:{$text:{$search}}} entries to the front of the pipeline (otherwise its an mongo error) | ||||
| func FixTextSearchPipeline(pipeline mongo.Pipeline) mongo.Pipeline { | ||||
|  | ||||
| 	dget := func(v bson.D, k string) (bson.M, bool) { | ||||
| 		for _, e := range v { | ||||
| 			if e.Key == k { | ||||
| 				if mv, ok := e.Value.(bson.M); ok { | ||||
| 					return mv, true | ||||
| 				} | ||||
| 			} | ||||
| 		} | ||||
| 		return nil, false | ||||
| 	} | ||||
| 	mget := func(v bson.M, k string) (bson.M, bool) { | ||||
| 		for ekey, eval := range v { | ||||
| 			if ekey == k { | ||||
| 				if mv, ok := eval.(bson.M); ok { | ||||
| 					return mv, true | ||||
| 				} | ||||
| 			} | ||||
| 		} | ||||
| 		return nil, false | ||||
| 	} | ||||
|  | ||||
| 	result := make([]bson.D, 0, len(pipeline)) | ||||
|  | ||||
| 	for _, entry := range pipeline { | ||||
|  | ||||
| 		if v0, ok := dget(entry, "$match"); ok { | ||||
| 			if v1, ok := mget(v0, "$text"); ok { | ||||
| 				if _, ok := v1["$search"]; ok { | ||||
| 					result = append([]bson.D{entry}, result...) | ||||
| 					continue | ||||
| 				} | ||||
| 			} | ||||
| 		} | ||||
|  | ||||
| 		result = append(result, entry) | ||||
| 	} | ||||
|  | ||||
| 	return result | ||||
| } | ||||
							
								
								
									
										30
									
								
								mongoext/projections.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										30
									
								
								mongoext/projections.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,30 @@ | ||||
| package mongoext | ||||
|  | ||||
| import ( | ||||
| 	"go.mongodb.org/mongo-driver/bson" | ||||
| 	"reflect" | ||||
| 	"strings" | ||||
| ) | ||||
|  | ||||
| // ProjectionFromStruct automatically generated a mongodb projection for a struct | ||||
| // This way you can pretty much always write | ||||
| // `options.FindOne().SetProjection(mongoutils.ProjectionFromStruct(...your_model...))` | ||||
| // to only get the data from mongodb that you will actually use in the later decode step | ||||
| func ProjectionFromStruct(obj interface{}) bson.M { | ||||
| 	v := reflect.ValueOf(obj) | ||||
| 	t := v.Type() | ||||
|  | ||||
| 	result := bson.M{} | ||||
|  | ||||
| 	for i := 0; i < v.NumField(); i++ { | ||||
| 		tag := t.Field(i).Tag.Get("bson") | ||||
| 		if tag == "" { | ||||
| 			continue | ||||
| 		} | ||||
| 		tag = strings.Split(tag, ",")[0] | ||||
|  | ||||
| 		result[tag] = 1 | ||||
| 	} | ||||
|  | ||||
| 	return result | ||||
| } | ||||
							
								
								
									
										28
									
								
								mongoext/registry.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										28
									
								
								mongoext/registry.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,28 @@ | ||||
| package mongoext | ||||
|  | ||||
| import ( | ||||
| 	"go.mongodb.org/mongo-driver/bson" | ||||
| 	"go.mongodb.org/mongo-driver/bson/bsoncodec" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/rfctime" | ||||
| 	"reflect" | ||||
| ) | ||||
|  | ||||
| func CreateGoExtBsonRegistry() *bsoncodec.Registry { | ||||
| 	rb := bsoncodec.NewRegistryBuilder() | ||||
|  | ||||
| 	rb.RegisterTypeDecoder(reflect.TypeOf(rfctime.RFC3339Time{}), rfctime.RFC3339Time{}) | ||||
| 	rb.RegisterTypeDecoder(reflect.TypeOf(&rfctime.RFC3339Time{}), rfctime.RFC3339Time{}) | ||||
|  | ||||
| 	rb.RegisterTypeDecoder(reflect.TypeOf(rfctime.RFC3339NanoTime{}), rfctime.RFC3339NanoTime{}) | ||||
| 	rb.RegisterTypeDecoder(reflect.TypeOf(&rfctime.RFC3339NanoTime{}), rfctime.RFC3339NanoTime{}) | ||||
|  | ||||
| 	rb.RegisterTypeDecoder(reflect.TypeOf(rfctime.Date{}), rfctime.Date{}) | ||||
| 	rb.RegisterTypeDecoder(reflect.TypeOf(&rfctime.Date{}), rfctime.Date{}) | ||||
|  | ||||
| 	bsoncodec.DefaultValueEncoders{}.RegisterDefaultEncoders(rb) | ||||
| 	bsoncodec.DefaultValueDecoders{}.RegisterDefaultDecoders(rb) | ||||
|  | ||||
| 	bson.PrimitiveCodecs{}.RegisterPrimitiveCodecs(rb) | ||||
|  | ||||
| 	return rb.Build() | ||||
| } | ||||
							
								
								
									
										136
									
								
								reflectext/casting.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										136
									
								
								reflectext/casting.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,136 @@ | ||||
| package reflectext | ||||
|  | ||||
| import ( | ||||
| 	"reflect" | ||||
| ) | ||||
|  | ||||
| var reflectBasicTypes = map[reflect.Kind]reflect.Type{ | ||||
| 	reflect.Bool:       reflect.TypeOf(false), | ||||
| 	reflect.Int:        reflect.TypeOf(int(0)), | ||||
| 	reflect.Int8:       reflect.TypeOf(int8(0)), | ||||
| 	reflect.Int16:      reflect.TypeOf(int16(0)), | ||||
| 	reflect.Int32:      reflect.TypeOf(int32(0)), | ||||
| 	reflect.Int64:      reflect.TypeOf(int64(0)), | ||||
| 	reflect.Uint:       reflect.TypeOf(uint(0)), | ||||
| 	reflect.Uint8:      reflect.TypeOf(uint8(0)), | ||||
| 	reflect.Uint16:     reflect.TypeOf(uint16(0)), | ||||
| 	reflect.Uint32:     reflect.TypeOf(uint32(0)), | ||||
| 	reflect.Uint64:     reflect.TypeOf(uint64(0)), | ||||
| 	reflect.Uintptr:    reflect.TypeOf(uintptr(0)), | ||||
| 	reflect.Float32:    reflect.TypeOf(float32(0)), | ||||
| 	reflect.Float64:    reflect.TypeOf(float64(0)), | ||||
| 	reflect.Complex64:  reflect.TypeOf(complex64(0)), | ||||
| 	reflect.Complex128: reflect.TypeOf(complex128(0)), | ||||
| 	reflect.String:     reflect.TypeOf(""), | ||||
| } | ||||
|  | ||||
| // Underlying returns the underlying type of t (without type alias) | ||||
| // | ||||
| // https://github.com/golang/go/issues/39574#issuecomment-655664772 | ||||
| func Underlying(t reflect.Type) (ret reflect.Type) { | ||||
| 	if t.Name() == "" { | ||||
| 		// t is an unnamed type. the underlying type is t itself | ||||
| 		return t | ||||
| 	} | ||||
| 	kind := t.Kind() | ||||
| 	if ret = reflectBasicTypes[kind]; ret != nil { | ||||
| 		return ret | ||||
| 	} | ||||
| 	switch kind { | ||||
| 	case reflect.Array: | ||||
| 		ret = reflect.ArrayOf(t.Len(), t.Elem()) | ||||
| 	case reflect.Chan: | ||||
| 		ret = reflect.ChanOf(t.ChanDir(), t.Elem()) | ||||
| 	case reflect.Map: | ||||
| 		ret = reflect.MapOf(t.Key(), t.Elem()) | ||||
| 	case reflect.Func: | ||||
| 		nIn := t.NumIn() | ||||
| 		nOut := t.NumOut() | ||||
| 		in := make([]reflect.Type, nIn) | ||||
| 		out := make([]reflect.Type, nOut) | ||||
| 		for i := 0; i < nIn; i++ { | ||||
| 			in[i] = t.In(i) | ||||
| 		} | ||||
| 		for i := 0; i < nOut; i++ { | ||||
| 			out[i] = t.Out(i) | ||||
| 		} | ||||
| 		ret = reflect.FuncOf(in, out, t.IsVariadic()) | ||||
| 	case reflect.Interface: | ||||
| 		// not supported | ||||
| 	case reflect.Ptr: | ||||
| 		ret = reflect.PtrTo(t.Elem()) | ||||
| 	case reflect.Slice: | ||||
| 		ret = reflect.SliceOf(t.Elem()) | ||||
| 	case reflect.Struct: | ||||
| 		// only partially supported: embedded fields | ||||
| 		// and unexported fields may cause panic in reflect.StructOf() | ||||
| 		defer func() { | ||||
| 			// if a panic happens, return t unmodified | ||||
| 			if recover() != nil && ret == nil { | ||||
| 				ret = t | ||||
| 			} | ||||
| 		}() | ||||
| 		n := t.NumField() | ||||
| 		fields := make([]reflect.StructField, n) | ||||
| 		for i := 0; i < n; i++ { | ||||
| 			fields[i] = t.Field(i) | ||||
| 		} | ||||
| 		ret = reflect.StructOf(fields) | ||||
| 	} | ||||
| 	return ret | ||||
| } | ||||
|  | ||||
| // TryCast works similar to `v2, ok := v.(T)` | ||||
| // Except it works through type alias' | ||||
| func TryCast[T any](v any) (T, bool) { | ||||
|  | ||||
| 	underlying := Underlying(reflect.TypeOf(v)) | ||||
|  | ||||
| 	def := *new(T) | ||||
|  | ||||
| 	if underlying != Underlying(reflect.TypeOf(def)) { | ||||
| 		return def, false | ||||
| 	} | ||||
|  | ||||
| 	r1 := reflect.ValueOf(v) | ||||
|  | ||||
| 	if !r1.CanConvert(underlying) { | ||||
| 		return def, false | ||||
| 	} | ||||
|  | ||||
| 	r2 := r1.Convert(underlying) | ||||
|  | ||||
| 	r3 := r2.Interface() | ||||
|  | ||||
| 	r4, ok := r3.(T) | ||||
| 	if !ok { | ||||
| 		return def, false | ||||
| 	} | ||||
|  | ||||
| 	return r4, true | ||||
| } | ||||
|  | ||||
| func TryCastType(v any, dest reflect.Type) (any, bool) { | ||||
|  | ||||
| 	underlying := Underlying(reflect.TypeOf(v)) | ||||
|  | ||||
| 	if underlying != Underlying(dest) { | ||||
| 		return nil, false | ||||
| 	} | ||||
|  | ||||
| 	r1 := reflect.ValueOf(v) | ||||
|  | ||||
| 	if !r1.CanConvert(underlying) { | ||||
| 		return nil, false | ||||
| 	} | ||||
|  | ||||
| 	r2 := r1.Convert(underlying) | ||||
|  | ||||
| 	if !r2.CanConvert(dest) { | ||||
| 		return nil, false | ||||
| 	} | ||||
|  | ||||
| 	r4 := r2.Convert(dest) | ||||
|  | ||||
| 	return r4.Interface(), true | ||||
| } | ||||
							
								
								
									
										136
									
								
								reflectext/primStrSer.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										136
									
								
								reflectext/primStrSer.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,136 @@ | ||||
| package reflectext | ||||
|  | ||||
| import ( | ||||
| 	"errors" | ||||
| 	"fmt" | ||||
| 	"go.mongodb.org/mongo-driver/bson/primitive" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/langext" | ||||
| 	"reflect" | ||||
| 	"strconv" | ||||
| 	"strings" | ||||
| 	"time" | ||||
| ) | ||||
|  | ||||
| var primitiveSerializer = map[reflect.Type]genSerializer{ | ||||
|  | ||||
| 	reflect.TypeOf(""): newGenSerializer(serStringToString, serStringToString), | ||||
|  | ||||
| 	reflect.TypeOf(int(0)):   newGenSerializer(serIntNumToString[int], serStringToSIntNum[int]), | ||||
| 	reflect.TypeOf(int32(0)): newGenSerializer(serIntNumToString[int32], serStringToSIntNum[int32]), | ||||
| 	reflect.TypeOf(int64(0)): newGenSerializer(serIntNumToString[int64], serStringToSIntNum[int64]), | ||||
|  | ||||
| 	reflect.TypeOf(uint(0)):   newGenSerializer(serIntNumToString[uint], serStringToUIntNum[uint]), | ||||
| 	reflect.TypeOf(uint32(0)): newGenSerializer(serIntNumToString[uint32], serStringToUIntNum[uint32]), | ||||
| 	reflect.TypeOf(uint64(0)): newGenSerializer(serIntNumToString[uint64], serStringToUIntNum[uint64]), | ||||
|  | ||||
| 	reflect.TypeOf(float32(0)): newGenSerializer(serFloatNumToString[float32], serStringToFloatNum[float32]), | ||||
| 	reflect.TypeOf(float64(0)): newGenSerializer(serFloatNumToString[float64], serStringToFloatNum[float64]), | ||||
|  | ||||
| 	reflect.TypeOf(true): newGenSerializer(serBoolToString, serStringToBool), | ||||
|  | ||||
| 	reflect.TypeOf(primitive.ObjectID{}): newGenSerializer(serObjectIDToString, serStringToObjectID), | ||||
|  | ||||
| 	reflect.TypeOf(time.Time{}): newGenSerializer(serTimeToString, serStringToTime), | ||||
| } | ||||
|  | ||||
| type genSerializer struct { | ||||
| 	ToString   func(v any) (string, error) | ||||
| 	FromString func(v string) (any, error) | ||||
| } | ||||
|  | ||||
| func newGenSerializer[TData any](tostr func(v TData) (string, error), fromstr func(v string) (TData, error)) genSerializer { | ||||
| 	return genSerializer{ | ||||
| 		ToString: func(v any) (string, error) { | ||||
| 			if tdv, ok := v.(TData); ok { | ||||
| 				rv, err := tostr(tdv) | ||||
| 				if err != nil { | ||||
| 					return "", err | ||||
| 				} | ||||
| 				return rv, nil | ||||
| 			} else { | ||||
| 				return "", errors.New(fmt.Sprintf("cannot convert type %T to TData (%T)", v, *new(TData))) | ||||
| 			} | ||||
| 		}, | ||||
| 		FromString: func(v string) (any, error) { | ||||
| 			nv, err := fromstr(v) | ||||
| 			if err != nil { | ||||
| 				return "", err | ||||
| 			} | ||||
| 			return nv, nil | ||||
| 		}, | ||||
| 	} | ||||
| } | ||||
|  | ||||
| func serStringToString(v string) (string, error) { | ||||
| 	return v, nil | ||||
| } | ||||
|  | ||||
| func serIntNumToString[TNum langext.IntegerConstraint](v TNum) (string, error) { | ||||
| 	return strconv.FormatInt(int64(v), 10), nil | ||||
| } | ||||
|  | ||||
| func serStringToSIntNum[TNum langext.SignedConstraint](v string) (TNum, error) { | ||||
| 	r, err := strconv.ParseInt(v, 10, 64) | ||||
| 	if err != nil { | ||||
| 		return 0, err | ||||
| 	} | ||||
| 	return TNum(r), nil | ||||
| } | ||||
|  | ||||
| func serStringToUIntNum[TNum langext.UnsignedConstraint](v string) (TNum, error) { | ||||
| 	r, err := strconv.ParseUint(v, 10, 64) | ||||
| 	if err != nil { | ||||
| 		return 0, err | ||||
| 	} | ||||
| 	return TNum(r), nil | ||||
| } | ||||
|  | ||||
| func serFloatNumToString[TNum langext.FloatConstraint](v TNum) (string, error) { | ||||
| 	return strconv.FormatFloat(float64(v), 'f', -1, 64), nil | ||||
| } | ||||
|  | ||||
| func serStringToFloatNum[TNum langext.FloatConstraint](v string) (TNum, error) { | ||||
| 	r, err := strconv.ParseFloat(v, 64) | ||||
| 	if err != nil { | ||||
| 		return 0, err | ||||
| 	} | ||||
| 	return TNum(r), nil | ||||
| } | ||||
|  | ||||
| func serBoolToString(v bool) (string, error) { | ||||
| 	return langext.Conditional(v, "true", "false"), nil | ||||
| } | ||||
|  | ||||
| func serStringToBool(v string) (bool, error) { | ||||
| 	if strings.ToLower(v) == "true" { | ||||
| 		return true, nil | ||||
| 	} | ||||
| 	if strings.ToLower(v) == "false" { | ||||
| 		return true, nil | ||||
| 	} | ||||
| 	return false, errors.New(fmt.Sprintf("invalid boolean value '%s'", v)) | ||||
| } | ||||
|  | ||||
| func serObjectIDToString(v primitive.ObjectID) (string, error) { | ||||
| 	return v.Hex(), nil | ||||
| } | ||||
|  | ||||
| func serStringToObjectID(v string) (primitive.ObjectID, error) { | ||||
| 	if rv, err := primitive.ObjectIDFromHex(v); err == nil { | ||||
| 		return rv, nil | ||||
| 	} else { | ||||
| 		return primitive.ObjectID{}, err | ||||
| 	} | ||||
| } | ||||
|  | ||||
| func serTimeToString(v time.Time) (string, error) { | ||||
| 	return v.Format(time.RFC3339Nano), nil | ||||
| } | ||||
|  | ||||
| func serStringToTime(v string) (time.Time, error) { | ||||
| 	if rv, err := time.Parse(time.RFC3339Nano, v); err == nil { | ||||
| 		return rv, nil | ||||
| 	} else { | ||||
| 		return time.Time{}, err | ||||
| 	} | ||||
| } | ||||
							
								
								
									
										92
									
								
								reflectext/primitiveStringSerializer.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										92
									
								
								reflectext/primitiveStringSerializer.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,92 @@ | ||||
| package reflectext | ||||
|  | ||||
| import ( | ||||
| 	"errors" | ||||
| 	"fmt" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/langext" | ||||
| 	"reflect" | ||||
| ) | ||||
|  | ||||
| // PrimitiveStringSerializer is used to serialize primitive types (and a few more) from and to string | ||||
| // This is not really intended to be user facing, and more as a simple building block for other mechanisms | ||||
| // supports: | ||||
| //   - golang primitives (ints, uints, floats, bool, string) | ||||
| //   - type aliases | ||||
| //   - time.Time | ||||
| //   - primitive.ObjectID | ||||
| type PrimitiveStringSerializer struct{} | ||||
|  | ||||
| func (pss PrimitiveStringSerializer) ValueToString(v any) (string, error) { | ||||
|  | ||||
| 	inType := reflect.TypeOf(v) | ||||
|  | ||||
| 	if inType.Kind() == reflect.Ptr && langext.IsNil(v) { | ||||
| 		return "", nil | ||||
| 	} | ||||
|  | ||||
| 	if inType.Kind() == reflect.Ptr { | ||||
| 		rval1 := reflect.ValueOf(v) | ||||
| 		rval2 := rval1.Elem() | ||||
| 		rval3 := rval2.Interface() | ||||
| 		return pss.ValueToString(rval3) | ||||
| 	} | ||||
|  | ||||
| 	if conv, ok := primitiveSerializer[inType]; ok { | ||||
| 		return conv.ToString(v) | ||||
| 	} | ||||
|  | ||||
| 	for convType, conv := range primitiveSerializer { | ||||
| 		if castV, ok := TryCastType(v, convType); ok { | ||||
| 			return conv.ToString(castV) | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
| 	return "", errors.New(fmt.Sprintf("failed to find a matching generic <toString> conversion fo type %T", v)) | ||||
| } | ||||
|  | ||||
| func (pss PrimitiveStringSerializer) ValueFromString(str string, outType reflect.Type) (any, error) { | ||||
|  | ||||
| 	if outType.Kind() == reflect.Ptr && str == "" { | ||||
| 		return reflect.Zero(outType).Interface(), nil // = nil.(outType), nil | ||||
| 	} | ||||
|  | ||||
| 	if str == "" { | ||||
| 		return reflect.Zero(outType).Interface(), nil // = <default>(outType), nil | ||||
| 	} | ||||
|  | ||||
| 	if outType.Kind() == reflect.Ptr { | ||||
|  | ||||
| 		innerValue, err := pss.ValueFromString(str, outType.Elem()) | ||||
| 		if err != nil { | ||||
| 			return nil, err | ||||
| 		} | ||||
|  | ||||
| 		// this weird piece of shit converts innerValue to &innerValue  (while keeping types) | ||||
|  | ||||
| 		rval1 := reflect.ValueOf(innerValue) | ||||
| 		rval2 := rval1.Convert(outType.Elem()) | ||||
| 		rval3 := reflect.New(outType.Elem()) | ||||
| 		rval3.Elem().Set(rval2) | ||||
| 		rval4 := rval3.Interface() | ||||
|  | ||||
| 		return rval4, nil | ||||
| 	} | ||||
|  | ||||
| 	if conv, ok := primitiveSerializer[outType]; ok { | ||||
| 		return conv.FromString(str) | ||||
| 	} | ||||
|  | ||||
| 	emptyResultVal := reflect.Zero(outType).Interface() | ||||
|  | ||||
| 	for convType, conv := range primitiveSerializer { | ||||
| 		if _, ok := TryCastType(emptyResultVal, convType); ok { | ||||
| 			if convVal, err := conv.FromString(str); err == nil { | ||||
| 				if resVal, ok := TryCastType(convVal, outType); ok { | ||||
| 					return resVal, nil | ||||
| 				} | ||||
| 			} | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
| 	return "", errors.New(fmt.Sprintf("failed to find a matching generic <toString> conversion fo type %s", outType.String())) | ||||
| } | ||||
| @@ -13,6 +13,7 @@ type Regex interface { | ||||
| 	ReplaceAllFunc(haystack string, repl func(string) string) string | ||||
| 	RemoveAll(haystack string) string | ||||
| 	GroupCount() int | ||||
| 	String() string | ||||
| } | ||||
|  | ||||
| type regexWrapper struct { | ||||
| @@ -42,6 +43,7 @@ func W(rex *regexp.Regexp) Regex { | ||||
|  | ||||
| // --------------------------------------------------------------------------------------------------------------------- | ||||
|  | ||||
| // IsMatch reports whether the string s contains any match of the regular expression re. | ||||
| func (w *regexWrapper) IsMatch(haystack string) bool { | ||||
| 	return w.rex.MatchString(haystack) | ||||
| } | ||||
| @@ -88,6 +90,11 @@ func (w *regexWrapper) GroupCount() int { | ||||
| 	return len(w.subnames) - 1 | ||||
| } | ||||
|  | ||||
| // String returns the source text used to compile the regular expression. | ||||
| func (w *regexWrapper) String() string { | ||||
| 	return w.rex.String() | ||||
| } | ||||
|  | ||||
| // --------------------------------------------------------------------------------------------------------------------- | ||||
|  | ||||
| func (m RegexMatch) FullMatch() RegexMatchGroup { | ||||
|   | ||||
| @@ -8,7 +8,7 @@ import ( | ||||
|  | ||||
| func TestGroupByNameOrEmpty1(t *testing.T) { | ||||
|  | ||||
| 	regex1 := W(regexp.MustCompile("0(?P<group1>A+)B(?P<group2>C+)0")) | ||||
| 	regex1 := W(regexp.MustCompile(`0(?P<group1>A+)B(?P<group2>C+)0`)) | ||||
|  | ||||
| 	match1, ok1 := regex1.MatchFirst("Hello 0AAAABCCC0 Bye.") | ||||
|  | ||||
| @@ -26,7 +26,7 @@ func TestGroupByNameOrEmpty1(t *testing.T) { | ||||
|  | ||||
| func TestGroupByNameOrEmpty2(t *testing.T) { | ||||
|  | ||||
| 	regex1 := W(regexp.MustCompile("0(?P<group1>A+)B(?P<group2>C+)(?P<group3>C+)?0")) | ||||
| 	regex1 := W(regexp.MustCompile(`0(?P<group1>A+)B(?P<group2>C+)(?P<group3>C+)?0`)) | ||||
|  | ||||
| 	match1, ok1 := regex1.MatchFirst("Hello 0AAAABCCC0 Bye.") | ||||
|  | ||||
|   | ||||
							
								
								
									
										240
									
								
								rfctime/date.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										240
									
								
								rfctime/date.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,240 @@ | ||||
| package rfctime | ||||
|  | ||||
| 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" | ||||
| 	"time" | ||||
| ) | ||||
|  | ||||
| type Date struct { | ||||
| 	Year  int | ||||
| 	Month int | ||||
| 	Day   int | ||||
| } | ||||
|  | ||||
| func (t Date) Time(loc *time.Location) time.Time { | ||||
| 	return time.Date(t.Year, time.Month(t.Month), t.Day, 0, 0, 0, 0, loc) | ||||
| } | ||||
|  | ||||
| func (t Date) TimeUTC() time.Time { | ||||
| 	return time.Date(t.Year, time.Month(t.Month), t.Day, 0, 0, 0, 0, time.UTC) | ||||
| } | ||||
|  | ||||
| func (t Date) TimeLocal() time.Time { | ||||
| 	return time.Date(t.Year, time.Month(t.Month), t.Day, 0, 0, 0, 0, time.Local) | ||||
| } | ||||
|  | ||||
| func (t Date) MarshalBinary() ([]byte, error) { | ||||
| 	return t.TimeUTC().MarshalBinary() | ||||
| } | ||||
|  | ||||
| func (t *Date) UnmarshalBinary(data []byte) error { | ||||
| 	nt := time.Time{} | ||||
| 	if err := nt.UnmarshalBinary(data); err != nil { | ||||
| 		return err | ||||
| 	} | ||||
| 	t.Year = nt.Year() | ||||
| 	t.Month = int(nt.Month()) | ||||
| 	t.Day = nt.Day() | ||||
| 	return nil | ||||
| } | ||||
|  | ||||
| func (t Date) GobEncode() ([]byte, error) { | ||||
| 	return t.TimeUTC().GobEncode() | ||||
| } | ||||
|  | ||||
| func (t *Date) GobDecode(data []byte) error { | ||||
| 	nt := time.Time{} | ||||
| 	if err := nt.GobDecode(data); err != nil { | ||||
| 		return err | ||||
| 	} | ||||
| 	t.Year = nt.Year() | ||||
| 	t.Month = int(nt.Month()) | ||||
| 	t.Day = nt.Day() | ||||
| 	return nil | ||||
| } | ||||
|  | ||||
| func (t *Date) UnmarshalJSON(data []byte) error { | ||||
| 	str := "" | ||||
| 	if err := json.Unmarshal(data, &str); err != nil { | ||||
| 		return err | ||||
| 	} | ||||
| 	t0, err := time.Parse(t.FormatStr(), str) | ||||
| 	if err != nil { | ||||
| 		return err | ||||
| 	} | ||||
| 	t.Year = t0.Year() | ||||
| 	t.Month = int(t0.Month()) | ||||
| 	t.Day = t0.Day() | ||||
| 	return nil | ||||
| } | ||||
|  | ||||
| func (t Date) MarshalJSON() ([]byte, error) { | ||||
| 	str := t.TimeUTC().Format(t.FormatStr()) | ||||
| 	return json.Marshal(str) | ||||
| } | ||||
|  | ||||
| func (t Date) MarshalText() ([]byte, error) { | ||||
| 	b := make([]byte, 0, len(t.FormatStr())) | ||||
| 	return t.TimeUTC().AppendFormat(b, t.FormatStr()), nil | ||||
| } | ||||
|  | ||||
| func (t *Date) UnmarshalText(data []byte) error { | ||||
| 	var err error | ||||
| 	v, err := time.Parse(t.FormatStr(), string(data)) | ||||
| 	if err != nil { | ||||
| 		return err | ||||
| 	} | ||||
| 	t.Year = v.Year() | ||||
| 	t.Month = int(v.Month()) | ||||
| 	t.Day = v.Day() | ||||
| 	return nil | ||||
| } | ||||
|  | ||||
| func (t *Date) UnmarshalBSONValue(bt bsontype.Type, data []byte) error { | ||||
| 	if bt == bsontype.Null { | ||||
| 		// 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 | ||||
| 		*t = Date{} | ||||
| 		return nil | ||||
| 	} | ||||
| 	if bt != bsontype.String { | ||||
| 		return errors.New(fmt.Sprintf("cannot unmarshal %v into Date", bt)) | ||||
| 	} | ||||
|  | ||||
| 	var tt string | ||||
| 	err := bson.RawValue{Type: bt, Value: data}.Unmarshal(&tt) | ||||
| 	if err != nil { | ||||
| 		return err | ||||
| 	} | ||||
|  | ||||
| 	v, err := time.Parse(t.FormatStr(), tt) | ||||
| 	if err != nil { | ||||
| 		return err | ||||
| 	} | ||||
| 	t.Year = v.Year() | ||||
| 	t.Month = int(v.Month()) | ||||
| 	t.Day = v.Day() | ||||
|  | ||||
| 	return nil | ||||
| } | ||||
|  | ||||
| func (t Date) MarshalBSONValue() (bsontype.Type, []byte, error) { | ||||
| 	return bson.MarshalValue(t.TimeUTC().Format(t.FormatStr())) | ||||
| } | ||||
|  | ||||
| func (t Date) 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 = t.UnmarshalBSONValue(tp, src) | ||||
| 	if err != nil { | ||||
| 		return err | ||||
| 	} | ||||
|  | ||||
| 	if val.Kind() == reflect.Ptr { | ||||
| 		val.Set(reflect.ValueOf(&t)) | ||||
| 	} else { | ||||
| 		val.Set(reflect.ValueOf(t)) | ||||
| 	} | ||||
|  | ||||
| 	return nil | ||||
| } | ||||
|  | ||||
| func (t Date) Serialize() string { | ||||
| 	return t.TimeUTC().Format(t.FormatStr()) | ||||
| } | ||||
|  | ||||
| func (t Date) FormatStr() string { | ||||
| 	return "2006-01-02" | ||||
| } | ||||
|  | ||||
| func (t Date) Date() (year int, month time.Month, day int) { | ||||
| 	return t.TimeUTC().Date() | ||||
| } | ||||
|  | ||||
| func (t Date) Weekday() time.Weekday { | ||||
| 	return t.TimeUTC().Weekday() | ||||
| } | ||||
|  | ||||
| func (t Date) ISOWeek() (year, week int) { | ||||
| 	return t.TimeUTC().ISOWeek() | ||||
| } | ||||
|  | ||||
| func (t Date) YearDay() int { | ||||
| 	return t.TimeUTC().YearDay() | ||||
| } | ||||
|  | ||||
| func (t Date) AddDate(years int, months int, days int) Date { | ||||
| 	return NewDate(t.TimeUTC().AddDate(years, months, days)) | ||||
| } | ||||
|  | ||||
| func (t Date) Unix() int64 { | ||||
| 	return t.TimeUTC().Unix() | ||||
| } | ||||
|  | ||||
| func (t Date) UnixMilli() int64 { | ||||
| 	return t.TimeUTC().UnixMilli() | ||||
| } | ||||
|  | ||||
| func (t Date) UnixMicro() int64 { | ||||
| 	return t.TimeUTC().UnixMicro() | ||||
| } | ||||
|  | ||||
| func (t Date) UnixNano() int64 { | ||||
| 	return t.TimeUTC().UnixNano() | ||||
| } | ||||
|  | ||||
| func (t Date) Format(layout string) string { | ||||
| 	return t.TimeUTC().Format(layout) | ||||
| } | ||||
|  | ||||
| func (t Date) GoString() string { | ||||
| 	return t.TimeUTC().GoString() | ||||
| } | ||||
|  | ||||
| func (t Date) String() string { | ||||
| 	return t.TimeUTC().String() | ||||
| } | ||||
|  | ||||
| func NewDate(t time.Time) Date { | ||||
| 	return Date{ | ||||
| 		Year:  t.Year(), | ||||
| 		Month: int(t.Month()), | ||||
| 		Day:   t.Day(), | ||||
| 	} | ||||
| } | ||||
|  | ||||
| func NowDate(loc *time.Location) Date { | ||||
| 	return NewDate(time.Now().In(loc)) | ||||
| } | ||||
|  | ||||
| func NowDateLoc() Date { | ||||
| 	return NewDate(time.Now().In(time.UTC)) | ||||
| } | ||||
|  | ||||
| func NowDateUTC() Date { | ||||
| 	return NewDate(time.Now().In(time.Local)) | ||||
| } | ||||
| @@ -1,6 +1,7 @@ | ||||
| package rfctime | ||||
|  | ||||
| import ( | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/tst" | ||||
| 	"testing" | ||||
| 	"time" | ||||
| ) | ||||
|   | ||||
| @@ -5,7 +5,10 @@ import ( | ||||
| 	"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" | ||||
| 	"time" | ||||
| ) | ||||
|  | ||||
| @@ -66,15 +69,19 @@ func (t *RFC3339Time) UnmarshalText(data []byte) error { | ||||
| } | ||||
|  | ||||
| func (t *RFC3339Time) UnmarshalBSONValue(bt bsontype.Type, data []byte) error { | ||||
| 	if bt == bsontype.Null { | ||||
| 		//t = nil | ||||
| 	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 | ||||
| 		*t = RFC3339Time{} | ||||
| 		return nil | ||||
| 	} | ||||
| 	if bt != bsontype.DateTime { | ||||
| 	if bt != bson.TypeDateTime { | ||||
| 		return errors.New(fmt.Sprintf("cannot unmarshal %v into RFC3339Time", bt)) | ||||
| 	} | ||||
| 	var tt time.Time | ||||
| 	err := bson.Unmarshal(data, &tt) | ||||
| 	err := bson.RawValue{Type: bt, Value: data}.Unmarshal(&tt) | ||||
| 	if err != nil { | ||||
| 		return err | ||||
| 	} | ||||
| @@ -86,6 +93,38 @@ func (t RFC3339Time) MarshalBSONValue() (bsontype.Type, []byte, error) { | ||||
| 	return bson.MarshalValue(time.Time(t)) | ||||
| } | ||||
|  | ||||
| func (t RFC3339Time) 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 = t.UnmarshalBSONValue(tp, src) | ||||
| 	if err != nil { | ||||
| 		return err | ||||
| 	} | ||||
|  | ||||
| 	if val.Kind() == reflect.Ptr { | ||||
| 		val.Set(reflect.ValueOf(&t)) | ||||
| 	} else { | ||||
| 		val.Set(reflect.ValueOf(t)) | ||||
| 	} | ||||
|  | ||||
| 	return nil | ||||
| } | ||||
|  | ||||
| func (t RFC3339Time) Serialize() string { | ||||
| 	return t.Time().Format(t.FormatStr()) | ||||
| } | ||||
|   | ||||
| @@ -5,7 +5,10 @@ import ( | ||||
| 	"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" | ||||
| 	"time" | ||||
| ) | ||||
|  | ||||
| @@ -66,11 +69,15 @@ func (t *RFC3339NanoTime) UnmarshalText(data []byte) error { | ||||
| } | ||||
|  | ||||
| func (t *RFC3339NanoTime) UnmarshalBSONValue(bt bsontype.Type, data []byte) error { | ||||
| 	if bt == bsontype.Null { | ||||
| 		//t = nil | ||||
| 	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 | ||||
| 		*t = RFC3339NanoTime{} | ||||
| 		return nil | ||||
| 	} | ||||
| 	if bt != bsontype.DateTime { | ||||
| 	if bt != bson.TypeDateTime { | ||||
| 		return errors.New(fmt.Sprintf("cannot unmarshal %v into RFC3339NanoTime", bt)) | ||||
| 	} | ||||
| 	var tt time.Time | ||||
| @@ -86,6 +93,38 @@ func (t RFC3339NanoTime) MarshalBSONValue() (bsontype.Type, []byte, error) { | ||||
| 	return bson.MarshalValue(time.Time(t)) | ||||
| } | ||||
|  | ||||
| func (t RFC3339NanoTime) 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 = t.UnmarshalBSONValue(tp, src) | ||||
| 	if err != nil { | ||||
| 		return err | ||||
| 	} | ||||
|  | ||||
| 	if val.Kind() == reflect.Ptr { | ||||
| 		val.Set(reflect.ValueOf(&t)) | ||||
| 	} else { | ||||
| 		val.Set(reflect.ValueOf(t)) | ||||
| 	} | ||||
|  | ||||
| 	return nil | ||||
| } | ||||
|  | ||||
| func (t RFC3339NanoTime) Serialize() string { | ||||
| 	return t.Time().Format(t.FormatStr()) | ||||
| } | ||||
|   | ||||
| @@ -2,6 +2,7 @@ package rfctime | ||||
|  | ||||
| import ( | ||||
| 	"encoding/json" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/timeext" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/tst" | ||||
| 	"testing" | ||||
| 	"time" | ||||
| @@ -13,7 +14,7 @@ func TestRoundtrip(t *testing.T) { | ||||
| 		Value RFC3339NanoTime `json:"v"` | ||||
| 	} | ||||
|  | ||||
| 	val1 := NewRFC3339Nano(time.Unix(0, 1675951556820915171)) | ||||
| 	val1 := NewRFC3339Nano(time.Unix(0, 1675951556820915171).In(timeext.TimezoneBerlin)) | ||||
| 	w1 := Wrap{val1} | ||||
|  | ||||
| 	jstr1, err := json.Marshal(w1) | ||||
|   | ||||
							
								
								
									
										91
									
								
								sq/converter.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										91
									
								
								sq/converter.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,91 @@ | ||||
| package sq | ||||
|  | ||||
| import ( | ||||
| 	"errors" | ||||
| 	"fmt" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/langext" | ||||
| 	"time" | ||||
| ) | ||||
|  | ||||
| //TODO UNFINISHED | ||||
| // this is not finished | ||||
| // idea was that we can register converter in the database struct | ||||
| // they get inherited from the transactions | ||||
| // and when marshallingunmarshaling (sq.Query | sq.QueryAll) | ||||
| // or marshaling (sq.InsertSingle) | ||||
| // the types get converter automatically... | ||||
|  | ||||
| type DBTypeConverter interface { | ||||
| 	ModelTypeString() string | ||||
| 	DBTypeString() string | ||||
| 	ModelToDB(v any) (any, error) | ||||
| 	DBToModel(v any) (any, error) | ||||
| } | ||||
|  | ||||
| var ConverterBoolToBit = NewDBTypeConverter[bool, int](func(v bool) (int, error) { | ||||
| 	return langext.Conditional(v, 1, 0), nil | ||||
| }, func(v int) (bool, error) { | ||||
| 	if v == 0 { | ||||
| 		return false, nil | ||||
| 	} | ||||
| 	if v == 1 { | ||||
| 		return true, nil | ||||
| 	} | ||||
| 	return false, errors.New(fmt.Sprintf("invalid valud for boolean: '%d'", v)) | ||||
| }) | ||||
|  | ||||
| var ConverterTimeToUnixMillis = NewDBTypeConverter[time.Time, int64](func(v time.Time) (int64, error) { | ||||
| 	return v.UnixMilli(), nil | ||||
| }, func(v int64) (time.Time, error) { | ||||
| 	return time.UnixMilli(v), nil | ||||
| }) | ||||
|  | ||||
| var ConverterOptTimeToUnixMillis = NewDBTypeConverter[*time.Time, *int64](func(v *time.Time) (*int64, error) { | ||||
| 	if v == nil { | ||||
| 		return nil, nil | ||||
| 	} | ||||
| 	return langext.Ptr(v.UnixMilli()), nil | ||||
| }, func(v *int64) (*time.Time, error) { | ||||
| 	if v == nil { | ||||
| 		return nil, nil | ||||
| 	} | ||||
| 	return langext.Ptr(time.UnixMilli(*v)), nil | ||||
| }) | ||||
|  | ||||
| type dbTypeConverterImpl[TModelData any, TDBData any] struct { | ||||
| 	dbTypeString    string | ||||
| 	modelTypeString string | ||||
| 	todb            func(v TModelData) (TDBData, error) | ||||
| 	tomodel         func(v TDBData) (TModelData, error) | ||||
| } | ||||
|  | ||||
| func (t *dbTypeConverterImpl[TModelData, TDBData]) ModelTypeString() string { | ||||
| 	return t.modelTypeString | ||||
| } | ||||
|  | ||||
| func (t *dbTypeConverterImpl[TModelData, TDBData]) DBTypeString() string { | ||||
| 	return t.dbTypeString | ||||
| } | ||||
|  | ||||
| func (t *dbTypeConverterImpl[TModelData, TDBData]) ModelToDB(v any) (any, error) { | ||||
| 	if vv, ok := v.(TModelData); ok { | ||||
| 		return t.todb(vv) | ||||
| 	} | ||||
| 	return nil, errors.New(fmt.Sprintf("Unexpected value in DBTypeConverter, expected '%s', found '%T'", t.modelTypeString, v)) | ||||
| } | ||||
|  | ||||
| func (t *dbTypeConverterImpl[TModelData, TDBData]) DBToModel(v any) (any, error) { | ||||
| 	if vv, ok := v.(TDBData); ok { | ||||
| 		return t.tomodel(vv) | ||||
| 	} | ||||
| 	return nil, errors.New(fmt.Sprintf("Unexpected value in DBTypeConverter, expected '%s', found '%T'", t.dbTypeString, v)) | ||||
| } | ||||
|  | ||||
| func NewDBTypeConverter[TModelData any, TDBData any](todb func(v TModelData) (TDBData, error), tomodel func(v TDBData) (TModelData, error)) DBTypeConverter { | ||||
| 	return &dbTypeConverterImpl[TModelData, TDBData]{ | ||||
| 		dbTypeString:    fmt.Sprintf("%T", *new(TDBData)), | ||||
| 		modelTypeString: fmt.Sprintf("%T", *new(TModelData)), | ||||
| 		todb:            todb, | ||||
| 		tomodel:         tomodel, | ||||
| 	} | ||||
| } | ||||
							
								
								
									
										199
									
								
								sq/hasher.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										199
									
								
								sq/hasher.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,199 @@ | ||||
| package sq | ||||
|  | ||||
| import ( | ||||
| 	"context" | ||||
| 	"crypto/sha256" | ||||
| 	"encoding/hex" | ||||
| 	"encoding/json" | ||||
| 	"fmt" | ||||
| 	"github.com/jmoiron/sqlx" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/langext" | ||||
| 	"os" | ||||
| 	"path/filepath" | ||||
| 	"strings" | ||||
| ) | ||||
|  | ||||
| func HashSqliteSchema(ctx context.Context, schemaStr string) (string, error) { | ||||
| 	dbdir := os.TempDir() | ||||
| 	dbfile1 := filepath.Join(dbdir, langext.MustHexUUID()+".sqlite3") | ||||
|  | ||||
| 	err := os.MkdirAll(dbdir, os.ModePerm) | ||||
| 	if err != nil { | ||||
| 		return "", err | ||||
| 	} | ||||
|  | ||||
| 	url := fmt.Sprintf("file:%s?_journal=%s&_timeout=%d&_fk=%s&_busy_timeout=%d", dbfile1, "DELETE", 1000, "true", 1000) | ||||
|  | ||||
| 	xdb, err := sqlx.Open("sqlite3", url) | ||||
| 	if err != nil { | ||||
| 		return "", err | ||||
| 	} | ||||
|  | ||||
| 	db := NewDB(xdb) | ||||
|  | ||||
| 	_, err = db.Exec(ctx, schemaStr, PP{}) | ||||
| 	if err != nil { | ||||
| 		return "", err | ||||
| 	} | ||||
|  | ||||
| 	return HashSqliteDatabase(ctx, db) | ||||
| } | ||||
|  | ||||
| func HashSqliteDatabase(ctx context.Context, db Queryable) (string, error) { | ||||
| 	ss, err := CreateSqliteDatabaseSchemaString(ctx, db) | ||||
| 	if err != nil { | ||||
| 		return "", err | ||||
| 	} | ||||
|  | ||||
| 	cs := sha256.Sum256([]byte(ss)) | ||||
|  | ||||
| 	return hex.EncodeToString(cs[:]), nil | ||||
| } | ||||
|  | ||||
| func CreateSqliteDatabaseSchemaString(ctx context.Context, db Queryable) (string, error) { | ||||
|  | ||||
| 	type colInfo struct { | ||||
| 		Name       string  `db:"name"` | ||||
| 		Type       string  `db:"type"` | ||||
| 		NotNull    string  `db:"notnull"` | ||||
| 		Default    *string `db:"dflt_value"` | ||||
| 		PrimaryKey *string `db:"pk"` | ||||
| 	} | ||||
|  | ||||
| 	type idxInfo struct { | ||||
| 		Name   string `json:"name"       db:"name"` | ||||
| 		Unique int    `json:"unique"     db:"unique"` | ||||
| 		Origin string `json:"origin"     db:"origin"` | ||||
| 		Patial int    `json:"partial"    db:"partial"` | ||||
| 	} | ||||
|  | ||||
| 	type fkyInfo struct { | ||||
| 		TableDest string `json:"table_dest"  db:"table"` | ||||
| 		From      string `json:"from"        db:"from"` | ||||
| 		To        string `json:"to"          db:"to"` | ||||
| 		OnUpdate  string `json:"on_update"   db:"on_update"` | ||||
| 		OnDelete  string `json:"on_delete"   db:"on_delete"` | ||||
| 		Match     string `json:"match"       db:"match"` | ||||
| 	} | ||||
|  | ||||
| 	type tabInfo struct { | ||||
| 		Name   string `json:"name"    db:"name"` | ||||
| 		Type   string `json:"type"    db:"type"` | ||||
| 		NumCol int    `json:"ncol"    db:"ncol"` | ||||
| 		Strict int    `json:"strict"  db:"strict"` | ||||
|  | ||||
| 		ColumnInfo []colInfo `json:"-"` | ||||
| 		IndexInfo  []idxInfo `json:"-"` | ||||
| 		FKeyInfo   []fkyInfo `json:"-"` | ||||
| 	} | ||||
|  | ||||
| 	rowsTableList, err := db.Query(ctx, "PRAGMA table_list;", PP{}) | ||||
| 	if err != nil { | ||||
| 		return "", err | ||||
| 	} | ||||
| 	tableList, err := ScanAll[tabInfo](rowsTableList, SModeFast, Unsafe, true) | ||||
| 	if err != nil { | ||||
| 		return "", err | ||||
| 	} | ||||
|  | ||||
| 	langext.SortBy(tableList, func(v tabInfo) string { return v.Name }) | ||||
|  | ||||
| 	result := make([]tabInfo, 0) | ||||
|  | ||||
| 	for i, tab := range tableList { | ||||
|  | ||||
| 		if strings.HasPrefix(tab.Name, "sqlite_") { | ||||
| 			continue | ||||
| 		} | ||||
|  | ||||
| 		{ | ||||
|  | ||||
| 			rowsColumnList, err := db.Query(ctx, fmt.Sprintf("PRAGMA table_info(\"%s\");", tab.Name), PP{}) | ||||
| 			if err != nil { | ||||
| 				return "", err | ||||
| 			} | ||||
|  | ||||
| 			columnList, err := ScanAll[colInfo](rowsColumnList, SModeFast, Unsafe, true) | ||||
| 			if err != nil { | ||||
| 				return "", err | ||||
| 			} | ||||
|  | ||||
| 			langext.SortBy(columnList, func(v colInfo) string { return v.Name }) | ||||
|  | ||||
| 			tableList[i].ColumnInfo = columnList | ||||
| 		} | ||||
|  | ||||
| 		{ | ||||
| 			rowsIdxList, err := db.Query(ctx, fmt.Sprintf("PRAGMA index_list(\"%s\");", tab.Name), PP{}) | ||||
| 			if err != nil { | ||||
| 				return "", err | ||||
| 			} | ||||
| 			idxList, err := ScanAll[idxInfo](rowsIdxList, SModeFast, Unsafe, true) | ||||
| 			if err != nil { | ||||
| 				return "", err | ||||
| 			} | ||||
|  | ||||
| 			langext.SortBy(idxList, func(v idxInfo) string { return v.Name }) | ||||
|  | ||||
| 			tableList[i].IndexInfo = idxList | ||||
| 		} | ||||
|  | ||||
| 		{ | ||||
| 			rowsIdxList, err := db.Query(ctx, fmt.Sprintf("PRAGMA foreign_key_list(\"%s\");", tab.Name), PP{}) | ||||
| 			if err != nil { | ||||
| 				return "", err | ||||
| 			} | ||||
| 			fkyList, err := ScanAll[fkyInfo](rowsIdxList, SModeFast, Unsafe, true) | ||||
| 			if err != nil { | ||||
| 				return "", err | ||||
| 			} | ||||
|  | ||||
| 			langext.SortBy(fkyList, func(v fkyInfo) string { return v.From }) | ||||
|  | ||||
| 			tableList[i].FKeyInfo = fkyList | ||||
| 		} | ||||
|  | ||||
| 		result = append(result, tableList[i]) | ||||
| 	} | ||||
|  | ||||
| 	strBuilderResult := "" | ||||
| 	for _, vTab := range result { | ||||
| 		jbinTable, err := json.Marshal(vTab) | ||||
| 		if err != nil { | ||||
| 			return "", err | ||||
| 		} | ||||
|  | ||||
| 		strBuilderResult += fmt.Sprintf("#TABLE: %s\n{\n", string(jbinTable)) | ||||
|  | ||||
| 		for _, vCol := range vTab.ColumnInfo { | ||||
| 			jbinColumn, err := json.Marshal(vCol) | ||||
| 			if err != nil { | ||||
| 				return "", err | ||||
| 			} | ||||
|  | ||||
| 			strBuilderResult += fmt.Sprintf("    COLUMN: %s\n", string(jbinColumn)) | ||||
| 		} | ||||
|  | ||||
| 		for _, vIdx := range vTab.IndexInfo { | ||||
| 			jbinIndex, err := json.Marshal(vIdx) | ||||
| 			if err != nil { | ||||
| 				return "", err | ||||
| 			} | ||||
|  | ||||
| 			strBuilderResult += fmt.Sprintf("    INDEX:  %s\n", string(jbinIndex)) | ||||
| 		} | ||||
|  | ||||
| 		for _, vFky := range vTab.FKeyInfo { | ||||
| 			jbinFKey, err := json.Marshal(vFky) | ||||
| 			if err != nil { | ||||
| 				return "", err | ||||
| 			} | ||||
|  | ||||
| 			strBuilderResult += fmt.Sprintf("    FKEY:   %s\n", string(jbinFKey)) | ||||
| 		} | ||||
|  | ||||
| 		strBuilderResult += "}\n\n" | ||||
| 	} | ||||
|  | ||||
| 	return strBuilderResult, nil | ||||
| } | ||||
| @@ -1,9 +1,13 @@ | ||||
| package sq | ||||
|  | ||||
| import ( | ||||
| 	"context" | ||||
| 	"database/sql" | ||||
| 	"errors" | ||||
| 	"fmt" | ||||
| 	"github.com/jmoiron/sqlx" | ||||
| 	"reflect" | ||||
| 	"strings" | ||||
| ) | ||||
|  | ||||
| type StructScanMode string | ||||
| @@ -16,10 +20,79 @@ const ( | ||||
| type StructScanSafety string | ||||
|  | ||||
| const ( | ||||
| 	Safe   StructScanSafety = "SAFE" | ||||
| 	Unsafe StructScanSafety = "UNSAFE" | ||||
| 	Safe   StructScanSafety = "SAFE"   // return error for missing fields | ||||
| 	Unsafe StructScanSafety = "UNSAFE" // ignore missing fields | ||||
| ) | ||||
|  | ||||
| func InsertSingle[TData any](ctx context.Context, q Queryable, tableName string, v TData) (sql.Result, error) { | ||||
|  | ||||
| 	rval := reflect.ValueOf(v) | ||||
| 	rtyp := rval.Type() | ||||
|  | ||||
| 	columns := make([]string, 0) | ||||
| 	params := make([]string, 0) | ||||
| 	pp := PP{} | ||||
|  | ||||
| 	for i := 0; i < rtyp.NumField(); i++ { | ||||
|  | ||||
| 		rsfield := rtyp.Field(i) | ||||
| 		rvfield := rval.Field(i) | ||||
|  | ||||
| 		if !rsfield.IsExported() { | ||||
| 			continue | ||||
| 		} | ||||
|  | ||||
| 		columnName := rsfield.Tag.Get("db") | ||||
| 		if columnName == "" || columnName == "-" { | ||||
| 			continue | ||||
| 		} | ||||
|  | ||||
| 		paramkey := fmt.Sprintf("_%s", columnName) | ||||
|  | ||||
| 		columns = append(columns, "\""+columnName+"\"") | ||||
| 		params = append(params, ":"+paramkey) | ||||
| 		pp[paramkey] = rvfield.Interface() | ||||
|  | ||||
| 	} | ||||
|  | ||||
| 	sqlstr := fmt.Sprintf("INSERT"+" INTO \"%s\" (%s) VALUES (%s)", tableName, strings.Join(columns, ", "), strings.Join(params, ", ")) | ||||
|  | ||||
| 	sqlr, err := q.Exec(ctx, sqlstr, pp) | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
|  | ||||
| 	return sqlr, nil | ||||
| } | ||||
|  | ||||
| func QuerySingle[TData any](ctx context.Context, q Queryable, sql string, pp PP, mode StructScanMode, sec StructScanSafety) (TData, error) { | ||||
| 	rows, err := q.Query(ctx, sql, pp) | ||||
| 	if err != nil { | ||||
| 		return *new(TData), err | ||||
| 	} | ||||
|  | ||||
| 	data, err := ScanSingle[TData](rows, mode, sec, true) | ||||
| 	if err != nil { | ||||
| 		return *new(TData), err | ||||
| 	} | ||||
|  | ||||
| 	return data, nil | ||||
| } | ||||
|  | ||||
| func QueryAll[TData any](ctx context.Context, q Queryable, sql string, pp PP, mode StructScanMode, sec StructScanSafety) ([]TData, error) { | ||||
| 	rows, err := q.Query(ctx, sql, pp) | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
|  | ||||
| 	data, err := ScanAll[TData](rows, mode, sec, true) | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
|  | ||||
| 	return data, nil | ||||
| } | ||||
|  | ||||
| func ScanSingle[TData any](rows *sqlx.Rows, mode StructScanMode, sec StructScanSafety, close bool) (TData, error) { | ||||
| 	if rows.Next() { | ||||
| 		var strscan *StructScanner | ||||
|   | ||||
| @@ -7,24 +7,40 @@ import ( | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/langext" | ||||
| ) | ||||
|  | ||||
| type TxStatus string | ||||
|  | ||||
| const ( | ||||
| 	TxStatusInitial  TxStatus = "INITIAL" | ||||
| 	TxStatusActive   TxStatus = "ACTIVE" | ||||
| 	TxStatusComitted TxStatus = "COMMITTED" | ||||
| 	TxStatusRollback TxStatus = "ROLLBACK" | ||||
| ) | ||||
|  | ||||
| type Tx interface { | ||||
| 	Rollback() error | ||||
| 	Commit() error | ||||
| 	Status() TxStatus | ||||
| 	Exec(ctx context.Context, sql string, prep PP) (sql.Result, error) | ||||
| 	Query(ctx context.Context, sql string, prep PP) (*sqlx.Rows, error) | ||||
| } | ||||
|  | ||||
| type transaction struct { | ||||
| 	tx   *sqlx.Tx | ||||
| 	id   uint16 | ||||
| 	lstr []Listener | ||||
| 	tx       *sqlx.Tx | ||||
| 	id       uint16 | ||||
| 	lstr     []Listener | ||||
| 	status   TxStatus | ||||
| 	execCtr  int | ||||
| 	queryCtr int | ||||
| } | ||||
|  | ||||
| func NewTransaction(xtx *sqlx.Tx, txid uint16, lstr []Listener) Tx { | ||||
| 	return &transaction{ | ||||
| 		tx:   xtx, | ||||
| 		id:   txid, | ||||
| 		lstr: lstr, | ||||
| 		tx:       xtx, | ||||
| 		id:       txid, | ||||
| 		lstr:     lstr, | ||||
| 		status:   TxStatusInitial, | ||||
| 		execCtr:  0, | ||||
| 		queryCtr: 0, | ||||
| 	} | ||||
| } | ||||
|  | ||||
| @@ -38,6 +54,10 @@ func (tx *transaction) Rollback() error { | ||||
|  | ||||
| 	result := tx.tx.Rollback() | ||||
|  | ||||
| 	if result == nil { | ||||
| 		tx.status = TxStatusRollback | ||||
| 	} | ||||
|  | ||||
| 	for _, v := range tx.lstr { | ||||
| 		v.PostTxRollback(tx.id, result) | ||||
| 	} | ||||
| @@ -55,6 +75,10 @@ func (tx *transaction) Commit() error { | ||||
|  | ||||
| 	result := tx.tx.Commit() | ||||
|  | ||||
| 	if result == nil { | ||||
| 		tx.status = TxStatusComitted | ||||
| 	} | ||||
|  | ||||
| 	for _, v := range tx.lstr { | ||||
| 		v.PostTxRollback(tx.id, result) | ||||
| 	} | ||||
| @@ -73,6 +97,10 @@ func (tx *transaction) Exec(ctx context.Context, sqlstr string, prep PP) (sql.Re | ||||
|  | ||||
| 	res, err := tx.tx.NamedExecContext(ctx, sqlstr, prep) | ||||
|  | ||||
| 	if tx.status == TxStatusInitial && err == nil { | ||||
| 		tx.status = TxStatusActive | ||||
| 	} | ||||
|  | ||||
| 	for _, v := range tx.lstr { | ||||
| 		v.PostExec(langext.Ptr(tx.id), origsql, sqlstr, prep) | ||||
| 	} | ||||
| @@ -94,6 +122,10 @@ func (tx *transaction) Query(ctx context.Context, sqlstr string, prep PP) (*sqlx | ||||
|  | ||||
| 	rows, err := sqlx.NamedQueryContext(ctx, tx.tx, sqlstr, prep) | ||||
|  | ||||
| 	if tx.status == TxStatusInitial && err == nil { | ||||
| 		tx.status = TxStatusActive | ||||
| 	} | ||||
|  | ||||
| 	for _, v := range tx.lstr { | ||||
| 		v.PostQuery(langext.Ptr(tx.id), origsql, sqlstr, prep) | ||||
| 	} | ||||
| @@ -103,3 +135,11 @@ func (tx *transaction) Query(ctx context.Context, sqlstr string, prep PP) (*sqlx | ||||
| 	} | ||||
| 	return rows, nil | ||||
| } | ||||
|  | ||||
| func (tx *transaction) Status() TxStatus { | ||||
| 	return tx.status | ||||
| } | ||||
|  | ||||
| func (tx *transaction) Traffic() (int, int) { | ||||
| 	return tx.execCtr, tx.queryCtr | ||||
| } | ||||
|   | ||||
| @@ -71,12 +71,12 @@ func SupportsColors() bool { | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
| 	var term256Regex = regexp.MustCompile("(?i)-256(color)?$") | ||||
| 	var term256Regex = regexp.MustCompile(`(?i)-256(color)?$`) | ||||
| 	if term256Regex.MatchString(termenv) { | ||||
| 		return true | ||||
| 	} | ||||
|  | ||||
| 	var termBasicRegex = regexp.MustCompile("(?i)^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux") | ||||
| 	var termBasicRegex = regexp.MustCompile(`(?i)^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux`) | ||||
|  | ||||
| 	if termBasicRegex.MatchString(termenv) { | ||||
| 		return true | ||||
|   | ||||
| @@ -1,6 +1,7 @@ | ||||
| package termext | ||||
|  | ||||
| import ( | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/tst" | ||||
| 	"math/rand" | ||||
| 	"testing" | ||||
| ) | ||||
| @@ -32,9 +33,3 @@ func TestColor(t *testing.T) { | ||||
| 	tst.AssertEqual(t, CleanString(Gray("test")), "test") | ||||
| 	tst.AssertEqual(t, CleanString(White("test")), "test") | ||||
| } | ||||
|  | ||||
| func tst.AssertEqual(t *testing.T, actual string, expected string) { | ||||
| 	if actual != expected { | ||||
| 		t.Errorf("values differ: Actual: '%v', Expected: '%v'", actual, expected) | ||||
| 	} | ||||
| } | ||||
|   | ||||
| @@ -7,56 +7,56 @@ import ( | ||||
|  | ||||
| func TestParseDurationShortString(t *testing.T) { | ||||
|  | ||||
| 	tst.AssertPDSSEqual(t, FromSeconds(1), "1s") | ||||
| 	tst.AssertPDSSEqual(t, FromSeconds(1), "1sec") | ||||
| 	tst.AssertPDSSEqual(t, FromSeconds(1), "1second") | ||||
| 	tst.AssertPDSSEqual(t, FromSeconds(1), "1seconds") | ||||
| 	tst.AssertPDSSEqual(t, FromSeconds(100), "100second") | ||||
| 	tst.AssertPDSSEqual(t, FromSeconds(100), "100seconds") | ||||
| 	tst.AssertPDSSEqual(t, FromSeconds(1883639.77), "1883639.77second") | ||||
| 	tst.AssertPDSSEqual(t, FromSeconds(1883639.77), "1883639.77seconds") | ||||
| 	tst.AssertPDSSEqual(t, FromSeconds(50), "50s") | ||||
| 	tst.AssertPDSSEqual(t, FromSeconds(50), "50sec") | ||||
| 	tst.AssertPDSSEqual(t, FromSeconds(1), "1second") | ||||
| 	tst.AssertPDSSEqual(t, FromSeconds(50), "50seconds") | ||||
| 	assertPDSSEqual(t, FromSeconds(1), "1s") | ||||
| 	assertPDSSEqual(t, FromSeconds(1), "1sec") | ||||
| 	assertPDSSEqual(t, FromSeconds(1), "1second") | ||||
| 	assertPDSSEqual(t, FromSeconds(1), "1seconds") | ||||
| 	assertPDSSEqual(t, FromSeconds(100), "100second") | ||||
| 	assertPDSSEqual(t, FromSeconds(100), "100seconds") | ||||
| 	assertPDSSEqual(t, FromSeconds(1883639.77), "1883639.77second") | ||||
| 	assertPDSSEqual(t, FromSeconds(1883639.77), "1883639.77seconds") | ||||
| 	assertPDSSEqual(t, FromSeconds(50), "50s") | ||||
| 	assertPDSSEqual(t, FromSeconds(50), "50sec") | ||||
| 	assertPDSSEqual(t, FromSeconds(1), "1second") | ||||
| 	assertPDSSEqual(t, FromSeconds(50), "50seconds") | ||||
|  | ||||
| 	tst.AssertPDSSEqual(t, FromMinutes(10), "10m") | ||||
| 	tst.AssertPDSSEqual(t, FromMinutes(10), "10min") | ||||
| 	tst.AssertPDSSEqual(t, FromMinutes(1), "1minute") | ||||
| 	tst.AssertPDSSEqual(t, FromMinutes(10), "10minutes") | ||||
| 	tst.AssertPDSSEqual(t, FromMinutes(10.5), "10.5minutes") | ||||
| 	assertPDSSEqual(t, FromMinutes(10), "10m") | ||||
| 	assertPDSSEqual(t, FromMinutes(10), "10min") | ||||
| 	assertPDSSEqual(t, FromMinutes(1), "1minute") | ||||
| 	assertPDSSEqual(t, FromMinutes(10), "10minutes") | ||||
| 	assertPDSSEqual(t, FromMinutes(10.5), "10.5minutes") | ||||
|  | ||||
| 	tst.AssertPDSSEqual(t, FromMilliseconds(100), "100ms") | ||||
| 	tst.AssertPDSSEqual(t, FromMilliseconds(100), "100milliseconds") | ||||
| 	tst.AssertPDSSEqual(t, FromMilliseconds(100), "100millisecond") | ||||
| 	assertPDSSEqual(t, FromMilliseconds(100), "100ms") | ||||
| 	assertPDSSEqual(t, FromMilliseconds(100), "100milliseconds") | ||||
| 	assertPDSSEqual(t, FromMilliseconds(100), "100millisecond") | ||||
|  | ||||
| 	tst.AssertPDSSEqual(t, FromNanoseconds(99235), "99235ns") | ||||
| 	tst.AssertPDSSEqual(t, FromNanoseconds(99235), "99235nanoseconds") | ||||
| 	tst.AssertPDSSEqual(t, FromNanoseconds(99235), "99235nanosecond") | ||||
| 	assertPDSSEqual(t, FromNanoseconds(99235), "99235ns") | ||||
| 	assertPDSSEqual(t, FromNanoseconds(99235), "99235nanoseconds") | ||||
| 	assertPDSSEqual(t, FromNanoseconds(99235), "99235nanosecond") | ||||
|  | ||||
| 	tst.AssertPDSSEqual(t, FromMicroseconds(99235), "99235us") | ||||
| 	tst.AssertPDSSEqual(t, FromMicroseconds(99235), "99235microseconds") | ||||
| 	tst.AssertPDSSEqual(t, FromMicroseconds(99235), "99235microsecond") | ||||
| 	assertPDSSEqual(t, FromMicroseconds(99235), "99235us") | ||||
| 	assertPDSSEqual(t, FromMicroseconds(99235), "99235microseconds") | ||||
| 	assertPDSSEqual(t, FromMicroseconds(99235), "99235microsecond") | ||||
|  | ||||
| 	tst.AssertPDSSEqual(t, FromHours(1), "1h") | ||||
| 	tst.AssertPDSSEqual(t, FromHours(1), "1hour") | ||||
| 	tst.AssertPDSSEqual(t, FromHours(2), "2hours") | ||||
| 	assertPDSSEqual(t, FromHours(1), "1h") | ||||
| 	assertPDSSEqual(t, FromHours(1), "1hour") | ||||
| 	assertPDSSEqual(t, FromHours(2), "2hours") | ||||
|  | ||||
| 	tst.AssertPDSSEqual(t, FromDays(1), "1d") | ||||
| 	tst.AssertPDSSEqual(t, FromDays(1), "1day") | ||||
| 	tst.AssertPDSSEqual(t, FromDays(10), "10days") | ||||
| 	tst.AssertPDSSEqual(t, FromDays(1), "1days") | ||||
| 	tst.AssertPDSSEqual(t, FromDays(10), "10day") | ||||
| 	assertPDSSEqual(t, FromDays(1), "1d") | ||||
| 	assertPDSSEqual(t, FromDays(1), "1day") | ||||
| 	assertPDSSEqual(t, FromDays(10), "10days") | ||||
| 	assertPDSSEqual(t, FromDays(1), "1days") | ||||
| 	assertPDSSEqual(t, FromDays(10), "10day") | ||||
|  | ||||
| 	tst.AssertPDSSEqual(t, FromDays(1)+FromMinutes(10), "1d10m") | ||||
| 	tst.AssertPDSSEqual(t, FromDays(1)+FromMinutes(10)+FromSeconds(200), "1d10m200sec") | ||||
| 	tst.AssertPDSSEqual(t, FromDays(1)+FromMinutes(10), "1d:10m") | ||||
| 	tst.AssertPDSSEqual(t, FromDays(1)+FromMinutes(10), "1d 10m") | ||||
| 	tst.AssertPDSSEqual(t, FromDays(1)+FromMinutes(10), "1d,10m") | ||||
| 	tst.AssertPDSSEqual(t, FromDays(1)+FromMinutes(10), "1d, 10m") | ||||
| 	tst.AssertPDSSEqual(t, FromDays(1)+FromSeconds(1000), "1d   1000seconds") | ||||
| 	assertPDSSEqual(t, FromDays(1)+FromMinutes(10), "1d10m") | ||||
| 	assertPDSSEqual(t, FromDays(1)+FromMinutes(10)+FromSeconds(200), "1d10m200sec") | ||||
| 	assertPDSSEqual(t, FromDays(1)+FromMinutes(10), "1d:10m") | ||||
| 	assertPDSSEqual(t, FromDays(1)+FromMinutes(10), "1d 10m") | ||||
| 	assertPDSSEqual(t, FromDays(1)+FromMinutes(10), "1d,10m") | ||||
| 	assertPDSSEqual(t, FromDays(1)+FromMinutes(10), "1d, 10m") | ||||
| 	assertPDSSEqual(t, FromDays(1)+FromSeconds(1000), "1d   1000seconds") | ||||
|  | ||||
| 	tst.AssertPDSSEqual(t, FromDays(1), "86400s") | ||||
| 	assertPDSSEqual(t, FromDays(1), "86400s") | ||||
| } | ||||
|  | ||||
| func assertPDSSEqual(t *testing.T, expected time.Duration, fmt string) { | ||||
|   | ||||
| @@ -22,6 +22,17 @@ func TimeToDatePart(t time.Time, tz *time.Location) time.Time { | ||||
| 	return time.Date(t.Year(), t.Month(), t.Day(), 0, 0, 0, 0, t.Location()) | ||||
| } | ||||
|  | ||||
| // TimeToDayStart returns a timestamp at the start of the day which contains t (= 00:00:00) | ||||
| func TimeToDayStart(t time.Time, tz *time.Location) time.Time { | ||||
| 	t = t.In(tz) | ||||
| 	return time.Date(t.Year(), t.Month(), t.Day(), 0, 0, 0, 0, t.Location()) | ||||
| } | ||||
|  | ||||
| // TimeToDayEnd returns a timestamp at the end of the day which contains t (= 23:59:59) | ||||
| func TimeToDayEnd(t time.Time, tz *time.Location) time.Time { | ||||
| 	return TimeToDayStart(t, tz).AddDate(0, 0, 1).Add(-1) | ||||
| } | ||||
|  | ||||
| // TimeToWeekStart returns a timestamp at the start of the week which contains t (= Monday 00:00:00) | ||||
| func TimeToWeekStart(t time.Time, tz *time.Location) time.Time { | ||||
| 	t = TimeToDatePart(t, tz) | ||||
|   | ||||
| @@ -2,6 +2,7 @@ package tst | ||||
|  | ||||
| import ( | ||||
| 	"encoding/hex" | ||||
| 	"runtime/debug" | ||||
| 	"testing" | ||||
| ) | ||||
|  | ||||
| @@ -54,12 +55,18 @@ func AssertHexEqual(t *testing.T, expected string, actual []byte) { | ||||
|  | ||||
| func AssertTrue(t *testing.T, value bool) { | ||||
| 	if !value { | ||||
| 		t.Error("value should be true") | ||||
| 		t.Error("value should be true\n" + string(debug.Stack())) | ||||
| 	} | ||||
| } | ||||
|  | ||||
| func AssertFalse(t *testing.T, value bool) { | ||||
| 	if value { | ||||
| 		t.Error("value should be false") | ||||
| 		t.Error("value should be false\n" + string(debug.Stack())) | ||||
| 	} | ||||
| } | ||||
|  | ||||
| func AssertNoErr(t *testing.T, anerr error) { | ||||
| 	if anerr != nil { | ||||
| 		t.Error("Function returned an error: " + anerr.Error() + "\n" + string(debug.Stack())) | ||||
| 	} | ||||
| } | ||||
|   | ||||
							
								
								
									
										100
									
								
								wmo/collection.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										100
									
								
								wmo/collection.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,100 @@ | ||||
| package wmo | ||||
|  | ||||
| import ( | ||||
| 	"context" | ||||
| 	"go.mongodb.org/mongo-driver/bson/bsontype" | ||||
| 	"go.mongodb.org/mongo-driver/mongo" | ||||
| 	ct "gogs.mikescher.com/BlackForestBytes/goext/cursortoken" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/exerr" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/langext" | ||||
| 	"reflect" | ||||
| ) | ||||
|  | ||||
| type EntityID interface { | ||||
| 	MarshalBSONValue() (bsontype.Type, []byte, error) | ||||
| 	String() string | ||||
| } | ||||
|  | ||||
| type Decodable interface { | ||||
| 	Decode(v any) error | ||||
| } | ||||
|  | ||||
| type Cursorable interface { | ||||
| 	Decode(v any) error | ||||
| 	Err() error | ||||
| 	Close(ctx context.Context) error | ||||
| 	All(ctx context.Context, results any) error | ||||
| 	RemainingBatchLength() int | ||||
| 	Next(ctx context.Context) bool | ||||
| } | ||||
|  | ||||
| type fullTypeRef struct { | ||||
| 	IsPointer      bool | ||||
| 	Kind           reflect.Kind | ||||
| 	RealType       reflect.Type | ||||
| 	Type           reflect.Type | ||||
| 	UnderlyingType reflect.Type | ||||
| 	Name           string | ||||
| 	Index          []int | ||||
| } | ||||
|  | ||||
| type Coll[TData any] struct { | ||||
| 	coll                *mongo.Collection                                        // internal mongo collection, access via Collection() | ||||
| 	dataTypeMap         map[string]fullTypeRef                                   // list of TData fields (only if TData is not an interface) | ||||
| 	implDataTypeMap     map[reflect.Type]map[string]fullTypeRef                  // dynamic list of fields of TData implementations (only if TData is an interface) | ||||
| 	customDecoder       *func(ctx context.Context, dec Decodable) (TData, error) // custom decoding function (useful if TData is an interface) | ||||
| 	isInterfaceDataType bool                                                     // true if TData is an interface (not a struct) | ||||
| } | ||||
|  | ||||
| func (c *Coll[TData]) Collection() *mongo.Collection { | ||||
| 	return c.coll | ||||
| } | ||||
|  | ||||
| func (c *Coll[TData]) Name() string { | ||||
| 	return c.coll.Name() | ||||
| } | ||||
|  | ||||
| func (c *Coll[TData]) WithDecodeFunc(cdf func(ctx context.Context, dec Decodable) (TData, error), example TData) *Coll[TData] { | ||||
|  | ||||
| 	c.EnsureInitializedReflection(example) | ||||
|  | ||||
| 	c.customDecoder = langext.Ptr(cdf) | ||||
| 	return c | ||||
| } | ||||
|  | ||||
| func (c *Coll[TData]) Indexes() mongo.IndexView { | ||||
| 	return c.coll.Indexes() | ||||
| } | ||||
|  | ||||
| func (c *Coll[TData]) Drop(ctx context.Context) error { | ||||
| 	err := c.coll.Drop(ctx) | ||||
| 	if err != nil { | ||||
| 		return exerr.Wrap(err, "failed to drop collection").Str("collection", c.Name()).Build() | ||||
| 	} | ||||
| 	return nil | ||||
| } | ||||
|  | ||||
| func (c *Coll[TData]) createToken(fieldPrimary string, dirPrimary ct.SortDirection, fieldSecondary *string, dirSecondary *ct.SortDirection, lastEntity TData, pageSize *int) (ct.CursorToken, error) { | ||||
|  | ||||
| 	valuePrimary, err := c.getFieldValueAsTokenString(lastEntity, fieldPrimary) | ||||
| 	if err != nil { | ||||
| 		return ct.CursorToken{}, exerr.Wrap(err, "failed to get (primary) field-value as token-string").Type("lastEntity", lastEntity).Str("fieldPrimary", fieldPrimary).Build() | ||||
| 	} | ||||
|  | ||||
| 	valueSeconary := "" | ||||
| 	if fieldSecondary != nil && dirSecondary != nil { | ||||
| 		valueSeconary, err = c.getFieldValueAsTokenString(lastEntity, *fieldSecondary) | ||||
| 		if err != nil { | ||||
| 			return ct.CursorToken{}, exerr.Wrap(err, "failed to get (secondary) field-value as token-string").Type("lastEntity", lastEntity).StrPtr("fieldSecondary", fieldSecondary).Build() | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
| 	return ct.CursorToken{ | ||||
| 		Mode:           ct.CTMNormal, | ||||
| 		ValuePrimary:   valuePrimary, | ||||
| 		ValueSecondary: valueSeconary, | ||||
| 		Direction:      dirPrimary, | ||||
| 		PageSize:       langext.Coalesce(pageSize, 0), | ||||
| 		Extra:          ct.Extra{}, | ||||
| 	}, nil | ||||
| } | ||||
							
								
								
									
										59
									
								
								wmo/decoding.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										59
									
								
								wmo/decoding.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,59 @@ | ||||
| package wmo | ||||
|  | ||||
| import ( | ||||
| 	"context" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/exerr" | ||||
| ) | ||||
|  | ||||
| func (c *Coll[TData]) decodeSingle(ctx context.Context, dec Decodable) (TData, error) { | ||||
| 	if c.customDecoder != nil { | ||||
|  | ||||
| 		res, err := (*c.customDecoder)(ctx, dec) | ||||
| 		if err != nil { | ||||
| 			return *new(TData), exerr.Wrap(err, "failed to decode single entity with custom-decoder").Type("decoder", *c.customDecoder).Build() | ||||
| 		} | ||||
| 		return res, nil | ||||
|  | ||||
| 	} else { | ||||
|  | ||||
| 		var res TData | ||||
|  | ||||
| 		err := dec.Decode(&res) | ||||
| 		if err != nil { | ||||
| 			return *new(TData), exerr.Wrap(err, "failed to decode single entity").Type("target-type", res).Build() | ||||
| 		} | ||||
|  | ||||
| 		return res, nil | ||||
|  | ||||
| 	} | ||||
| } | ||||
|  | ||||
| func (c *Coll[TData]) decodeAll(ctx context.Context, cursor Cursorable) ([]TData, error) { | ||||
| 	if c.customDecoder != nil { | ||||
|  | ||||
| 		res := make([]TData, 0, cursor.RemainingBatchLength()) | ||||
|  | ||||
| 		for cursor.Next(ctx) { | ||||
| 			entry, err := (*c.customDecoder)(ctx, cursor) | ||||
| 			if err != nil { | ||||
| 				return nil, exerr.Wrap(err, "failed to decode entity with custom-decoder").Type("decoder", *c.customDecoder).Build() | ||||
| 			} | ||||
| 			res = append(res, entry) | ||||
| 		} | ||||
|  | ||||
| 		return res, nil | ||||
|  | ||||
| 	} else { | ||||
|  | ||||
| 		res := make([]TData, 0, cursor.RemainingBatchLength()) | ||||
|  | ||||
| 		err := cursor.All(ctx, &res) | ||||
| 		if err != nil { | ||||
| 			return nil, exerr.Wrap(err, "failed to batch-decode entity").Type("target-type", res).Build() | ||||
| 		} | ||||
|  | ||||
| 		return res, nil | ||||
|  | ||||
| 	} | ||||
|  | ||||
| } | ||||
							
								
								
									
										11
									
								
								wmo/mongo.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										11
									
								
								wmo/mongo.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,11 @@ | ||||
| package wmo | ||||
|  | ||||
| import "go.mongodb.org/mongo-driver/mongo" | ||||
|  | ||||
| func W[TData any](collection *mongo.Collection) *Coll[TData] { | ||||
| 	c := Coll[TData]{coll: collection} | ||||
|  | ||||
| 	c.init() | ||||
|  | ||||
| 	return &c | ||||
| } | ||||
							
								
								
									
										87
									
								
								wmo/pagination.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										87
									
								
								wmo/pagination.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,87 @@ | ||||
| package wmo | ||||
|  | ||||
| import ( | ||||
| 	"go.mongodb.org/mongo-driver/bson" | ||||
| 	ct "gogs.mikescher.com/BlackForestBytes/goext/cursortoken" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/exerr" | ||||
| ) | ||||
|  | ||||
| func CreatePagination[TData any](coll *Coll[TData], token ct.CursorToken, fieldPrimary string, sortPrimary ct.SortDirection, fieldSecondary *string, sortSecondary *ct.SortDirection, pageSize *int) ([]bson.D, error) { | ||||
|  | ||||
| 	cond := bson.A{} | ||||
| 	sort := bson.D{} | ||||
|  | ||||
| 	valuePrimary, err := coll.getTokenValueAsMongoType(token.ValuePrimary, fieldPrimary) | ||||
| 	if err != nil { | ||||
| 		return nil, exerr.Wrap(err, "failed to get (primary) token-value as mongo-type").Build() | ||||
| 	} | ||||
|  | ||||
| 	if sortPrimary == ct.SortASC { | ||||
| 		// We sort ASC on <field> - so we want all entries newer ($gt) than the $primary | ||||
| 		cond = append(cond, bson.M{fieldPrimary: bson.M{"$gt": valuePrimary}}) | ||||
| 		sort = append(sort, bson.E{Key: fieldPrimary, Value: +1}) | ||||
| 	} else if sortPrimary == ct.SortDESC { | ||||
| 		// We sort DESC on <field> - so we want all entries older ($lt) than the $primary | ||||
| 		cond = append(cond, bson.M{fieldPrimary: bson.M{"$lt": valuePrimary}}) | ||||
| 		sort = append(sort, bson.E{Key: fieldPrimary, Value: -1}) | ||||
| 	} | ||||
|  | ||||
| 	if fieldSecondary != nil && sortSecondary != nil && *fieldSecondary != fieldPrimary { | ||||
|  | ||||
| 		valueSecondary, err := coll.getTokenValueAsMongoType(token.ValueSecondary, *fieldSecondary) | ||||
| 		if err != nil { | ||||
| 			return nil, exerr.Wrap(err, "failed to get (secondary) token-value as mongo-type").Build() | ||||
| 		} | ||||
|  | ||||
| 		if *sortSecondary == ct.SortASC { | ||||
|  | ||||
| 			// the conflict-resolution condition, for entries with the _same_ <field> as the $primary we take the ones with a greater $secondary (= newer) | ||||
| 			cond = append(cond, bson.M{"$and": bson.A{ | ||||
| 				bson.M{fieldPrimary: valuePrimary}, | ||||
| 				bson.M{*fieldSecondary: bson.M{"$gt": valueSecondary}}, | ||||
| 			}}) | ||||
|  | ||||
| 			sort = append(sort, bson.E{Key: fieldPrimary, Value: +1}) | ||||
|  | ||||
| 		} else if *sortSecondary == ct.SortDESC { | ||||
|  | ||||
| 			// the conflict-resolution condition, for entries with the _same_ <field> as the $primary we take the ones with a smaller $secondary (= older) | ||||
| 			cond = append(cond, bson.M{"$and": bson.A{ | ||||
| 				bson.M{fieldPrimary: valuePrimary}, | ||||
| 				bson.M{*fieldSecondary: bson.M{"$lt": valueSecondary}}, | ||||
| 			}}) | ||||
|  | ||||
| 			sort = append(sort, bson.E{Key: fieldPrimary, Value: -1}) | ||||
|  | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
| 	pipeline := make([]bson.D, 0, 3) | ||||
|  | ||||
| 	if token.Mode == ct.CTMStart { | ||||
|  | ||||
| 		// no gt/lt condition | ||||
|  | ||||
| 	} else if token.Mode == ct.CTMNormal { | ||||
|  | ||||
| 		pipeline = append(pipeline, bson.D{{Key: "$match", Value: bson.M{"$or": cond}}}) | ||||
|  | ||||
| 	} else if token.Mode == ct.CTMEnd { | ||||
|  | ||||
| 		// false | ||||
| 		pipeline = append(pipeline, bson.D{{Key: "$match", Value: bson.M{"$expr": bson.M{"$eq": bson.A{"1", "0"}}}}}) | ||||
|  | ||||
| 	} else { | ||||
|  | ||||
| 		return nil, exerr.New(exerr.TypeInternal, "unknown ct mode: "+string(token.Mode)).Any("token.Mode", token.Mode).Build() | ||||
|  | ||||
| 	} | ||||
|  | ||||
| 	pipeline = append(pipeline, bson.D{{Key: "$sort", Value: sort}}) | ||||
|  | ||||
| 	if pageSize != nil { | ||||
| 		pipeline = append(pipeline, bson.D{{Key: "$limit", Value: int64(*pageSize + 1)}}) | ||||
| 	} | ||||
|  | ||||
| 	return pipeline, nil | ||||
| } | ||||
							
								
								
									
										56
									
								
								wmo/queryAggregate.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										56
									
								
								wmo/queryAggregate.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,56 @@ | ||||
| package wmo | ||||
|  | ||||
| import ( | ||||
| 	"context" | ||||
| 	"go.mongodb.org/mongo-driver/mongo" | ||||
| 	"go.mongodb.org/mongo-driver/mongo/options" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/exerr" | ||||
| ) | ||||
|  | ||||
| func (c *Coll[TData]) Aggregate(ctx context.Context, pipeline mongo.Pipeline, opts ...*options.AggregateOptions) ([]TData, error) { | ||||
| 	cursor, err := c.coll.Aggregate(ctx, pipeline, opts...) | ||||
| 	if err != nil { | ||||
| 		return nil, exerr.Wrap(err, "mongo-aggregation failed").Any("pipeline", pipeline).Any("options", opts).Str("collection", c.Name()).Build() | ||||
| 	} | ||||
|  | ||||
| 	res, err := c.decodeAll(ctx, cursor) | ||||
| 	if err != nil { | ||||
| 		return nil, exerr.Wrap(err, "failed to decode values").Build() | ||||
| 	} | ||||
|  | ||||
| 	return res, nil | ||||
| } | ||||
|  | ||||
| func (c *Coll[TData]) AggregateOneOpt(ctx context.Context, pipeline mongo.Pipeline, opts ...*options.AggregateOptions) (*TData, error) { | ||||
| 	cursor, err := c.coll.Aggregate(ctx, pipeline, opts...) | ||||
| 	if err != nil { | ||||
| 		return nil, exerr.Wrap(err, "mongo-aggregation failed").Any("pipeline", pipeline).Any("options", opts).Str("collection", c.Name()).Build() | ||||
| 	} | ||||
|  | ||||
| 	if cursor.Next(ctx) { | ||||
| 		v, err := c.decodeSingle(ctx, cursor) | ||||
| 		if err != nil { | ||||
| 			return nil, exerr.Wrap(err, "failed to decode single value").Build() | ||||
| 		} | ||||
| 		return &v, nil | ||||
| 	} | ||||
|  | ||||
| 	return nil, nil | ||||
| } | ||||
|  | ||||
| func (c *Coll[TData]) AggregateOne(ctx context.Context, pipeline mongo.Pipeline, opts ...*options.AggregateOptions) (TData, error) { | ||||
| 	cursor, err := c.coll.Aggregate(ctx, pipeline, opts...) | ||||
| 	if err != nil { | ||||
| 		return *new(TData), exerr.Wrap(err, "mongo-aggregation failed").Any("pipeline", pipeline).Any("options", opts).Str("collection", c.Name()).Build() | ||||
| 	} | ||||
|  | ||||
| 	if cursor.Next(ctx) { | ||||
| 		v, err := c.decodeSingle(ctx, cursor) | ||||
| 		if err != nil { | ||||
| 			return *new(TData), exerr.Wrap(err, "failed to decode single value").Build() | ||||
| 		} | ||||
| 		return v, nil | ||||
| 	} | ||||
|  | ||||
| 	return *new(TData), exerr.Wrap(mongo.ErrNoDocuments, "no document in result").Build() | ||||
| } | ||||
							
								
								
									
										35
									
								
								wmo/queryDelete.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										35
									
								
								wmo/queryDelete.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,35 @@ | ||||
| package wmo | ||||
|  | ||||
| import ( | ||||
| 	"context" | ||||
| 	"go.mongodb.org/mongo-driver/bson" | ||||
| 	"go.mongodb.org/mongo-driver/mongo" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/exerr" | ||||
| ) | ||||
|  | ||||
| func (c *Coll[TData]) DeleteOneByID(ctx context.Context, id EntityID) error { | ||||
| 	_, err := c.coll.DeleteOne(ctx, bson.M{"_id": id}) | ||||
| 	if err != nil { | ||||
| 		return exerr.Wrap(err, "mongo-query[delete-one-by-id] failed").Id("id", id).Str("collection", c.Name()).Build() | ||||
| 	} | ||||
|  | ||||
| 	return nil | ||||
| } | ||||
|  | ||||
| func (c *Coll[TData]) DeleteOne(ctx context.Context, filterQuery bson.M) error { | ||||
| 	_, err := c.coll.DeleteOne(ctx, filterQuery) | ||||
| 	if err != nil { | ||||
| 		return exerr.Wrap(err, "mongo-query[delete-one] failed").Any("filterQuery", filterQuery).Str("collection", c.Name()).Build() | ||||
| 	} | ||||
|  | ||||
| 	return nil | ||||
| } | ||||
|  | ||||
| func (c *Coll[TData]) DeleteMany(ctx context.Context, filterQuery bson.M) (*mongo.DeleteResult, error) { | ||||
| 	res, err := c.coll.DeleteMany(ctx, filterQuery) | ||||
| 	if err != nil { | ||||
| 		return nil, exerr.Wrap(err, "mongo-query[delete-many] failed").Any("filterQuery", filterQuery).Str("collection", c.Name()).Build() | ||||
| 	} | ||||
|  | ||||
| 	return res, nil | ||||
| } | ||||
							
								
								
									
										76
									
								
								wmo/queryFind.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										76
									
								
								wmo/queryFind.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,76 @@ | ||||
| package wmo | ||||
|  | ||||
| import ( | ||||
| 	"context" | ||||
| 	"errors" | ||||
| 	"go.mongodb.org/mongo-driver/bson" | ||||
| 	"go.mongodb.org/mongo-driver/mongo" | ||||
| 	"go.mongodb.org/mongo-driver/mongo/options" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/exerr" | ||||
| ) | ||||
|  | ||||
| func (c *Coll[TData]) FindOne(ctx context.Context, filter bson.M) (TData, error) { | ||||
| 	mongoRes := c.coll.FindOne(ctx, filter) | ||||
| 	if err := mongoRes.Err(); err != nil { | ||||
| 		return *new(TData), exerr.Wrap(err, "mongo-query[find-one] failed"). | ||||
| 			Str("collection", c.Name()). | ||||
| 			Any("filter", filter). | ||||
| 			Build() | ||||
| 	} | ||||
|  | ||||
| 	return c.decodeSingle(ctx, mongoRes) | ||||
| } | ||||
|  | ||||
| func (c *Coll[TData]) FindOneOpt(ctx context.Context, filter bson.M) (*TData, error) { | ||||
| 	mongoRes := c.coll.FindOne(ctx, filter) | ||||
|  | ||||
| 	res, err := c.decodeSingle(ctx, mongoRes) | ||||
| 	if errors.Is(err, mongo.ErrNoDocuments) { | ||||
| 		return nil, nil | ||||
| 	} | ||||
| 	if err != nil { | ||||
| 		return nil, exerr.Wrap(err, "mongo-query[find-one-opt] failed").Any("filter", filter).Str("collection", c.Name()).Build() | ||||
| 	} | ||||
|  | ||||
| 	return &res, nil | ||||
| } | ||||
|  | ||||
| func (c *Coll[TData]) FindOneByID(ctx context.Context, id EntityID) (TData, error) { | ||||
| 	mongoRes := c.coll.FindOne(ctx, bson.M{"_id": id}) | ||||
| 	if err := mongoRes.Err(); err != nil { | ||||
| 		return *new(TData), exerr.Wrap(err, "mongo-query[find-one-by-id] failed"). | ||||
| 			Str("collection", c.Name()). | ||||
| 			Id("id", id). | ||||
| 			Build() | ||||
| 	} | ||||
|  | ||||
| 	return c.decodeSingle(ctx, mongoRes) | ||||
| } | ||||
|  | ||||
| func (c *Coll[TData]) FindOneOptByID(ctx context.Context, id EntityID) (*TData, error) { | ||||
| 	mongoRes := c.coll.FindOne(ctx, bson.M{"_id": id}) | ||||
|  | ||||
| 	res, err := c.decodeSingle(ctx, mongoRes) | ||||
| 	if errors.Is(err, mongo.ErrNoDocuments) { | ||||
| 		return nil, nil | ||||
| 	} | ||||
| 	if err != nil { | ||||
| 		return nil, exerr.Wrap(err, "mongo-query[find-one-opt-by-id] failed").Id("id", id).Str("collection", c.Name()).Build() | ||||
| 	} | ||||
|  | ||||
| 	return &res, nil | ||||
| } | ||||
|  | ||||
| func (c *Coll[TData]) Find(ctx context.Context, filter bson.M, opts ...*options.FindOptions) ([]TData, error) { | ||||
| 	cursor, err := c.coll.Find(ctx, filter, opts...) | ||||
| 	if err != nil { | ||||
| 		return nil, exerr.Wrap(err, "mongo-query[find-one-opt] failed").Any("filter", filter).Any("opts", opts).Str("collection", c.Name()).Build() | ||||
| 	} | ||||
|  | ||||
| 	res, err := c.decodeAll(ctx, cursor) | ||||
| 	if err != nil { | ||||
| 		return nil, exerr.Wrap(err, "failed to decode values").Build() | ||||
| 	} | ||||
|  | ||||
| 	return res, nil | ||||
| } | ||||
							
								
								
									
										29
									
								
								wmo/queryInsert.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										29
									
								
								wmo/queryInsert.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,29 @@ | ||||
| package wmo | ||||
|  | ||||
| import ( | ||||
| 	"context" | ||||
| 	"go.mongodb.org/mongo-driver/bson" | ||||
| 	"go.mongodb.org/mongo-driver/mongo" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/exerr" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/langext" | ||||
| ) | ||||
|  | ||||
| func (c *Coll[TData]) InsertOne(ctx context.Context, valueIn TData) (TData, error) { | ||||
| 	insRes, err := c.coll.InsertOne(ctx, valueIn) | ||||
| 	if err != nil { | ||||
| 		return *new(TData), exerr.Wrap(err, "mongo-query[insert-one] failed").Str("collection", c.Name()).Build() | ||||
| 	} | ||||
|  | ||||
| 	mongoRes := c.coll.FindOne(ctx, bson.M{"_id": insRes.InsertedID}) | ||||
|  | ||||
| 	return c.decodeSingle(ctx, mongoRes) | ||||
| } | ||||
|  | ||||
| func (c *Coll[TData]) InsertMany(ctx context.Context, valueIn []TData) (*mongo.InsertManyResult, error) { | ||||
| 	insRes, err := c.coll.InsertMany(ctx, langext.ArrayToInterface(valueIn)) | ||||
| 	if err != nil { | ||||
| 		return nil, exerr.Wrap(err, "mongo-query[insert-many] failed").Int("len(valueIn)", len(valueIn)).Str("collection", c.Name()).Build() | ||||
| 	} | ||||
|  | ||||
| 	return insRes, nil | ||||
| } | ||||
							
								
								
									
										118
									
								
								wmo/queryList.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										118
									
								
								wmo/queryList.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,118 @@ | ||||
| package wmo | ||||
|  | ||||
| import ( | ||||
| 	"context" | ||||
| 	"go.mongodb.org/mongo-driver/bson" | ||||
| 	"go.mongodb.org/mongo-driver/mongo" | ||||
| 	ct "gogs.mikescher.com/BlackForestBytes/goext/cursortoken" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/exerr" | ||||
| ) | ||||
|  | ||||
| func (c *Coll[TData]) List(ctx context.Context, filter ct.Filter, pageSize *int, inTok ct.CursorToken) ([]TData, ct.CursorToken, error) { | ||||
| 	if inTok.Mode == ct.CTMEnd { | ||||
| 		return make([]TData, 0), ct.End(), nil | ||||
| 	} | ||||
|  | ||||
| 	pipeline := mongo.Pipeline{} | ||||
| 	pf1 := "_id" | ||||
| 	pd1 := ct.SortASC | ||||
| 	pf2 := "_id" | ||||
| 	pd2 := ct.SortASC | ||||
|  | ||||
| 	if filter != nil { | ||||
| 		pipeline = filter.FilterQuery() | ||||
| 		pf1, pd1, pf2, pd2 = filter.Pagination() | ||||
| 	} | ||||
|  | ||||
| 	sortPrimary := pf1 | ||||
| 	sortDirPrimary := pd1 | ||||
| 	sortSecondary := &pf2 | ||||
| 	sortDirSecondary := &pd2 | ||||
|  | ||||
| 	if pf1 == pf2 { | ||||
| 		sortSecondary = nil | ||||
| 		sortDirSecondary = nil | ||||
| 	} | ||||
|  | ||||
| 	paginationPipeline, err := CreatePagination(c, inTok, sortPrimary, sortDirPrimary, sortSecondary, sortDirSecondary, pageSize) | ||||
| 	if err != nil { | ||||
| 		return nil, ct.CursorToken{}, exerr. | ||||
| 			Wrap(err, "failed to create pagination"). | ||||
| 			WithType(exerr.TypeCursorTokenDecode). | ||||
| 			Str("collection", c.Name()). | ||||
| 			Any("inTok", inTok). | ||||
| 			Any("sortPrimary", sortPrimary). | ||||
| 			Any("sortDirPrimary", sortDirPrimary). | ||||
| 			Any("sortSecondary", sortSecondary). | ||||
| 			Any("sortDirSecondary", sortDirSecondary). | ||||
| 			Any("pageSize", pageSize). | ||||
| 			Build() | ||||
| 	} | ||||
|  | ||||
| 	pipeline = append(pipeline, paginationPipeline...) | ||||
|  | ||||
| 	cursor, err := c.coll.Aggregate(ctx, pipeline) | ||||
| 	if err != nil { | ||||
| 		return nil, ct.CursorToken{}, exerr.Wrap(err, "mongo-aggregation failed").Any("pipeline", pipeline).Str("collection", c.Name()).Build() | ||||
| 	} | ||||
|  | ||||
| 	// fast branch | ||||
| 	if pageSize == nil { | ||||
| 		entries, err := c.decodeAll(ctx, cursor) | ||||
| 		if err != nil { | ||||
| 			return nil, ct.CursorToken{}, exerr.Wrap(err, "failed to all-decode entities").Build() | ||||
| 		} | ||||
| 		return entries, ct.End(), nil | ||||
| 	} | ||||
|  | ||||
| 	entities := make([]TData, 0, cursor.RemainingBatchLength()) | ||||
| 	for (pageSize == nil || len(entities) != *pageSize) && cursor.Next(ctx) { | ||||
| 		var entry TData | ||||
| 		entry, err = c.decodeSingle(ctx, cursor) | ||||
| 		if err != nil { | ||||
| 			return nil, ct.CursorToken{}, exerr.Wrap(err, "failed to decode entity").Build() | ||||
| 		} | ||||
| 		entities = append(entities, entry) | ||||
| 	} | ||||
|  | ||||
| 	if pageSize == nil || len(entities) < *pageSize || !cursor.TryNext(ctx) { | ||||
| 		return entities, ct.End(), nil | ||||
| 	} | ||||
|  | ||||
| 	last := entities[len(entities)-1] | ||||
|  | ||||
| 	c.EnsureInitializedReflection(last) | ||||
|  | ||||
| 	nextToken, err := c.createToken(sortPrimary, sortDirPrimary, sortSecondary, sortDirSecondary, last, pageSize) | ||||
| 	if err != nil { | ||||
| 		return nil, ct.CursorToken{}, exerr.Wrap(err, "failed to create (out)-token").Build() | ||||
| 	} | ||||
|  | ||||
| 	return entities, nextToken, nil | ||||
| } | ||||
|  | ||||
| type countRes struct { | ||||
| 	Count int64 `bson:"c"` | ||||
| } | ||||
|  | ||||
| func (c *Coll[TData]) Count(ctx context.Context, filter ct.Filter) (int64, error) { | ||||
| 	pipeline := filter.FilterQuery() | ||||
|  | ||||
| 	pipeline = append(pipeline, bson.D{{Key: "$count", Value: "c"}}) | ||||
|  | ||||
| 	cursor, err := c.coll.Aggregate(ctx, pipeline) | ||||
| 	if err != nil { | ||||
| 		return 0, exerr.Wrap(err, "mongo-aggregation failed").Any("pipeline", pipeline).Str("collection", c.Name()).Build() | ||||
| 	} | ||||
|  | ||||
| 	if cursor.Next(ctx) { | ||||
| 		v := countRes{} | ||||
| 		err = cursor.Decode(&v) | ||||
| 		if err != nil { | ||||
| 			return 0, exerr.Wrap(err, "failed to decode entity").Build() | ||||
| 		} | ||||
| 		return v.Count, nil | ||||
| 	} | ||||
|  | ||||
| 	return 0, nil | ||||
| } | ||||
							
								
								
									
										85
									
								
								wmo/queryUpdate.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										85
									
								
								wmo/queryUpdate.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,85 @@ | ||||
| package wmo | ||||
|  | ||||
| import ( | ||||
| 	"context" | ||||
| 	"go.mongodb.org/mongo-driver/bson" | ||||
| 	"go.mongodb.org/mongo-driver/mongo" | ||||
| 	"go.mongodb.org/mongo-driver/mongo/options" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/exerr" | ||||
| ) | ||||
|  | ||||
| func (c *Coll[TData]) FindOneAndUpdate(ctx context.Context, filterQuery bson.M, updateQuery bson.M) (TData, error) { | ||||
| 	mongoRes := c.coll.FindOneAndUpdate(ctx, filterQuery, updateQuery, options.FindOneAndUpdate().SetReturnDocument(options.After)) | ||||
| 	if err := mongoRes.Err(); err != nil { | ||||
| 		return *new(TData), exerr.Wrap(err, "mongo-query[find-one-and-update] failed"). | ||||
| 			Str("collection", c.Name()). | ||||
| 			Any("filterQuery", filterQuery). | ||||
| 			Any("updateQuery", updateQuery). | ||||
| 			Build() | ||||
| 	} | ||||
|  | ||||
| 	return c.decodeSingle(ctx, mongoRes) | ||||
| } | ||||
|  | ||||
| func (c *Coll[TData]) UpdateOne(ctx context.Context, filterQuery bson.M, updateQuery bson.M) error { | ||||
| 	_, err := c.coll.UpdateOne(ctx, filterQuery, updateQuery) | ||||
| 	if err != nil { | ||||
| 		return exerr.Wrap(err, "mongo-query[update-one] failed"). | ||||
| 			Str("collection", c.Name()). | ||||
| 			Any("filterQuery", filterQuery). | ||||
| 			Any("updateQuery", updateQuery). | ||||
| 			Build() | ||||
| 	} | ||||
|  | ||||
| 	return nil | ||||
| } | ||||
|  | ||||
| func (c *Coll[TData]) UpdateOneByID(ctx context.Context, id EntityID, updateQuery bson.M) error { | ||||
| 	_, err := c.coll.UpdateOne(ctx, bson.M{"_id": id}, updateQuery) | ||||
| 	if err != nil { | ||||
| 		return exerr.Wrap(err, "mongo-query[update-one-by-id] failed"). | ||||
| 			Str("collection", c.Name()). | ||||
| 			Id("id", id). | ||||
| 			Any("updateQuery", updateQuery). | ||||
| 			Build() | ||||
| 	} | ||||
|  | ||||
| 	return nil | ||||
| } | ||||
|  | ||||
| func (c *Coll[TData]) UpdateMany(ctx context.Context, filterQuery bson.M, updateQuery bson.M) (*mongo.UpdateResult, error) { | ||||
| 	res, err := c.coll.UpdateMany(ctx, filterQuery, updateQuery) | ||||
| 	if err != nil { | ||||
| 		return nil, exerr.Wrap(err, "mongo-query[update-many] failed"). | ||||
| 			Str("collection", c.Name()). | ||||
| 			Any("filterQuery", filterQuery). | ||||
| 			Any("updateQuery", updateQuery). | ||||
| 			Build() | ||||
| 	} | ||||
|  | ||||
| 	return res, nil | ||||
| } | ||||
|  | ||||
| func (c *Coll[TData]) ReplaceOne(ctx context.Context, filterQuery bson.M, value TData) error { | ||||
| 	_, err := c.coll.UpdateOne(ctx, filterQuery, bson.M{"$set": value}) | ||||
| 	if err != nil { | ||||
| 		return exerr.Wrap(err, "mongo-query[replace-one] failed"). | ||||
| 			Str("collection", c.Name()). | ||||
| 			Any("filterQuery", filterQuery). | ||||
| 			Build() | ||||
| 	} | ||||
|  | ||||
| 	return nil | ||||
| } | ||||
|  | ||||
| func (c *Coll[TData]) FindOneAndReplace(ctx context.Context, filterQuery bson.M, value TData) (TData, error) { | ||||
| 	mongoRes := c.coll.FindOneAndUpdate(ctx, filterQuery, bson.M{"$set": value}, options.FindOneAndUpdate().SetReturnDocument(options.After)) | ||||
| 	if err := mongoRes.Err(); err != nil { | ||||
| 		return *new(TData), exerr.Wrap(err, "mongo-query[find-one-and-update] failed"). | ||||
| 			Str("collection", c.Name()). | ||||
| 			Any("filterQuery", filterQuery). | ||||
| 			Build() | ||||
| 	} | ||||
|  | ||||
| 	return c.decodeSingle(ctx, mongoRes) | ||||
| } | ||||
							
								
								
									
										215
									
								
								wmo/reflection.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										215
									
								
								wmo/reflection.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,215 @@ | ||||
| package wmo | ||||
|  | ||||
| import ( | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/exerr" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/langext" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/reflectext" | ||||
| 	"reflect" | ||||
| 	"strings" | ||||
| ) | ||||
|  | ||||
| func (c *Coll[TData]) EnsureInitializedReflection(v TData) { | ||||
|  | ||||
| 	if !c.isInterfaceDataType { | ||||
| 		return // only dynamically load dataTypeMap on interface TData | ||||
| 	} | ||||
|  | ||||
| 	rval := reflect.ValueOf(v) | ||||
| 	for rval.Type().Kind() == reflect.Pointer { | ||||
| 		rval = rval.Elem() | ||||
| 	} | ||||
|  | ||||
| 	if _, ok := c.implDataTypeMap[rval.Type()]; ok { | ||||
| 		return // already loaded | ||||
| 	} | ||||
|  | ||||
| 	m := make(map[string]fullTypeRef) | ||||
|  | ||||
| 	c.initFields("", rval, m, make([]int, 0)) | ||||
|  | ||||
| 	c.implDataTypeMap[rval.Type()] = m | ||||
| } | ||||
|  | ||||
| func (c *Coll[TData]) init() { | ||||
|  | ||||
| 	example := *new(TData) | ||||
|  | ||||
| 	datatype := reflect.TypeOf(&example).Elem() | ||||
|  | ||||
| 	if datatype.Kind() == reflect.Interface { | ||||
|  | ||||
| 		c.isInterfaceDataType = true | ||||
|  | ||||
| 		c.dataTypeMap = make(map[string]fullTypeRef) | ||||
| 		c.implDataTypeMap = make(map[reflect.Type]map[string]fullTypeRef) | ||||
| 	} else { | ||||
|  | ||||
| 		c.isInterfaceDataType = false | ||||
|  | ||||
| 		c.dataTypeMap = make(map[string]fullTypeRef) | ||||
| 		c.implDataTypeMap = make(map[reflect.Type]map[string]fullTypeRef) | ||||
|  | ||||
| 		v := reflect.ValueOf(example) | ||||
| 		c.initFields("", v, c.dataTypeMap, make([]int, 0)) | ||||
|  | ||||
| 	} | ||||
|  | ||||
| } | ||||
|  | ||||
| func (c *Coll[TData]) initFields(prefix string, rval reflect.Value, m map[string]fullTypeRef, idxarr []int) { | ||||
|  | ||||
| 	rtyp := rval.Type() | ||||
|  | ||||
| 	for i := 0; i < rtyp.NumField(); i++ { | ||||
|  | ||||
| 		rsfield := rtyp.Field(i) | ||||
| 		rvfield := rval.Field(i) | ||||
|  | ||||
| 		if !rsfield.IsExported() { | ||||
| 			continue | ||||
| 		} | ||||
|  | ||||
| 		bsontags := make([]string, 0) | ||||
| 		bsonkey, found := rsfield.Tag.Lookup("bson") | ||||
| 		if !found { | ||||
| 			continue | ||||
| 		} | ||||
| 		if strings.Contains(bsonkey, ",") { | ||||
| 			bsontags = strings.Split(bsonkey[strings.Index(bsonkey, ",")+1:], ",") | ||||
| 			bsonkey = bsonkey[:strings.Index(bsonkey, ",")] | ||||
| 		} | ||||
| 		if bsonkey == "-" { | ||||
| 			continue | ||||
| 		} | ||||
|  | ||||
| 		if bsonkey == "" { | ||||
| 			bsonkey = rsfield.Name | ||||
| 		} | ||||
|  | ||||
| 		fullKey := prefix + bsonkey | ||||
|  | ||||
| 		newIdxArr := langext.ArrCopy(idxarr) | ||||
| 		newIdxArr = append(newIdxArr, i) | ||||
|  | ||||
| 		if langext.InArray("inline", bsontags) && rvfield.Kind() == reflect.Struct { | ||||
|  | ||||
| 			// pass-through field | ||||
| 			c.initFields(prefix, rvfield, m, newIdxArr) | ||||
|  | ||||
| 		} else { | ||||
|  | ||||
| 			if rvfield.Type().Kind() == reflect.Pointer { | ||||
|  | ||||
| 				m[fullKey] = fullTypeRef{ | ||||
| 					IsPointer:      true, | ||||
| 					RealType:       rvfield.Type(), | ||||
| 					Kind:           rvfield.Type().Elem().Kind(), | ||||
| 					Type:           rvfield.Type().Elem(), | ||||
| 					UnderlyingType: reflectext.Underlying(rvfield.Type().Elem()), | ||||
| 					Name:           rsfield.Name, | ||||
| 					Index:          newIdxArr, | ||||
| 				} | ||||
|  | ||||
| 			} else { | ||||
|  | ||||
| 				m[fullKey] = fullTypeRef{ | ||||
| 					IsPointer:      false, | ||||
| 					RealType:       rvfield.Type(), | ||||
| 					Kind:           rvfield.Type().Kind(), | ||||
| 					Type:           rvfield.Type(), | ||||
| 					UnderlyingType: reflectext.Underlying(rvfield.Type()), | ||||
| 					Name:           rsfield.Name, | ||||
| 					Index:          newIdxArr, | ||||
| 				} | ||||
|  | ||||
| 			} | ||||
|  | ||||
| 			if rvfield.Kind() == reflect.Struct { | ||||
| 				c.initFields(fullKey+".", rvfield, m, newIdxArr) | ||||
| 			} | ||||
|  | ||||
| 		} | ||||
|  | ||||
| 	} | ||||
|  | ||||
| } | ||||
|  | ||||
| func (c *Coll[TData]) getTokenValueAsMongoType(value string, fieldName string) (any, error) { | ||||
|  | ||||
| 	fref, err := c.getFieldType(fieldName) | ||||
| 	if err != nil { | ||||
| 		return nil, exerr.Wrap(err, "failed to get-field-type").Str("fieldName", fieldName).Build() | ||||
| 	} | ||||
|  | ||||
| 	pss := reflectext.PrimitiveStringSerializer{} | ||||
|  | ||||
| 	return pss.ValueFromString(value, fref.RealType) | ||||
|  | ||||
| } | ||||
|  | ||||
| func (c *Coll[TData]) getFieldValueAsTokenString(entity TData, fieldName string) (string, error) { | ||||
|  | ||||
| 	realValue, err := c.getFieldValue(entity, fieldName) | ||||
| 	if err != nil { | ||||
| 		return "", exerr.Wrap(err, "failed to get-field-value").Str("fieldName", fieldName).Build() | ||||
| 	} | ||||
|  | ||||
| 	pss := reflectext.PrimitiveStringSerializer{} | ||||
|  | ||||
| 	return pss.ValueToString(realValue) | ||||
|  | ||||
| } | ||||
|  | ||||
| func (c *Coll[TData]) getFieldType(fieldName string) (fullTypeRef, error) { | ||||
| 	if c.isInterfaceDataType { | ||||
|  | ||||
| 		for _, m := range c.implDataTypeMap { | ||||
| 			if r, ok := m[fieldName]; ok { | ||||
| 				return r, nil | ||||
| 			} | ||||
| 		} | ||||
|  | ||||
| 		return fullTypeRef{}, exerr.New(exerr.TypeMongoReflection, "unknown field: '"+fieldName+"' (in any impl)").Str("fieldName", fieldName).Build() | ||||
|  | ||||
| 	} else { | ||||
|  | ||||
| 		if r, ok := c.dataTypeMap[fieldName]; ok { | ||||
| 			return r, nil | ||||
| 		} else { | ||||
| 			return fullTypeRef{}, exerr.New(exerr.TypeMongoReflection, "unknown field: '"+fieldName+"'").Str("fieldName", fieldName).Build() | ||||
| 		} | ||||
|  | ||||
| 	} | ||||
|  | ||||
| } | ||||
|  | ||||
| func (c *Coll[TData]) getFieldValue(data TData, fieldName string) (any, error) { | ||||
| 	if c.isInterfaceDataType { | ||||
|  | ||||
| 		rval := reflect.ValueOf(data) | ||||
| 		for rval.Type().Kind() == reflect.Pointer { | ||||
| 			rval = rval.Elem() | ||||
| 		} | ||||
|  | ||||
| 		if m, ok := c.implDataTypeMap[rval.Type()]; ok { | ||||
| 			if fref, ok := m[fieldName]; ok { | ||||
| 				rval := reflect.ValueOf(data) | ||||
| 				return rval.FieldByIndex(fref.Index).Interface(), nil | ||||
| 			} else { | ||||
| 				return nil, exerr.New(exerr.TypeMongoReflection, "unknown bson field '"+fieldName+"' in type '"+rval.Type().String()+"'").Str("fieldName", fieldName).Type("rval", rval).Build() | ||||
| 			} | ||||
| 		} else { | ||||
| 			return nil, exerr.New(exerr.TypeMongoReflection, "unknown TData type: '"+rval.Type().String()+"'").Type("rval", rval).Build() | ||||
| 		} | ||||
|  | ||||
| 	} else { | ||||
|  | ||||
| 		if fref, ok := c.dataTypeMap[fieldName]; ok { | ||||
| 			rval := reflect.ValueOf(data) | ||||
| 			return rval.FieldByIndex(fref.Index).Interface(), nil | ||||
| 		} else { | ||||
| 			return nil, exerr.New(exerr.TypeMongoReflection, "unknown bson field '"+fieldName+"'").Str("fieldName", fieldName).Build() | ||||
| 		} | ||||
|  | ||||
| 	} | ||||
| } | ||||
							
								
								
									
										226
									
								
								wmo/reflection_test.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										226
									
								
								wmo/reflection_test.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,226 @@ | ||||
| package wmo | ||||
|  | ||||
| import ( | ||||
| 	"context" | ||||
| 	"go.mongodb.org/mongo-driver/bson/primitive" | ||||
| 	"go.mongodb.org/mongo-driver/mongo" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/langext" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/rfctime" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/timeext" | ||||
| 	"gogs.mikescher.com/BlackForestBytes/goext/tst" | ||||
| 	"reflect" | ||||
| 	"testing" | ||||
| 	"time" | ||||
| ) | ||||
|  | ||||
| func TestReflectionGetFieldType(t *testing.T) { | ||||
|  | ||||
| 	type IDType string | ||||
|  | ||||
| 	type TestData struct { | ||||
| 		ID    IDType    `bson:"_id"` | ||||
| 		CDate time.Time `bson:"cdate"` | ||||
| 		Sub   struct { | ||||
| 			A string `bson:"a"` | ||||
| 		} `bson:"sub"` | ||||
| 		Str   string                  `bson:"str"` | ||||
| 		Ptr   *int                    `bson:"ptr"` | ||||
| 		MDate rfctime.RFC3339NanoTime `bson:"mdate"` | ||||
| 	} | ||||
|  | ||||
| 	coll := W[TestData](&mongo.Collection{}) | ||||
|  | ||||
| 	coll.init() | ||||
|  | ||||
| 	t0 := time.Now() | ||||
| 	t1 := rfctime.NewRFC3339Nano(t0) | ||||
|  | ||||
| 	d := TestData{ | ||||
| 		ID:    "1", | ||||
| 		CDate: t0, | ||||
| 		Sub: struct { | ||||
| 			A string `bson:"a"` | ||||
| 		}{ | ||||
| 			A: "2", | ||||
| 		}, | ||||
| 		Str:   "3", | ||||
| 		Ptr:   langext.Ptr(4), | ||||
| 		MDate: t1, | ||||
| 	} | ||||
|  | ||||
| 	gft := func(k string) fullTypeRef { | ||||
| 		v, err := coll.getFieldType(k) | ||||
| 		if err != nil { | ||||
| 			t.Errorf("%s: %v", "failed to getFieldType", err) | ||||
| 		} | ||||
| 		return v | ||||
| 	} | ||||
|  | ||||
| 	gfv := func(k string) any { | ||||
| 		v, err := coll.getFieldValue(d, k) | ||||
| 		if err != nil { | ||||
| 			t.Errorf("%s: %v", "failed to getFieldType", err) | ||||
| 		} | ||||
| 		return v | ||||
| 	} | ||||
|  | ||||
| 	tst.AssertEqual(t, gft("_id").Kind.String(), "string") | ||||
| 	tst.AssertEqual(t, gft("_id").Type.String(), "wmo.IDType") | ||||
| 	tst.AssertEqual(t, gft("_id").Name, "ID") | ||||
| 	tst.AssertEqual(t, gft("_id").IsPointer, false) | ||||
| 	tst.AssertEqual(t, gfv("_id").(IDType), "1") | ||||
|  | ||||
| 	tst.AssertEqual(t, gft("cdate").Kind.String(), "struct") | ||||
| 	tst.AssertEqual(t, gft("cdate").Type.String(), "time.Time") | ||||
| 	tst.AssertEqual(t, gft("cdate").Name, "CDate") | ||||
| 	tst.AssertEqual(t, gft("cdate").IsPointer, false) | ||||
| 	tst.AssertEqual(t, gfv("cdate").(time.Time), t0) | ||||
|  | ||||
| 	tst.AssertEqual(t, gft("sub.a").Kind.String(), "string") | ||||
| 	tst.AssertEqual(t, gft("sub.a").Type.String(), "string") | ||||
| 	tst.AssertEqual(t, gft("sub.a").Name, "A") | ||||
| 	tst.AssertEqual(t, gft("sub.a").IsPointer, false) | ||||
| 	tst.AssertEqual(t, gfv("sub.a").(string), "2") | ||||
|  | ||||
| 	tst.AssertEqual(t, gft("str").Kind.String(), "string") | ||||
| 	tst.AssertEqual(t, gft("str").Type.String(), "string") | ||||
| 	tst.AssertEqual(t, gft("str").Name, "Str") | ||||
| 	tst.AssertEqual(t, gft("str").IsPointer, false) | ||||
| 	tst.AssertEqual(t, gfv("str").(string), "3") | ||||
|  | ||||
| 	tst.AssertEqual(t, gft("ptr").Kind.String(), "int") | ||||
| 	tst.AssertEqual(t, gft("ptr").Type.String(), "int") | ||||
| 	tst.AssertEqual(t, gft("ptr").Name, "Ptr") | ||||
| 	tst.AssertEqual(t, gft("ptr").IsPointer, true) | ||||
| 	tst.AssertEqual(t, *gfv("ptr").(*int), 4) | ||||
| } | ||||
|  | ||||
| func TestReflectionGetTokenValueAsMongoType(t *testing.T) { | ||||
|  | ||||
| 	type IDType string | ||||
|  | ||||
| 	type TestData struct { | ||||
| 		ID    IDType    `bson:"_id"` | ||||
| 		CDate time.Time `bson:"cdate"` | ||||
| 		Sub   struct { | ||||
| 			A string `bson:"a"` | ||||
| 		} `bson:"sub"` | ||||
| 		Str   string                  `bson:"str"` | ||||
| 		Ptr   *int                    `bson:"ptr"` | ||||
| 		Num   int                     `bson:"num"` | ||||
| 		MDate rfctime.RFC3339NanoTime `bson:"mdate"` | ||||
| 	} | ||||
|  | ||||
| 	coll := W[TestData](&mongo.Collection{}) | ||||
|  | ||||
| 	coll.init() | ||||
|  | ||||
| 	gtvasmt := func(value string, fieldName string) any { | ||||
| 		v, err := coll.getTokenValueAsMongoType(value, fieldName) | ||||
| 		if err != nil { | ||||
| 			t.Errorf("%s", "failed to getTokenValueAsMongoType") | ||||
| 			t.Errorf("%v+", err) | ||||
| 		} | ||||
| 		return v | ||||
| 	} | ||||
|  | ||||
| 	tx, err := time.Parse(time.RFC3339Nano, "2009-11-10T23:00:00Z") | ||||
| 	if err != nil { | ||||
| 		t.Errorf("%v", err) | ||||
| 	} | ||||
|  | ||||
| 	tst.AssertEqual(t, gtvasmt("hello", "str").(string), "hello") | ||||
| 	tst.AssertEqual(t, gtvasmt("4", "num").(int), 4) | ||||
| 	tst.AssertEqual(t, gtvasmt("asdf", "_id").(IDType), "asdf") | ||||
| 	tst.AssertEqual(t, gtvasmt("", "ptr").(*int), nil) | ||||
| 	tst.AssertEqual(t, *(gtvasmt("123", "ptr").(*int)), 123) | ||||
| 	tst.AssertEqual(t, gtvasmt("2009-11-10T23:00:00Z", "cdate").(time.Time), tx) | ||||
| 	tst.AssertEqual(t, gtvasmt("2009-11-10T23:00:00Z", "mdate").(rfctime.RFC3339NanoTime), rfctime.NewRFC3339Nano(tx)) | ||||
| } | ||||
|  | ||||
| func TestReflectionGetFieldValueAsTokenString(t *testing.T) { | ||||
|  | ||||
| 	type IDType string | ||||
|  | ||||
| 	type TestData struct { | ||||
| 		ID    IDType    `bson:"_id"` | ||||
| 		CDate time.Time `bson:"cdate"` | ||||
| 		Sub   struct { | ||||
| 			A string `bson:"a"` | ||||
| 		} `bson:"sub"` | ||||
| 		Str   string                  `bson:"str"` | ||||
| 		Ptr   *int                    `bson:"ptr"` | ||||
| 		Num   int                     `bson:"num"` | ||||
| 		Ptr2  *int                    `bson:"ptr2"` | ||||
| 		FFF   float64                 `bson:"fff"` | ||||
| 		MDate rfctime.RFC3339NanoTime `bson:"mdate"` | ||||
| 	} | ||||
|  | ||||
| 	coll := W[TestData](&mongo.Collection{}) | ||||
|  | ||||
| 	coll.init() | ||||
|  | ||||
| 	t0 := time.Date(2000, 1, 1, 12, 0, 0, 0, timeext.TimezoneBerlin) | ||||
| 	t1 := rfctime.NewRFC3339Nano(t0) | ||||
|  | ||||
| 	d := TestData{ | ||||
| 		ID:    "1", | ||||
| 		CDate: t0, | ||||
| 		MDate: t1, | ||||
| 		Sub: struct { | ||||
| 			A string `bson:"a"` | ||||
| 		}{ | ||||
| 			A: "2", | ||||
| 		}, | ||||
| 		Str:  "3", | ||||
| 		Ptr:  langext.Ptr(4), | ||||
| 		Num:  22, | ||||
| 		FFF:  22.5, | ||||
| 		Ptr2: nil, | ||||
| 	} | ||||
|  | ||||
| 	gfvats := func(value TestData, fieldName string) string { | ||||
| 		v, err := coll.getFieldValueAsTokenString(value, fieldName) | ||||
| 		if err != nil { | ||||
| 			t.Errorf("%s: %v", "failed to getTokenValueAsMongoType", err) | ||||
| 		} | ||||
| 		return v | ||||
| 	} | ||||
|  | ||||
| 	tst.AssertEqual(t, gfvats(d, "str"), "3") | ||||
| 	tst.AssertEqual(t, gfvats(d, "num"), "22") | ||||
| 	tst.AssertEqual(t, gfvats(d, "_id"), "1") | ||||
| 	tst.AssertEqual(t, gfvats(d, "ptr"), "4") | ||||
| 	tst.AssertEqual(t, gfvats(d, "ptr2"), "") | ||||
| 	tst.AssertEqual(t, gfvats(d, "fff"), "22.5") | ||||
| 	tst.AssertEqual(t, gfvats(d, "cdate"), t0.Format(time.RFC3339Nano)) | ||||
| 	tst.AssertEqual(t, gfvats(d, "mdate"), t0.Format(time.RFC3339Nano)) | ||||
| } | ||||
|  | ||||
| func TestReflectionWithInterface(t *testing.T) { | ||||
|  | ||||
| 	type TestData struct { | ||||
| 		ID    primitive.ObjectID `bson:"_id"` | ||||
| 		CDate time.Time          `bson:"cdate"` | ||||
| 	} | ||||
|  | ||||
| 	type TestInterface interface { | ||||
| 	} | ||||
|  | ||||
| 	coll1 := W[TestInterface](&mongo.Collection{}) | ||||
|  | ||||
| 	tst.AssertTrue(t, coll1.coll != nil) | ||||
| 	tst.AssertEqual(t, 0, len(coll1.implDataTypeMap)) | ||||
|  | ||||
| 	df := func(ctx context.Context, dec Decodable) (TestInterface, error) { | ||||
| 		return TestData{}, nil | ||||
| 	} | ||||
|  | ||||
| 	coll2 := W[TestInterface](&mongo.Collection{}).WithDecodeFunc(df, TestData{}) | ||||
|  | ||||
| 	tst.AssertTrue(t, coll2.coll != nil) | ||||
| 	tst.AssertEqual(t, 1, len(coll2.implDataTypeMap)) | ||||
|  | ||||
| 	tst.AssertEqual(t, "ID", coll2.implDataTypeMap[reflect.TypeOf(TestData{})]["_id"].Name) | ||||
| 	tst.AssertEqual(t, "CDate", coll2.implDataTypeMap[reflect.TypeOf(TestData{})]["cdate"].Name) | ||||
| } | ||||
		Reference in New Issue
	
	Block a user