From 060edf2d69b60435f055ec71b66cf16c7b5f21b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= Date: Tue, 5 Dec 2023 18:19:32 +0800 Subject: [PATCH] badjson: Remove empty JSON object in JSON object --- common/json/badjson/object.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/common/json/badjson/object.go b/common/json/badjson/object.go index 5d36fa4..225d3af 100644 --- a/common/json/badjson/object.go +++ b/common/json/badjson/object.go @@ -4,8 +4,10 @@ import ( "bytes" "strings" + "github.com/sagernet/sing/common" E "github.com/sagernet/sing/common/exceptions" "github.com/sagernet/sing/common/json" + "github.com/sagernet/sing/common/x/collections" "github.com/sagernet/sing/common/x/linkedhashmap" ) @@ -16,7 +18,12 @@ type JSONObject struct { func (m JSONObject) MarshalJSON() ([]byte, error) { buffer := new(bytes.Buffer) buffer.WriteString("{") - items := m.Entries() + items := common.Filter(m.Entries(), func(it collections.MapEntry[string, any]) bool { + if valueObject, valueIsJSONObject := it.Value.(*JSONObject); valueIsJSONObject && valueObject.IsEmpty() { + return false + } + return true + }) iLen := len(items) for i, entry := range items { keyContent, err := json.Marshal(entry.Key)