♻️ Refactor

2025-10-25 16:51:01 +00:00 · 2024-10-03 01:24:54 +08:00
parent 573d0056d0
commit 3729675031
32 changed files with 284 additions and 829 deletions
--- a/model/config.go
+++ b/model/config.go
@@ -1,102 +0,0 @@
-package model
-
-import "encoding/json"
-
-type Listable[T any] []T
-
-func (l *Listable[T]) UnmarshalJSON(data []byte) error {
-	var arr []T
-	if err := json.Unmarshal(data, &arr); err == nil {
-		*l = arr
-		return nil
-	}
-	var v T
-	if err := json.Unmarshal(data, &v); err == nil {
-		*l = []T{v}
-		return nil
-	}
-	return nil
-}
-
-type Config struct {
-	Log          any           `json:"log,omitempty"`
-	DNS          any           `json:"dns,omitempty"`
-	NTP          any           `json:"ntp,omitempty"`
-	Inbounds     any           `json:"inbounds,omitempty"`
-	Outbounds    []Outbound    `json:"outbounds,omitempty"`
-	Route        *RouteOptions `json:"route,omitempty"`
-	Experimental any           `json:"experimental,omitempty"`
-}
-
-type RouteOptions struct {
-	GeoIP               *GeoIPOptions     `json:"geoip,omitempty"`
-	Geosite             *GeositeOptions   `json:"geosite,omitempty"`
-	Rules               Listable[Rule]    `json:"rules,omitempty"`
-	RuleSet             Listable[RuleSet] `json:"rule_set,omitempty"`
-	Final               string            `json:"final,omitempty"`
-	FindProcess         bool              `json:"find_process,omitempty"`
-	AutoDetectInterface bool              `json:"auto_detect_interface,omitempty"`
-	OverrideAndroidVPN  bool              `json:"override_android_vpn,omitempty"`
-	DefaultInterface    string            `json:"default_interface,omitempty"`
-	DefaultMark         int               `json:"default_mark,omitempty"`
-}
-
-type Rule struct {
-	Type                     string           `json:"type,omitempty"`
-	Inbound                  Listable[string] `json:"inbound,omitempty"`
-	IPVersion                int              `json:"ip_version,omitempty"`
-	Network                  Listable[string] `json:"network,omitempty"`
-	AuthUser                 Listable[string] `json:"auth_user,omitempty"`
-	Protocol                 string           `json:"protocol,omitempty"`
-	Domain                   Listable[string] `json:"domain,omitempty"`
-	DomainSuffix             Listable[string] `json:"domain_suffix,omitempty"`
-	DomainKeyword            Listable[string] `json:"domain_keyword,omitempty"`
-	DomainRegex              Listable[string] `json:"domain_regex,omitempty"`
-	Geosite                  Listable[string] `json:"geosite,omitempty"`
-	SourceGeoIP              Listable[string] `json:"source_geoip,omitempty"`
-	GeoIP                    Listable[string] `json:"geoip,omitempty"`
-	SourceIPCIDR             Listable[string] `json:"source_ip_cidr,omitempty"`
-	SourceIPIsPrivate        bool             `json:"source_ip_is_private,omitempty"`
-	IPCIDR                   Listable[string] `json:"ip_cidr,omitempty"`
-	IPIsPrivate              bool             `json:"ip_is_private,omitempty"`
-	SourcePort               Listable[uint16] `json:"source_port,omitempty"`
-	SourcePortRange          Listable[string] `json:"source_port_range,omitempty"`
-	Port                     Listable[uint16] `json:"port,omitempty"`
-	PortRange                Listable[string] `json:"port_range,omitempty"`
-	ProcessName              Listable[string] `json:"process_name,omitempty"`
-	ProcessPath              Listable[string] `json:"process_path,omitempty"`
-	PackageName              Listable[string] `json:"package_name,omitempty"`
-	User                     Listable[string] `json:"user,omitempty"`
-	UserID                   Listable[int32]  `json:"user_id,omitempty"`
-	ClashMode                string           `json:"clash_mode,omitempty"`
-	WIFISSID                 Listable[string] `json:"wifi_ssid,omitempty"`
-	WIFIBSSID                Listable[string] `json:"wifi_bssid,omitempty"`
-	RuleSet                  Listable[string] `json:"rule_set,omitempty"`
-	RuleSetIPCIDRMatchSource bool             `json:"rule_set_ipcidr_match_source,omitempty"`
-	Invert                   bool             `json:"invert,omitempty"`
-	Outbound                 string           `json:"outbound,omitempty"`
-	Mode                     string           `json:"mode,omitempty"`
-	Rules                    Listable[Rule]   `json:"rules,omitempty"`
-}
-
-type GeoIPOptions struct {
-	Path           string `json:"path,omitempty"`
-	DownloadURL    string `json:"download_url,omitempty"`
-	DownloadDetour string `json:"download_detour,omitempty"`
-}
-
-type GeositeOptions struct {
-	Path           string `json:"path,omitempty"`
-	DownloadURL    string `json:"download_url,omitempty"`
-	DownloadDetour string `json:"download_detour,omitempty"`
-}
-
-type RuleSet struct {
-	Type           string `json:"type"`
-	Tag            string `json:"tag"`
-	Format         string `json:"format"`
-	Path           string `json:"path,omitempty"`
-	URL            string `json:"url"`
-	DownloadDetour string `json:"download_detour,omitempty"`
-	UpdateInterval string `json:"update_interval,omitempty"`
-}
--- a/model/direct.go
+++ b/model/direct.go
@@ -1,8 +0,0 @@
-package model
-
-type DirectOutboundOptions struct {
-	DialerOptions
-	OverrideAddress string `json:"override_address,omitempty"`
-	OverridePort    uint16 `json:"override_port,omitempty"`
-	ProxyProtocol   uint8  `json:"proxy_protocol,omitempty"`
-}
--- a/model/group.go
+++ b/model/group.go
@@ -1,16 +0,0 @@
-package model
-
-type SelectorOutboundOptions struct {
-	Outbounds                 []string `json:"outbounds"`
-	Default                   string   `json:"default,omitempty"`
-	InterruptExistConnections bool     `json:"interrupt_exist_connections,omitempty"`
-}
-
-type URLTestOutboundOptions struct {
-	Outbounds                 []string `json:"outbounds"`
-	URL                       string   `json:"url,omitempty"`
-	Interval                  string   `json:"interval,omitempty"`
-	Tolerance                 uint16   `json:"tolerance,omitempty"`
-	IdleTimeout               string   `json:"idle_timeout,omitempty"`
-	InterruptExistConnections bool     `json:"interrupt_exist_connections,omitempty"`
-}
--- a/model/hysteria.go
+++ b/model/hysteria.go
@@ -1,18 +0,0 @@
-package model
-
-type HysteriaOutboundOptions struct {
-	DialerOptions
-	ServerOptions
-	Up                  string `json:"up,omitempty"`
-	UpMbps              int    `json:"up_mbps,omitempty"`
-	Down                string `json:"down,omitempty"`
-	DownMbps            int    `json:"down_mbps,omitempty"`
-	Obfs                string `json:"obfs,omitempty"`
-	Auth                []byte `json:"auth,omitempty"`
-	AuthString          string `json:"auth_str,omitempty"`
-	ReceiveWindowConn   uint64 `json:"recv_window_conn,omitempty"`
-	ReceiveWindow       uint64 `json:"recv_window,omitempty"`
-	DisableMTUDiscovery bool   `json:"disable_mtu_discovery,omitempty"`
-	Network             string `json:"network,omitempty"`
-	OutboundTLSOptionsContainer
-}
--- a/model/hysteria2.go
+++ b/model/hysteria2.go
@@ -1,18 +0,0 @@
-package model
-
-type Hysteria2Obfs struct {
-	Type     string `json:"type,omitempty"`
-	Password string `json:"password,omitempty"`
-}
-
-type Hysteria2OutboundOptions struct {
-	DialerOptions
-	ServerOptions
-	UpMbps   int            `json:"up_mbps,omitempty"`
-	DownMbps int            `json:"down_mbps,omitempty"`
-	Obfs     *Hysteria2Obfs `json:"obfs,omitempty"`
-	Password string         `json:"password,omitempty"`
-	Network  string         `json:"network,omitempty"`
-	OutboundTLSOptionsContainer
-	BrutalDebug bool `json:"brutal_debug,omitempty"`
-}
--- a/model/multiplex.go
+++ b/model/multiplex.go
@@ -1,17 +0,0 @@
-package model
-
-type OutboundMultiplexOptions struct {
-	Enabled        bool           `json:"enabled,omitempty"`
-	Protocol       string         `json:"protocol,omitempty"`
-	MaxConnections int            `json:"max_connections,omitempty"`
-	MinStreams     int            `json:"min_streams,omitempty"`
-	MaxStreams     int            `json:"max_streams,omitempty"`
-	Padding        bool           `json:"padding,omitempty"`
-	Brutal         *BrutalOptions `json:"brutal,omitempty"`
-}
-
-type BrutalOptions struct {
-	Enabled  bool `json:"enabled,omitempty"`
-	UpMbps   int  `json:"up_mbps,omitempty"`
-	DownMbps int  `json:"down_mbps,omitempty"`
-}
--- a/model/option.go
+++ b/model/option.go
@@ -0,0 +1,41 @@
+package model
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/sagernet/sing-box/option"
+)
+
+type _Options struct {
+	RawMessage   json.RawMessage             `json:"-"`
+	Schema       string                      `json:"$schema,omitempty"`
+	Log          *LogOptions                 `json:"log,omitempty"`
+	DNS          *option.DNSOptions          `json:"dns,omitempty"`
+	NTP          *option.NTPOptions          `json:"ntp,omitempty"`
+	Inbounds     []option.Inbound            `json:"inbounds,omitempty"`
+	Outbounds    []Outbound                  `json:"outbounds,omitempty"`
+	Route        *option.RouteOptions        `json:"route,omitempty"`
+	Experimental *option.ExperimentalOptions `json:"experimental,omitempty"`
+}
+
+type Options _Options
+
+func (o *Options) UnmarshalJSON(content []byte) error {
+	decoder := json.NewDecoder(bytes.NewReader(content))
+	decoder.DisallowUnknownFields()
+	err := decoder.Decode((*_Options)(o))
+	if err != nil {
+		return err
+	}
+	o.RawMessage = content
+	return nil
+}
+
+type LogOptions struct {
+	Disabled     bool   `json:"disabled,omitempty"`
+	Level        string `json:"level,omitempty"`
+	Output       string `json:"output,omitempty"`
+	Timestamp    bool   `json:"timestamp,omitempty"`
+	DisableColor bool   `json:"-"`
+}
--- a/model/outbound.go
+++ b/model/outbound.go
@@ -1,155 +1,12 @@
 package model

 import (
-	"encoding/json"
-	"errors"
-	"reflect"
-	"strings"
-
 	C "github.com/nitezs/sub2sing-box/constant"
+	"github.com/sagernet/sing-box/option"
 )

