SagerNet/sing
1
0
Fork 0
mirror of https://github.com/SagerNet/sing.git synced 2025-04-03 11:57:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

badjson: Refactor TypedMap to handle multiple key types

Browse source
This commit is contained in:
世界 2023-12-16 15:27:27 +08:00
parent 2196f193ac
commit 0d1b3d6d6d
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
1 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
common/json/badjson/typed.go
View file

@ -9,11 +9,11 @@ import (
"github.com/sagernet/sing/common/x/linkedhashmap"
)
type TypedMap[T any] struct {
linkedhashmap.Map[string, T]
type TypedMap[K comparable, V any] struct {
linkedhashmap.Map[K, V]
}
func (m TypedMap[T]) MarshalJSON() ([]byte, error) {
func (m TypedMap[K, V]) MarshalJSON() ([]byte, error) {
buffer := new(bytes.Buffer)
buffer.WriteString("{")
items := m.Entries()
@ -38,7 +38,7 @@ func (m TypedMap[T]) MarshalJSON() ([]byte, error) {
return buffer.Bytes(), nil
}
func (m *TypedMap[T]) UnmarshalJSON(content []byte) error {
func (m *TypedMap[K, V]) UnmarshalJSON(content []byte) error {
decoder := json.NewDecoder(bytes.NewReader(content))
m.Clear()
objectStart, err := decoder.Token()
@ -60,15 +60,22 @@ func (m *TypedMap[T]) UnmarshalJSON(content []byte) error {
return nil
}
func (m *TypedMap[T]) decodeJSON(decoder *json.Decoder) error {
func (m *TypedMap[K, V]) decodeJSON(decoder *json.Decoder) error {
for decoder.More() {
var entryKey string
keyToken, err := decoder.Token()
if err != nil {
return err
}
entryKey = keyToken.(string)
var entryValue T
keyContent, err := json.Marshal(keyToken)
if err != nil {
return err
}
var entryKey K
err = json.Unmarshal(keyContent, &entryKey)
if err != nil {
return err
}
var entryValue V
err = decoder.Decode(&entryValue)
if err != nil {
return err