chore: simplify DNSPrefer serialization process

2025-12-19 08:20:05 +08:00 · 2025-12-04 13:41:44 +08:00 · 2025-12-04 13:41:44 +08:00 · b509affe5b
commit b509affe5b
parent 32ce513977
20 changed files with 35 additions and 30 deletions
--- a/adapter/outbound/anytls.go
+++ b/adapter/outbound/anytls.go
@ -95,7 +95,7 @@ func NewAnyTLS(option AnyTLSOption) (*AnyTLS, error) {
 			mpTcp:  option.MPTCP,
 			iface:  option.Interface,
 			rmark:  option.RoutingMark,
-			prefer: C.NewDNSPrefer(option.IPVersion),
+			prefer: option.IPVersion,
 		},
 		option: &option,
 	}
--- a/adapter/outbound/base.go
+++ b/adapter/outbound/base.go
@ -160,12 +160,12 @@ func (b *Base) Close() error {
 }

 type BasicOption struct {
-	TFO         bool   `proxy:"tfo,omitempty"`
-	MPTCP       bool   `proxy:"mptcp,omitempty"`
-	Interface   string `proxy:"interface-name,omitempty"`
-	RoutingMark int    `proxy:"routing-mark,omitempty"`
-	IPVersion   string `proxy:"ip-version,omitempty"`
-	DialerProxy string `proxy:"dialer-proxy,omitempty"` // don't apply this option into groups, but can set a group name in a proxy
+	TFO         bool        `proxy:"tfo,omitempty"`
+	MPTCP       bool        `proxy:"mptcp,omitempty"`
+	Interface   string      `proxy:"interface-name,omitempty"`
+	RoutingMark int         `proxy:"routing-mark,omitempty"`
+	IPVersion   C.DNSPrefer `proxy:"ip-version,omitempty"`
+	DialerProxy string      `proxy:"dialer-proxy,omitempty"` // don't apply this option into groups, but can set a group name in a proxy

 	DialerForAPI C.Dialer `proxy:"-"` // the dialer used for API usage has higher priority than all the above configurations.
 }
--- a/adapter/outbound/direct.go
+++ b/adapter/outbound/direct.go
@ -74,7 +74,7 @@ func NewDirectWithOption(option DirectOption) *Direct {
 			mpTcp:  option.MPTCP,
 			iface:  option.Interface,
 			rmark:  option.RoutingMark,
-			prefer: C.NewDNSPrefer(option.IPVersion),
+			prefer: option.IPVersion,
 		},
 		loopBack: loopback.NewDetector(),
 	}
--- a/adapter/outbound/dns.go
+++ b/adapter/outbound/dns.go
@ -163,7 +163,7 @@ func NewDnsWithOption(option DnsOption) *Dns {
 			mpTcp:  option.MPTCP,
 			iface:  option.Interface,
 			rmark:  option.RoutingMark,
-			prefer: C.NewDNSPrefer(option.IPVersion),
+			prefer: option.IPVersion,
 		},
 	}
 }
--- a/adapter/outbound/http.go
+++ b/adapter/outbound/http.go
@ -174,7 +174,7 @@ func NewHttp(option HttpOption) (*Http, error) {
 			mpTcp:  option.MPTCP,
 			iface:  option.Interface,
 			rmark:  option.RoutingMark,
-			prefer: C.NewDNSPrefer(option.IPVersion),
+			prefer: option.IPVersion,
 		},
 		user:      option.UserName,
 		pass:      option.Password,
--- a/adapter/outbound/hysteria.go
+++ b/adapter/outbound/hysteria.go
@ -247,7 +247,7 @@ func NewHysteria(option HysteriaOption) (*Hysteria, error) {
 			tfo:    option.FastOpen,
 			iface:  option.Interface,
 			rmark:  option.RoutingMark,
-			prefer: C.NewDNSPrefer(option.IPVersion),
+			prefer: option.IPVersion,
 		},
 		option:    &option,
 		client:    client,
--- a/adapter/outbound/hysteria2.go
+++ b/adapter/outbound/hysteria2.go
@ -113,7 +113,7 @@ func NewHysteria2(option Hysteria2Option) (*Hysteria2, error) {
 			udp:    true,
 			iface:  option.Interface,
 			rmark:  option.RoutingMark,
-			prefer: C.NewDNSPrefer(option.IPVersion),
+			prefer: option.IPVersion,
 		},
 		option: &option,
 	}
