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/api/v1/utils/error.go

@@ -1,37 +1,31 @@
 package utils
 
 import (
-	"errors"
-	"fmt"
 	"net/http"
 
-	"github.com/sirupsen/logrus"
 	E "github.com/yusing/go-proxy/internal/error"
 )
 
-var Logger = logrus.WithField("module", "api")
-
 func HandleErr(w http.ResponseWriter, r *http.Request, origErr error, code ...int) {
 	if origErr == nil {
 		return
 	}
-	err := E.From(origErr).Subjectf("%s %s", r.Method, r.URL)
-	Logger.Error(err)
+	LogError(r).Msg(origErr.Error())
 	if len(code) > 0 {
-		http.Error(w, err.String(), code[0])
+		http.Error(w, origErr.Error(), code[0])
 		return
 	}
-	http.Error(w, err.String(), http.StatusInternalServerError)
+	http.Error(w, origErr.Error(), http.StatusInternalServerError)
 }
 
 func ErrMissingKey(k string) error {
-	return errors.New("missing key '" + k + "' in query or request body")
+	return E.New("missing key '" + k + "' in query or request body")
 }
 
 func ErrInvalidKey(k string) error {
-	return errors.New("invalid key '" + k + "' in query or request body")
+	return E.New("invalid key '" + k + "' in query or request body")
 }
 
 func ErrNotFound(k, v string) error {
-	return fmt.Errorf("key %q with value %q not found", k, v)
+	return E.Errorf("key %q with value %q not found", k, v)
 }

internal/api/v1/utils/http_client.go

@@ -9,12 +9,11 @@ import (
 )
 
 var (
-	HTTPClient = &http.Client{
+	httpClient = &http.Client{
 		Timeout: common.ConnectionTimeout,
 		Transport: &http.Transport{
-			Proxy:             http.ProxyFromEnvironment,
 			DisableKeepAlives: true,
-			ForceAttemptHTTP2: true,
+			ForceAttemptHTTP2: false,
 			DialContext: (&net.Dialer{
 				Timeout:   common.DialTimeout,
 				KeepAlive: common.KeepAlive, // this is different from DisableKeepAlives
@@ -23,7 +22,7 @@ var (
 		},
 	}
 
-	Get  = HTTPClient.Get
-	Post = HTTPClient.Post
-	Head = HTTPClient.Head
+	Get  = httpClient.Get
+	Post = httpClient.Post
+	Head = httpClient.Head
 )

internal/api/v1/utils/logging.go

@@ -0,0 +1,18 @@
+package utils
+
+import (
+	"net/http"
+
+	"github.com/rs/zerolog"
+	"github.com/yusing/go-proxy/internal/logging"
+)
+
+func reqLogger(r *http.Request, level zerolog.Level) *zerolog.Event {
+	return logging.WithLevel(level).Str("module", "api").
+		Str("method", r.Method).
+		Str("path", r.RequestURI)
+}
+
+func LogError(r *http.Request) *zerolog.Event { return reqLogger(r, zerolog.ErrorLevel) }
+func LogWarn(r *http.Request) *zerolog.Event  { return reqLogger(r, zerolog.WarnLevel) }
+func LogInfo(r *http.Request) *zerolog.Event  { return reqLogger(r, zerolog.InfoLevel) }

internal/api/v1/utils/utils.go

@@ -3,6 +3,8 @@ package utils
 import (
 	"encoding/json"
 	"net/http"
+
+	"github.com/yusing/go-proxy/internal/logging"
 )
 
 func WriteBody(w http.ResponseWriter, body []byte) {
@@ -11,15 +13,25 @@ func WriteBody(w http.ResponseWriter, body []byte) {
 	}
 }
 
-func RespondJSON(w http.ResponseWriter, r *http.Request, data any, code ...int) bool {
+func RespondJSON(w http.ResponseWriter, r *http.Request, data any, code ...int) (canProceed bool) {
 	if len(code) > 0 {
 		w.WriteHeader(code[0])
 	}
 	w.Header().Set("Content-Type", "application/json")
-	j, err := json.MarshalIndent(data, "", "  ")
-	if err != nil {
-		HandleErr(w, r, err)
-		return false
+	var j []byte
+	var err error
+
+	switch data := data.(type) {
+	case string:
+		j = []byte(`"` + data + `"`)
+	case []byte:
+		j = data
+	default:
+		j, err = json.MarshalIndent(data, "", "  ")
+		if err != nil {
+			logging.Panic().Err(err).Msg("failed to marshal json")
+			return false
+		}
 	}
 	_, err = w.Write(j)
 	if err != nil {