From 2238a05966ae4ad930e79d88ea0c5a9c8e26f329 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= <i@sekai.icu>
Date: Mon, 10 Feb 2025 18:59:17 +0800
Subject: [PATCH] Fix merge objects

---
 common/json/badjson/merge_objects.go          | 10 +++----
 common/json/internal/contextjson/keys.go      | 20 ++++++++++++++
 common/json/internal/contextjson/keys_test.go | 26 +++++++++++++++++++
 3 files changed, 50 insertions(+), 6 deletions(-)
 create mode 100644 common/json/internal/contextjson/keys.go
 create mode 100644 common/json/internal/contextjson/keys_test.go

diff --git a/common/json/badjson/merge_objects.go b/common/json/badjson/merge_objects.go
index fa6c2d4..5b23209 100644
--- a/common/json/badjson/merge_objects.go
+++ b/common/json/badjson/merge_objects.go
@@ -2,9 +2,11 @@ package badjson
 
 import (
 	"context"
+	"reflect"
 
 	E "github.com/sagernet/sing/common/exceptions"
 	"github.com/sagernet/sing/common/json"
+	cJSON "github.com/sagernet/sing/common/json/internal/contextjson"
 )
 
 func MarshallObjects(objects ...any) ([]byte, error) {
@@ -31,16 +33,12 @@ func UnmarshallExcluded(inputContent []byte, parentObject any, object any) error
 }
 
 func UnmarshallExcludedContext(ctx context.Context, inputContent []byte, parentObject any, object any) error {
-	parentContent, err := newJSONObject(ctx, parentObject)
-	if err != nil {
-		return err
-	}
 	var content JSONObject
-	err = content.UnmarshalJSONContext(ctx, inputContent)
+	err := content.UnmarshalJSONContext(ctx, inputContent)
 	if err != nil {
 		return err
 	}
-	for _, key := range parentContent.Keys() {
+	for _, key := range cJSON.ObjectKeys(reflect.TypeOf(parentObject)) {
 		content.Remove(key)
 	}
 	if object == nil {
diff --git a/common/json/internal/contextjson/keys.go b/common/json/internal/contextjson/keys.go
new file mode 100644
index 0000000..589007f
--- /dev/null
+++ b/common/json/internal/contextjson/keys.go
@@ -0,0 +1,20 @@
+package json
+
+import (
+	"reflect"
+
+	"github.com/sagernet/sing/common"
+)
+
+func ObjectKeys(object reflect.Type) []string {
+	switch object.Kind() {
+	case reflect.Pointer:
+		return ObjectKeys(object.Elem())
+	case reflect.Struct:
+	default:
+		panic("invalid non-struct input")
+	}
+	return common.Map(cachedTypeFields(object).list, func(field field) string {
+		return field.name
+	})
+}
diff --git a/common/json/internal/contextjson/keys_test.go b/common/json/internal/contextjson/keys_test.go
new file mode 100644
index 0000000..11c72cb
--- /dev/null
+++ b/common/json/internal/contextjson/keys_test.go
@@ -0,0 +1,26 @@
+package json_test
+
+import (
+	"reflect"
+	"testing"
+
+	json "github.com/sagernet/sing/common/json/internal/contextjson"
+
+	"github.com/stretchr/testify/require"
+)
+
+type MyObject struct {
+	Hello string `json:"hello,omitempty"`
+	MyWorld
+	MyWorld2 string `json:"-"`
+}
+
+type MyWorld struct {
+	World string `json:"world,omitempty"`
+}
+
+func TestObjectKeys(t *testing.T) {
+	t.Parallel()
+	keys := json.ObjectKeys(reflect.TypeOf(&MyObject{}))
+	require.Equal(t, []string{"hello", "world"}, keys)
+}