@ -189,7 +189,7 @@ func NewHysteria2(option Hysteria2Option) (*Hysteria2, error) {
 		CWND:               option.CWND,
 		UdpMTU:             option.UdpMTU,
 		ServerAddress: func(ctx context.Context) (*net.UDPAddr, error) {
-			udpAddr, err := resolveUDPAddr(ctx, "udp", addr, C.NewDNSPrefer(option.IPVersion))
+			udpAddr, err := resolveUDPAddr(ctx, "udp", addr, option.IPVersion)
 			if err != nil {
 				return nil, err
 			}
--- a/adapter/outbound/mieru.go
+++ b/adapter/outbound/mieru.go
@ -172,7 +172,7 @@ func NewMieru(option MieruOption) (*Mieru, error) {
 			udp:    option.UDP,
 			xudp:   false,
 			rmark:  option.RoutingMark,
-			prefer: C.NewDNSPrefer(option.IPVersion),
+			prefer: option.IPVersion,
 		},
 		option: &option,
 		client: c,
--- a/adapter/outbound/shadowsocks.go
+++ b/adapter/outbound/shadowsocks.go
@ -463,7 +463,7 @@ func NewShadowSocks(option ShadowSocksOption) (*ShadowSocks, error) {
 			mpTcp:  option.MPTCP,
 			iface:  option.Interface,
 			rmark:  option.RoutingMark,
-			prefer: C.NewDNSPrefer(option.IPVersion),
+			prefer: option.IPVersion,
 		},
 		method: method,

--- a/adapter/outbound/shadowsocksr.go
+++ b/adapter/outbound/shadowsocksr.go
@ -167,7 +167,7 @@ func NewShadowSocksR(option ShadowSocksROption) (*ShadowSocksR, error) {
 			mpTcp:  option.MPTCP,
 			iface:  option.Interface,
 			rmark:  option.RoutingMark,
-			prefer: C.NewDNSPrefer(option.IPVersion),
+			prefer: option.IPVersion,
 		},
 		option:   &option,
 		cipher:   coreCiph,
--- a/adapter/outbound/snell.go
+++ b/adapter/outbound/snell.go
@ -170,7 +170,7 @@ func NewSnell(option SnellOption) (*Snell, error) {
 			mpTcp:  option.MPTCP,
 			iface:  option.Interface,
 			rmark:  option.RoutingMark,
-			prefer: C.NewDNSPrefer(option.IPVersion),
+			prefer: option.IPVersion,
 		},
 		option:     &option,
 		psk:        psk,
--- a/adapter/outbound/socks5.go
+++ b/adapter/outbound/socks5.go
@ -195,7 +195,7 @@ func NewSocks5(option Socks5Option) (*Socks5, error) {
 			mpTcp:  option.MPTCP,
 			iface:  option.Interface,
 			rmark:  option.RoutingMark,
-			prefer: C.NewDNSPrefer(option.IPVersion),
+			prefer: option.IPVersion,
 		},
 		option:         &option,
 		user:           option.UserName,
--- a/adapter/outbound/ssh.go
+++ b/adapter/outbound/ssh.go
@ -189,7 +189,7 @@ func NewSsh(option SshOption) (*Ssh, error) {
 			udp:    false,
 			iface:  option.Interface,
 			rmark:  option.RoutingMark,
-			prefer: C.NewDNSPrefer(option.IPVersion),
+			prefer: option.IPVersion,
 		},
 		option: &option,
 		config: &config,
--- a/adapter/outbound/sudoku.go
+++ b/adapter/outbound/sudoku.go
@ -243,7 +243,7 @@ func NewSudoku(option SudokuOption) (*Sudoku, error) {
 			mpTcp:  option.MPTCP,
 			iface:  option.Interface,
 			rmark:  option.RoutingMark,
-			prefer: C.NewDNSPrefer(option.IPVersion),
+			prefer: option.IPVersion,
 		},
 		option:   &option,
 		table:    table,
--- a/adapter/outbound/trojan.go
+++ b/adapter/outbound/trojan.go
@ -293,7 +293,7 @@ func NewTrojan(option TrojanOption) (*Trojan, error) {
 			mpTcp:  option.MPTCP,
 			iface:  option.Interface,
 			rmark:  option.RoutingMark,
-			prefer: C.NewDNSPrefer(option.IPVersion),
+			prefer: option.IPVersion,
 		},
 		option:      &option,
 		hexPassword: trojan.Key(option.Password),
--- a/adapter/outbound/tuic.go
+++ b/adapter/outbound/tuic.go
@ -256,7 +256,7 @@ func NewTuic(option TuicOption) (*Tuic, error) {
 			tfo:    option.FastOpen,
 			iface:  option.Interface,
 			rmark:  option.RoutingMark,
-			prefer: C.NewDNSPrefer(option.IPVersion),
+			prefer: option.IPVersion,
 		},
 		option:    &option,
 		tlsConfig: tlsClientConfig,
--- a/adapter/outbound/vless.go
+++ b/adapter/outbound/vless.go
@ -423,7 +423,7 @@ func NewVless(option VlessOption) (*Vless, error) {
 			mpTcp:  option.MPTCP,
 			iface:  option.Interface,
 			rmark:  option.RoutingMark,
-			prefer: C.NewDNSPrefer(option.IPVersion),
+			prefer: option.IPVersion,
 		},
 		client: client,
 		option: &option,
--- a/adapter/outbound/vmess.go
+++ b/adapter/outbound/vmess.go
@ -433,7 +433,7 @@ func NewVmess(option VmessOption) (*Vmess, error) {
 			mpTcp:  option.MPTCP,
 			iface:  option.Interface,
 			rmark:  option.RoutingMark,
-			prefer: C.NewDNSPrefer(option.IPVersion),
+			prefer: option.IPVersion,
 		},
 		client: client,
 		option: &option,
--- a/adapter/outbound/wireguard.go
+++ b/adapter/outbound/wireguard.go
@ -173,7 +173,7 @@ func NewWireGuard(option WireGuardOption) (*WireGuard, error) {
 			udp:    option.UDP,
 			iface:  option.Interface,
 			rmark:  option.RoutingMark,
-			prefer: C.NewDNSPrefer(option.IPVersion),
+			prefer: option.IPVersion,
 		},
 	}
 	outbound.dialer = option.NewDialer(outbound.DialOptions())
--- a/constant/dns.go
+++ b/constant/dns.go
@ -86,12 +86,17 @@ func (d DNSPrefer) String() string {
 	}
 }

-func NewDNSPrefer(prefer string) DNSPrefer {
-	if p, ok := dnsPreferMap[prefer]; ok {
-		return p
-	} else {
-		return DualStack
+func (d DNSPrefer) MarshalText() ([]byte, error) {
+	return []byte(d.String()), nil
+}
+
+func (d *DNSPrefer) UnmarshalText(data []byte) error {
+	p, exist := dnsPreferMap[strings.ToLower(string(data))]
+	if !exist {
+		p = DualStack
 	}
+	*d = p
+	return nil
 }

 // FilterModeMapping is a mapping for FilterMode enum