Compare commits
28 Commits
v0.0.52
...
feature/ex
Author | SHA1 | Date | |
---|---|---|---|
c0443af63b
|
|||
17383894a7
|
|||
fd33b43f31
|
|||
be4de07eb8
|
|||
36ed474bfe
|
|||
fdc590c8c3
|
|||
1990e5d32d
|
|||
72883cf6bd
|
|||
ff08d5f180
|
|||
72d6b538f7
|
|||
48dd30fb94
|
|||
b7c5756f11
|
|||
2070a432a5
|
|||
34e6d1819d
|
|||
87fa6021e4
|
|||
297d6c52a8
|
|||
b9c46947d2
|
|||
412277b3e0
|
|||
e46f8019ec
|
|||
ae952b2166
|
|||
b24dba9a45
|
|||
cfbc20367d
|
|||
e25912758e
|
|||
e1ae77a9db
|
|||
9d07b3955f
|
|||
02be696c25
|
|||
ba07625b7c
|
|||
aeded3fb37
|
1
.idea/inspectionProfiles/Project_Default.xml
generated
1
.idea/inspectionProfiles/Project_Default.xml
generated
@@ -1,6 +1,7 @@
|
||||
<component name="InspectionProjectProfileManager">
|
||||
<profile version="1.0">
|
||||
<option name="myName" value="Project Default" />
|
||||
<inspection_tool class="GoMixedReceiverTypes" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
|
||||
<inspection_tool class="LanguageDetectionInspection" enabled="false" level="WARNING" enabled_by_default="false" />
|
||||
<inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
|
||||
<option name="processCode" value="true" />
|
||||
|
73
cmdext/builder.go
Normal file
73
cmdext/builder.go
Normal file
@@ -0,0 +1,73 @@
|
||||
package cmdext
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"time"
|
||||
)
|
||||
|
||||
type CommandRunner struct {
|
||||
program string
|
||||
args []string
|
||||
timeout *time.Duration
|
||||
env []string
|
||||
listener []CommandListener
|
||||
}
|
||||
|
||||
func Runner(program string) *CommandRunner {
|
||||
return &CommandRunner{
|
||||
program: program,
|
||||
args: make([]string, 0),
|
||||
timeout: nil,
|
||||
env: make([]string, 0),
|
||||
listener: make([]CommandListener, 0),
|
||||
}
|
||||
}
|
||||
|
||||
func (r *CommandRunner) Arg(arg string) *CommandRunner {
|
||||
r.args = append(r.args, arg)
|
||||
return r
|
||||
}
|
||||
|
||||
func (r *CommandRunner) Args(arg []string) *CommandRunner {
|
||||
r.args = append(r.args, arg...)
|
||||
return r
|
||||
}
|
||||
|
||||
func (r *CommandRunner) Timeout(timeout time.Duration) *CommandRunner {
|
||||
r.timeout = &timeout
|
||||
return r
|
||||
}
|
||||
|
||||
func (r *CommandRunner) Env(key, value string) *CommandRunner {
|
||||
r.env = append(r.env, fmt.Sprintf("%s=%s", key, value))
|
||||
return r
|
||||
}
|
||||
|
||||
func (r *CommandRunner) RawEnv(env string) *CommandRunner {
|
||||
r.env = append(r.env, env)
|
||||
return r
|
||||
}
|
||||
|
||||
func (r *CommandRunner) Envs(env []string) *CommandRunner {
|
||||
r.env = append(r.env, env...)
|
||||
return r
|
||||
}
|
||||
|
||||
func (r *CommandRunner) Listen(lstr CommandListener) *CommandRunner {
|
||||
r.listener = append(r.listener, lstr)
|
||||
return r
|
||||
}
|
||||
|
||||
func (r *CommandRunner) ListenStdout(lstr func(string)) *CommandRunner {
|
||||
r.listener = append(r.listener, genericCommandListener{_readStdoutLine: &lstr})
|
||||
return r
|
||||
}
|
||||
|
||||
func (r *CommandRunner) ListenStderr(lstr func(string)) *CommandRunner {
|
||||
r.listener = append(r.listener, genericCommandListener{_readStderrLine: &lstr})
|
||||
return r
|
||||
}
|
||||
|
||||
func (r *CommandRunner) Run() (CommandResult, error) {
|
||||
return run(*r)
|
||||
}
|
@@ -1,7 +1,8 @@
|
||||
package cmdext
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"gogs.mikescher.com/BlackForestBytes/goext/mathext"
|
||||
"gogs.mikescher.com/BlackForestBytes/goext/syncext"
|
||||
"os/exec"
|
||||
"time"
|
||||
)
|
||||
@@ -14,9 +15,10 @@ type CommandResult struct {
|
||||
CommandTimedOut bool
|
||||
}
|
||||
|
||||
func RunCommand(program string, args []string, timeout *time.Duration) (CommandResult, error) {
|
||||
func run(opt CommandRunner) (CommandResult, error) {
|
||||
cmd := exec.Command(opt.program, opt.args...)
|
||||
|
||||
cmd := exec.Command(program, args...)
|
||||
cmd.Env = append(cmd.Env, opt.env...)
|
||||
|
||||
stdoutPipe, err := cmd.StdoutPipe()
|
||||
if err != nil {
|
||||
@@ -28,115 +30,100 @@ func RunCommand(program string, args []string, timeout *time.Duration) (CommandR
|
||||
return CommandResult{}, err
|
||||
}
|
||||
|
||||
preader := pipeReader{
|
||||
stdout: stdoutPipe,
|
||||
stderr: stderrPipe,
|
||||
}
|
||||
|
||||
err = cmd.Start()
|
||||
if err != nil {
|
||||
return CommandResult{}, err
|
||||
}
|
||||
|
||||
errch := make(chan error, 1)
|
||||
go func() { errch <- cmd.Wait() }()
|
||||
type resultObj struct {
|
||||
stdout string
|
||||
stderr string
|
||||
stdcombined string
|
||||
err error
|
||||
}
|
||||
|
||||
combch := make(chan string, 32)
|
||||
stopCombch := make(chan bool)
|
||||
|
||||
stdout := ""
|
||||
outputChan := make(chan resultObj)
|
||||
go func() {
|
||||
scanner := bufio.NewScanner(stdoutPipe)
|
||||
for scanner.Scan() {
|
||||
txt := scanner.Text()
|
||||
stdout += txt
|
||||
combch <- txt
|
||||
// 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)
|
||||
if err != nil {
|
||||
outputChan <- resultObj{stdout, stderr, stdcombined, err}
|
||||
}
|
||||
}()
|
||||
|
||||
stderr := ""
|
||||
go func() {
|
||||
scanner := bufio.NewScanner(stderrPipe)
|
||||
for scanner.Scan() {
|
||||
txt := scanner.Text()
|
||||
stderr += txt
|
||||
combch <- txt
|
||||
err = cmd.Wait()
|
||||
if err != nil {
|
||||
outputChan <- resultObj{stdout, stderr, stdcombined, err}
|
||||
}
|
||||
|
||||
outputChan <- resultObj{stdout, stderr, stdcombined, nil}
|
||||
}()
|
||||
|
||||
defer func() {
|
||||
stopCombch <- true
|
||||
}()
|
||||
var timeoutChan <-chan time.Time = make(chan time.Time, 1)
|
||||
if opt.timeout != nil {
|
||||
timeoutChan = time.After(*opt.timeout)
|
||||
}
|
||||
|
||||
stdcombined := ""
|
||||
go func() {
|
||||
for {
|
||||
select {
|
||||
case txt := <-combch:
|
||||
stdcombined += txt
|
||||
case <-stopCombch:
|
||||
return
|
||||
}
|
||||
select {
|
||||
|
||||
case <-timeoutChan:
|
||||
_ = cmd.Process.Kill()
|
||||
for _, lstr := range opt.listener {
|
||||
lstr.Timeout()
|
||||
}
|
||||
}()
|
||||
|
||||
if timeout != nil {
|
||||
|
||||
select {
|
||||
|
||||
case <-time.After(*timeout):
|
||||
_ = cmd.Process.Kill()
|
||||
if fallback, ok := syncext.ReadChannelWithTimeout(outputChan, mathext.Min(32*time.Millisecond, *opt.timeout)); ok {
|
||||
// most of the time the cmd.Process.Kill() should also ahve finished the pipereader
|
||||
// and we can at least return the already collected stdout, stderr, etc
|
||||
return CommandResult{
|
||||
StdOut: stdout,
|
||||
StdErr: stderr,
|
||||
StdCombined: stdcombined,
|
||||
StdOut: fallback.stdout,
|
||||
StdErr: fallback.stderr,
|
||||
StdCombined: fallback.stdcombined,
|
||||
ExitCode: -1,
|
||||
CommandTimedOut: true,
|
||||
}, nil
|
||||
} else {
|
||||
return CommandResult{
|
||||
StdOut: "",
|
||||
StdErr: "",
|
||||
StdCombined: "",
|
||||
ExitCode: -1,
|
||||
CommandTimedOut: true,
|
||||
}, nil
|
||||
|
||||
case err := <-errch:
|
||||
if exiterr, ok := err.(*exec.ExitError); ok {
|
||||
return CommandResult{
|
||||
StdOut: stdout,
|
||||
StdErr: stderr,
|
||||
StdCombined: stdcombined,
|
||||
ExitCode: exiterr.ExitCode(),
|
||||
CommandTimedOut: false,
|
||||
}, nil
|
||||
} else if err != nil {
|
||||
return CommandResult{}, err
|
||||
} else {
|
||||
return CommandResult{
|
||||
StdOut: stdout,
|
||||
StdErr: stderr,
|
||||
StdCombined: stdcombined,
|
||||
ExitCode: 0,
|
||||
CommandTimedOut: false,
|
||||
}, nil
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
} else {
|
||||
|
||||
select {
|
||||
|
||||
case err := <-errch:
|
||||
if exiterr, ok := err.(*exec.ExitError); ok {
|
||||
return CommandResult{
|
||||
StdOut: stdout,
|
||||
StdErr: stderr,
|
||||
StdCombined: stdcombined,
|
||||
ExitCode: exiterr.ExitCode(),
|
||||
CommandTimedOut: false,
|
||||
}, nil
|
||||
} else if err != nil {
|
||||
return CommandResult{}, err
|
||||
} else {
|
||||
return CommandResult{
|
||||
StdOut: stdout,
|
||||
StdErr: stderr,
|
||||
StdCombined: stdcombined,
|
||||
ExitCode: 0,
|
||||
CommandTimedOut: false,
|
||||
}, nil
|
||||
case outobj := <-outputChan:
|
||||
if exiterr, ok := outobj.err.(*exec.ExitError); ok {
|
||||
excode := exiterr.ExitCode()
|
||||
for _, lstr := range opt.listener {
|
||||
lstr.Finished(excode)
|
||||
}
|
||||
|
||||
return CommandResult{
|
||||
StdOut: outobj.stdout,
|
||||
StdErr: outobj.stderr,
|
||||
StdCombined: outobj.stdcombined,
|
||||
ExitCode: excode,
|
||||
CommandTimedOut: false,
|
||||
}, nil
|
||||
} else if err != nil {
|
||||
return CommandResult{}, err
|
||||
} else {
|
||||
for _, lstr := range opt.listener {
|
||||
lstr.Finished(0)
|
||||
}
|
||||
return CommandResult{
|
||||
StdOut: outobj.stdout,
|
||||
StdErr: outobj.stderr,
|
||||
StdCombined: outobj.stdcombined,
|
||||
ExitCode: 0,
|
||||
CommandTimedOut: false,
|
||||
}, nil
|
||||
}
|
||||
}
|
||||
}
|
||||
|
226
cmdext/cmdrunner_test.go
Normal file
226
cmdext/cmdrunner_test.go
Normal file
@@ -0,0 +1,226 @@
|
||||
package cmdext
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
func TestStdout(t *testing.T) {
|
||||
|
||||
res1, err := Runner("printf").Arg("hello").Run()
|
||||
if err != nil {
|
||||
t.Errorf("%v", err)
|
||||
}
|
||||
if res1.StdErr != "" {
|
||||
t.Errorf("res1.StdErr == '%v'", res1.StdErr)
|
||||
}
|
||||
if res1.StdOut != "hello" {
|
||||
t.Errorf("res1.StdOut == '%v'", res1.StdOut)
|
||||
}
|
||||
if res1.StdCombined != "hello\n" {
|
||||
t.Errorf("res1.StdCombined == '%v'", res1.StdCombined)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func TestStderr(t *testing.T) {
|
||||
|
||||
res1, err := Runner("python").Arg("-c").Arg("import sys; print(\"error\", file=sys.stderr, end='')").Run()
|
||||
if err != nil {
|
||||
t.Errorf("%v", err)
|
||||
}
|
||||
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 TestStdcombined(t *testing.T) {
|
||||
res1, err := Runner("python").
|
||||
Arg("-c").
|
||||
Arg("import sys; import time; print(\"1\", file=sys.stderr, flush=True); time.sleep(0.1); print(\"2\", file=sys.stdout, flush=True); time.sleep(0.1); print(\"3\", file=sys.stderr, flush=True)").
|
||||
Run()
|
||||
if err != nil {
|
||||
t.Errorf("%v", err)
|
||||
}
|
||||
if res1.StdErr != "1\n3\n" {
|
||||
t.Errorf("res1.StdErr == '%v'", res1.StdErr)
|
||||
}
|
||||
if res1.StdOut != "2\n" {
|
||||
t.Errorf("res1.StdOut == '%v'", res1.StdOut)
|
||||
}
|
||||
if res1.StdCombined != "1\n2\n3\n" {
|
||||
t.Errorf("res1.StdCombined == '%v'", res1.StdCombined)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func TestPartialRead(t *testing.T) {
|
||||
res1, err := Runner("python").
|
||||
Arg("-c").
|
||||
Arg("import sys; import time; print(\"first message\", flush=True); time.sleep(5); print(\"cant see me\", flush=True);").
|
||||
Timeout(100 * time.Millisecond).
|
||||
Run()
|
||||
if err != nil {
|
||||
t.Errorf("%v", err)
|
||||
}
|
||||
if !res1.CommandTimedOut {
|
||||
t.Errorf("!CommandTimedOut")
|
||||
}
|
||||
if res1.StdErr != "" {
|
||||
t.Errorf("res1.StdErr == '%v'", res1.StdErr)
|
||||
}
|
||||
if res1.StdOut != "first message\n" {
|
||||
t.Errorf("res1.StdOut == '%v'", res1.StdOut)
|
||||
}
|
||||
if res1.StdCombined != "first message\n" {
|
||||
t.Errorf("res1.StdCombined == '%v'", res1.StdCombined)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func TestPartialReadStderr(t *testing.T) {
|
||||
res1, err := Runner("python").
|
||||
Arg("-c").
|
||||
Arg("import sys; import time; print(\"first message\", file=sys.stderr, flush=True); time.sleep(5); print(\"cant see me\", file=sys.stderr, flush=True);").
|
||||
Timeout(100 * time.Millisecond).
|
||||
Run()
|
||||
if err != nil {
|
||||
t.Errorf("%v", err)
|
||||
}
|
||||
if !res1.CommandTimedOut {
|
||||
t.Errorf("!CommandTimedOut")
|
||||
}
|
||||
if res1.StdErr != "first message\n" {
|
||||
t.Errorf("res1.StdErr == '%v'", res1.StdErr)
|
||||
}
|
||||
if res1.StdOut != "" {
|
||||
t.Errorf("res1.StdOut == '%v'", res1.StdOut)
|
||||
}
|
||||
if res1.StdCombined != "first message\n" {
|
||||
t.Errorf("res1.StdCombined == '%v'", res1.StdCombined)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func TestReadUnflushedStdout(t *testing.T) {
|
||||
|
||||
res1, err := Runner("python").Arg("-c").Arg("import sys; print(\"message101\", file=sys.stdout, end='')").Run()
|
||||
if err != nil {
|
||||
t.Errorf("%v", err)
|
||||
}
|
||||
if res1.StdErr != "" {
|
||||
t.Errorf("res1.StdErr == '%v'", res1.StdErr)
|
||||
}
|
||||
if res1.StdOut != "message101" {
|
||||
t.Errorf("res1.StdOut == '%v'", res1.StdOut)
|
||||
}
|
||||
if res1.StdCombined != "message101\n" {
|
||||
t.Errorf("res1.StdCombined == '%v'", res1.StdCombined)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func TestReadUnflushedStderr(t *testing.T) {
|
||||
|
||||
res1, err := Runner("python").Arg("-c").Arg("import sys; print(\"message101\", file=sys.stderr, end='')").Run()
|
||||
if err != nil {
|
||||
t.Errorf("%v", err)
|
||||
}
|
||||
if res1.StdErr != "message101" {
|
||||
t.Errorf("res1.StdErr == '%v'", res1.StdErr)
|
||||
}
|
||||
if res1.StdOut != "" {
|
||||
t.Errorf("res1.StdOut == '%v'", res1.StdOut)
|
||||
}
|
||||
if res1.StdCombined != "message101\n" {
|
||||
t.Errorf("res1.StdCombined == '%v'", res1.StdCombined)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func TestPartialReadUnflushed(t *testing.T) {
|
||||
t.SkipNow()
|
||||
|
||||
res1, err := Runner("python").
|
||||
Arg("-c").
|
||||
Arg("import sys; import time; print(\"first message\", end=''); time.sleep(5); print(\"cant see me\", end='');").
|
||||
Timeout(100 * time.Millisecond).
|
||||
Run()
|
||||
if err != nil {
|
||||
t.Errorf("%v", err)
|
||||
}
|
||||
if !res1.CommandTimedOut {
|
||||
t.Errorf("!CommandTimedOut")
|
||||
}
|
||||
if res1.StdErr != "" {
|
||||
t.Errorf("res1.StdErr == '%v'", res1.StdErr)
|
||||
}
|
||||
if res1.StdOut != "first message" {
|
||||
t.Errorf("res1.StdOut == '%v'", res1.StdOut)
|
||||
}
|
||||
if res1.StdCombined != "first message" {
|
||||
t.Errorf("res1.StdCombined == '%v'", res1.StdCombined)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func TestPartialReadUnflushedStderr(t *testing.T) {
|
||||
t.SkipNow()
|
||||
|
||||
res1, err := Runner("python").
|
||||
Arg("-c").
|
||||
Arg("import sys; import time; print(\"first message\", file=sys.stderr, end=''); time.sleep(5); print(\"cant see me\", file=sys.stderr, end='');").
|
||||
Timeout(100 * time.Millisecond).
|
||||
Run()
|
||||
if err != nil {
|
||||
t.Errorf("%v", err)
|
||||
}
|
||||
if !res1.CommandTimedOut {
|
||||
t.Errorf("!CommandTimedOut")
|
||||
}
|
||||
if res1.StdErr != "first message" {
|
||||
t.Errorf("res1.StdErr == '%v'", res1.StdErr)
|
||||
}
|
||||
if res1.StdOut != "" {
|
||||
t.Errorf("res1.StdOut == '%v'", res1.StdOut)
|
||||
}
|
||||
if res1.StdCombined != "first message" {
|
||||
t.Errorf("res1.StdCombined == '%v'", res1.StdCombined)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func TestListener(t *testing.T) {
|
||||
|
||||
_, err := Runner("python").
|
||||
Arg("-c").
|
||||
Arg("import sys;" +
|
||||
"import time;" +
|
||||
"print(\"message 1\", flush=True);" +
|
||||
"time.sleep(1);" +
|
||||
"print(\"message 2\", flush=True);" +
|
||||
"time.sleep(1);" +
|
||||
"print(\"message 3\", flush=True);" +
|
||||
"time.sleep(1);" +
|
||||
"print(\"message 4\", file=sys.stderr, flush=True);" +
|
||||
"time.sleep(1);" +
|
||||
"print(\"message 5\", flush=True);" +
|
||||
"time.sleep(1);" +
|
||||
"print(\"final\");").
|
||||
ListenStdout(func(s string) { fmt.Printf("@@STDOUT <<- %v (%v)\n", s, time.Now().Format(time.RFC3339Nano)) }).
|
||||
ListenStderr(func(s string) { fmt.Printf("@@STDERR <<- %v (%v)\n", s, time.Now().Format(time.RFC3339Nano)) }).
|
||||
Timeout(10 * time.Second).
|
||||
Run()
|
||||
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
}
|
12
cmdext/helper.go
Normal file
12
cmdext/helper.go
Normal file
@@ -0,0 +1,12 @@
|
||||
package cmdext
|
||||
|
||||
import "time"
|
||||
|
||||
func RunCommand(program string, args []string, timeout *time.Duration) (CommandResult, error) {
|
||||
b := Runner(program)
|
||||
b = b.Args(args)
|
||||
if timeout != nil {
|
||||
b = b.Timeout(*timeout)
|
||||
}
|
||||
return b.Run()
|
||||
}
|
57
cmdext/listener.go
Normal file
57
cmdext/listener.go
Normal file
@@ -0,0 +1,57 @@
|
||||
package cmdext
|
||||
|
||||
type CommandListener interface {
|
||||
ReadRawStdout([]byte)
|
||||
ReadRawStderr([]byte)
|
||||
|
||||
ReadStdoutLine(string)
|
||||
ReadStderrLine(string)
|
||||
|
||||
Finished(int)
|
||||
Timeout()
|
||||
}
|
||||
|
||||
type genericCommandListener struct {
|
||||
_readRawStdout *func([]byte)
|
||||
_readRawStderr *func([]byte)
|
||||
_readStdoutLine *func(string)
|
||||
_readStderrLine *func(string)
|
||||
_finished *func(int)
|
||||
_timeout *func()
|
||||
}
|
||||
|
||||
func (g genericCommandListener) ReadRawStdout(v []byte) {
|
||||
if g._readRawStdout != nil {
|
||||
(*g._readRawStdout)(v)
|
||||
}
|
||||
}
|
||||
|
||||
func (g genericCommandListener) ReadRawStderr(v []byte) {
|
||||
if g._readRawStderr != nil {
|
||||
(*g._readRawStderr)(v)
|
||||
}
|
||||
}
|
||||
|
||||
func (g genericCommandListener) ReadStdoutLine(v string) {
|
||||
if g._readStdoutLine != nil {
|
||||
(*g._readStdoutLine)(v)
|
||||
}
|
||||
}
|
||||
|
||||
func (g genericCommandListener) ReadStderrLine(v string) {
|
||||
if g._readStderrLine != nil {
|
||||
(*g._readStderrLine)(v)
|
||||
}
|
||||
}
|
||||
|
||||
func (g genericCommandListener) Finished(v int) {
|
||||
if g._finished != nil {
|
||||
(*g._finished)(v)
|
||||
}
|
||||
}
|
||||
|
||||
func (g genericCommandListener) Timeout() {
|
||||
if g._timeout != nil {
|
||||
(*g._timeout)()
|
||||
}
|
||||
}
|
146
cmdext/pipereader.go
Normal file
146
cmdext/pipereader.go
Normal file
@@ -0,0 +1,146 @@
|
||||
package cmdext
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"gogs.mikescher.com/BlackForestBytes/goext/syncext"
|
||||
"io"
|
||||
"sync"
|
||||
)
|
||||
|
||||
type pipeReader struct {
|
||||
stdout io.ReadCloser
|
||||
stderr io.ReadCloser
|
||||
}
|
||||
|
||||
// Read ready stdout and stdin until finished
|
||||
// also splits both pipes into lines and calld the listener
|
||||
func (pr *pipeReader) Read(listener []CommandListener) (string, string, string, error) {
|
||||
type combevt struct {
|
||||
line string
|
||||
stop bool
|
||||
}
|
||||
|
||||
errch := make(chan error, 8)
|
||||
|
||||
wg := sync.WaitGroup{}
|
||||
|
||||
// [1] read raw stdout
|
||||
|
||||
wg.Add(1)
|
||||
stdoutBufferReader, stdoutBufferWriter := io.Pipe()
|
||||
stdout := ""
|
||||
go func() {
|
||||
buf := make([]byte, 128)
|
||||
for true {
|
||||
n, out := pr.stdout.Read(buf)
|
||||
|
||||
if n > 0 {
|
||||
txt := string(buf[:n])
|
||||
stdout += txt
|
||||
_, _ = stdoutBufferWriter.Write(buf[:n])
|
||||
for _, lstr := range listener {
|
||||
lstr.ReadRawStdout(buf[:n])
|
||||
}
|
||||
}
|
||||
if out == io.EOF {
|
||||
break
|
||||
}
|
||||
if out != nil {
|
||||
errch <- out
|
||||
break
|
||||
}
|
||||
}
|
||||
_ = stdoutBufferWriter.Close()
|
||||
wg.Done()
|
||||
}()
|
||||
|
||||
// [2] read raw stderr
|
||||
|
||||
wg.Add(1)
|
||||
stderrBufferReader, stderrBufferWriter := io.Pipe()
|
||||
stderr := ""
|
||||
go func() {
|
||||
buf := make([]byte, 128)
|
||||
for true {
|
||||
n, err := pr.stderr.Read(buf)
|
||||
|
||||
if n > 0 {
|
||||
txt := string(buf[:n])
|
||||
stderr += txt
|
||||
_, _ = stderrBufferWriter.Write(buf[:n])
|
||||
for _, lstr := range listener {
|
||||
lstr.ReadRawStderr(buf[:n])
|
||||
}
|
||||
}
|
||||
if err == io.EOF {
|
||||
break
|
||||
}
|
||||
if err != nil {
|
||||
errch <- err
|
||||
break
|
||||
}
|
||||
}
|
||||
_ = stderrBufferWriter.Close()
|
||||
wg.Done()
|
||||
}()
|
||||
|
||||
combch := make(chan combevt, 32)
|
||||
|
||||
// [3] collect stdout line-by-line
|
||||
|
||||
wg.Add(1)
|
||||
go func() {
|
||||
scanner := bufio.NewScanner(stdoutBufferReader)
|
||||
for scanner.Scan() {
|
||||
txt := scanner.Text()
|
||||
for _, lstr := range listener {
|
||||
lstr.ReadStdoutLine(txt)
|
||||
}
|
||||
combch <- combevt{txt, false}
|
||||
}
|
||||
combch <- combevt{"", true}
|
||||
wg.Done()
|
||||
}()
|
||||
|
||||
// [4] collect stderr line-by-line
|
||||
|
||||
wg.Add(1)
|
||||
go func() {
|
||||
scanner := bufio.NewScanner(stderrBufferReader)
|
||||
for scanner.Scan() {
|
||||
txt := scanner.Text()
|
||||
for _, lstr := range listener {
|
||||
lstr.ReadStderrLine(txt)
|
||||
}
|
||||
combch <- combevt{txt, false}
|
||||
}
|
||||
combch <- combevt{"", true}
|
||||
wg.Done()
|
||||
}()
|
||||
|
||||
// [5] combine stdcombined
|
||||
|
||||
wg.Add(1)
|
||||
stdcombined := ""
|
||||
go func() {
|
||||
stopctr := 0
|
||||
for stopctr < 2 {
|
||||
vvv := <-combch
|
||||
if vvv.stop {
|
||||
stopctr++
|
||||
} else {
|
||||
stdcombined += vvv.line + "\n" // this comes from bufio.Scanner and has no newlines...
|
||||
}
|
||||
}
|
||||
wg.Done()
|
||||
}()
|
||||
|
||||
// wait for all (5) goroutines to finish
|
||||
wg.Wait()
|
||||
|
||||
if err, ok := syncext.ReadNonBlocking(errch); ok {
|
||||
return "", "", "", err
|
||||
}
|
||||
|
||||
return stdout, stderr, stdcombined, nil
|
||||
}
|
@@ -14,9 +14,21 @@ import (
|
||||
// ApplyEnvOverrides overrides field values from environment variables
|
||||
//
|
||||
// fields must be tagged with `env:"env_key"`
|
||||
func ApplyEnvOverrides[T any](c *T) error {
|
||||
|
||||
//
|
||||
// only works on exported fields
|
||||
//
|
||||
// fields without an env tag are ignored
|
||||
// fields with an `env:"-"` tag are ignore
|
||||
//
|
||||
// sub-structs are recursively parsed (if they have an env tag) and the env-variable keys are delimited by the delim parameter
|
||||
// sub-structs with `env:""` are also parsed, but the delimited is skipped (they are handled as if they were one level higher)
|
||||
func ApplyEnvOverrides[T any](c *T, delim string) error {
|
||||
rval := reflect.ValueOf(c).Elem()
|
||||
|
||||
return processEnvOverrides(rval, delim, "")
|
||||
}
|
||||
|
||||
func processEnvOverrides(rval reflect.Value, delim string, prefix string) error {
|
||||
rtyp := rval.Type()
|
||||
|
||||
for i := 0; i < rtyp.NumField(); i++ {
|
||||
@@ -24,12 +36,36 @@ func ApplyEnvOverrides[T any](c *T) error {
|
||||
rsfield := rtyp.Field(i)
|
||||
rvfield := rval.Field(i)
|
||||
|
||||
envkey := rsfield.Tag.Get("env")
|
||||
if envkey == "" {
|
||||
if !rsfield.IsExported() {
|
||||
continue
|
||||
}
|
||||
|
||||
envval, efound := os.LookupEnv(envkey)
|
||||
if rvfield.Kind() == reflect.Struct {
|
||||
|
||||
envkey, found := rsfield.Tag.Lookup("env")
|
||||
if !found || envkey == "-" {
|
||||
continue
|
||||
}
|
||||
|
||||
subPrefix := prefix
|
||||
if envkey != "" {
|
||||
subPrefix = subPrefix + envkey + delim
|
||||
}
|
||||
|
||||
err := processEnvOverrides(rvfield, delim, subPrefix)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
envkey := rsfield.Tag.Get("env")
|
||||
if envkey == "" || envkey == "-" {
|
||||
continue
|
||||
}
|
||||
|
||||
fullEnvKey := prefix + envkey
|
||||
|
||||
envval, efound := os.LookupEnv(fullEnvKey)
|
||||
if !efound {
|
||||
continue
|
||||
}
|
||||
@@ -38,86 +74,86 @@ func ApplyEnvOverrides[T any](c *T) error {
|
||||
|
||||
rvfield.Set(reflect.ValueOf(envval))
|
||||
|
||||
fmt.Printf("[CONF] Overwrite config '%s' with '%s'\n", envkey, envval)
|
||||
fmt.Printf("[CONF] Overwrite config '%s' with '%s'\n", fullEnvKey, envval)
|
||||
|
||||
} else if rvfield.Type() == reflect.TypeOf(int(0)) {
|
||||
|
||||
envint, err := strconv.ParseInt(envval, 10, bits.UintSize)
|
||||
if err != nil {
|
||||
return errors.New(fmt.Sprintf("Failed to parse env-config variable '%s' to int (value := '%s')", envkey, envval))
|
||||
return errors.New(fmt.Sprintf("Failed to parse env-config variable '%s' to int (value := '%s')", fullEnvKey, envval))
|
||||
}
|
||||
|
||||
rvfield.Set(reflect.ValueOf(int(envint)))
|
||||
|
||||
fmt.Printf("[CONF] Overwrite config '%s' with '%s'\n", envkey, envval)
|
||||
fmt.Printf("[CONF] Overwrite config '%s' with '%s'\n", fullEnvKey, envval)
|
||||
|
||||
} else if rvfield.Type() == reflect.TypeOf(int64(0)) {
|
||||
|
||||
envint, err := strconv.ParseInt(envval, 10, 64)
|
||||
if err != nil {
|
||||
return errors.New(fmt.Sprintf("Failed to parse env-config variable '%s' to int64 (value := '%s')", envkey, envval))
|
||||
return errors.New(fmt.Sprintf("Failed to parse env-config variable '%s' to int64 (value := '%s')", fullEnvKey, envval))
|
||||
}
|
||||
|
||||
rvfield.Set(reflect.ValueOf(int64(envint)))
|
||||
|
||||
fmt.Printf("[CONF] Overwrite config '%s' with '%s'\n", envkey, envval)
|
||||
fmt.Printf("[CONF] Overwrite config '%s' with '%s'\n", fullEnvKey, envval)
|
||||
|
||||
} else if rvfield.Type() == reflect.TypeOf(int32(0)) {
|
||||
|
||||
envint, err := strconv.ParseInt(envval, 10, 32)
|
||||
if err != nil {
|
||||
return errors.New(fmt.Sprintf("Failed to parse env-config variable '%s' to int32 (value := '%s')", envkey, envval))
|
||||
return errors.New(fmt.Sprintf("Failed to parse env-config variable '%s' to int32 (value := '%s')", fullEnvKey, envval))
|
||||
}
|
||||
|
||||
rvfield.Set(reflect.ValueOf(int32(envint)))
|
||||
|
||||
fmt.Printf("[CONF] Overwrite config '%s' with '%s'\n", envkey, envval)
|
||||
fmt.Printf("[CONF] Overwrite config '%s' with '%s'\n", fullEnvKey, envval)
|
||||
|
||||
} else if rvfield.Type() == reflect.TypeOf(int8(0)) {
|
||||
|
||||
envint, err := strconv.ParseInt(envval, 10, 8)
|
||||
if err != nil {
|
||||
return errors.New(fmt.Sprintf("Failed to parse env-config variable '%s' to int32 (value := '%s')", envkey, envval))
|
||||
return errors.New(fmt.Sprintf("Failed to parse env-config variable '%s' to int32 (value := '%s')", fullEnvKey, envval))
|
||||
}
|
||||
|
||||
rvfield.Set(reflect.ValueOf(int8(envint)))
|
||||
|
||||
fmt.Printf("[CONF] Overwrite config '%s' with '%s'\n", envkey, envval)
|
||||
fmt.Printf("[CONF] Overwrite config '%s' with '%s'\n", fullEnvKey, envval)
|
||||
|
||||
} else if rvfield.Type() == reflect.TypeOf(time.Duration(0)) {
|
||||
|
||||
dur, err := timeext.ParseDurationShortString(envval)
|
||||
if err != nil {
|
||||
return errors.New(fmt.Sprintf("Failed to parse env-config variable '%s' to duration (value := '%s')", envkey, envval))
|
||||
return errors.New(fmt.Sprintf("Failed to parse env-config variable '%s' to duration (value := '%s')", fullEnvKey, envval))
|
||||
}
|
||||
|
||||
rvfield.Set(reflect.ValueOf(dur))
|
||||
|
||||
fmt.Printf("[CONF] Overwrite config '%s' with '%s'\n", envkey, dur.String())
|
||||
fmt.Printf("[CONF] Overwrite config '%s' with '%s'\n", fullEnvKey, dur.String())
|
||||
|
||||
} else if rvfield.Type() == reflect.TypeOf(time.UnixMilli(0)) {
|
||||
|
||||
tim, err := time.Parse(time.RFC3339Nano, envval)
|
||||
if err != nil {
|
||||
return errors.New(fmt.Sprintf("Failed to parse env-config variable '%s' to time.time (value := '%s')", envkey, envval))
|
||||
return errors.New(fmt.Sprintf("Failed to parse env-config variable '%s' to time.time (value := '%s')", fullEnvKey, envval))
|
||||
}
|
||||
|
||||
rvfield.Set(reflect.ValueOf(tim))
|
||||
|
||||
fmt.Printf("[CONF] Overwrite config '%s' with '%s'\n", envkey, tim.String())
|
||||
fmt.Printf("[CONF] Overwrite config '%s' with '%s'\n", fullEnvKey, tim.String())
|
||||
|
||||
} else if rvfield.Type().ConvertibleTo(reflect.TypeOf(int(0))) {
|
||||
|
||||
envint, err := strconv.ParseInt(envval, 10, 8)
|
||||
if err != nil {
|
||||
return errors.New(fmt.Sprintf("Failed to parse env-config variable '%s' to <%s, ,int> (value := '%s')", rvfield.Type().Name(), envkey, envval))
|
||||
return errors.New(fmt.Sprintf("Failed to parse env-config variable '%s' to <%s, ,int> (value := '%s')", rvfield.Type().Name(), fullEnvKey, envval))
|
||||
}
|
||||
|
||||
envcvl := reflect.ValueOf(envint).Convert(rvfield.Type())
|
||||
|
||||
rvfield.Set(envcvl)
|
||||
|
||||
fmt.Printf("[CONF] Overwrite config '%s' with '%v'\n", envkey, envcvl.Interface())
|
||||
fmt.Printf("[CONF] Overwrite config '%s' with '%v'\n", fullEnvKey, envcvl.Interface())
|
||||
|
||||
} else if rvfield.Type().ConvertibleTo(reflect.TypeOf("")) {
|
||||
|
||||
@@ -125,7 +161,7 @@ func ApplyEnvOverrides[T any](c *T) error {
|
||||
|
||||
rvfield.Set(envcvl)
|
||||
|
||||
fmt.Printf("[CONF] Overwrite config '%s' with '%v'\n", envkey, envcvl.Interface())
|
||||
fmt.Printf("[CONF] Overwrite config '%s' with '%v'\n", fullEnvKey, envcvl.Interface())
|
||||
|
||||
} else {
|
||||
return errors.New(fmt.Sprintf("Unknown kind/type in config: [ %s | %s ]", rvfield.Kind().String(), rvfield.Type().String()))
|
||||
|
@@ -1,6 +1,7 @@
|
||||
package confext
|
||||
|
||||
import (
|
||||
"gogs.mikescher.com/BlackForestBytes/goext/timeext"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
@@ -40,7 +41,7 @@ func TestApplyEnvOverridesNoop(t *testing.T) {
|
||||
|
||||
output := input
|
||||
|
||||
err := ApplyEnvOverrides(&output)
|
||||
err := ApplyEnvOverrides(&output, ".")
|
||||
if err != nil {
|
||||
t.Errorf("%v", err)
|
||||
t.FailNow()
|
||||
@@ -92,7 +93,7 @@ func TestApplyEnvOverridesSimple(t *testing.T) {
|
||||
t.Setenv("TEST_V8", "1min4s")
|
||||
t.Setenv("TEST_V9", "2009-11-10T23:00:00Z")
|
||||
|
||||
err := ApplyEnvOverrides(&data)
|
||||
err := ApplyEnvOverrides(&data, ".")
|
||||
if err != nil {
|
||||
t.Errorf("%v", err)
|
||||
t.FailNow()
|
||||
@@ -109,6 +110,109 @@ func TestApplyEnvOverridesSimple(t *testing.T) {
|
||||
assertEqual(t, data.V9, time.Unix(1257894000, 0).UTC())
|
||||
}
|
||||
|
||||
func TestApplyEnvOverridesRecursive(t *testing.T) {
|
||||
|
||||
type subdata struct {
|
||||
V1 int `env:"SUB_V1"`
|
||||
VX string ``
|
||||
V2 string `env:"SUB_V2"`
|
||||
V8 time.Duration `env:"SUB_V3"`
|
||||
V9 time.Time `env:"SUB_V4"`
|
||||
}
|
||||
|
||||
type testdata struct {
|
||||
V1 int `env:"TEST_V1"`
|
||||
VX string ``
|
||||
Sub1 subdata ``
|
||||
Sub2 subdata `env:"TEST_V2"`
|
||||
Sub3 subdata `env:"TEST_V3"`
|
||||
Sub4 subdata `env:""`
|
||||
V5 string `env:"-"`
|
||||
}
|
||||
|
||||
data := testdata{
|
||||
V1: 1,
|
||||
VX: "2",
|
||||
V5: "no",
|
||||
Sub1: subdata{
|
||||
V1: 3,
|
||||
VX: "4",
|
||||
V2: "5",
|
||||
V8: 6 * time.Second,
|
||||
V9: time.Date(2000, 1, 7, 1, 1, 1, 0, time.UTC),
|
||||
},
|
||||
Sub2: subdata{
|
||||
V1: 8,
|
||||
VX: "9",
|
||||
V2: "10",
|
||||
V8: 11 * time.Second,
|
||||
V9: time.Date(2000, 1, 12, 1, 1, 1, 0, timeext.TimezoneBerlin),
|
||||
},
|
||||
Sub3: subdata{
|
||||
V1: 13,
|
||||
VX: "14",
|
||||
V2: "15",
|
||||
V8: 16 * time.Second,
|
||||
V9: time.Date(2000, 1, 17, 1, 1, 1, 0, timeext.TimezoneBerlin),
|
||||
},
|
||||
Sub4: subdata{
|
||||
V1: 18,
|
||||
VX: "19",
|
||||
V2: "20",
|
||||
V8: 21 * time.Second,
|
||||
V9: time.Date(2000, 1, 22, 1, 1, 1, 0, timeext.TimezoneBerlin),
|
||||
},
|
||||
}
|
||||
|
||||
t.Setenv("TEST_V1", "999")
|
||||
t.Setenv("-", "yes")
|
||||
|
||||
t.Setenv("TEST_V2_SUB_V1", "846")
|
||||
t.Setenv("TEST_V2_SUB_V2", "222_hello_world")
|
||||
t.Setenv("TEST_V2_SUB_V3", "1min4s")
|
||||
t.Setenv("TEST_V2_SUB_V4", "2009-11-10T23:00:00Z")
|
||||
|
||||
t.Setenv("TEST_V3_SUB_V1", "33846")
|
||||
t.Setenv("TEST_V3_SUB_V2", "33_hello_world")
|
||||
t.Setenv("TEST_V3_SUB_V3", "33min4s")
|
||||
t.Setenv("TEST_V3_SUB_V4", "2033-11-10T23:00:00Z")
|
||||
|
||||
t.Setenv("SUB_V1", "11")
|
||||
t.Setenv("SUB_V2", "22")
|
||||
t.Setenv("SUB_V3", "33min")
|
||||
t.Setenv("SUB_V4", "2044-01-01T00:00:00Z")
|
||||
|
||||
err := ApplyEnvOverrides(&data, "_")
|
||||
if err != nil {
|
||||
t.Errorf("%v", err)
|
||||
t.FailNow()
|
||||
}
|
||||
|
||||
assertEqual(t, data.V1, 999)
|
||||
assertEqual(t, data.VX, "2")
|
||||
assertEqual(t, data.V5, "no")
|
||||
assertEqual(t, data.Sub1.V1, 3)
|
||||
assertEqual(t, data.Sub1.VX, "4")
|
||||
assertEqual(t, data.Sub1.V2, "5")
|
||||
assertEqual(t, data.Sub1.V8, time.Second*6)
|
||||
assertEqual(t, data.Sub1.V9, time.Unix(947206861, 0).UTC())
|
||||
assertEqual(t, data.Sub2.V1, 846)
|
||||
assertEqual(t, data.Sub2.VX, "9")
|
||||
assertEqual(t, data.Sub2.V2, "222_hello_world")
|
||||
assertEqual(t, data.Sub2.V8, time.Second*64)
|
||||
assertEqual(t, data.Sub2.V9, time.Unix(1257894000, 0).UTC())
|
||||
assertEqual(t, data.Sub3.V1, 33846)
|
||||
assertEqual(t, data.Sub3.VX, "14")
|
||||
assertEqual(t, data.Sub3.V2, "33_hello_world")
|
||||
assertEqual(t, data.Sub3.V8, time.Second*1984)
|
||||
assertEqual(t, data.Sub3.V9, time.Unix(2015276400, 0).UTC())
|
||||
assertEqual(t, data.Sub4.V1, 11)
|
||||
assertEqual(t, data.Sub4.VX, "19")
|
||||
assertEqual(t, data.Sub4.V2, "22")
|
||||
assertEqual(t, data.Sub4.V8, time.Second*1980)
|
||||
assertEqual(t, data.Sub4.V9, time.Unix(2335219200, 0).UTC())
|
||||
}
|
||||
|
||||
func assertEqual[T comparable](t *testing.T, actual T, expected T) {
|
||||
if actual != expected {
|
||||
t.Errorf("values differ: Actual: '%v', Expected: '%v'", actual, expected)
|
||||
|
132
cryptext/aes.go
Normal file
132
cryptext/aes.go
Normal file
@@ -0,0 +1,132 @@
|
||||
package cryptext
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"crypto/aes"
|
||||
"crypto/cipher"
|
||||
"crypto/rand"
|
||||
"crypto/sha256"
|
||||
"encoding/base32"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"golang.org/x/crypto/scrypt"
|
||||
"io"
|
||||
)
|
||||
|
||||
// https://stackoverflow.com/a/18819040/1761622
|
||||
|
||||
type aesPayload struct {
|
||||
Salt []byte `json:"s"`
|
||||
IV []byte `json:"i"`
|
||||
Data []byte `json:"d"`
|
||||
Rounds int `json:"r"`
|
||||
Version uint `json:"v"`
|
||||
}
|
||||
|
||||
func EncryptAESSimple(password []byte, data []byte, rounds int) (string, error) {
|
||||
|
||||
salt := make([]byte, 8)
|
||||
_, err := io.ReadFull(rand.Reader, salt)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
key, err := scrypt.Key(password, salt, rounds, 8, 1, 32)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
block, err := aes.NewCipher(key)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
h := sha256.New()
|
||||
h.Write(data)
|
||||
checksum := h.Sum(nil)
|
||||
if len(checksum) != 32 {
|
||||
return "", errors.New("wrong cs size")
|
||||
}
|
||||
|
||||
ciphertext := make([]byte, 32+len(data))
|
||||
|
||||
iv := make([]byte, aes.BlockSize)
|
||||
_, err = io.ReadFull(rand.Reader, iv)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
combinedData := make([]byte, 0, 32+len(data))
|
||||
combinedData = append(combinedData, checksum...)
|
||||
combinedData = append(combinedData, data...)
|
||||
|
||||
cfb := cipher.NewCFBEncrypter(block, iv)
|
||||
cfb.XORKeyStream(ciphertext, combinedData)
|
||||
|
||||
pl := aesPayload{
|
||||
Salt: salt,
|
||||
IV: iv,
|
||||
Data: ciphertext,
|
||||
Version: 1,
|
||||
Rounds: rounds,
|
||||
}
|
||||
|
||||
jbin, err := json.Marshal(pl)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
res := base32.StdEncoding.WithPadding(base32.NoPadding).EncodeToString(jbin)
|
||||
|
||||
return res, nil
|
||||
}
|
||||
|
||||
func DecryptAESSimple(password []byte, encText string) ([]byte, error) {
|
||||
|
||||
jbin, err := base32.StdEncoding.WithPadding(base32.NoPadding).DecodeString(encText)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var pl aesPayload
|
||||
err = json.Unmarshal(jbin, &pl)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if pl.Version != 1 {
|
||||
return nil, errors.New("unsupported version")
|
||||
}
|
||||
|
||||
key, err := scrypt.Key(password, pl.Salt, pl.Rounds, 8, 1, 32) // this is not 100% correct, rounds too low and salt is missing
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
block, err := aes.NewCipher(key)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
dest := make([]byte, len(pl.Data))
|
||||
|
||||
cfb := cipher.NewCFBDecrypter(block, pl.IV)
|
||||
cfb.XORKeyStream(dest, pl.Data)
|
||||
|
||||
if len(dest) < 32 {
|
||||
return nil, errors.New("payload too small")
|
||||
}
|
||||
|
||||
chck := dest[:32]
|
||||
data := dest[32:]
|
||||
|
||||
h := sha256.New()
|
||||
h.Write(data)
|
||||
chck2 := h.Sum(nil)
|
||||
|
||||
if !bytes.Equal(chck, chck2) {
|
||||
return nil, errors.New("checksum mismatch")
|
||||
}
|
||||
|
||||
return data, nil
|
||||
}
|
35
cryptext/aes_test.go
Normal file
35
cryptext/aes_test.go
Normal file
@@ -0,0 +1,35 @@
|
||||
package cryptext
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestEncryptAESSimple(t *testing.T) {
|
||||
|
||||
pw := []byte("hunter12")
|
||||
|
||||
str1 := []byte("Hello World")
|
||||
|
||||
str2, err := EncryptAESSimple(pw, str1, 512)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
fmt.Printf("%s\n", str2)
|
||||
|
||||
str3, err := DecryptAESSimple(pw, str2)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
assertEqual(t, string(str1), string(str3))
|
||||
|
||||
str4, err := EncryptAESSimple(pw, str3, 512)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
assertNotEqual(t, string(str2), string(str4))
|
||||
|
||||
}
|
@@ -23,3 +23,9 @@ func assertEqual(t *testing.T, actual string, expected string) {
|
||||
t.Errorf("values differ: Actual: '%v', Expected: '%v'", actual, expected)
|
||||
}
|
||||
}
|
||||
|
||||
func assertNotEqual(t *testing.T, actual string, expected string) {
|
||||
if actual == expected {
|
||||
t.Errorf("values do not differ: Actual: '%v', Expected: '%v'", actual, expected)
|
||||
}
|
||||
}
|
||||
|
@@ -245,6 +245,35 @@ func (ph PassHash) WithTOTP(totpSecret []byte) (PassHash, error) {
|
||||
return "", errors.New("unknown version")
|
||||
}
|
||||
|
||||
func (ph PassHash) Change(newPlainPass string) (PassHash, error) {
|
||||
version, _, _, hastotp, totpsecret, valid := ph.Data()
|
||||
if !valid {
|
||||
return "", errors.New("invalid PassHash")
|
||||
}
|
||||
|
||||
if version == 0 {
|
||||
return HashPasswordV0(newPlainPass)
|
||||
}
|
||||
|
||||
if version == 1 {
|
||||
return HashPasswordV1(newPlainPass)
|
||||
}
|
||||
|
||||
if version == 2 {
|
||||
return HashPasswordV2(newPlainPass)
|
||||
}
|
||||
|
||||
if version == 3 {
|
||||
return HashPasswordV3(newPlainPass, langext.Conditional(hastotp, totpsecret, nil))
|
||||
}
|
||||
|
||||
if version == 4 {
|
||||
return HashPasswordV4(newPlainPass, langext.Conditional(hastotp, totpsecret, nil))
|
||||
}
|
||||
|
||||
return "", errors.New("unknown version")
|
||||
}
|
||||
|
||||
func (ph PassHash) String() string {
|
||||
return string(ph)
|
||||
}
|
||||
|
@@ -19,38 +19,38 @@ import (
|
||||
// There are also a bunch of unit tests to ensure that the cache is always in a consistent state
|
||||
//
|
||||
|
||||
type LRUMap[TData any] struct {
|
||||
type LRUMap[TKey comparable, TData any] struct {
|
||||
maxsize int
|
||||
lock sync.Mutex
|
||||
|
||||
cache map[string]*cacheNode[TData]
|
||||
cache map[TKey]*cacheNode[TKey, TData]
|
||||
|
||||
lfuHead *cacheNode[TData]
|
||||
lfuTail *cacheNode[TData]
|
||||
lfuHead *cacheNode[TKey, TData]
|
||||
lfuTail *cacheNode[TKey, TData]
|
||||
}
|
||||
|
||||
type cacheNode[TData any] struct {
|
||||
key string
|
||||
type cacheNode[TKey comparable, TData any] struct {
|
||||
key TKey
|
||||
data TData
|
||||
parent *cacheNode[TData]
|
||||
child *cacheNode[TData]
|
||||
parent *cacheNode[TKey, TData]
|
||||
child *cacheNode[TKey, TData]
|
||||
}
|
||||
|
||||
func NewLRUMap[TData any](size int) *LRUMap[TData] {
|
||||
func NewLRUMap[TKey comparable, TData any](size int) *LRUMap[TKey, TData] {
|
||||
if size <= 2 && size != 0 {
|
||||
panic("Size must be > 2 (or 0)")
|
||||
}
|
||||
|
||||
return &LRUMap[TData]{
|
||||
return &LRUMap[TKey, TData]{
|
||||
maxsize: size,
|
||||
lock: sync.Mutex{},
|
||||
cache: make(map[string]*cacheNode[TData], size+1),
|
||||
cache: make(map[TKey]*cacheNode[TKey, TData], size+1),
|
||||
lfuHead: nil,
|
||||
lfuTail: nil,
|
||||
}
|
||||
}
|
||||
|
||||
func (c *LRUMap[TData]) Put(key string, value TData) {
|
||||
func (c *LRUMap[TKey, TData]) Put(key TKey, value TData) {
|
||||
if c.maxsize == 0 {
|
||||
return // cache disabled
|
||||
}
|
||||
@@ -68,7 +68,7 @@ func (c *LRUMap[TData]) Put(key string, value TData) {
|
||||
}
|
||||
|
||||
// key does not exist: insert into map and add to top of LFU
|
||||
node = &cacheNode[TData]{
|
||||
node = &cacheNode[TKey, TData]{
|
||||
key: key,
|
||||
data: value,
|
||||
parent: nil,
|
||||
@@ -93,7 +93,7 @@ func (c *LRUMap[TData]) Put(key string, value TData) {
|
||||
}
|
||||
}
|
||||
|
||||
func (c *LRUMap[TData]) TryGet(key string) (TData, bool) {
|
||||
func (c *LRUMap[TKey, TData]) TryGet(key TKey) (TData, bool) {
|
||||
if c.maxsize == 0 {
|
||||
return *new(TData), false // cache disabled
|
||||
}
|
||||
@@ -109,7 +109,7 @@ func (c *LRUMap[TData]) TryGet(key string) (TData, bool) {
|
||||
return val.data, ok
|
||||
}
|
||||
|
||||
func (c *LRUMap[TData]) moveNodeToTop(node *cacheNode[TData]) {
|
||||
func (c *LRUMap[TKey, TData]) moveNodeToTop(node *cacheNode[TKey, TData]) {
|
||||
// (only called in critical section !)
|
||||
|
||||
if c.lfuHead == node { // fast case
|
||||
@@ -142,7 +142,7 @@ func (c *LRUMap[TData]) moveNodeToTop(node *cacheNode[TData]) {
|
||||
}
|
||||
}
|
||||
|
||||
func (c *LRUMap[TData]) Size() int {
|
||||
func (c *LRUMap[TKey, TData]) Size() int {
|
||||
c.lock.Lock()
|
||||
defer c.lock.Unlock()
|
||||
return len(c.cache)
|
||||
|
116
dataext/stack.go
Normal file
116
dataext/stack.go
Normal file
@@ -0,0 +1,116 @@
|
||||
package dataext
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"gogs.mikescher.com/BlackForestBytes/goext/langext"
|
||||
"sync"
|
||||
)
|
||||
|
||||
var ErrEmptyStack = errors.New("stack is empty")
|
||||
|
||||
type Stack[T any] struct {
|
||||
lock *sync.Mutex
|
||||
data []T
|
||||
}
|
||||
|
||||
func NewStack[T any](threadsafe bool, initialCapacity int) *Stack[T] {
|
||||
var lck *sync.Mutex = nil
|
||||
if threadsafe {
|
||||
lck = &sync.Mutex{}
|
||||
}
|
||||
return &Stack[T]{
|
||||
lock: lck,
|
||||
data: make([]T, 0, initialCapacity),
|
||||
}
|
||||
}
|
||||
|
||||
func (s *Stack[T]) Push(v T) {
|
||||
if s.lock != nil {
|
||||
s.lock.Lock()
|
||||
defer s.lock.Unlock()
|
||||
}
|
||||
|
||||
s.data = append(s.data, v)
|
||||
}
|
||||
|
||||
func (s *Stack[T]) Pop() (T, error) {
|
||||
if s.lock != nil {
|
||||
s.lock.Lock()
|
||||
defer s.lock.Unlock()
|
||||
}
|
||||
|
||||
l := len(s.data)
|
||||
if l == 0 {
|
||||
return *new(T), ErrEmptyStack
|
||||
}
|
||||
|
||||
result := s.data[l-1]
|
||||
s.data = s.data[:l-1]
|
||||
|
||||
return result, nil
|
||||
}
|
||||
|
||||
func (s *Stack[T]) OptPop() *T {
|
||||
if s.lock != nil {
|
||||
s.lock.Lock()
|
||||
defer s.lock.Unlock()
|
||||
}
|
||||
|
||||
l := len(s.data)
|
||||
if l == 0 {
|
||||
return nil
|
||||
}
|
||||
|
||||
result := s.data[l-1]
|
||||
s.data = s.data[:l-1]
|
||||
|
||||
return langext.Ptr(result)
|
||||
}
|
||||
|
||||
func (s *Stack[T]) Peek() (T, error) {
|
||||
if s.lock != nil {
|
||||
s.lock.Lock()
|
||||
defer s.lock.Unlock()
|
||||
}
|
||||
|
||||
l := len(s.data)
|
||||
|
||||
if l == 0 {
|
||||
return *new(T), ErrEmptyStack
|
||||
}
|
||||
|
||||
return s.data[l-1], nil
|
||||
}
|
||||
|
||||
func (s *Stack[T]) OptPeek() *T {
|
||||
if s.lock != nil {
|
||||
s.lock.Lock()
|
||||
defer s.lock.Unlock()
|
||||
}
|
||||
|
||||
l := len(s.data)
|
||||
|
||||
if l == 0 {
|
||||
return nil
|
||||
}
|
||||
|
||||
return langext.Ptr(s.data[l-1])
|
||||
}
|
||||
|
||||
func (s *Stack[T]) Length() int {
|
||||
if s.lock != nil {
|
||||
s.lock.Lock()
|
||||
defer s.lock.Unlock()
|
||||
}
|
||||
|
||||
return len(s.data)
|
||||
}
|
||||
|
||||
func (s *Stack[T]) Empty() bool {
|
||||
if s.lock != nil {
|
||||
s.lock.Lock()
|
||||
defer s.lock.Unlock()
|
||||
}
|
||||
|
||||
return len(s.data) == 0
|
||||
}
|
416
exerr/builder.go
Normal file
416
exerr/builder.go
Normal file
@@ -0,0 +1,416 @@
|
||||
package exerr
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"github.com/rs/zerolog"
|
||||
"go.mongodb.org/mongo-driver/bson/primitive"
|
||||
"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 bmerror:
|
||||
// value, err := do_something(..)
|
||||
// if err != nil {
|
||||
// return nil, bmerror.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, bmerror.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, bmerror.New(bmerror.ErrInternal, "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 {
|
||||
bmerror *bringmanError
|
||||
|
||||
containsGinData bool
|
||||
}
|
||||
|
||||
func Get(err error) *Builder {
|
||||
return &Builder{bmerror: fromError(err)}
|
||||
}
|
||||
|
||||
func New(t ErrorType, msg string) *Builder {
|
||||
return &Builder{bmerror: newBringmanErr(CatSystem, t, msg)}
|
||||
}
|
||||
|
||||
func Wrap(err error, msg string) *Builder {
|
||||
return &Builder{bmerror: fromError(err).wrap(msg, CatWrap, 1)}
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
func (b *Builder) WithType(t ErrorType) *Builder {
|
||||
b.bmerror.Type = t
|
||||
return b
|
||||
}
|
||||
|
||||
func (b *Builder) WithStatuscode(status int) *Builder {
|
||||
b.bmerror.StatusCode = status
|
||||
return b
|
||||
}
|
||||
|
||||
func (b *Builder) WithMessage(msg string) *Builder {
|
||||
b.bmerror.Message = msg
|
||||
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.bmerror.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.bmerror.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.bmerror.Severity = SevInfo
|
||||
return b
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// User sets the Category to CatUser
|
||||
//
|
||||
// Errors with category
|
||||
func (b *Builder) User() *Builder {
|
||||
b.bmerror.Category = CatUser
|
||||
return b
|
||||
}
|
||||
|
||||
func (b *Builder) System() *Builder {
|
||||
b.bmerror.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) 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).toBMError().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.Str("gin.header", formatHeader(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 && req.Header.Get("Content-Type") == "application/json" {
|
||||
if brc, ok := req.Body.(langext.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]]", len(bin)))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// 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 {
|
||||
if b.bmerror.Severity == SevErr || b.bmerror.Severity == SevFatal {
|
||||
b.bmerror.ShortLog(stackSkipLogger.Error())
|
||||
}
|
||||
|
||||
b.CallListener(MethodBuild)
|
||||
|
||||
return b.bmerror.ToGrpcError()
|
||||
}
|
||||
|
||||
// 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.bmerror.Output(ctx, g)
|
||||
|
||||
if b.bmerror.Severity == SevErr || b.bmerror.Severity == SevFatal {
|
||||
b.bmerror.Log(stackSkipLogger.Error())
|
||||
} else if b.bmerror.Severity == SevWarn {
|
||||
b.bmerror.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.bmerror.Severity == SevErr || b.bmerror.Severity == SevFatal {
|
||||
b.bmerror.Log(stackSkipLogger.Error())
|
||||
} else if b.bmerror.Severity == SevWarn {
|
||||
b.bmerror.ShortLog(stackSkipLogger.Warn())
|
||||
}
|
||||
|
||||
b.CallListener(MethodPrint)
|
||||
}
|
||||
|
||||
func (b *Builder) Format(level LogPrintLevel) string {
|
||||
return b.bmerror.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.bmerror.Severity = SevFatal
|
||||
b.bmerror.Log(stackSkipLogger.WithLevel(zerolog.FatalLevel))
|
||||
|
||||
b.CallListener(MethodFatal)
|
||||
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
func (b *Builder) addMeta(key string, mdtype metaDataType, val interface{}) *Builder {
|
||||
b.bmerror.Meta.add(key, mdtype, val)
|
||||
return b
|
||||
}
|
||||
|
||||
func (b *Builder) toBMError() BMError {
|
||||
return b.bmerror.ToBMError()
|
||||
}
|
32
exerr/data.go
Normal file
32
exerr/data.go
Normal file
@@ -0,0 +1,32 @@
|
||||
package exerr
|
||||
|
||||
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
|
||||
)
|
||||
|
||||
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"}
|
||||
)
|
||||
|
||||
var AllSeverities = []ErrorSeverity{SevTrace, SevDebug, SevInfo, SevWarn, SevErr, SevFatal}
|
||||
|
||||
type ErrorType struct{ Key string }
|
||||
|
||||
var (
|
||||
TypeInternal = ErrorType{"Internal"}
|
||||
// other values come from pkgconfig
|
||||
)
|
1
exerr/defaults.go
Normal file
1
exerr/defaults.go
Normal file
@@ -0,0 +1 @@
|
||||
package exerr
|
50
exerr/errinit.go
Normal file
50
exerr/errinit.go
Normal file
@@ -0,0 +1,50 @@
|
||||
package exerr
|
||||
|
||||
type ErrorPackageConfig struct {
|
||||
ZeroLogTraces bool // autom print zerolog logs on CreateError
|
||||
RecursiveErrors bool // errors contains their Origin-Error
|
||||
Types []ErrorType // all available error-types
|
||||
}
|
||||
|
||||
type ErrorPackageConfigInit struct {
|
||||
LogTraces bool
|
||||
RecursiveErrors bool
|
||||
InitTypes func(_ func(_ string) ErrorType)
|
||||
}
|
||||
|
||||
var initialized = false
|
||||
|
||||
var pkgconfig = ErrorPackageConfig{
|
||||
ZeroLogTraces: true,
|
||||
RecursiveErrors: true,
|
||||
Types: []ErrorType{TypeInternal},
|
||||
}
|
||||
|
||||
// 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")
|
||||
}
|
||||
|
||||
types := pkgconfig.Types
|
||||
|
||||
fnAddType := func(v string) ErrorType {
|
||||
et := ErrorType{v}
|
||||
types = append(types, et)
|
||||
return et
|
||||
}
|
||||
|
||||
if cfg.InitTypes != nil {
|
||||
cfg.InitTypes(fnAddType)
|
||||
}
|
||||
|
||||
pkgconfig = ErrorPackageConfig{
|
||||
ZeroLogTraces: cfg.LogTraces,
|
||||
RecursiveErrors: cfg.RecursiveErrors,
|
||||
Types: types,
|
||||
}
|
||||
|
||||
initialized = true
|
||||
}
|
33
exerr/exerr.go
Normal file
33
exerr/exerr.go
Normal file
@@ -0,0 +1,33 @@
|
||||
package exerr
|
||||
|
||||
import (
|
||||
"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"`
|
||||
|
||||
Message string `json:"message"`
|
||||
Caller string `json:"caller"`
|
||||
|
||||
OriginalError *ExErr
|
||||
|
||||
Meta MetaMap `json:"meta"`
|
||||
}
|
||||
|
||||
func (ee ExErr) Error() string {
|
||||
|
||||
}
|
||||
|
||||
func (ee ExErr) Unwrap() error {
|
||||
|
||||
}
|
||||
|
||||
func (ee ExErr) Is(err error) bool {
|
||||
|
||||
}
|
146
exerr/foreign.go
Normal file
146
exerr/foreign.go
Normal file
@@ -0,0 +1,146 @@
|
||||
package exerr
|
||||
|
||||
import (
|
||||
"bringman.de/common/shared/langext"
|
||||
"encoding/json"
|
||||
"go.mongodb.org/mongo-driver/bson/primitive"
|
||||
"reflect"
|
||||
"time"
|
||||
)
|
||||
|
||||
var reflectTypeStr = reflect.TypeOf("")
|
||||
|
||||
func getForeignMeta(err error) (mm MetaMap) {
|
||||
mm = make(map[string]MetaValue)
|
||||
|
||||
defer func() {
|
||||
if panicerr := recover(); panicerr != nil {
|
||||
New(ErrPanic, "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
|
||||
}
|
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.toBMError()
|
||||
|
||||
listenerLock.Lock()
|
||||
defer listenerLock.Unlock()
|
||||
|
||||
for _, v := range listener {
|
||||
v(m, valErr)
|
||||
}
|
||||
}
|
697
exerr/meta.go
Normal file
697
exerr/meta.go
Normal file
@@ -0,0 +1,697 @@
|
||||
package exerr
|
||||
|
||||
import (
|
||||
"encoding/hex"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"github.com/rs/zerolog"
|
||||
"github.com/rs/zerolog/log"
|
||||
"go.mongodb.org/mongo-driver/bson"
|
||||
"go.mongodb.org/mongo-driver/bson/primitive"
|
||||
"gogs.mikescher.com/BlackForestBytes/goext/langext"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
)
|
||||
|
||||
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"
|
||||
)
|
||||
|
||||
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
|
||||
}
|
||||
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>>"
|
||||
}
|
||||
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>>")
|
||||
}
|
||||
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 {
|
||||
r, err := valueFromProto(value[1:], MDTString)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
v.Value = langext.Ptr(r.Value.(string))
|
||||
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
|
||||
}
|
||||
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>>"
|
||||
}
|
||||
return "(err)"
|
||||
}
|
||||
|
||||
func valueFromProto(value string, datatype metaDataType) (MetaValue, error) {
|
||||
obj := MetaValue{}
|
||||
err := obj.Deserialize(value, datatype)
|
||||
if err != nil {
|
||||
return MetaValue{}, err
|
||||
}
|
||||
return obj, nil
|
||||
}
|
||||
|
||||
func metaFromProto(proto []*spbmodels.CustomError_MetaValue) MetaMap {
|
||||
r := make(MetaMap)
|
||||
|
||||
for _, v := range proto {
|
||||
mval, err := valueFromProto(v.Value, metaDataType(v.Type))
|
||||
if err != nil {
|
||||
log.Warn().Err(err).Msg("metaFromProto failed for " + v.Key)
|
||||
continue
|
||||
}
|
||||
r[v.Key] = mval
|
||||
}
|
||||
|
||||
return r
|
||||
}
|
||||
|
||||
func (mm MetaMap) ToProto() []*spbmodels.CustomError_MetaValue {
|
||||
if mm == nil {
|
||||
return make([]*spbmodels.CustomError_MetaValue, 0)
|
||||
}
|
||||
r := make([]*spbmodels.CustomError_MetaValue, 0, len(mm))
|
||||
for k, v := range mm {
|
||||
strval, err := v.SerializeValue()
|
||||
if err != nil {
|
||||
log.Warn().Err(err).Msg("MetaMap.ToProto failed for " + k)
|
||||
continue
|
||||
}
|
||||
|
||||
r = append(r, &spbmodels.CustomError_MetaValue{
|
||||
Key: k,
|
||||
Type: string(v.DataType),
|
||||
Value: strval,
|
||||
})
|
||||
}
|
||||
return r
|
||||
}
|
||||
|
||||
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)
|
||||
}
|
133
exerr/wrapper.go
Normal file
133
exerr/wrapper.go
Normal file
@@ -0,0 +1,133 @@
|
||||
package exerr
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"github.com/rs/zerolog/log"
|
||||
"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}
|
||||
}
|
||||
}
|
||||
}
|
16
go.mod
16
go.mod
@@ -3,11 +3,25 @@ module gogs.mikescher.com/BlackForestBytes/goext
|
||||
go 1.19
|
||||
|
||||
require (
|
||||
golang.org/x/sys v0.3.0
|
||||
golang.org/x/sys v0.5.0
|
||||
golang.org/x/term v0.3.0
|
||||
)
|
||||
|
||||
require (
|
||||
github.com/golang/snappy v0.0.1 // indirect
|
||||
github.com/jmoiron/sqlx v1.3.5 // indirect
|
||||
github.com/klauspost/compress v1.13.6 // indirect
|
||||
github.com/mattn/go-colorable v0.1.13 // indirect
|
||||
github.com/mattn/go-isatty v0.0.17 // indirect
|
||||
github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe // indirect
|
||||
github.com/pkg/errors v0.9.1 // indirect
|
||||
github.com/rs/zerolog v1.29.0 // indirect
|
||||
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
|
||||
github.com/xdg-go/scram v1.1.1 // indirect
|
||||
github.com/xdg-go/stringprep v1.0.3 // indirect
|
||||
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
|
||||
go.mongodb.org/mongo-driver v1.11.2 // indirect
|
||||
golang.org/x/crypto v0.4.0 // indirect
|
||||
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
|
||||
golang.org/x/text v0.5.0 // indirect
|
||||
)
|
||||
|
63
go.sum
63
go.sum
@@ -1,15 +1,78 @@
|
||||
github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/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/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
|
||||
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
|
||||
github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
|
||||
github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
|
||||
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||
github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g=
|
||||
github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ=
|
||||
github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc=
|
||||
github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
|
||||
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/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-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
|
||||
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/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/zerolog v1.29.0 h1:Zes4hju04hjbvkVkOhdl2HpZa+0PmVwigmo8XoORE5w=
|
||||
github.com/rs/zerolog v1.29.0/go.mod h1:NILgTygv/Uej1ra5XxGf82ZFSLk58MFGAUS2o6usyD0=
|
||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||
github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
|
||||
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/stringprep v1.0.3 h1:kdwGpVNwPFtjs98xCGkHjQtGKh86rDcRZN17QEMCOIs=
|
||||
github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8=
|
||||
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.2 h1:+1v2rDQUWNcGW7/7E0Jvdz51V38XXxJfhzbV17aNHCw=
|
||||
go.mongodb.org/mongo-driver v1.11.2/go.mod h1:s7p5vEtfbeR1gYi6pnj3c3/urpbLv2T5Sfd6Rp2HBB8=
|
||||
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/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
||||
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/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-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/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||
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/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.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM=
|
||||
golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
|
||||
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
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/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
|
@@ -265,6 +265,16 @@ func ArrMap[T1 any, T2 any](arr []T1, conv func(v T1) T2) []T2 {
|
||||
return r
|
||||
}
|
||||
|
||||
func ArrFilterMap[T1 any, T2 any](arr []T1, filter func(v T1) bool, conv func(v T1) T2) []T2 {
|
||||
r := make([]T2, 0, len(arr))
|
||||
for _, v := range arr {
|
||||
if filter(v) {
|
||||
r = append(r, conv(v))
|
||||
}
|
||||
}
|
||||
return r
|
||||
}
|
||||
|
||||
func ArrSum[T NumberConstraint](arr []T) T {
|
||||
var r T = 0
|
||||
for _, v := range arr {
|
||||
@@ -272,3 +282,11 @@ func ArrSum[T NumberConstraint](arr []T) T {
|
||||
}
|
||||
return r
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
|
@@ -15,3 +15,35 @@ func Conditional[T any](v bool, resTrue T, resFalse T) T {
|
||||
return resFalse
|
||||
}
|
||||
}
|
||||
|
||||
func ConditionalFn00[T any](v bool, resTrue T, resFalse T) T {
|
||||
if v {
|
||||
return resTrue
|
||||
} else {
|
||||
return resFalse
|
||||
}
|
||||
}
|
||||
|
||||
func ConditionalFn10[T any](v bool, resTrue func() T, resFalse T) T {
|
||||
if v {
|
||||
return resTrue()
|
||||
} else {
|
||||
return resFalse
|
||||
}
|
||||
}
|
||||
|
||||
func ConditionalFn01[T any](v bool, resTrue T, resFalse func() T) T {
|
||||
if v {
|
||||
return resTrue
|
||||
} else {
|
||||
return resFalse()
|
||||
}
|
||||
}
|
||||
|
||||
func ConditionalFn11[T any](v bool, resTrue func() T, resFalse func() T) T {
|
||||
if v {
|
||||
return resTrue()
|
||||
} else {
|
||||
return resFalse()
|
||||
}
|
||||
}
|
||||
|
@@ -7,3 +7,11 @@ func MapKeyArr[T comparable, V any](v map[T]V) []T {
|
||||
}
|
||||
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 {
|
||||
result[keyfunc(v)] = v
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
@@ -34,3 +34,7 @@ func IsNil(i interface{}) bool {
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func PtrEquals[T comparable](v1 *T, v2 *T) bool {
|
||||
return (v1 == nil && v2 == nil) || (v1 != nil && v2 != nil && *v1 == *v2)
|
||||
}
|
||||
|
@@ -37,3 +37,21 @@ func IsSliceSorted[T any](arr []T, less func(v1, v2 T) bool) bool {
|
||||
return less(arr[i1], arr[i2])
|
||||
})
|
||||
}
|
||||
|
||||
func SortBy[TElem any, TSel OrderedConstraint](arr []TElem, selector func(v TElem) TSel) {
|
||||
sort.Slice(arr, func(i1, i2 int) bool {
|
||||
return selector(arr[i1]) < selector(arr[i2])
|
||||
})
|
||||
}
|
||||
|
||||
func SortByStable[TElem any, TSel OrderedConstraint](arr []TElem, selector func(v TElem) TSel) {
|
||||
sort.SliceStable(arr, func(i1, i2 int) bool {
|
||||
return selector(arr[i1]) < selector(arr[i2])
|
||||
})
|
||||
}
|
||||
|
||||
func IsSortedBy[TElem any, TSel OrderedConstraint](arr []TElem, selector func(v TElem) TSel) {
|
||||
sort.SliceStable(arr, func(i1, i2 int) bool {
|
||||
return selector(arr[i1]) < selector(arr[i2])
|
||||
})
|
||||
}
|
||||
|
130
rext/wrapper.go
Normal file
130
rext/wrapper.go
Normal file
@@ -0,0 +1,130 @@
|
||||
package rext
|
||||
|
||||
import "regexp"
|
||||
|
||||
type Regex interface {
|
||||
IsMatch(haystack string) bool
|
||||
MatchFirst(haystack string) (RegexMatch, bool)
|
||||
MatchAll(haystack string) []RegexMatch
|
||||
ReplaceAll(haystack string, repl string, literal bool) string
|
||||
ReplaceAllFunc(haystack string, repl func(string) string) string
|
||||
RemoveAll(haystack string) string
|
||||
GroupCount() int
|
||||
}
|
||||
|
||||
type regexWrapper struct {
|
||||
rex *regexp.Regexp
|
||||
subnames []string
|
||||
}
|
||||
|
||||
type RegexMatch struct {
|
||||
haystack string
|
||||
submatchesIndex []int
|
||||
subnames []string
|
||||
}
|
||||
|
||||
type RegexMatchGroup struct {
|
||||
haystack string
|
||||
start int
|
||||
end int
|
||||
}
|
||||
|
||||
func W(rex *regexp.Regexp) Regex {
|
||||
return ®exWrapper{rex: rex, subnames: rex.SubexpNames()}
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
func (w *regexWrapper) IsMatch(haystack string) bool {
|
||||
return w.rex.MatchString(haystack)
|
||||
}
|
||||
|
||||
func (w *regexWrapper) MatchFirst(haystack string) (RegexMatch, bool) {
|
||||
res := w.rex.FindStringSubmatchIndex(haystack)
|
||||
if res == nil {
|
||||
return RegexMatch{}, false
|
||||
}
|
||||
|
||||
return RegexMatch{haystack: haystack, submatchesIndex: res, subnames: w.subnames}, true
|
||||
}
|
||||
|
||||
func (w *regexWrapper) MatchAll(haystack string) []RegexMatch {
|
||||
resarr := w.rex.FindAllStringSubmatchIndex(haystack, -1)
|
||||
|
||||
matches := make([]RegexMatch, 0, len(resarr))
|
||||
for _, res := range resarr {
|
||||
matches = append(matches, RegexMatch{haystack: haystack, submatchesIndex: res, subnames: w.subnames})
|
||||
}
|
||||
|
||||
return matches
|
||||
}
|
||||
|
||||
func (w *regexWrapper) ReplaceAll(haystack string, repl string, literal bool) string {
|
||||
if literal {
|
||||
// do not expand placeholder aka $1, $2, ...
|
||||
return w.rex.ReplaceAllLiteralString(haystack, repl)
|
||||
} else {
|
||||
return w.rex.ReplaceAllString(haystack, repl)
|
||||
}
|
||||
}
|
||||
|
||||
func (w *regexWrapper) ReplaceAllFunc(haystack string, repl func(string) string) string {
|
||||
return w.rex.ReplaceAllStringFunc(haystack, repl)
|
||||
}
|
||||
|
||||
func (w *regexWrapper) RemoveAll(haystack string) string {
|
||||
return w.rex.ReplaceAllLiteralString(haystack, "")
|
||||
}
|
||||
|
||||
// GroupCount returns the amount of groups in this match, does not count group-0 (whole match)
|
||||
func (w *regexWrapper) GroupCount() int {
|
||||
return len(w.subnames) - 1
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
func (m RegexMatch) FullMatch() RegexMatchGroup {
|
||||
return RegexMatchGroup{haystack: m.haystack, start: m.submatchesIndex[0], end: m.submatchesIndex[1]}
|
||||
}
|
||||
|
||||
// GroupCount returns the amount of groups in this match, does not count group-0 (whole match)
|
||||
func (m RegexMatch) GroupCount() int {
|
||||
return len(m.subnames) - 1
|
||||
}
|
||||
|
||||
// GroupByIndex returns the value of a matched group (group 0 == whole match)
|
||||
func (m RegexMatch) GroupByIndex(idx int) RegexMatchGroup {
|
||||
return RegexMatchGroup{haystack: m.haystack, start: m.submatchesIndex[idx*2], end: m.submatchesIndex[idx*2+1]}
|
||||
}
|
||||
|
||||
// GroupByName returns the value of a matched group (group 0 == whole match)
|
||||
func (m RegexMatch) GroupByName(name string) RegexMatchGroup {
|
||||
for idx, subname := range m.subnames {
|
||||
if subname == name {
|
||||
return RegexMatchGroup{haystack: m.haystack, start: m.submatchesIndex[idx*2], end: m.submatchesIndex[idx*2+1]}
|
||||
}
|
||||
}
|
||||
panic("failed to find regex-group by name")
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
func (g RegexMatchGroup) Value() string {
|
||||
return g.haystack[g.start:g.end]
|
||||
}
|
||||
|
||||
func (g RegexMatchGroup) Start() int {
|
||||
return g.start
|
||||
}
|
||||
|
||||
func (g RegexMatchGroup) End() int {
|
||||
return g.end
|
||||
}
|
||||
|
||||
func (g RegexMatchGroup) Range() (int, int) {
|
||||
return g.start, g.end
|
||||
}
|
||||
|
||||
func (g RegexMatchGroup) Length() int {
|
||||
return g.end - g.start
|
||||
}
|
45
rfctime/interface.go
Normal file
45
rfctime/interface.go
Normal file
@@ -0,0 +1,45 @@
|
||||
package rfctime
|
||||
|
||||
import "time"
|
||||
|
||||
type RFCTime interface {
|
||||
Time() time.Time
|
||||
Serialize() string
|
||||
|
||||
UnmarshalJSON(bytes []byte) error
|
||||
MarshalJSON() ([]byte, error)
|
||||
|
||||
MarshalBinary() ([]byte, error)
|
||||
UnmarshalBinary(data []byte) error
|
||||
|
||||
GobEncode() ([]byte, error)
|
||||
GobDecode(data []byte) error
|
||||
|
||||
MarshalText() ([]byte, error)
|
||||
UnmarshalText(data []byte) error
|
||||
|
||||
After(u RFCTime) bool
|
||||
Before(u RFCTime) bool
|
||||
Equal(u RFCTime) bool
|
||||
IsZero() bool
|
||||
Date() (year int, month time.Month, day int)
|
||||
Year() int
|
||||
Month() time.Month
|
||||
Day() int
|
||||
Weekday() time.Weekday
|
||||
ISOWeek() (year, week int)
|
||||
Clock() (hour, min, sec int)
|
||||
Hour() int
|
||||
Minute() int
|
||||
Second() int
|
||||
Nanosecond() int
|
||||
YearDay() int
|
||||
Sub(u RFCTime) time.Duration
|
||||
Unix() int64
|
||||
UnixMilli() int64
|
||||
UnixMicro() int64
|
||||
UnixNano() int64
|
||||
Format(layout string) string
|
||||
GoString() string
|
||||
String() string
|
||||
}
|
182
rfctime/rfc3339.go
Normal file
182
rfctime/rfc3339.go
Normal file
@@ -0,0 +1,182 @@
|
||||
package rfctime
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"time"
|
||||
)
|
||||
|
||||
type RFC3339Time time.Time
|
||||
|
||||
func (t RFC3339Time) Time() time.Time {
|
||||
return time.Time(t)
|
||||
}
|
||||
|
||||
func (t RFC3339Time) MarshalBinary() ([]byte, error) {
|
||||
return (time.Time)(t).MarshalBinary()
|
||||
}
|
||||
|
||||
func (t *RFC3339Time) UnmarshalBinary(data []byte) error {
|
||||
return (*time.Time)(t).UnmarshalBinary(data)
|
||||
}
|
||||
|
||||
func (t RFC3339Time) GobEncode() ([]byte, error) {
|
||||
return (time.Time)(t).GobEncode()
|
||||
}
|
||||
|
||||
func (t *RFC3339Time) GobDecode(data []byte) error {
|
||||
return (*time.Time)(t).GobDecode(data)
|
||||
}
|
||||
|
||||
func (t *RFC3339Time) 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 = RFC3339Time(t0)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (t RFC3339Time) MarshalJSON() ([]byte, error) {
|
||||
str := t.Time().Format(t.FormatStr())
|
||||
return json.Marshal(str)
|
||||
}
|
||||
|
||||
func (t RFC3339Time) MarshalText() ([]byte, error) {
|
||||
b := make([]byte, 0, len(t.FormatStr()))
|
||||
return t.Time().AppendFormat(b, t.FormatStr()), nil
|
||||
}
|
||||
|
||||
func (t *RFC3339Time) UnmarshalText(data []byte) error {
|
||||
var err error
|
||||
v, err := time.Parse(t.FormatStr(), string(data))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
tt := RFC3339Time(v)
|
||||
*t = tt
|
||||
return nil
|
||||
}
|
||||
|
||||
func (t RFC3339Time) Serialize() string {
|
||||
return t.Time().Format(t.FormatStr())
|
||||
}
|
||||
|
||||
func (t RFC3339Time) FormatStr() string {
|
||||
return time.RFC3339
|
||||
}
|
||||
|
||||
func (t RFC3339Time) After(u RFCTime) bool {
|
||||
return t.Time().After(u.Time())
|
||||
}
|
||||
|
||||
func (t RFC3339Time) Before(u RFCTime) bool {
|
||||
return t.Time().Before(u.Time())
|
||||
}
|
||||
|
||||
func (t RFC3339Time) Equal(u RFCTime) bool {
|
||||
return t.Time().Equal(u.Time())
|
||||
}
|
||||
|
||||
func (t RFC3339Time) IsZero() bool {
|
||||
return t.Time().IsZero()
|
||||
}
|
||||
|
||||
func (t RFC3339Time) Date() (year int, month time.Month, day int) {
|
||||
return t.Time().Date()
|
||||
}
|
||||
|
||||
func (t RFC3339Time) Year() int {
|
||||
return t.Time().Year()
|
||||
}
|
||||
|
||||
func (t RFC3339Time) Month() time.Month {
|
||||
return t.Time().Month()
|
||||
}
|
||||
|
||||
func (t RFC3339Time) Day() int {
|
||||
return t.Time().Day()
|
||||
}
|
||||
|
||||
func (t RFC3339Time) Weekday() time.Weekday {
|
||||
return t.Time().Weekday()
|
||||
}
|
||||
|
||||
func (t RFC3339Time) ISOWeek() (year, week int) {
|
||||
return t.Time().ISOWeek()
|
||||
}
|
||||
|
||||
func (t RFC3339Time) Clock() (hour, min, sec int) {
|
||||
return t.Time().Clock()
|
||||
}
|
||||
|
||||
func (t RFC3339Time) Hour() int {
|
||||
return t.Time().Hour()
|
||||
}
|
||||
|
||||
func (t RFC3339Time) Minute() int {
|
||||
return t.Time().Minute()
|
||||
}
|
||||
|
||||
func (t RFC3339Time) Second() int {
|
||||
return t.Time().Second()
|
||||
}
|
||||
|
||||
func (t RFC3339Time) Nanosecond() int {
|
||||
return t.Time().Nanosecond()
|
||||
}
|
||||
|
||||
func (t RFC3339Time) YearDay() int {
|
||||
return t.Time().YearDay()
|
||||
}
|
||||
|
||||
func (t RFC3339Time) Add(d time.Duration) RFC3339Time {
|
||||
return RFC3339Time(t.Time().Add(d))
|
||||
}
|
||||
|
||||
func (t RFC3339Time) Sub(u RFCTime) time.Duration {
|
||||
return t.Time().Sub(u.Time())
|
||||
}
|
||||
|
||||
func (t RFC3339Time) AddDate(years int, months int, days int) RFC3339Time {
|
||||
return RFC3339Time(t.Time().AddDate(years, months, days))
|
||||
}
|
||||
|
||||
func (t RFC3339Time) Unix() int64 {
|
||||
return t.Time().Unix()
|
||||
}
|
||||
|
||||
func (t RFC3339Time) UnixMilli() int64 {
|
||||
return t.Time().UnixMilli()
|
||||
}
|
||||
|
||||
func (t RFC3339Time) UnixMicro() int64 {
|
||||
return t.Time().UnixMicro()
|
||||
}
|
||||
|
||||
func (t RFC3339Time) UnixNano() int64 {
|
||||
return t.Time().UnixNano()
|
||||
}
|
||||
|
||||
func (t RFC3339Time) Format(layout string) string {
|
||||
return t.Time().Format(layout)
|
||||
}
|
||||
|
||||
func (t RFC3339Time) GoString() string {
|
||||
return t.Time().GoString()
|
||||
}
|
||||
|
||||
func (t RFC3339Time) String() string {
|
||||
return t.Time().String()
|
||||
}
|
||||
|
||||
func NewRFC3339(t time.Time) RFC3339Time {
|
||||
return RFC3339Time(t)
|
||||
}
|
||||
|
||||
func NowRFC3339() RFC3339Time {
|
||||
return RFC3339Time(time.Now())
|
||||
}
|
182
rfctime/rfc3339Nano.go
Normal file
182
rfctime/rfc3339Nano.go
Normal file
@@ -0,0 +1,182 @@
|
||||
package rfctime
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"time"
|
||||
)
|
||||
|
||||
type RFC3339NanoTime time.Time
|
||||
|
||||
func (t RFC3339NanoTime) Time() time.Time {
|
||||
return time.Time(t)
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) MarshalBinary() ([]byte, error) {
|
||||
return (time.Time)(t).MarshalBinary()
|
||||
}
|
||||
|
||||
func (t *RFC3339NanoTime) UnmarshalBinary(data []byte) error {
|
||||
return (*time.Time)(t).UnmarshalBinary(data)
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) GobEncode() ([]byte, error) {
|
||||
return (time.Time)(t).GobEncode()
|
||||
}
|
||||
|
||||
func (t *RFC3339NanoTime) GobDecode(data []byte) error {
|
||||
return (*time.Time)(t).GobDecode(data)
|
||||
}
|
||||
|
||||
func (t *RFC3339NanoTime) 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 = RFC3339NanoTime(t0)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) MarshalJSON() ([]byte, error) {
|
||||
str := t.Time().Format(t.FormatStr())
|
||||
return json.Marshal(str)
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) MarshalText() ([]byte, error) {
|
||||
b := make([]byte, 0, len(t.FormatStr()))
|
||||
return t.Time().AppendFormat(b, t.FormatStr()), nil
|
||||
}
|
||||
|
||||
func (t *RFC3339NanoTime) UnmarshalText(data []byte) error {
|
||||
var err error
|
||||
v, err := time.Parse(t.FormatStr(), string(data))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
tt := RFC3339NanoTime(v)
|
||||
*t = tt
|
||||
return nil
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) Serialize() string {
|
||||
return t.Time().Format(t.FormatStr())
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) FormatStr() string {
|
||||
return time.RFC3339Nano
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) After(u RFCTime) bool {
|
||||
return t.Time().After(u.Time())
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) Before(u RFCTime) bool {
|
||||
return t.Time().Before(u.Time())
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) Equal(u RFCTime) bool {
|
||||
return t.Time().Equal(u.Time())
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) IsZero() bool {
|
||||
return t.Time().IsZero()
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) Date() (year int, month time.Month, day int) {
|
||||
return t.Time().Date()
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) Year() int {
|
||||
return t.Time().Year()
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) Month() time.Month {
|
||||
return t.Time().Month()
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) Day() int {
|
||||
return t.Time().Day()
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) Weekday() time.Weekday {
|
||||
return t.Time().Weekday()
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) ISOWeek() (year, week int) {
|
||||
return t.Time().ISOWeek()
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) Clock() (hour, min, sec int) {
|
||||
return t.Time().Clock()
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) Hour() int {
|
||||
return t.Time().Hour()
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) Minute() int {
|
||||
return t.Time().Minute()
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) Second() int {
|
||||
return t.Time().Second()
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) Nanosecond() int {
|
||||
return t.Time().Nanosecond()
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) YearDay() int {
|
||||
return t.Time().YearDay()
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) Add(d time.Duration) RFC3339NanoTime {
|
||||
return RFC3339NanoTime(t.Time().Add(d))
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) Sub(u RFCTime) time.Duration {
|
||||
return t.Time().Sub(u.Time())
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) AddDate(years int, months int, days int) RFC3339NanoTime {
|
||||
return RFC3339NanoTime(t.Time().AddDate(years, months, days))
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) Unix() int64 {
|
||||
return t.Time().Unix()
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) UnixMilli() int64 {
|
||||
return t.Time().UnixMilli()
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) UnixMicro() int64 {
|
||||
return t.Time().UnixMicro()
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) UnixNano() int64 {
|
||||
return t.Time().UnixNano()
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) Format(layout string) string {
|
||||
return t.Time().Format(layout)
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) GoString() string {
|
||||
return t.Time().GoString()
|
||||
}
|
||||
|
||||
func (t RFC3339NanoTime) String() string {
|
||||
return t.Time().String()
|
||||
}
|
||||
|
||||
func NewRFC3339Nano(t time.Time) RFC3339NanoTime {
|
||||
return RFC3339NanoTime(t)
|
||||
}
|
||||
|
||||
func NowRFC3339Nano() RFC3339NanoTime {
|
||||
return RFC3339NanoTime(time.Now())
|
||||
}
|
51
rfctime/rfc3339Nano_test.go
Normal file
51
rfctime/rfc3339Nano_test.go
Normal file
@@ -0,0 +1,51 @@
|
||||
package rfctime
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
func TestRoundtrip(t *testing.T) {
|
||||
|
||||
type Wrap struct {
|
||||
Value RFC3339NanoTime `json:"v"`
|
||||
}
|
||||
|
||||
val1 := NewRFC3339Nano(time.Now())
|
||||
w1 := Wrap{val1}
|
||||
|
||||
jstr1, err := json.Marshal(w1)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
if string(jstr1) != "{\"v\":\"2023-01-29T20:32:36.149692117+01:00\"}" {
|
||||
t.Errorf("repr differs")
|
||||
}
|
||||
|
||||
w2 := Wrap{}
|
||||
|
||||
err = json.Unmarshal(jstr1, &w2)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
jstr2, err := json.Marshal(w2)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
assertEqual(t, string(jstr1), string(jstr2))
|
||||
|
||||
if !w1.Value.Equal(&w2.Value) {
|
||||
t.Errorf("time differs")
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func assertEqual(t *testing.T, actual string, expected string) {
|
||||
if actual != expected {
|
||||
t.Errorf("values differ: Actual: '%v', Expected: '%v'", actual, expected)
|
||||
}
|
||||
}
|
176
rfctime/unix.go
Normal file
176
rfctime/unix.go
Normal file
@@ -0,0 +1,176 @@
|
||||
package rfctime
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"strconv"
|
||||
"time"
|
||||
)
|
||||
|
||||
type UnixTime time.Time
|
||||
|
||||
func (t UnixTime) Time() time.Time {
|
||||
return time.Time(t)
|
||||
}
|
||||
|
||||
func (t UnixTime) MarshalBinary() ([]byte, error) {
|
||||
return (time.Time)(t).MarshalBinary()
|
||||
}
|
||||
|
||||
func (t *UnixTime) UnmarshalBinary(data []byte) error {
|
||||
return (*time.Time)(t).UnmarshalBinary(data)
|
||||
}
|
||||
|
||||
func (t UnixTime) GobEncode() ([]byte, error) {
|
||||
return (time.Time)(t).GobEncode()
|
||||
}
|
||||
|
||||
func (t *UnixTime) GobDecode(data []byte) error {
|
||||
return (*time.Time)(t).GobDecode(data)
|
||||
}
|
||||
|
||||
func (t *UnixTime) UnmarshalJSON(data []byte) error {
|
||||
str := ""
|
||||
if err := json.Unmarshal(data, &str); err != nil {
|
||||
return err
|
||||
}
|
||||
t0, err := strconv.ParseInt(str, 10, 64)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
*t = UnixTime(time.Unix(t0, 0))
|
||||
return nil
|
||||
}
|
||||
|
||||
func (t UnixTime) MarshalJSON() ([]byte, error) {
|
||||
str := strconv.FormatInt(t.Time().Unix(), 10)
|
||||
return json.Marshal(str)
|
||||
}
|
||||
|
||||
func (t UnixTime) MarshalText() ([]byte, error) {
|
||||
return []byte(strconv.FormatInt(t.Time().Unix(), 10)), nil
|
||||
}
|
||||
|
||||
func (t *UnixTime) UnmarshalText(data []byte) error {
|
||||
t0, err := strconv.ParseInt(string(data), 10, 64)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
*t = UnixTime(time.Unix(t0, 0))
|
||||
return nil
|
||||
}
|
||||
|
||||
func (t UnixTime) Serialize() string {
|
||||
return strconv.FormatInt(t.Time().Unix(), 10)
|
||||
}
|
||||
|
||||
func (t UnixTime) After(u RFCTime) bool {
|
||||
return t.Time().After(u.Time())
|
||||
}
|
||||
|
||||
func (t UnixTime) Before(u RFCTime) bool {
|
||||
return t.Time().Before(u.Time())
|
||||
}
|
||||
|
||||
func (t UnixTime) Equal(u RFCTime) bool {
|
||||
return t.Time().Equal(u.Time())
|
||||
}
|
||||
|
||||
func (t UnixTime) IsZero() bool {
|
||||
return t.Time().IsZero()
|
||||
}
|
||||
|
||||
func (t UnixTime) Date() (year int, month time.Month, day int) {
|
||||
return t.Time().Date()
|
||||
}
|
||||
|
||||
func (t UnixTime) Year() int {
|
||||
return t.Time().Year()
|
||||
}
|
||||
|
||||
func (t UnixTime) Month() time.Month {
|
||||
return t.Time().Month()
|
||||
}
|
||||
|
||||
func (t UnixTime) Day() int {
|
||||
return t.Time().Day()
|
||||
}
|
||||
|
||||
func (t UnixTime) Weekday() time.Weekday {
|
||||
return t.Time().Weekday()
|
||||
}
|
||||
|
||||
func (t UnixTime) ISOWeek() (year, week int) {
|
||||
return t.Time().ISOWeek()
|
||||
}
|
||||
|
||||
func (t UnixTime) Clock() (hour, min, sec int) {
|
||||
return t.Time().Clock()
|
||||
}
|
||||
|
||||
func (t UnixTime) Hour() int {
|
||||
return t.Time().Hour()
|
||||
}
|
||||
|
||||
func (t UnixTime) Minute() int {
|
||||
return t.Time().Minute()
|
||||
}
|
||||
|
||||
func (t UnixTime) Second() int {
|
||||
return t.Time().Second()
|
||||
}
|
||||
|
||||
func (t UnixTime) Nanosecond() int {
|
||||
return t.Time().Nanosecond()
|
||||
}
|
||||
|
||||
func (t UnixTime) YearDay() int {
|
||||
return t.Time().YearDay()
|
||||
}
|
||||
|
||||
func (t UnixTime) Add(d time.Duration) UnixTime {
|
||||
return UnixTime(t.Time().Add(d))
|
||||
}
|
||||
|
||||
func (t UnixTime) Sub(u RFCTime) time.Duration {
|
||||
return t.Time().Sub(u.Time())
|
||||
}
|
||||
|
||||
func (t UnixTime) AddDate(years int, months int, days int) UnixTime {
|
||||
return UnixTime(t.Time().AddDate(years, months, days))
|
||||
}
|
||||
|
||||
func (t UnixTime) Unix() int64 {
|
||||
return t.Time().Unix()
|
||||
}
|
||||
|
||||
func (t UnixTime) UnixMilli() int64 {
|
||||
return t.Time().UnixMilli()
|
||||
}
|
||||
|
||||
func (t UnixTime) UnixMicro() int64 {
|
||||
return t.Time().UnixMicro()
|
||||
}
|
||||
|
||||
func (t UnixTime) UnixNano() int64 {
|
||||
return t.Time().UnixNano()
|
||||
}
|
||||
|
||||
func (t UnixTime) Format(layout string) string {
|
||||
return t.Time().Format(layout)
|
||||
}
|
||||
|
||||
func (t UnixTime) GoString() string {
|
||||
return t.Time().GoString()
|
||||
}
|
||||
|
||||
func (t UnixTime) String() string {
|
||||
return t.Time().String()
|
||||
}
|
||||
|
||||
func NewUnix(t time.Time) UnixTime {
|
||||
return UnixTime(t)
|
||||
}
|
||||
|
||||
func NowUnix() UnixTime {
|
||||
return UnixTime(time.Now())
|
||||
}
|
176
rfctime/unixMilli.go
Normal file
176
rfctime/unixMilli.go
Normal file
@@ -0,0 +1,176 @@
|
||||
package rfctime
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"strconv"
|
||||
"time"
|
||||
)
|
||||
|
||||
type UnixMilliTime time.Time
|
||||
|
||||
func (t UnixMilliTime) Time() time.Time {
|
||||
return time.Time(t)
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) MarshalBinary() ([]byte, error) {
|
||||
return (time.Time)(t).MarshalBinary()
|
||||
}
|
||||
|
||||
func (t *UnixMilliTime) UnmarshalBinary(data []byte) error {
|
||||
return (*time.Time)(t).UnmarshalBinary(data)
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) GobEncode() ([]byte, error) {
|
||||
return (time.Time)(t).GobEncode()
|
||||
}
|
||||
|
||||
func (t *UnixMilliTime) GobDecode(data []byte) error {
|
||||
return (*time.Time)(t).GobDecode(data)
|
||||
}
|
||||
|
||||
func (t *UnixMilliTime) UnmarshalJSON(data []byte) error {
|
||||
str := ""
|
||||
if err := json.Unmarshal(data, &str); err != nil {
|
||||
return err
|
||||
}
|
||||
t0, err := strconv.ParseInt(str, 10, 64)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
*t = UnixMilliTime(time.UnixMilli(t0))
|
||||
return nil
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) MarshalJSON() ([]byte, error) {
|
||||
str := strconv.FormatInt(t.Time().UnixMilli(), 10)
|
||||
return json.Marshal(str)
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) MarshalText() ([]byte, error) {
|
||||
return []byte(strconv.FormatInt(t.Time().UnixMilli(), 10)), nil
|
||||
}
|
||||
|
||||
func (t *UnixMilliTime) UnmarshalText(data []byte) error {
|
||||
t0, err := strconv.ParseInt(string(data), 10, 64)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
*t = UnixMilliTime(time.UnixMilli(t0))
|
||||
return nil
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) Serialize() string {
|
||||
return strconv.FormatInt(t.Time().UnixMilli(), 10)
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) After(u RFCTime) bool {
|
||||
return t.Time().After(u.Time())
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) Before(u RFCTime) bool {
|
||||
return t.Time().Before(u.Time())
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) Equal(u RFCTime) bool {
|
||||
return t.Time().Equal(u.Time())
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) IsZero() bool {
|
||||
return t.Time().IsZero()
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) Date() (year int, month time.Month, day int) {
|
||||
return t.Time().Date()
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) Year() int {
|
||||
return t.Time().Year()
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) Month() time.Month {
|
||||
return t.Time().Month()
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) Day() int {
|
||||
return t.Time().Day()
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) Weekday() time.Weekday {
|
||||
return t.Time().Weekday()
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) ISOWeek() (year, week int) {
|
||||
return t.Time().ISOWeek()
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) Clock() (hour, min, sec int) {
|
||||
return t.Time().Clock()
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) Hour() int {
|
||||
return t.Time().Hour()
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) Minute() int {
|
||||
return t.Time().Minute()
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) Second() int {
|
||||
return t.Time().Second()
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) Nanosecond() int {
|
||||
return t.Time().Nanosecond()
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) YearDay() int {
|
||||
return t.Time().YearDay()
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) Add(d time.Duration) UnixMilliTime {
|
||||
return UnixMilliTime(t.Time().Add(d))
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) Sub(u RFCTime) time.Duration {
|
||||
return t.Time().Sub(u.Time())
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) AddDate(years int, months int, days int) UnixMilliTime {
|
||||
return UnixMilliTime(t.Time().AddDate(years, months, days))
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) Unix() int64 {
|
||||
return t.Time().Unix()
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) UnixMilli() int64 {
|
||||
return t.Time().UnixMilli()
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) UnixMicro() int64 {
|
||||
return t.Time().UnixMicro()
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) UnixNano() int64 {
|
||||
return t.Time().UnixNano()
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) Format(layout string) string {
|
||||
return t.Time().Format(layout)
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) GoString() string {
|
||||
return t.Time().GoString()
|
||||
}
|
||||
|
||||
func (t UnixMilliTime) String() string {
|
||||
return t.Time().String()
|
||||
}
|
||||
|
||||
func NewUnixMilli(t time.Time) UnixMilliTime {
|
||||
return UnixMilliTime(t)
|
||||
}
|
||||
|
||||
func NowUnixMilli() UnixMilliTime {
|
||||
return UnixMilliTime(time.Now())
|
||||
}
|
176
rfctime/unixNano.go
Normal file
176
rfctime/unixNano.go
Normal file
@@ -0,0 +1,176 @@
|
||||
package rfctime
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"strconv"
|
||||
"time"
|
||||
)
|
||||
|
||||
type UnixNanoTime time.Time
|
||||
|
||||
func (t UnixNanoTime) Time() time.Time {
|
||||
return time.Time(t)
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) MarshalBinary() ([]byte, error) {
|
||||
return (time.Time)(t).MarshalBinary()
|
||||
}
|
||||
|
||||
func (t *UnixNanoTime) UnmarshalBinary(data []byte) error {
|
||||
return (*time.Time)(t).UnmarshalBinary(data)
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) GobEncode() ([]byte, error) {
|
||||
return (time.Time)(t).GobEncode()
|
||||
}
|
||||
|
||||
func (t *UnixNanoTime) GobDecode(data []byte) error {
|
||||
return (*time.Time)(t).GobDecode(data)
|
||||
}
|
||||
|
||||
func (t *UnixNanoTime) UnmarshalJSON(data []byte) error {
|
||||
str := ""
|
||||
if err := json.Unmarshal(data, &str); err != nil {
|
||||
return err
|
||||
}
|
||||
t0, err := strconv.ParseInt(str, 10, 64)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
*t = UnixNanoTime(time.Unix(0, t0))
|
||||
return nil
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) MarshalJSON() ([]byte, error) {
|
||||
str := strconv.FormatInt(t.Time().UnixNano(), 10)
|
||||
return json.Marshal(str)
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) MarshalText() ([]byte, error) {
|
||||
return []byte(strconv.FormatInt(t.Time().UnixNano(), 10)), nil
|
||||
}
|
||||
|
||||
func (t *UnixNanoTime) UnmarshalText(data []byte) error {
|
||||
t0, err := strconv.ParseInt(string(data), 10, 64)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
*t = UnixNanoTime(time.Unix(0, t0))
|
||||
return nil
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) Serialize() string {
|
||||
return strconv.FormatInt(t.Time().UnixNano(), 10)
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) After(u RFCTime) bool {
|
||||
return t.Time().After(u.Time())
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) Before(u RFCTime) bool {
|
||||
return t.Time().Before(u.Time())
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) Equal(u RFCTime) bool {
|
||||
return t.Time().Equal(u.Time())
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) IsZero() bool {
|
||||
return t.Time().IsZero()
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) Date() (year int, month time.Month, day int) {
|
||||
return t.Time().Date()
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) Year() int {
|
||||
return t.Time().Year()
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) Month() time.Month {
|
||||
return t.Time().Month()
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) Day() int {
|
||||
return t.Time().Day()
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) Weekday() time.Weekday {
|
||||
return t.Time().Weekday()
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) ISOWeek() (year, week int) {
|
||||
return t.Time().ISOWeek()
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) Clock() (hour, min, sec int) {
|
||||
return t.Time().Clock()
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) Hour() int {
|
||||
return t.Time().Hour()
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) Minute() int {
|
||||
return t.Time().Minute()
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) Second() int {
|
||||
return t.Time().Second()
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) Nanosecond() int {
|
||||
return t.Time().Nanosecond()
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) YearDay() int {
|
||||
return t.Time().YearDay()
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) Add(d time.Duration) UnixNanoTime {
|
||||
return UnixNanoTime(t.Time().Add(d))
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) Sub(u RFCTime) time.Duration {
|
||||
return t.Time().Sub(u.Time())
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) AddDate(years int, months int, days int) UnixNanoTime {
|
||||
return UnixNanoTime(t.Time().AddDate(years, months, days))
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) Unix() int64 {
|
||||
return t.Time().Unix()
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) UnixMilli() int64 {
|
||||
return t.Time().UnixNano()
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) UnixMicro() int64 {
|
||||
return t.Time().UnixMicro()
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) UnixNano() int64 {
|
||||
return t.Time().UnixNano()
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) Format(layout string) string {
|
||||
return t.Time().Format(layout)
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) GoString() string {
|
||||
return t.Time().GoString()
|
||||
}
|
||||
|
||||
func (t UnixNanoTime) String() string {
|
||||
return t.Time().String()
|
||||
}
|
||||
|
||||
func NewUnixNano(t time.Time) UnixNanoTime {
|
||||
return UnixNanoTime(t)
|
||||
}
|
||||
|
||||
func NowUnixNano() UnixNanoTime {
|
||||
return UnixNanoTime(time.Now())
|
||||
}
|
@@ -2,58 +2,50 @@ package syncext
|
||||
|
||||
import (
|
||||
"context"
|
||||
"sync/atomic"
|
||||
"gogs.mikescher.com/BlackForestBytes/goext/langext"
|
||||
"sync"
|
||||
"time"
|
||||
)
|
||||
|
||||
type AtomicBool struct {
|
||||
v int32
|
||||
waiter chan bool // unbuffered
|
||||
v bool
|
||||
listener map[string]chan bool
|
||||
lock sync.Mutex
|
||||
}
|
||||
|
||||
func NewAtomicBool(value bool) *AtomicBool {
|
||||
if value {
|
||||
return &AtomicBool{v: 1, waiter: make(chan bool)}
|
||||
} else {
|
||||
return &AtomicBool{v: 0, waiter: make(chan bool)}
|
||||
return &AtomicBool{
|
||||
v: value,
|
||||
listener: make(map[string]chan bool),
|
||||
lock: sync.Mutex{},
|
||||
}
|
||||
}
|
||||
|
||||
func (a *AtomicBool) Get() bool {
|
||||
return atomic.LoadInt32(&a.v) == 1
|
||||
a.lock.Lock()
|
||||
defer a.lock.Unlock()
|
||||
return a.v
|
||||
}
|
||||
|
||||
func (a *AtomicBool) Set(value bool) {
|
||||
if value {
|
||||
atomic.StoreInt32(&a.v, 1)
|
||||
} else {
|
||||
atomic.StoreInt32(&a.v, 0)
|
||||
}
|
||||
a.lock.Lock()
|
||||
defer a.lock.Unlock()
|
||||
|
||||
select {
|
||||
case a.waiter <- value:
|
||||
// message sent
|
||||
default:
|
||||
// no receiver on channel
|
||||
a.v = value
|
||||
|
||||
for k, v := range a.listener {
|
||||
select {
|
||||
case v <- value:
|
||||
// message sent
|
||||
default:
|
||||
// no receiver on channel
|
||||
delete(a.listener, k)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (a *AtomicBool) Wait(waitFor bool) {
|
||||
if a.Get() == waitFor {
|
||||
return
|
||||
}
|
||||
|
||||
for {
|
||||
if v, ok := ReadChannelWithTimeout(a.waiter, 128*time.Millisecond); ok {
|
||||
if v == waitFor {
|
||||
return
|
||||
}
|
||||
} else {
|
||||
if a.Get() == waitFor {
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
_ = a.WaitWithContext(context.Background(), waitFor)
|
||||
}
|
||||
|
||||
func (a *AtomicBool) WaitWithTimeout(timeout time.Duration, waitFor bool) error {
|
||||
@@ -71,12 +63,25 @@ func (a *AtomicBool) WaitWithContext(ctx context.Context, waitFor bool) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
uuid, _ := langext.NewHexUUID()
|
||||
|
||||
waitchan := make(chan bool)
|
||||
|
||||
a.lock.Lock()
|
||||
a.listener[uuid] = waitchan
|
||||
a.lock.Unlock()
|
||||
defer func() {
|
||||
a.lock.Lock()
|
||||
delete(a.listener, uuid)
|
||||
a.lock.Unlock()
|
||||
}()
|
||||
|
||||
for {
|
||||
if err := ctx.Err(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
timeOut := 128 * time.Millisecond
|
||||
timeOut := 1024 * time.Millisecond
|
||||
|
||||
if dl, ok := ctx.Deadline(); ok {
|
||||
timeOutMax := dl.Sub(time.Now())
|
||||
@@ -87,7 +92,7 @@ func (a *AtomicBool) WaitWithContext(ctx context.Context, waitFor bool) error {
|
||||
}
|
||||
}
|
||||
|
||||
if v, ok := ReadChannelWithTimeout(a.waiter, timeOut); ok {
|
||||
if v, ok := ReadChannelWithTimeout(waitchan, timeOut); ok {
|
||||
if v == waitFor {
|
||||
return nil
|
||||
}
|
||||
|
Reference in New Issue
Block a user