refactor(errs): migrate from gperr.Error to standard Go error interface

This is a large-scale refactoring across the codebase that replaces the custom
`gperr.Error` type with Go's standard `error` interface. The changes include:

- Replacing `gperr.Error` return types with `error` in function signatures
- Using `errors.New()` and `fmt.Errorf()` instead of `gperr.New()` and `gperr.Errorf()`
- Using `%w` format verb for error wrapping instead of `.With()` method
- Replacing `gperr.Subject()` calls with `gperr.PrependSubject()`
- Converting error logging from `gperr.Log*()` functions to zerolog's `.Err().Msg()` pattern
- Update NewLogger to handle multiline error message
- Updating `goutils` submodule to latest commit

This refactoring aligns with Go idioms and removes the dependency on
custom error handling abstractions in favor of standard library patterns.
This commit is contained in:
yusing
2026-02-08 12:07:36 +08:00
parent 7eb2a78041
commit 6da7227f9b
118 changed files with 572 additions and 563 deletions

View File

@@ -59,7 +59,7 @@ func (cfg *DockerProviderConfig) Parse(value string) error {
return nil
}
func (cfg *DockerProviderConfig) UnmarshalMap(m map[string]any) gperr.Error {
func (cfg *DockerProviderConfig) UnmarshalMap(m map[string]any) error {
var tmp DockerProviderConfigDetailed
var err = serialization.MapUnmarshalValidate(m, &tmp)
if err != nil {
@@ -70,7 +70,7 @@ func (cfg *DockerProviderConfig) UnmarshalMap(m map[string]any) gperr.Error {
cfg.TLS = tmp.TLS
if cfg.TLS != nil {
if err := checkFilesOk(cfg.TLS.CAFile, cfg.TLS.CertFile, cfg.TLS.KeyFile); err != nil {
return gperr.Wrap(err)
return err
}
}
return nil

View File

@@ -1,6 +1,7 @@
package types
import (
"errors"
"net/url"
"strconv"
"strings"
@@ -32,7 +33,7 @@ type (
DependsOn []string `json:"depends_on,omitempty"`
NoLoadingPage bool `json:"no_loading_page,omitempty"`
valErr gperr.Error
valErr error
} // @name IdlewatcherConfig
ContainerStopMethod string // @name ContainerStopMethod
ContainerSignal string // @name ContainerSignal
@@ -57,6 +58,13 @@ const (
ContainerStopMethodKill ContainerStopMethod = "kill"
)
var (
ErrMissingProviderConfig = errors.New("missing idlewatcher provider config")
ErrInvalidStopMethod = errors.New("invalid stop method")
ErrInvalidStopSignal = errors.New("invalid stop signal")
ErrEmptyStartEndpoint = errors.New("start endpoint must not be empty if defined")
)
func (c *IdlewatcherConfig) Key() string {
if c.Docker != nil {
return c.Docker.ContainerID
@@ -71,7 +79,7 @@ func (c *IdlewatcherConfig) ContainerName() string {
return "lxc-" + strconv.Itoa(c.Proxmox.VMID)
}
func (c *IdlewatcherConfig) Validate() gperr.Error {
func (c *IdlewatcherConfig) Validate() error {
if c.IdleTimeout == 0 { // zero idle timeout means no idle watcher
c.valErr = nil
return nil
@@ -89,13 +97,13 @@ func (c *IdlewatcherConfig) Validate() gperr.Error {
return c.valErr
}
func (c *IdlewatcherConfig) ValErr() gperr.Error {
func (c *IdlewatcherConfig) ValErr() error {
return c.valErr
}
func (c *IdlewatcherConfig) validateProvider() error {
if c.Docker == nil && c.Proxmox == nil {
return gperr.New("missing idlewatcher provider config")
return ErrMissingProviderConfig
}
return nil
}
@@ -118,7 +126,7 @@ func (c *IdlewatcherConfig) validateStopMethod() error {
case ContainerStopMethodPause, ContainerStopMethodStop, ContainerStopMethodKill:
return nil
default:
return gperr.New("invalid stop method").Subject(string(c.StopMethod))
return gperr.PrependSubject(ErrInvalidStopMethod, string(c.StopMethod))
}
}
@@ -127,7 +135,7 @@ func (c *IdlewatcherConfig) validateStopSignal() error {
case "", "SIGINT", "SIGTERM", "SIGQUIT", "SIGHUP", "INT", "TERM", "QUIT", "HUP":
return nil
default:
return gperr.New("invalid stop signal").Subject(string(c.StopSignal))
return gperr.PrependSubject(ErrInvalidStopSignal, string(c.StopSignal))
}
}
@@ -141,7 +149,7 @@ func (c *IdlewatcherConfig) validateStartEndpoint() error {
c.StartEndpoint = c.StartEndpoint[:i]
}
if len(c.StartEndpoint) == 0 {
return gperr.New("start endpoint must not be empty if defined")
return ErrEmptyStartEndpoint
}
_, err := url.ParseRequestURI(c.StartEndpoint)
return err

View File

@@ -8,7 +8,6 @@ import (
"github.com/yusing/godoxy/internal/homepage"
nettypes "github.com/yusing/godoxy/internal/net/types"
provider "github.com/yusing/godoxy/internal/route/provider/types"
gperr "github.com/yusing/goutils/errs"
"github.com/yusing/goutils/http/reverseproxy"
"github.com/yusing/goutils/pool"
"github.com/yusing/goutils/task"
@@ -66,8 +65,8 @@ type (
Stream() nettypes.Stream
}
RouteProvider interface {
Start(task.Parent) gperr.Error
LoadRoutes() gperr.Error
Start(parent task.Parent) error
LoadRoutes() error
GetRoute(alias string) (r Route, ok bool)
// should be used like `for _, r := range p.IterRoutes` (no braces), not calling it directly
IterRoutes(yield func(alias string, r Route) bool)