refactor and organize code

This commit is contained in:
yusing
2025-02-15 05:44:47 +08:00
parent 1af6dd9cf8
commit 18d258aaa2
169 changed files with 1020 additions and 755 deletions

View File

@@ -3,7 +3,7 @@ package types
import (
"strconv"
E "github.com/yusing/go-proxy/internal/error"
"github.com/yusing/go-proxy/internal/gperr"
"github.com/yusing/go-proxy/internal/utils/strutils"
)
@@ -13,8 +13,8 @@ type Port struct {
}
var (
ErrInvalidPortSyntax = E.New("invalid port syntax, expect [listening_port:]target_port")
ErrPortOutOfRange = E.New("port out of range")
ErrInvalidPortSyntax = gperr.New("invalid port syntax, expect [listening_port:]target_port")
ErrPortOutOfRange = gperr.New("port out of range")
)
// Parse implements strutils.Parser.
@@ -28,7 +28,7 @@ func (p *Port) Parse(v string) (err error) {
var err2 error
p.Listening, err = strconv.Atoi(parts[0])
p.Proxy, err2 = strconv.Atoi(parts[1])
err = E.Join(err, err2)
err = gperr.Join(err, err2)
default:
return ErrInvalidPortSyntax.Subject(v)
}

View File

@@ -11,7 +11,7 @@ import (
"github.com/yusing/go-proxy/internal/task"
"github.com/yusing/go-proxy/internal/watcher/health"
loadbalance "github.com/yusing/go-proxy/internal/net/http/loadbalancer/types"
loadbalance "github.com/yusing/go-proxy/internal/net/gphttp/loadbalancer/types"
)
type (

View File

@@ -1,12 +1,12 @@
package types
import (
E "github.com/yusing/go-proxy/internal/error"
"github.com/yusing/go-proxy/internal/gperr"
)
type Scheme string
var ErrInvalidScheme = E.New("invalid scheme")
var ErrInvalidScheme = gperr.New("invalid scheme")
const (
SchemeHTTP Scheme = "http"
@@ -16,7 +16,7 @@ const (
SchemeFileServer Scheme = "fileserver"
)
func (s Scheme) Validate() E.Error {
func (s Scheme) Validate() gperr.Error {
switch s {
case SchemeHTTP, SchemeHTTPS,
SchemeTCP, SchemeUDP, SchemeFileServer: