chunyu/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2025-06-13 21:54:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve listable parsing

Browse Source
This commit is contained in:
septs 2023-10-08 11:44:06 +08:00 committed by 世界
parent 021ce4efe1
commit dc350a128b
No known key found for this signature in database
GPG Key ID: CD109927C34A63C4
1 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
option/types.go
View File

@ -2,7 +2,6 @@ package option
import ( import (
"net/netip" "net/netip"
"strings"
"time" "time"
"github.com/sagernet/sing-box/common/json" "github.com/sagernet/sing-box/common/json"
@ -50,60 +49,60 @@ func (a *ListenAddress) Build() netip.Addr {
return (netip.Addr)(*a) return (netip.Addr)(*a)
} }
type NetworkList string type NetworkList []string
func (v *NetworkList) UnmarshalJSON(content []byte) error { func (v *NetworkList) UnmarshalJSON(content []byte) error {
var networkList []string var (
err := json.Unmarshal(content, &networkList) networkList []string
if err != nil { err error
var networkItem string )
err = json.Unmarshal(content, &networkItem) if len(content) > 0 && content[0] != '[' {
networkList = make([]string, 1)
err = json.Unmarshal(content, &networkList[0])
} else {
err = json.Unmarshal(content, &networkList)
}
if err != nil { if err != nil {
return err return err
} }
networkList = []string{networkItem}
}
for _, networkName := range networkList { for _, networkName := range networkList {
switch networkName { switch networkName {
case N.NetworkTCP, N.NetworkUDP: case N.NetworkTCP, N.NetworkUDP:
break break
default: default:
return E.New("unknown network: " + networkName) return E.Extend(N.ErrUnknownNetwork, networkName)
} }
} }
*v = NetworkList(strings.Join(networkList, "\n")) *v = networkList
return nil return nil
} }
func (v NetworkList) Build() []string { func (v NetworkList) Build() []string {
if v == "" { if len(v) == 0 {
return []string{N.NetworkTCP, N.NetworkUDP} return []string{N.NetworkTCP, N.NetworkUDP}
} }
return strings.Split(string(v), "\n") return v
} }
type Listable[T comparable] []T type Listable[T comparable] []T
func (l Listable[T]) MarshalJSON() ([]byte, error) { func (l Listable[T]) MarshalJSON() ([]byte, error) {
arrayList := []T(l) if len(l) == 1 {
if len(arrayList) == 1 { return json.Marshal(l[0])
return json.Marshal(arrayList[0])
} }
return json.Marshal(arrayList) return json.Marshal([]T(l))
} }
func (l *Listable[T]) UnmarshalJSON(content []byte) error { func (l *Listable[T]) UnmarshalJSON(content []byte) error {
err := json.Unmarshal(content, (*[]T)(l)) if len(content) > 0 && content[0] != '[' {
var element T
err := json.Unmarshal(content, &element)
if err == nil { if err == nil {
*l = []T{element}
return nil return nil
} }
var singleItem T
newError := json.Unmarshal(content, &singleItem)
if newError != nil {
return E.Errors(err, newError)
} }
*l = []T{singleItem} return json.Unmarshal(content, (*[]T)(l))
return nil
} }
type DomainStrategy dns.DomainStrategy type DomainStrategy dns.DomainStrategy