-type _Outbound struct {
-	Type                string                      `json:"type"`
-	Tag                 string                      `json:"tag,omitempty"`
-	DirectOptions       DirectOutboundOptions       `json:"-"`
-	SocksOptions        SocksOutboundOptions        `json:"-"`
-	HTTPOptions         HTTPOutboundOptions         `json:"-"`
-	ShadowsocksOptions  ShadowsocksOutboundOptions  `json:"-"`
-	VMessOptions        VMessOutboundOptions        `json:"-"`
-	TrojanOptions       TrojanOutboundOptions       `json:"-"`
-	WireGuardOptions    WireGuardOutboundOptions    `json:"-"`
-	HysteriaOptions     HysteriaOutboundOptions     `json:"-"`
-	TorOptions          TorOutboundOptions          `json:"-"`
-	SSHOptions          SSHOutboundOptions          `json:"-"`
-	ShadowTLSOptions    ShadowTLSOutboundOptions    `json:"-"`
-	ShadowsocksROptions ShadowsocksROutboundOptions `json:"-"`
-	VLESSOptions        VLESSOutboundOptions        `json:"-"`
-	TUICOptions         TUICOutboundOptions         `json:"-"`
-	Hysteria2Options    Hysteria2OutboundOptions    `json:"-"`
-	SelectorOptions     SelectorOutboundOptions     `json:"-"`
-	URLTestOptions      URLTestOutboundOptions      `json:"-"`
-}
-type Outbound _Outbound
-
-func (h *Outbound) RawOptions() (any, error) {
-	var rawOptionsPtr any
-	switch h.Type {
-	case C.TypeDirect:
-		rawOptionsPtr = &h.DirectOptions
-	case C.TypeBlock, C.TypeDNS:
-		rawOptionsPtr = nil
-	case C.TypeSOCKS:
-		rawOptionsPtr = &h.SocksOptions
-	case C.TypeHTTP:
-		rawOptionsPtr = &h.HTTPOptions
-	case C.TypeShadowsocks:
-		rawOptionsPtr = &h.ShadowsocksOptions
-	case C.TypeVMess:
-		rawOptionsPtr = &h.VMessOptions
-	case C.TypeTrojan:
-		rawOptionsPtr = &h.TrojanOptions
-	case C.TypeWireGuard:
-		rawOptionsPtr = &h.WireGuardOptions
-	case C.TypeHysteria:
-		rawOptionsPtr = &h.HysteriaOptions
-	case C.TypeTor:
-		rawOptionsPtr = &h.TorOptions
-	case C.TypeSSH:
-		rawOptionsPtr = &h.SSHOptions
-	case C.TypeShadowTLS:
-		rawOptionsPtr = &h.ShadowTLSOptions
-	case C.TypeShadowsocksR:
-		rawOptionsPtr = &h.ShadowsocksROptions
-	case C.TypeVLESS:
-		rawOptionsPtr = &h.VLESSOptions
-	case C.TypeTUIC:
-		rawOptionsPtr = &h.TUICOptions
-	case C.TypeHysteria2:
-		rawOptionsPtr = &h.Hysteria2Options
-	case C.TypeSelector:
-		rawOptionsPtr = &h.SelectorOptions
-	case C.TypeURLTest:
-		rawOptionsPtr = &h.URLTestOptions
-	case "":
-		return nil, errors.New("missing outbound type")
-	default:
-		return nil, errors.New("unknown outbound type: " + h.Type)
-	}
-	return rawOptionsPtr, nil
-}
-
-func (h *Outbound) MarshalJSON() ([]byte, error) {
-	rawOptions, err := h.RawOptions()
-	if err != nil {
-		return nil, err
-	}
-	if rawOptions == nil {
-		return json.Marshal((*_Outbound)(h))
-	}
-	result := make(map[string]any)
-	result["type"] = h.Type
-	result["tag"] = h.Tag
-	optsValue := reflect.ValueOf(rawOptions).Elem()
-	optsType := optsValue.Type()
-	for i := 0; i < optsType.NumField(); i++ {
-		field := optsValue.Field(i)
-		fieldType := optsType.Field(i)
-		if fieldType.Anonymous {
-			embeddedFields := reflect.ValueOf(field.Interface())
-			if field.Kind() == reflect.Struct {
-				for j := 0; j < embeddedFields.NumField(); j++ {
-					embeddedField := embeddedFields.Field(j)
-					embeddedFieldType := embeddedFields.Type().Field(j)
-					processField(embeddedField, embeddedFieldType, result)
-				}
-			}
-		} else {
-			processField(field, fieldType, result)
-		}
-	}
-	return json.Marshal(result)
-}
-
-func processField(field reflect.Value, fieldType reflect.StructField, result map[string]any) {
-	jsonTag := fieldType.Tag.Get("json")
-	if jsonTag == "-" {
-		return
-	}
-	tagParts := strings.Split(jsonTag, ",")
-	tagName := tagParts[0]
-	if len(tagParts) > 1 && tagParts[1] == "omitempty" && field.IsZero() {
-		return
-	}
-	result[tagName] = field.Interface()
-}
-
-func (h *Outbound) UnmarshalJSON(bytes []byte) error {
-	err := json.Unmarshal(bytes, (*_Outbound)(h))
-	if err != nil {
-		return err
-	}
-	rawOptions, err := h.RawOptions()
-	if err != nil {
-		return err
-	}
-	if rawOptions == nil {
-		return nil
-	}
-	err = json.Unmarshal(bytes, rawOptions)
-	if err != nil {
-		return err
-	}
-	rawOptionsType := reflect.TypeOf(rawOptions).Elem()
-	hValue := reflect.ValueOf(h).Elem()
-	for i := 0; i < hValue.NumField(); i++ {
-		fieldType := hValue.Field(i).Type()
-		if fieldType == rawOptionsType {
-			hValue.Field(i).Set(reflect.ValueOf(rawOptions).Elem())
-			return nil
-		}
-	}
-	return errors.New("unknown outbound type: " + h.Type)
+type Outbound struct {
+	option.Outbound
 }

 func (h *Outbound) GetOutbounds() []string {
@@ -170,26 +27,3 @@ func (h *Outbound) SetOutbounds(outbounds []string) {
 		h.URLTestOptions.Outbounds = outbounds
 	}
 }
-
-type DialerOptions struct {
-	Detour              string `json:"detour,omitempty"`
-	BindInterface       string `json:"bind_interface,omitempty"`
-	Inet4BindAddress    string `json:"inet4_bind_address,omitempty"`
-	Inet6BindAddress    string `json:"inet6_bind_address,omitempty"`
-	ProtectPath         string `json:"protect_path,omitempty"`
-	RoutingMark         int    `json:"routing_mark,omitempty"`
-	ReuseAddr           bool   `json:"reuse_addr,omitempty"`
-	ConnectTimeout      string `json:"connect_timeout,omitempty"`
-	TCPFastOpen         bool   `json:"tcp_fast_open,omitempty"`
-	TCPMultiPath        bool   `json:"tcp_multi_path,omitempty"`
-	UDPFragment         *bool  `json:"udp_fragment,omitempty"`
-	UDPFragmentDefault  bool   `json:"-"`
-	DomainStrategy      string `json:"domain_strategy,omitempty"`
-	FallbackDelay       string `json:"fallback_delay,omitempty"`
-	IsWireGuardListener bool   `json:"-"`
-}
-
-type ServerOptions struct {
-	Server     string `json:"server"`
-	ServerPort uint16 `json:"server_port"`
-}
--- a/model/shadowsocks.go
+++ b/model/shadowsocks.go
@@ -1,13 +0,0 @@
-package model
-
-type ShadowsocksOutboundOptions struct {
-	DialerOptions
-	ServerOptions
-	Method        string                    `json:"method"`
-	Password      string                    `json:"password"`
-	Plugin        string                    `json:"plugin,omitempty"`
-	PluginOptions string                    `json:"plugin_opts,omitempty"`
-	Network       string                    `json:"network,omitempty"`
-	UDPOverTCP    *UDPOverTCPOptions        `json:"udp_over_tcp,omitempty"`
-	Multiplex     *OutboundMultiplexOptions `json:"multiplex,omitempty"`
-}
--- a/model/shadowsocksr.go
+++ b/model/shadowsocksr.go
@@ -1,13 +0,0 @@
-package model
-
-type ShadowsocksROutboundOptions struct {
-	DialerOptions
-	ServerOptions
-	Method        string `json:"method"`
-	Password      string `json:"password"`
-	Obfs          string `json:"obfs,omitempty"`
-	ObfsParam     string `json:"obfs_param,omitempty"`
-	Protocol      string `json:"protocol,omitempty"`
-	ProtocolParam string `json:"protocol_param,omitempty"`
-	Network       string `json:"network,omitempty"`
-}
--- a/model/shadowtls.go
+++ b/model/shadowtls.go
@@ -1,19 +0,0 @@
-package model
-
-type ShadowTLSUser struct {
-	Name     string `json:"name,omitempty"`
-	Password string `json:"password,omitempty"`
-}
-
-type ShadowTLSHandshakeOptions struct {
-	ServerOptions
-	DialerOptions
-}
-
-type ShadowTLSOutboundOptions struct {
-	DialerOptions
-	ServerOptions
-	Version  int    `json:"version,omitempty"`
-	Password string `json:"password,omitempty"`
-	OutboundTLSOptionsContainer
-}
--- a/model/simple.go
+++ b/model/simple.go
@@ -1,21 +0,0 @@
-package model
-
-type SocksOutboundOptions struct {
-	DialerOptions
-	ServerOptions
-	Version    string             `json:"version,omitempty"`
-	Username   string             `json:"username,omitempty"`
-	Password   string             `json:"password,omitempty"`
-	Network    Listable[string]   `json:"network,omitempty"`
-	UDPOverTCP *UDPOverTCPOptions `json:"udp_over_tcp,omitempty"`
-}
-
-type HTTPOutboundOptions struct {
-	DialerOptions
-	ServerOptions
-	Username string `json:"username,omitempty"`
-	Password string `json:"password,omitempty"`
-	OutboundTLSOptionsContainer
-	Path    string            `json:"path,omitempty"`
-	Headers map[string]string `json:"headers,omitempty"`
-}
--- a/model/ssh.go
+++ b/model/ssh.go
@@ -1,14 +0,0 @@
-package model
-
-type SSHOutboundOptions struct {
-	DialerOptions
-	ServerOptions
-	User                 string           `json:"user,omitempty"`
-	Password             string           `json:"password,omitempty"`
-	PrivateKey           Listable[string] `json:"private_key,omitempty"`
-	PrivateKeyPath       string           `json:"private_key_path,omitempty"`
-	PrivateKeyPassphrase string           `json:"private_key_passphrase,omitempty"`
-	HostKey              Listable[string] `json:"host_key,omitempty"`
-	HostKeyAlgorithms    Listable[string] `json:"host_key_algorithms,omitempty"`
-	ClientVersion        string           `json:"client_version,omitempty"`
-}
--- a/model/tls.go
+++ b/model/tls.go
@@ -1,40 +0,0 @@
-package model
-
-type OutboundTLSOptions struct {
-	Enabled         bool                    `json:"enabled,omitempty"`
-	DisableSNI      bool                    `json:"disable_sni,omitempty"`
-	ServerName      string                  `json:"server_name,omitempty"`
-	Insecure        bool                    `json:"insecure,omitempty"`
-	ALPN            Listable[string]        `json:"alpn,omitempty"`
-	MinVersion      string                  `json:"min_version,omitempty"`
-	MaxVersion      string                  `json:"max_version,omitempty"`
-	CipherSuites    Listable[string]        `json:"cipher_suites,omitempty"`
-	Certificate     Listable[string]        `json:"certificate,omitempty"`
-	CertificatePath string                  `json:"certificate_path,omitempty"`
-	ECH             *OutboundECHOptions     `json:"ech,omitempty"`
-	UTLS            *OutboundUTLSOptions    `json:"utls,omitempty"`
-	Reality         *OutboundRealityOptions `json:"reality,omitempty"`
-}
-
-type OutboundECHOptions struct {
-	Enabled                     bool             `json:"enabled,omitempty"`
-	PQSignatureSchemesEnabled   bool             `json:"pq_signature_schemes_enabled,omitempty"`
-	DynamicRecordSizingDisabled bool             `json:"dynamic_record_sizing_disabled,omitempty"`
-	Config                      Listable[string] `json:"config,omitempty"`
-	ConfigPath                  string           `json:"config_path,omitempty"`
-}
-
-type OutboundUTLSOptions struct {
-	Enabled     bool   `json:"enabled,omitempty"`
-	Fingerprint string `json:"fingerprint,omitempty"`
-}
-
-type OutboundRealityOptions struct {
-	Enabled   bool   `json:"enabled,omitempty"`
-	PublicKey string `json:"public_key,omitempty"`
-	ShortID   string `json:"short_id,omitempty"`
-}
-
-type OutboundTLSOptionsContainer struct {
-	TLS *OutboundTLSOptions `json:"tls,omitempty"`
-}
--- a/model/tor.go
+++ b/model/tor.go
@@ -1,9 +0,0 @@
-package model
-
-type TorOutboundOptions struct {
-	DialerOptions
-	ExecutablePath string            `json:"executable_path,omitempty"`
-	ExtraArgs      []string          `json:"extra_args,omitempty"`
-	DataDirectory  string            `json:"data_directory,omitempty"`
-	Options        map[string]string `json:"torrc,omitempty"`
-}
--- a/model/trojan.go
+++ b/model/trojan.go
@@ -1,11 +0,0 @@
-package model
-
-type TrojanOutboundOptions struct {
-	DialerOptions
-	ServerOptions
-	Password string `json:"password"`
-	Network  string `json:"network,omitempty"`
-	OutboundTLSOptionsContainer
-	Multiplex *OutboundMultiplexOptions `json:"multiplex,omitempty"`
-	Transport *V2RayTransportOptions    `json:"transport,omitempty"`
-}
--- a/model/tuic.go
+++ b/model/tuic.go
@@ -1,15 +0,0 @@
-package model
-
-type TUICOutboundOptions struct {
-	DialerOptions
-	ServerOptions
-	UUID              string `json:"uuid,omitempty"`
-	Password          string `json:"password,omitempty"`
-	CongestionControl string `json:"congestion_control,omitempty"`
-	UDPRelayMode      string `json:"udp_relay_mode,omitempty"`
-	UDPOverStream     bool   `json:"udp_over_stream,omitempty"`
-	ZeroRTTHandshake  bool   `json:"zero_rtt_handshake,omitempty"`
-	Heartbeat         string `json:"heartbeat,omitempty"`
-	Network           string `json:"network,omitempty"`
-	OutboundTLSOptionsContainer
-}
--- a/model/udp_over_tcp.go
+++ b/model/udp_over_tcp.go
@@ -1,6 +0,0 @@
-package model
-
-type UDPOverTCPOptions struct {
-	Enabled bool  `json:"enabled,omitempty"`
-	Version uint8 `json:"version,omitempty"`
-}
--- a/model/v2ray_transport.go
+++ b/model/v2ray_transport.go
@@ -1,85 +0,0 @@
-package model
-
-import (
-	"encoding/json"
-)
-
-type V2RayTransportOptions struct {
-	Type               string                  `json:"type"`
-	HTTPOptions        V2RayHTTPOptions        `json:"-"`
-	WebsocketOptions   V2RayWebsocketOptions   `json:"-"`
-	QUICOptions        V2RayQUICOptions        `json:"-"`
-	GRPCOptions        V2RayGRPCOptions        `json:"-"`
-	HTTPUpgradeOptions V2RayHTTPUpgradeOptions `json:"-"`
-}
-
-func (o *V2RayTransportOptions) MarshalJSON() ([]byte, error) {
-	switch o.Type {
-	case "ws":
-		return json.Marshal(&struct {
-			Type string `json:"type"`
-			*V2RayWebsocketOptions
-		}{
-			Type:                  o.Type,
-			V2RayWebsocketOptions: &o.WebsocketOptions,
-		})
-	case "quic":
-		return json.Marshal(&struct {
-			Type string `json:"type"`
-			*V2RayQUICOptions
-		}{
-			Type:             o.Type,
-			V2RayQUICOptions: &o.QUICOptions,
-		})
-	case "grpc":
-		return json.Marshal(&struct {
-			Type string `json:"type"`
-			*V2RayGRPCOptions
-		}{
-			Type:             o.Type,
-			V2RayGRPCOptions: &o.GRPCOptions,
-		})
-	case "http":
-		return json.Marshal(&struct {
-			Type string `json:"type"`
-			*V2RayHTTPOptions
-		}{
-			Type:             o.Type,
-			V2RayHTTPOptions: &o.HTTPOptions,
-		})
-	default:
-		return json.Marshal(&struct{}{})
-	}
-}
-
-type V2RayHTTPOptions struct {
-	Host        Listable[string]  `json:"host,omitempty"`
-	Path        string            `json:"path,omitempty"`
-	Method      string            `json:"method,omitempty"`
-	Headers     map[string]string `json:"headers,omitempty"`
-	IdleTimeout string            `json:"idle_timeout,omitempty"`
-	PingTimeout string            `json:"ping_timeout,omitempty"`
-}
-
-type V2RayWebsocketOptions struct {
-	Path                string            `json:"path,omitempty"`
-	Headers             map[string]string `json:"headers,omitempty"`
-	MaxEarlyData        uint32            `json:"max_early_data,omitempty"`
-	EarlyDataHeaderName string            `json:"early_data_header_name,omitempty"`
-}
-
-type V2RayQUICOptions struct{}
-
-type V2RayGRPCOptions struct {
-	ServiceName         string `json:"service_name,omitempty"`
-	IdleTimeout         string `json:"idle_timeout,omitempty"`
-	PingTimeout         string `json:"ping_timeout,omitempty"`
-	PermitWithoutStream bool   `json:"permit_without_stream,omitempty"`
-	ForceLite           bool   `json:"-"` // for test
-}
-
-type V2RayHTTPUpgradeOptions struct {
-	Host    string            `json:"host,omitempty"`
-	Path    string            `json:"path,omitempty"`
-	Headers map[string]string `json:"headers,omitempty"`
-}
--- a/model/vless.go
+++ b/model/vless.go
@@ -1,13 +0,0 @@
-package model
-
-type VLESSOutboundOptions struct {
-	DialerOptions
-	ServerOptions
-	UUID    string `json:"uuid"`
-	Flow    string `json:"flow,omitempty"`
-	Network string `json:"network,omitempty"`
-	OutboundTLSOptionsContainer
-	Multiplex      *OutboundMultiplexOptions `json:"multiplex,omitempty"`
-	Transport      *V2RayTransportOptions    `json:"transport,omitempty"`
-	PacketEncoding *string                   `json:"packet_encoding,omitempty"`
-}
--- a/model/vmess.go
+++ b/model/vmess.go
@@ -17,18 +17,3 @@ type VmessJson struct {
 	Alpn string `json:"alpn"`
 	Fp   string `json:"fp"`
 }
-
-type VMessOutboundOptions struct {
-	DialerOptions
-	ServerOptions
-	UUID                string `json:"uuid"`
-	Security            string `json:"security"`
-	AlterId             int    `json:"alter_id,omitempty"`
-	GlobalPadding       bool   `json:"global_padding,omitempty"`
-	AuthenticatedLength bool   `json:"authenticated_length,omitempty"`
-	Network             string `json:"network,omitempty"`
-	OutboundTLSOptionsContainer
-	PacketEncoding string                    `json:"packet_encoding,omitempty"`
-	Multiplex      *OutboundMultiplexOptions `json:"multiplex,omitempty"`
-	Transport      *V2RayTransportOptions    `json:"transport,omitempty"`
-}
--- a/model/wireguard.go
+++ b/model/wireguard.go
@@ -1,28 +0,0 @@
-package model
-
-import "net/netip"
-
-type WireGuardOutboundOptions struct {
-	DialerOptions
-	SystemInterface bool                   `json:"system_interface,omitempty"`
-	GSO             bool                   `json:"gso,omitempty"`
-	InterfaceName   string                 `json:"interface_name,omitempty"`
-	LocalAddress    Listable[netip.Prefix] `json:"local_address"`
-	PrivateKey      string                 `json:"private_key"`
-	Peers           []WireGuardPeer        `json:"peers,omitempty"`
-	ServerOptions
-	PeerPublicKey string  `json:"peer_public_key"`
-	PreSharedKey  string  `json:"pre_shared_key,omitempty"`
-	Reserved      []uint8 `json:"reserved,omitempty"`
-	Workers       int     `json:"workers,omitempty"`
-	MTU           uint32  `json:"mtu,omitempty"`
-	Network       string  `json:"network,omitempty"`
-}
-
-type WireGuardPeer struct {
-	ServerOptions
-	PublicKey    string           `json:"public_key,omitempty"`
-	PreSharedKey string           `json:"pre_shared_key,omitempty"`
-	AllowedIPs   Listable[string] `json:"allowed_ips,omitempty"`
-	Reserved     []uint8          `json:"reserved,omitempty"`
-}