dan9i10/xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2026-05-08 14:13:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Exp: Make eveything listable

Browse Source
This commit is contained in:
Fangliding
2026-02-02 01:26:01 +08:00
parent 37efc4237a
commit e9a2d26c07
18 changed files with 282 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
infra/conf/api.go
View File

@@ -11,12 +11,13 @@ import (
statsservice "github.com/xtls/xray-core/app/stats/command"
"github.com/xtls/xray-core/common/errors"
"github.com/xtls/xray-core/common/serial"
"github.com/xtls/xray-core/infra/conf/cfgcommon/types"
)
type APIConfig struct {
Tag string `json:"tag"`
Listen string `json:"listen"`
Services []string `json:"services"`
Services types.Listable[string] `json:"services"`
}
func (c *APIConfig) Build() (*commander.Config, error) {

7
infra/conf/dns.go
View File

@@ -13,6 +13,7 @@ import (
"github.com/xtls/xray-core/app/router"
"github.com/xtls/xray-core/common/errors"
"github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/infra/conf/cfgcommon/types"
)
type NameServerConfig struct {
@@ -20,7 +21,7 @@ type NameServerConfig struct {
ClientIP *Address `json:"clientIp"`
Port uint16 `json:"port"`
SkipFallback bool `json:"skipFallback"`
Domains []string `json:"domains"`
Domains types.Listable[string] `json:"domains"`
ExpectedIPs StringList `json:"expectedIPs"`
ExpectIPs StringList `json:"expectIPs"`
QueryStrategy string `json:"queryStrategy"`
@@ -46,7 +47,7 @@ func (c *NameServerConfig) UnmarshalJSON(data []byte) error {
ClientIP *Address `json:"clientIp"`
Port uint16 `json:"port"`
SkipFallback bool `json:"skipFallback"`
Domains []string `json:"domains"`
Domains types.Listable[string] `json:"domains"`
ExpectedIPs StringList `json:"expectedIPs"`
ExpectIPs StringList `json:"expectIPs"`
QueryStrategy string `json:"queryStrategy"`
@@ -196,7 +197,7 @@ var typeMap = map[router.Domain_Type]dns.DomainMatchingType{
// DNSConfig is a JSON serializable object for dns.Config.
type DNSConfig struct {
Servers []*NameServerConfig `json:"servers"`
Servers types.Listable[*NameServerConfig] `json:"servers"`
Hosts *HostsWrapper `json:"hosts"`
ClientIP *Address `json:"clientIp"`
Tag string `json:"tag"`

3
infra/conf/dns_proxy.go
View File

@@ -3,6 +3,7 @@ package conf
import (
"github.com/xtls/xray-core/common/errors"
"github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/infra/conf/cfgcommon/types"
"github.com/xtls/xray-core/proxy/dns"
"google.golang.org/protobuf/proto"
)
@@ -13,7 +14,7 @@ type DNSOutboundConfig struct {
Port uint16 `json:"port"`
UserLevel uint32 `json:"userLevel"`
NonIPQuery string `json:"nonIPQuery"`
BlockTypes []int32 `json:"blockTypes"`
BlockTypes types.Listable[int32] `json:"blockTypes"`
}
func (c *DNSOutboundConfig) Build() (proto.Message, error) {

5
infra/conf/freedom.go
View File

@@ -9,9 +9,10 @@ import (
"github.com/xtls/xray-core/common/errors"
v2net "github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/common/protocol"
"github.com/xtls/xray-core/infra/conf/cfgcommon/types"
"github.com/xtls/xray-core/proxy/freedom"
"google.golang.org/protobuf/proto"
"github.com/xtls/xray-core/transport/internet"
"google.golang.org/protobuf/proto"
)
type FreedomConfig struct {
@@ -21,7 +22,7 @@ type FreedomConfig struct {
UserLevel uint32 `json:"userLevel"`
Fragment *Fragment `json:"fragment"`
Noise *Noise `json:"noise"`
Noises []*Noise `json:"noises"`
Noises types.Listable[*Noise] `json:"noises"`
ProxyProtocol uint32 `json:"proxyProtocol"`
}

7
infra/conf/http.go
View File

@@ -6,6 +6,7 @@ import (
"github.com/xtls/xray-core/common/errors"
"github.com/xtls/xray-core/common/protocol"
"github.com/xtls/xray-core/common/serial"
"github.com/xtls/xray-core/infra/conf/cfgcommon/types"
"github.com/xtls/xray-core/proxy/http"
"google.golang.org/protobuf/proto"
)
@@ -23,7 +24,7 @@ func (v *HTTPAccount) Build() *http.Account {
}
type HTTPServerConfig struct {
Accounts []*HTTPAccount `json:"accounts"`
Accounts types.Listable[*HTTPAccount] `json:"accounts"`
Transparent bool `json:"allowTransparent"`
UserLevel uint32 `json:"userLevel"`
}
@@ -47,7 +48,7 @@ func (c *HTTPServerConfig) Build() (proto.Message, error) {
type HTTPRemoteConfig struct {
Address *Address `json:"address"`
Port uint16 `json:"port"`
Users []json.RawMessage `json:"users"`
Users types.Listable[json.RawMessage] `json:"users"`
}
type HTTPClientConfig struct {
@@ -57,7 +58,7 @@ type HTTPClientConfig struct {
Email string `json:"email"`
Username string `json:"user"`
Password string `json:"pass"`
Servers []*HTTPRemoteConfig `json:"servers"`
Servers types.Listable[*HTTPRemoteConfig] `json:"servers"`
Headers map[string]string `json:"headers"`
}

7
infra/conf/observatory.go
View File

@@ -1,16 +1,15 @@
package conf
import (
"google.golang.org/protobuf/proto"
"github.com/xtls/xray-core/app/observatory"
"github.com/xtls/xray-core/app/observatory/burst"
"github.com/xtls/xray-core/common/errors"
"github.com/xtls/xray-core/infra/conf/cfgcommon/types"
"google.golang.org/protobuf/proto"
)
type ObservatoryConfig struct {
SubjectSelector []string `json:"subjectSelector"`
SubjectSelector types.Listable[string] `json:"subjectSelector"`
ProbeURL string `json:"probeURL"`
ProbeInterval types.Duration `json:"probeInterval"`
EnableConcurrency bool `json:"enableConcurrency"`
@@ -21,7 +20,7 @@ func (o *ObservatoryConfig) Build() (proto.Message, error) {
}
type BurstObservatoryConfig struct {
SubjectSelector []string `json:"subjectSelector"`
SubjectSelector types.Listable[string] `json:"subjectSelector"`
// health check settings
HealthCheck *healthCheckSettings `json:"pingConfig,omitempty"`
}

5
infra/conf/reverse.go
View File

@@ -2,6 +2,7 @@ package conf
import (
"github.com/xtls/xray-core/app/reverse"
"github.com/xtls/xray-core/infra/conf/cfgcommon/types"
"google.golang.org/protobuf/proto"
)
@@ -30,8 +31,8 @@ func (c *PortalConfig) Build() (*reverse.PortalConfig, error) {
}
type ReverseConfig struct {
Bridges []BridgeConfig `json:"bridges"`
Portals []PortalConfig `json:"portals"`
Bridges types.Listable[BridgeConfig] `json:"bridges"`
Portals types.Listable[PortalConfig] `json:"portals"`
}
func (c *ReverseConfig) Build() (proto.Message, error) {

5
infra/conf/router.go
View File

@@ -14,6 +14,7 @@ import (
"github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/common/platform/filesystem"
"github.com/xtls/xray-core/common/serial"
"github.com/xtls/xray-core/infra/conf/cfgcommon/types"
"google.golang.org/protobuf/proto"
)
@@ -74,9 +75,9 @@ func (r *BalancingRule) Build() (*router.BalancingRule, error) {
}
type RouterConfig struct {
RuleList []json.RawMessage `json:"rules"`
RuleList types.Listable[json.RawMessage] `json:"rules"`
DomainStrategy *string `json:"domainStrategy"`
Balancers []*BalancingRule `json:"balancers"`
Balancers types.Listable[*BalancingRule] `json:"balancers"`
}
func (c *RouterConfig) getDomainStrategy() router.Config_DomainStrategy {

7
infra/conf/router_strategy.go
View File

@@ -3,11 +3,10 @@ package conf
import (
"strings"
"google.golang.org/protobuf/proto"
"github.com/xtls/xray-core/app/observatory/burst"
"github.com/xtls/xray-core/app/router"
"github.com/xtls/xray-core/infra/conf/cfgcommon/types"
"google.golang.org/protobuf/proto"
)
const (
@@ -35,9 +34,9 @@ func (v *strategyEmptyConfig) Build() (proto.Message, error) {
type strategyLeastLoadConfig struct {
// weight settings
Costs []*router.StrategyWeight `json:"costs,omitempty"`
Costs types.Listable[*router.StrategyWeight] `json:"costs,omitempty"`
// ping rtt baselines
Baselines []types.Duration `json:"baselines,omitempty"`
Baselines types.Listable[types.Duration] `json:"baselines,omitempty"`
// expected nodes count to select
Expected int32 `json:"expected,omitempty"`
// max acceptable rtt, filter away high delay nodes. default 0

5
infra/conf/shadowsocks.go
View File

@@ -8,6 +8,7 @@ import (
"github.com/xtls/xray-core/common/errors"
"github.com/xtls/xray-core/common/protocol"
"github.com/xtls/xray-core/common/serial"
"github.com/xtls/xray-core/infra/conf/cfgcommon/types"
"github.com/xtls/xray-core/proxy/shadowsocks"
"github.com/xtls/xray-core/proxy/shadowsocks_2022"
"google.golang.org/protobuf/proto"
@@ -44,7 +45,7 @@ type ShadowsocksServerConfig struct {
Password string `json:"password"`
Level byte `json:"level"`
Email string `json:"email"`
Users []*ShadowsocksUserConfig `json:"clients"`
Users types.Listable[*ShadowsocksUserConfig] `json:"clients"`
NetworkList *NetworkList `json:"network"`
}
@@ -178,7 +179,7 @@ type ShadowsocksClientConfig struct {
Password string `json:"password"`
UoT bool `json:"uot"`
UoTVersion int `json:"uotVersion"`
Servers []*ShadowsocksServerTarget `json:"servers"`
Servers types.Listable[*ShadowsocksServerTarget] `json:"servers"`
}
func (v *ShadowsocksClientConfig) Build() (proto.Message, error) {

7
infra/conf/socks.go
View File

@@ -6,6 +6,7 @@ import (
"github.com/xtls/xray-core/common/errors"
"github.com/xtls/xray-core/common/protocol"
"github.com/xtls/xray-core/common/serial"
"github.com/xtls/xray-core/infra/conf/cfgcommon/types"
"github.com/xtls/xray-core/proxy/socks"
"google.golang.org/protobuf/proto"
)
@@ -29,7 +30,7 @@ const (
type SocksServerConfig struct {
AuthMethod string `json:"auth"`
Accounts []*SocksAccount `json:"accounts"`
Accounts types.Listable[*SocksAccount] `json:"accounts"`
UDP bool `json:"udp"`
Host *Address `json:"ip"`
UserLevel uint32 `json:"userLevel"`
@@ -66,7 +67,7 @@ func (v *SocksServerConfig) Build() (proto.Message, error) {
type SocksRemoteConfig struct {
Address *Address `json:"address"`
Port uint16 `json:"port"`
Users []json.RawMessage `json:"users"`
Users types.Listable[json.RawMessage] `json:"users"`
}
type SocksClientConfig struct {
@@ -76,7 +77,7 @@ type SocksClientConfig struct {
Email string `json:"email"`
Username string `json:"user"`
Password string `json:"pass"`
Servers []*SocksRemoteConfig `json:"servers"`
Servers types.Listable[*SocksRemoteConfig] `json:"servers"`
}
func (v *SocksClientConfig) Build() (proto.Message, error) {

19
infra/conf/transport_internet.go
View File

@@ -15,6 +15,7 @@ import (
"github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/common/platform/filesystem"
"github.com/xtls/xray-core/common/serial"
"github.com/xtls/xray-core/infra/conf/cfgcommon/types"
"github.com/xtls/xray-core/transport/internet"
"github.com/xtls/xray-core/transport/internet/finalmask/salamander"
"github.com/xtls/xray-core/transport/internet/httpupgrade"
@@ -517,9 +518,9 @@ func readFileOrString(f string, s []string) ([]byte, error) {
type TLSCertConfig struct {
CertFile string `json:"certificateFile"`
CertStr []string `json:"certificate"`
CertStr types.Listable[string] `json:"certificate"`
KeyFile string `json:"keyFile"`
KeyStr []string `json:"key"`
KeyStr types.Listable[string] `json:"key"`
Usage string `json:"usage"`
OcspStapling uint64 `json:"ocspStapling"`
OneTimeLoading bool `json:"oneTimeLoading"`
@@ -569,7 +570,7 @@ func (c *TLSCertConfig) Build() (*tls.Certificate, error) {
type TLSConfig struct {
AllowInsecure bool `json:"allowInsecure"`
Certs []*TLSCertConfig `json:"certificates"`
Certs types.Listable[*TLSCertConfig] `json:"certificates"`
ServerName string `json:"serverName"`
ALPN *StringList `json:"alpn"`
EnableSessionResumption bool `json:"enableSessionResumption"`
@@ -583,7 +584,7 @@ type TLSConfig struct {
MasterKeyLog string `json:"masterKeyLog"`
PinnedPeerCertSha256 string `json:"pinnedPeerCertSha256"`
VerifyPeerCertByName string `json:"verifyPeerCertByName"`
VerifyPeerCertInNames []string `json:"verifyPeerCertInNames"`
VerifyPeerCertInNames types.Listable[string] `json:"verifyPeerCertInNames"`
ECHServerKeys string `json:"echServerKeys"`
ECHConfigList string `json:"echConfigList"`
ECHForceQuery string `json:"echForceQuery"`
@@ -699,12 +700,12 @@ type REALITYConfig struct {
Dest json.RawMessage `json:"dest"`
Type string `json:"type"`
Xver uint64 `json:"xver"`
ServerNames []string `json:"serverNames"`
ServerNames types.Listable[string] `json:"serverNames"`
PrivateKey string `json:"privateKey"`
MinClientVer string `json:"minClientVer"`
MaxClientVer string `json:"maxClientVer"`
MaxTimeDiff uint64 `json:"maxTimeDiff"`
ShortIds []string `json:"shortIds"`
ShortIds types.Listable[string] `json:"shortIds"`
Mldsa65Seed string `json:"mldsa65Seed"`
LimitFallbackUpload LimitFallback `json:"limitFallbackUpload"`
@@ -982,10 +983,10 @@ type SocketConfig struct {
V6only bool `json:"v6only"`
Interface string `json:"interface"`
TcpMptcp bool `json:"tcpMptcp"`
CustomSockopt []*CustomSockoptConfig `json:"customSockopt"`
CustomSockopt types.Listable[*CustomSockoptConfig] `json:"customSockopt"`
AddressPortStrategy string `json:"addressPortStrategy"`
HappyEyeballsSettings *HappyEyeballsConfig `json:"happyEyeballs"`
TrustedXForwardedFor []string `json:"trustedXForwardedFor"`
TrustedXForwardedFor types.Listable[string] `json:"trustedXForwardedFor"`
}
// Build implements Buildable.
@@ -1156,7 +1157,7 @@ type StreamConfig struct {
Port uint16 `json:"port"`
Network *TransportProtocol `json:"network"`
Security string `json:"security"`
Udpmasks []*FinalMask `json:"udpmasks"`
Udpmasks types.Listable[*FinalMask] `json:"udpmasks"`
TLSSettings *TLSConfig `json:"tlsSettings"`
REALITYSettings *REALITYConfig `json:"realitySettings"`
RAWSettings *TCPConfig `json:"rawSettings"`

7
infra/conf/trojan.go
View File

@@ -12,6 +12,7 @@ import (
"github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/common/protocol"
"github.com/xtls/xray-core/common/serial"
"github.com/xtls/xray-core/infra/conf/cfgcommon/types"
"github.com/xtls/xray-core/proxy/trojan"
"google.golang.org/protobuf/proto"
)
@@ -34,7 +35,7 @@ type TrojanClientConfig struct {
Email string `json:"email"`
Password string `json:"password"`
Flow string `json:"flow"`
Servers []*TrojanServerTarget `json:"servers"`
Servers types.Listable[*TrojanServerTarget] `json:"servers"`
}
// Build implements Buildable
@@ -111,8 +112,8 @@ type TrojanUserConfig struct {
// TrojanServerConfig is Inbound configuration
type TrojanServerConfig struct {
Clients []*TrojanUserConfig `json:"clients"`
Fallbacks []*TrojanInboundFallback `json:"fallbacks"`
Clients types.Listable[*TrojanUserConfig] `json:"clients"`
Fallbacks types.Listable[*TrojanInboundFallback] `json:"fallbacks"`
}
// Build implements Buildable

3
infra/conf/version.go
View File

@@ -1,9 +1,10 @@
package conf
import (
"strconv"
"github.com/xtls/xray-core/app/version"
"github.com/xtls/xray-core/core"
"strconv"
)
type VersionConfig struct {

13
infra/conf/vless.go
View File

@@ -14,6 +14,7 @@ import (
"github.com/xtls/xray-core/common/protocol"
"github.com/xtls/xray-core/common/serial"
"github.com/xtls/xray-core/common/uuid"
"github.com/xtls/xray-core/infra/conf/cfgcommon/types"
"github.com/xtls/xray-core/proxy/vless"
"github.com/xtls/xray-core/proxy/vless/inbound"
"github.com/xtls/xray-core/proxy/vless/outbound"
@@ -30,11 +31,11 @@ type VLessInboundFallback struct {
}
type VLessInboundConfig struct {
Clients []json.RawMessage `json:"clients"`
Clients types.Listable[json.RawMessage] `json:"clients"`
Decryption string `json:"decryption"`
Fallbacks []*VLessInboundFallback `json:"fallbacks"`
Fallbacks types.Listable[*VLessInboundFallback] `json:"fallbacks"`
Flow string `json:"flow"`
Testseed []uint32 `json:"testseed"`
Testseed types.Listable[uint32] `json:"testseed"`
}
// Build implements Buildable
@@ -203,7 +204,7 @@ func (c *VLessInboundConfig) Build() (proto.Message, error) {
type VLessOutboundVnext struct {
Address *Address `json:"address"`
Port uint16 `json:"port"`
Users []json.RawMessage `json:"users"`
Users types.Listable[json.RawMessage] `json:"users"`
}
type VLessOutboundConfig struct {
@@ -217,8 +218,8 @@ type VLessOutboundConfig struct {
Encryption string `json:"encryption"`
Reverse *vless.Reverse `json:"reverse"`
Testpre uint32 `json:"testpre"`
Testseed []uint32 `json:"testseed"`
Vnext []*VLessOutboundVnext `json:"vnext"`
Testseed types.Listable[uint32] `json:"testseed"`
Vnext types.Listable[*VLessOutboundVnext] `json:"vnext"`
}
// Build implements Buildable

7
infra/conf/vmess.go
View File

@@ -8,6 +8,7 @@ import (
"github.com/xtls/xray-core/common/protocol"
"github.com/xtls/xray-core/common/serial"
"github.com/xtls/xray-core/common/uuid"
"github.com/xtls/xray-core/infra/conf/cfgcommon/types"
"github.com/xtls/xray-core/proxy/vmess"
"github.com/xtls/xray-core/proxy/vmess/inbound"
"github.com/xtls/xray-core/proxy/vmess/outbound"
@@ -58,7 +59,7 @@ func (c *VMessDefaultConfig) Build() *inbound.DefaultConfig {
}
type VMessInboundConfig struct {
Users []json.RawMessage `json:"clients"`
Users types.Listable[json.RawMessage] `json:"clients"`
Defaults *VMessDefaultConfig `json:"default"`
}
@@ -99,7 +100,7 @@ func (c *VMessInboundConfig) Build() (proto.Message, error) {
type VMessOutboundTarget struct {
Address *Address `json:"address"`
Port uint16 `json:"port"`
Users []json.RawMessage `json:"users"`
Users types.Listable[json.RawMessage] `json:"users"`
}
type VMessOutboundConfig struct {
@@ -110,7 +111,7 @@ type VMessOutboundConfig struct {
ID string `json:"id"`
Security string `json:"security"`
Experiments string `json:"experiments"`
Receivers []*VMessOutboundTarget `json:"vnext"`
Receivers types.Listable[*VMessOutboundTarget] `json:"vnext"`
}
// Build implements Buildable

7
infra/conf/wireguard.go
View File

@@ -6,6 +6,7 @@ import (
"strings"
"github.com/xtls/xray-core/common/errors"
"github.com/xtls/xray-core/infra/conf/cfgcommon/types"
"github.com/xtls/xray-core/proxy/wireguard"
"google.golang.org/protobuf/proto"
)
@@ -15,7 +16,7 @@ type WireGuardPeerConfig struct {
PreSharedKey string `json:"preSharedKey"`
Endpoint string `json:"endpoint"`
KeepAlive uint32 `json:"keepAlive"`
AllowedIPs []string `json:"allowedIPs,omitempty"`
AllowedIPs types.Listable[string] `json:"allowedIPs,omitempty"`
}
func (c *WireGuardPeerConfig) Build() (proto.Message, error) {
@@ -53,8 +54,8 @@ type WireGuardConfig struct {
NoKernelTun bool `json:"noKernelTun"`
SecretKey string `json:"secretKey"`
Address []string `json:"address"`
Peers []*WireGuardPeerConfig `json:"peers"`
Address types.Listable[string] `json:"address"`
Peers types.Listable[*WireGuardPeerConfig] `json:"peers"`
MTU int32 `json:"mtu"`
NumWorkers int32 `json:"workers"`
Reserved []byte `json:"reserved"`

5
infra/conf/xray.go
View File

@@ -13,6 +13,7 @@ import (
"github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/common/serial"
core "github.com/xtls/xray-core/core"
"github.com/xtls/xray-core/infra/conf/cfgcommon/types"
"github.com/xtls/xray-core/transport/internet"
)
@@ -341,8 +342,8 @@ type Config struct {
LogConfig *LogConfig `json:"log"`
RouterConfig *RouterConfig `json:"routing"`
DNSConfig *DNSConfig `json:"dns"`
InboundConfigs []InboundDetourConfig `json:"inbounds"`
OutboundConfigs []OutboundDetourConfig `json:"outbounds"`
InboundConfigs types.Listable[InboundDetourConfig] `json:"inbounds"`
OutboundConfigs types.Listable[OutboundDetourConfig] `json:"outbounds"`
Policy *PolicyConfig `json:"policy"`
API *APIConfig `json:"api"`
Metrics *MetricsConfig `json:"metrics"`