refactor: refactor to adapt new custom json marshaler

internal/net/gphttp/accesslog/access_logger.go

@@ -194,6 +194,6 @@ func (l *AccessLogger) write(data []byte) {
 	if err != nil {
 		l.handleErr(err)
 	} else {
-		logging.Debug().Msg("access log flushed to " + l.io.Name())
+		logging.Trace().Msg("access log flushed to " + l.io.Name())
 	}
 }

internal/net/gphttp/accesslog/access_logger_test.go

@@ -2,13 +2,14 @@ package accesslog_test
 
 import (
 	"bytes"
-	"encoding/json"
 	"fmt"
 	"net/http"
 	"net/url"
 	"testing"
 	"time"
 
+	"github.com/yusing/go-proxy/pkg/json"
+
 	. "github.com/yusing/go-proxy/internal/net/gphttp/accesslog"
 	"github.com/yusing/go-proxy/internal/task"
 	. "github.com/yusing/go-proxy/internal/utils/testing"

internal/net/gphttp/accesslog/formatter.go

@@ -2,13 +2,14 @@ package accesslog
 
 import (
 	"bytes"
-	"encoding/json"
 	"net"
 	"net/http"
 	"net/url"
 	"strconv"
 	"time"
 
+	"github.com/yusing/go-proxy/pkg/json"
+
 	"github.com/yusing/go-proxy/internal/logging"
 )
 

internal/net/gphttp/body.go

@@ -2,11 +2,12 @@ package gphttp
 
 import (
 	"context"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"net/http"
 
+	"github.com/yusing/go-proxy/pkg/json"
+
 	"github.com/yusing/go-proxy/internal/logging"
 )
 

internal/net/gphttp/error.go

@@ -2,11 +2,12 @@ package gphttp
 
 import (
 	"context"
-	"encoding/json"
 	"errors"
 	"net/http"
 	"syscall"
 
+	"github.com/yusing/go-proxy/pkg/json"
+
 	"github.com/yusing/go-proxy/internal/gperr"
 	"github.com/yusing/go-proxy/internal/net/gphttp/httpheaders"
 )

internal/net/gphttp/gpwebsocket/utils.go

@@ -12,7 +12,6 @@ import (
 	"github.com/yusing/go-proxy/internal/logging"
 	"github.com/yusing/go-proxy/internal/net/gphttp"
 	"github.com/yusing/go-proxy/internal/net/gphttp/httpheaders"
-	"github.com/yusing/go-proxy/internal/utils"
 )
 
 func warnNoMatchDomains() {
@@ -95,7 +94,7 @@ func WriteText(r *http.Request, conn *websocket.Conn, msg string) bool {
 func DynamicJSONHandler[ResultType any](w http.ResponseWriter, r *http.Request, getter func() ResultType, interval time.Duration) {
 	if httpheaders.IsWebsocket(r.Header) {
 		Periodic(w, r, interval, func(conn *websocket.Conn) error {
-			return wsjson.Write(r.Context(), conn, utils.ToJSONObject(getter()))
+			return wsjson.Write(r.Context(), conn, getter())
 		})
 	} else {
 		gphttp.RespondJSON(w, r, getter())

internal/net/gphttp/middleware/middleware.go

@@ -1,12 +1,13 @@
 package middleware
 
 import (
-	"encoding/json"
 	"net/http"
 	"reflect"
 	"sort"
 	"strings"
 
+	"github.com/yusing/go-proxy/pkg/json"
+
 	"github.com/yusing/go-proxy/internal/gperr"
 	"github.com/yusing/go-proxy/internal/logging"
 	gphttp "github.com/yusing/go-proxy/internal/net/gphttp"
@@ -158,12 +159,12 @@ func (m *Middleware) String() string {
 	return m.name
 }
 
-func (m *Middleware) MarshalJSON() ([]byte, error) {
-	return json.MarshalIndent(map[string]any{
+func (m *Middleware) MarshalJSONTo(buf []byte) []byte {
+	return json.MarshalTo(map[string]any{
 		"name":     m.name,
 		"options":  m.impl,
 		"priority": m.priority,
-	}, "", "  ")
+	}, buf)
 }
 
 func (m *Middleware) ModifyRequest(next http.HandlerFunc, w http.ResponseWriter, r *http.Request) {

internal/net/gphttp/middleware/middleware_builder_test.go

@@ -2,9 +2,10 @@ package middleware
 
 import (
 	_ "embed"
-	"encoding/json"
 	"testing"
 
+	"github.com/yusing/go-proxy/pkg/json"
+
 	"github.com/yusing/go-proxy/internal/gperr"
 	. "github.com/yusing/go-proxy/internal/utils/testing"
 )
@@ -16,7 +17,7 @@ func TestBuild(t *testing.T) {
 	errs := gperr.NewBuilder("")
 	middlewares := BuildMiddlewaresFromYAML("", testMiddlewareCompose, errs)
 	ExpectNoError(t, errs.Error())
-	Must(json.MarshalIndent(middlewares, "", "  "))
+	json.Marshal(middlewares)
 	// t.Log(string(data))
 	// TODO: test
 }

internal/net/gphttp/middleware/test_utils.go

@@ -3,12 +3,13 @@ package middleware
 import (
 	"bytes"
 	_ "embed"
-	"encoding/json"
 	"io"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
 
+	"github.com/yusing/go-proxy/pkg/json"
+
 	"github.com/yusing/go-proxy/internal/common"
 	"github.com/yusing/go-proxy/internal/gperr"
 	"github.com/yusing/go-proxy/internal/net/gphttp/reverseproxy"