refactoring (#8)

Author: markus621

.github/dependabot.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go: [ '1.23.11' ]
+        go: [ '1.24' ]
     steps:
       - uses: actions/checkout@v3
 

.github/workflows/ci.yml

@@ -1,3 +1,12 @@
+
+.tools/
+bin/
+vendor/
+build/
+.idea/
+.vscode/
+coverage.txt
+coverage.out
 *.exe
 *.exe~
 *.dll
@@ -8,16 +17,4 @@
 *.mmdb
 *.test
 *.out
-
-.idea/
-.vscode/
-.tools/
-
-coverage.txt
-coverage.out
-
-bin/
-vendor/
-build/
-
-.env
+.env

.gitignore

@@ -1,201 +1,61 @@
+version: "2"
 
 run:
-  go: "1.23.11"
-  concurrency: 4
+  go: "1.24"
   timeout: 5m
   tests: false
   issues-exit-code: 1
   modules-download-mode: readonly
+  allow-parallel-runners: true
 
 issues:
-  exclude-use-default: false
-  max-issues-per-linter: 100
-  max-same-issues: 4
+  max-issues-per-linter: 0
+  max-same-issues: 0
   new: false
-  exclude-files:
-    - ".+_test.go"
-  exclude-dirs:
-    - "vendor$"
+  fix: false
 
 output:
   formats:
-    - format: line-number
-  sort-results: true
+    text:
+      print-linter-name: true
+      print-issued-lines: true
 
-linters-settings:
-  govet:
-    check-shadowing: true
-    enable:
-      - asmdecl
-      - assign
-      - atomic
-      - atomicalign
-      - bools
-      - buildtag
-      - cgocall
-      - composites
-      - copylocks
-      - deepequalerrors
-      - errorsas
-      - findcall
-      - framepointer
-      - httpresponse
-      - ifaceassert
-      - loopclosure
-      - lostcancel
-      - nilfunc
-      - nilness
-      - printf
-      - reflectvaluecompare
-      - shadow
-      - shift
-      - sigchanyzer
-      - sortslice
-      - stdmethods
-      - stringintconv
-      - structtag
-      - testinggoroutine
-      - tests
-      - unmarshal
-      - unreachable
-      - unsafeptr
-      - unusedresult
-      - unusedwrite
-    disable:
-      - fieldalignment
-  gofmt:
-    simplify: true
-  errcheck:
-    check-type-assertions: true
-    check-blank: true
-  gocyclo:
-    min-complexity: 30
-  misspell:
-    locale: US
-  prealloc:
-    simple: true
-    range-loops: true
-    for-loops: true
-  unparam:
-    check-exported: false
-  gci:
-    skip-generated: true
-    custom-order: false
-  gosec:
-    includes:
-      - G101 # Look for hard coded credentials
-      - G102 # Bind to all interfaces
-      - G103 # Audit the use of unsafe block
-      - G104 # Audit errors not checked
-      - G106 # Audit the use of ssh.InsecureIgnoreHostKey
-      - G107 # Url provided to HTTP request as taint input
-      - G108 # Profiling endpoint automatically exposed on /debug/pprof
-      - G109 # Potential Integer overflow made by strconv.Atoi result conversion to int16/32
-      - G110 # Potential DoS vulnerability via decompression bomb
-      - G111 # Potential directory traversal
-      - G112 # Potential slowloris attack
-      - G113 # Usage of Rat.SetString in math/big with an overflow (CVE-2022-23772)
-      - G114 # Use of net/http serve function that has no support for setting timeouts
-      - G201 # SQL query construction using format string
-      - G202 # SQL query construction using string concatenation
-      - G203 # Use of unescaped data in HTML templates
-      - G204 # Audit use of command execution
-      - G301 # Poor file permissions used when creating a directory
-      - G302 # Poor file permissions used with chmod
-      - G303 # Creating tempfile using a predictable path
-      - G304 # File path provided as taint input
-      - G305 # File traversal when extracting zip/tar archive
-      - G306 # Poor file permissions used when writing to a new file
-      - G307 # Deferring a method which returns an error
-      - G401 # Detect the usage of DES, RC4, MD5 or SHA1
-      - G402 # Look for bad TLS connection settings
-      - G403 # Ensure minimum RSA key length of 2048 bits
-      - G404 # Insecure random number source (rand)
-      - G501 # Import blocklist: crypto/md5
-      - G502 # Import blocklist: crypto/des
-      - G503 # Import blocklist: crypto/rc4
-      - G504 # Import blocklist: net/http/cgi
-      - G505 # Import blocklist: crypto/sha1
-      - G601 # Implicit memory aliasing of items from a range statement
-    excludes:
-      - G101 # Look for hard coded credentials
-      - G102 # Bind to all interfaces
-      - G103 # Audit the use of unsafe block
-      - G104 # Audit errors not checked
-      - G106 # Audit the use of ssh.InsecureIgnoreHostKey
-      - G107 # Url provided to HTTP request as taint input
-      - G108 # Profiling endpoint automatically exposed on /debug/pprof
-      - G109 # Potential Integer overflow made by strconv.Atoi result conversion to int16/32
-      - G110 # Potential DoS vulnerability via decompression bomb
-      - G111 # Potential directory traversal
-      - G112 # Potential slowloris attack
-      - G113 # Usage of Rat.SetString in math/big with an overflow (CVE-2022-23772)
-      - G114 # Use of net/http serve function that has no support for setting timeouts
-      - G201 # SQL query construction using format string
-      - G202 # SQL query construction using string concatenation
-      - G203 # Use of unescaped data in HTML templates
-      - G204 # Audit use of command execution
-      - G301 # Poor file permissions used when creating a directory
-      - G302 # Poor file permissions used with chmod
-      - G303 # Creating tempfile using a predictable path
-      - G304 # File path provided as taint input
-      - G305 # File traversal when extracting zip/tar archive
-      - G306 # Poor file permissions used when writing to a new file
-      - G307 # Deferring a method which returns an error
-      - G401 # Detect the usage of DES, RC4, MD5 or SHA1
-      - G402 # Look for bad TLS connection settings
-      - G403 # Ensure minimum RSA key length of 2048 bits
-      - G404 # Insecure random number source (rand)
-      - G501 # Import blocklist: crypto/md5
-      - G502 # Import blocklist: crypto/des
-      - G503 # Import blocklist: crypto/rc4
-      - G504 # Import blocklist: net/http/cgi
-      - G505 # Import blocklist: crypto/sha1
-      - G601 # Implicit memory aliasing of items from a range statement
-    exclude-generated: true
-    severity: medium
-    confidence: medium
-    concurrency: 12
-    config:
-      global:
-        nosec: true
-        "#nosec": "#my-custom-nosec"
-        show-ignored: true
-        audit: true
-      G101:
-        pattern: "(?i)passwd|pass|password|pwd|secret|token|pw|apiKey|bearer|cred"
-        ignore_entropy: false
-        entropy_threshold: "80.0"
-        per_char_threshold: "3.0"
-        truncate: "32"
-      G104:
-        fmt:
-          - Fscanf
-      G111:
-        pattern: "http\\.Dir\\(\"\\/\"\\)|http\\.Dir\\('\\/'\\)"
-      G301: "0750"
-      G302: "0600"
-      G306: "0600"
-
-  lll:
-    line-length: 130
-    tab-width: 1
-  staticcheck:
-    go: "1.15"
-    # SAxxxx checks in https://staticcheck.io/docs/configuration/options/#checks
-    # Default: ["*"]
-    checks: [ "*", "-SA1019" ]
+formatters:
+  exclusions:
+    paths:
+      - vendors/
+  enable:
+    - gofmt
+    - goimports
 
 linters:
-  disable-all: true
+  settings:
+    staticcheck:
+      checks:
+        - all
+        - -S1023
+        - -ST1000
+        - -ST1003
+        - -ST1020
+    gosec:
+      excludes:
+        - G104
+        - G115
+        - G301
+        - G304
+        - G306
+        - G501
+        - G505
+  exclusions:
+    paths:
+      - vendors/
+  default: none
   enable:
     - govet
-    - gofmt
     - errcheck
     - misspell
     - gocyclo
     - ineffassign
-    - goimports
     - unparam
     - unused
     - prealloc
@@ -206,5 +66,3 @@ linters:
     - errorlint
     - bodyclose
     - gosec
-    - lll
-  fast: false

.golangci.yml

@@ -73,7 +73,7 @@ func TestUnit_AutoClean(t *testing.T) {
 	c.Set("foo", testValue{Val: "bar", TS: time.Now().Add(time.Millisecond * 200).Unix()})
 	casecheck.True(t, c.Has("foo"))
 
-	time.Sleep(time.Second)
+	time.Sleep(time.Second * 2)
 
 	casecheck.False(t, c.Has("foo"))
 }

cache/cache_test.go

@@ -7,60 +7,66 @@ package codec
 
 import (
 	"encoding/json"
+	"encoding/xml"
 
+	"github.com/BurntSushi/toml"
 	"go.osspkg.com/errors"
 	"go.osspkg.com/syncing"
 	"gopkg.in/yaml.v3"
 )
 
 const (
-	EncoderYAML = ".yaml"
-	EncoderJSON = ".json"
+	ExtYAML = ".yaml"
+	ExtJSON = ".json"
+	ExtToml = ".toml"
+	ExtXML  = ".xml"
 )
 
 var (
-	errBadFormat = errors.New("format is not a supported")
+	ErrUnsupportedFormat = errors.New("format is not a supported")
 
 	_default = newEncoders().
-			Add(".yml", yaml.Marshal, yaml.Unmarshal, mapMerge).
-			Add(EncoderYAML, yaml.Marshal, yaml.Unmarshal, mapMerge).
-			Add(EncoderJSON, json.Marshal, json.Unmarshal, mapMerge)
+			Add(".yml", yaml.Marshal, yaml.Unmarshal, BytesJoin).
+			Add(ExtYAML, yaml.Marshal, yaml.Unmarshal, BytesJoin).
+			Add(ExtJSON, json.Marshal, json.Unmarshal, MapJoin).
+			Add(ExtToml, toml.Marshal, toml.Unmarshal, BytesJoin).
+			Add(ExtXML, xml.Marshal, xml.Unmarshal, BytesJoin)
 )
 
 type (
 	Codec struct {
 		Encode func(in interface{}) ([]byte, error)
 		Decode func(b []byte, out interface{}) error
-		Merge  func(dst map[string]interface{}, src ...map[string]interface{})
+		Join   func(c Codec, dst *[]byte, src ...[]byte) error
 	}
 	encoders struct {
 		list map[string]Codec
 		mux  syncing.Lock
 	}
 )
 
+func AddCodec(ext string, c Codec) {
+	_default.Add(ext, c.Encode, c.Decode, c.Join)
+}
+
 func newEncoders() *encoders {
 	return &encoders{
 		list: make(map[string]Codec, 10),
 		mux:  syncing.NewLock(),
 	}
 }
 
-func AddCodec(ext string, c Codec) {
-	_default.Add(ext, c.Encode, c.Decode, c.Merge)
-}
-
 func (v *encoders) Add(
 	ext string,
 	enc func(interface{}) ([]byte, error),
 	dec func([]byte, interface{}) error,
-	merge func(map[string]interface{}, ...map[string]interface{}),
+	join func(c Codec, dst *[]byte, src ...[]byte) error,
 ) *encoders {
 	v.mux.Lock(func() {
 		v.list[ext] = Codec{
 			Encode: enc,
 			Decode: dec,
-			Merge:  merge,
+			Join:   join,
 		}
 	})
 	return v
@@ -70,7 +76,7 @@ func (v *encoders) Get(ext string) (c Codec, err error) {
 	v.mux.RLock(func() {
 		var ok bool
 		if c, ok = v.list[ext]; !ok {
-			err = errBadFormat
+			err = ErrUnsupportedFormat
 			return
 		}
 	})