migrated from logrus to zerolog, improved error formatting, fixed concurrent map write, fixed crash on rapid page refresh for idle containers, fixed infinite recursion on gotfiy error, fixed websocket connection problem when using idlewatcher

internal/proxy/entry/entry.go

@@ -23,18 +23,18 @@ func ValidateEntry(m *RawEntry) (Entry, E.Error) {
 
 	scheme, err := T.NewScheme(m.Scheme)
 	if err != nil {
-		return nil, err
+		return nil, E.From(err)
 	}
 
 	var entry Entry
-	e := E.NewBuilder("error validating entry")
+	errs := E.NewBuilder("entry validation failed")
 	if scheme.IsStream() {
-		entry = validateStreamEntry(m, e)
+		entry = validateStreamEntry(m, errs)
 	} else {
-		entry = validateRPEntry(m, scheme, e)
+		entry = validateRPEntry(m, scheme, errs)
 	}
-	if err := e.Build(); err != nil {
-		return nil, err
+	if errs.HasError() {
+		return nil, errs.Error()
 	}
 	return entry, nil
 }

internal/proxy/entry/raw.go

@@ -5,13 +5,14 @@ import (
 	"strings"
 
 	"github.com/docker/docker/api/types"
-	"github.com/sirupsen/logrus"
 	"github.com/yusing/go-proxy/internal/common"
 	"github.com/yusing/go-proxy/internal/docker"
 	"github.com/yusing/go-proxy/internal/homepage"
+	"github.com/yusing/go-proxy/internal/logging"
 	"github.com/yusing/go-proxy/internal/net/http/loadbalancer"
 	U "github.com/yusing/go-proxy/internal/utils"
 	F "github.com/yusing/go-proxy/internal/utils/functional"
+	"github.com/yusing/go-proxy/internal/utils/strutils"
 	"github.com/yusing/go-proxy/internal/watcher/health"
 )
 
@@ -85,20 +86,20 @@ func (e *RawEntry) FillMissingFields() {
 		} else if !isDocker {
 			pp = "80"
 		} else {
-			logrus.Debugf("no port found for %s", e.Alias)
+			logging.Debug().Msg("no port found for " + e.Alias)
 		}
 	}
 
 	// replace private port with public port if using public IP.
 	if e.Host == cont.PublicIP {
 		if p, ok := cont.PrivatePortMapping[pp]; ok {
-			pp = U.PortString(p.PublicPort)
+			pp = strutils.PortString(p.PublicPort)
 		}
 	}
 	// replace public port with private port if using private IP.
 	if e.Host == cont.PrivateIP {
 		if p, ok := cont.PublicPortMapping[pp]; ok {
-			pp = U.PortString(p.PrivatePort)
+			pp = strutils.PortString(p.PrivatePort)
 		}
 	}
 

internal/proxy/entry/reverse_proxy.go

@@ -53,7 +53,7 @@ func (rp *ReverseProxyEntry) IdlewatcherConfig() *idlewatcher.Config {
 	return rp.Idlewatcher
 }
 
-func validateRPEntry(m *RawEntry, s fields.Scheme, b E.Builder) *ReverseProxyEntry {
+func validateRPEntry(m *RawEntry, s fields.Scheme, errs *E.Builder) *ReverseProxyEntry {
 	cont := m.Container
 	if cont == nil {
 		cont = docker.DummyContainer
@@ -64,35 +64,26 @@ func validateRPEntry(m *RawEntry, s fields.Scheme, b E.Builder) *ReverseProxyEnt
 		lb = nil
 	}
 
-	host, err := fields.ValidateHost(m.Host)
-	b.Add(err)
+	host := E.Collect(errs, fields.ValidateHost, m.Host)
+	port := E.Collect(errs, fields.ValidatePort, m.Port)
+	pathPats := E.Collect(errs, fields.ValidatePathPatterns, m.PathPatterns)
+	url := E.Collect(errs, url.Parse, fmt.Sprintf("%s://%s:%d", s, host, port))
+	iwCfg := E.Collect(errs, idlewatcher.ValidateConfig, m.Container)
 
-	port, err := fields.ValidatePort(m.Port)
-	b.Add(err)
-
-	pathPatterns, err := fields.ValidatePathPatterns(m.PathPatterns)
-	b.Add(err)
-
-	url, err := E.Check(url.Parse(fmt.Sprintf("%s://%s:%d", s, host, port)))
-	b.Add(err)
-
-	idleWatcherCfg, err := idlewatcher.ValidateConfig(m.Container)
-	b.Add(err)
-
-	if err != nil {
+	if errs.HasError() {
 		return nil
 	}
 
 	return &ReverseProxyEntry{
 		Raw:          m,
-		Alias:        fields.NewAlias(m.Alias),
+		Alias:        fields.Alias(m.Alias),
 		Scheme:       s,
 		URL:          net.NewURL(url),
 		NoTLSVerify:  m.NoTLSVerify,
-		PathPatterns: pathPatterns,
+		PathPatterns: pathPats,
 		HealthCheck:  m.HealthCheck,
 		LoadBalance:  lb,
 		Middlewares:  m.Middlewares,
-		Idlewatcher:  idleWatcherCfg,
+		Idlewatcher:  iwCfg,
 	}
 }

internal/proxy/entry/stream.go

@@ -51,34 +51,25 @@ func (s *StreamEntry) IdlewatcherConfig() *idlewatcher.Config {
 	return s.Idlewatcher
 }
 
-func validateStreamEntry(m *RawEntry, b E.Builder) *StreamEntry {
+func validateStreamEntry(m *RawEntry, errs *E.Builder) *StreamEntry {
 	cont := m.Container
 	if cont == nil {
 		cont = docker.DummyContainer
 	}
 
-	host, err := fields.ValidateHost(m.Host)
-	b.Add(err)
+	host := E.Collect(errs, fields.ValidateHost, m.Host)
+	port := E.Collect(errs, fields.ValidateStreamPort, m.Port)
+	scheme := E.Collect(errs, fields.ValidateStreamScheme, m.Scheme)
+	url := E.Collect(errs, net.ParseURL, fmt.Sprintf("%s://%s:%d", scheme.ListeningScheme, host, port.ListeningPort))
+	idleWatcherCfg := E.Collect(errs, idlewatcher.ValidateConfig, m.Container)
 
-	port, err := fields.ValidateStreamPort(m.Port)
-	b.Add(err)
-
-	scheme, err := fields.ValidateStreamScheme(m.Scheme)
-	b.Add(err)
-
-	url, err := E.Check(net.ParseURL(fmt.Sprintf("%s://%s:%d", scheme.ProxyScheme, m.Host, port.ProxyPort)))
-	b.Add(err)
-
-	idleWatcherCfg, err := idlewatcher.ValidateConfig(m.Container)
-	b.Add(err)
-
-	if b.HasError() {
+	if errs.HasError() {
 		return nil
 	}
 
 	return &StreamEntry{
 		Raw:         m,
-		Alias:       fields.NewAlias(m.Alias),
+		Alias:       fields.Alias(m.Alias),
 		Scheme:      *scheme,
 		URL:         url,
 		Host:        host,