Add custom json un-/marshal functions

Author: Samuel Oechsler

CHANGELOG.md

@@ -1,6 +1,11 @@
 # vNext
 
-# v.1.3.0
+# v1.3.1
+
+- (feature) Add custom json un-/marshall functions
+- (internal) Use goccy/go-json when Architecture is ARM64 instead of bytedance/sonic
+
+# v1.3.0
 
 - (feature) Add bytedance/sonic as default fiber json en-/decoder
 - (feature) Make json en-/decoder configurable with `FIBER_JSON_ENCODER` and `FIBER_JSON_DECODER`

fiber/fiber.go

@@ -2,18 +2,16 @@ package fiber
 
 import (
 	"context"
-	"encoding/json"
 	"time"
 
 	"github.com/Becklyn/go-wire-core/app"
 	"github.com/Becklyn/go-wire-core/env"
+	"github.com/Becklyn/go-wire-core/json"
 	"github.com/Becklyn/go-wire-core/metrics"
-	"github.com/bytedance/sonic"
 	"github.com/fraym/golog"
 	"github.com/gofiber/fiber/v2"
 	"github.com/gofiber/fiber/v2/middleware/cors"
 	fiberlog "github.com/gofiber/fiber/v2/middleware/logger"
-	"github.com/gofiber/fiber/v2/utils"
 )
 
 type MiddlewareHandlerMap map[string][]fiber.Handler
@@ -28,23 +26,10 @@ type NewFiberOptions struct {
 }
 
 func NewFiber(options *NewFiberOptions) *fiber.App {
-	jsonEncoder := func() utils.JSONMarshal {
-		if env.StringWithDefault("FIBER_JSON_ENCODER", "sonic") == "sonic" {
-			return sonic.Marshal
-		}
-		return json.Marshal
-	}()
-	jsonDecoder := func() utils.JSONUnmarshal {
-		if env.StringWithDefault("FIBER_JSON_DECODER", "sonic") == "sonic" {
-			return sonic.Unmarshal
-		}
-		return json.Unmarshal
-	}()
-
 	app := fiber.New(fiber.Config{
 		BodyLimit:   env.IntWithDefault("HTTP_REQUEST_BODY_LIMIT", 4) * 1024 * 1024,
-		JSONEncoder: jsonEncoder,
-		JSONDecoder: jsonDecoder,
+		JSONEncoder: json.Marshal,
+		JSONDecoder: json.Unmarshal,
 	})
 
 	app.Use(fiberlog.New(fiberlog.Config{

go.mod

@@ -23,6 +23,7 @@ require (
 	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
 	github.com/chenzhuoyu/iasm v0.9.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/klauspost/compress v1.16.3 // indirect

go.sum

@@ -87,6 +87,8 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
 github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
+github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gofiber/adaptor/v2 v2.1.27 h1:I3Xjn1qaH6W09shPi8F/kz98AncwbVYWFBV4niBBC0Q=
 github.com/gofiber/adaptor/v2 v2.1.27/go.mod h1:xcc+UqppJ+XfYVcqxp2fHyoqKctQxxvZ/IyUybNSIlQ=

json/marshal.go

@@ -0,0 +1,22 @@
+package json
+
+import (
+	stdjson "encoding/json"
+	"runtime"
+
+	"github.com/Becklyn/go-wire-core/env"
+	"github.com/bytedance/sonic"
+	"github.com/goccy/go-json"
+)
+
+func Marshal(v interface{}) ([]byte, error) {
+	if env.StringWithDefault("JSON_ENCODER", "std") == "std" {
+		return stdjson.Marshal(v)
+	}
+
+	if runtime.GOARCH == "amd64" {
+		return sonic.Marshal(v)
+	}
+
+	return json.Marshal(v)
+}

json/unmarshal.go

@@ -0,0 +1,22 @@
+package json
+
+import (
+	stdjson "encoding/json"
+	"runtime"
+
+	"github.com/Becklyn/go-wire-core/env"
+	"github.com/bytedance/sonic"
+	"github.com/goccy/go-json"
+)
+
+func Unmarshal(data []byte, v interface{}) error {
+	if env.StringWithDefault("JSON_DECODER", "std") == "std" {
+		return stdjson.Unmarshal(data, v)
+	}
+
+	if runtime.GOARCH == "amd64" {
+		return sonic.Unmarshal(data, v)
+	}
+
+	return json.Unmarshal(data, v)
+}