nite/sub2clash
1
0
Fork 0
mirror of https://github.com/bestnite/sub2clash.git synced 2025-10-26 01:01:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

#69

Browse Source
This commit is contained in:
nite
2025-10-17 18:13:49 +11:00
parent be656cca57
commit 1e8a79c2d2
21 changed files with 186 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
model/proxy/anytls.go
View File

@@ -2,17 +2,17 @@ package proxy
// https://github.com/MetaCubeX/mihomo/blob/Meta/adapter/outbound/anytls.go // https://github.com/MetaCubeX/mihomo/blob/Meta/adapter/outbound/anytls.go
type Anytls struct { type Anytls struct {
Server string `yaml:"server"` Server string `yaml:"server"`
Port int `yaml:"port"` Port IntOrString `yaml:"port"`
Password string `yaml:"password"` Password string `yaml:"password"`
ALPN []string `yaml:"alpn,omitempty"` ALPN []string `yaml:"alpn,omitempty"`
SNI string `yaml:"sni,omitempty"` SNI string `yaml:"sni,omitempty"`
ECHOpts ECHOptions `yaml:"ech-opts,omitempty"` ECHOpts ECHOptions `yaml:"ech-opts,omitempty"`
ClientFingerprint string `yaml:"client-fingerprint,omitempty"` ClientFingerprint string `yaml:"client-fingerprint,omitempty"`
SkipCertVerify bool `yaml:"skip-cert-verify,omitempty"` SkipCertVerify bool `yaml:"skip-cert-verify,omitempty"`
Fingerprint string `yaml:"fingerprint,omitempty"` Fingerprint string `yaml:"fingerprint,omitempty"`
UDP bool `yaml:"udp,omitempty"` UDP bool `yaml:"udp,omitempty"`
IdleSessionCheckInterval int `yaml:"idle-session-check-interval,omitempty"` IdleSessionCheckInterval int `yaml:"idle-session-check-interval,omitempty"`
IdleSessionTimeout int `yaml:"idle-session-timeout,omitempty"` IdleSessionTimeout int `yaml:"idle-session-timeout,omitempty"`
MinIdleSession int `yaml:"min-idle-session,omitempty"` MinIdleSession int `yaml:"min-idle-session,omitempty"`
} }

48
model/proxy/hysteria.go
View File

@@ -2,28 +2,28 @@ package proxy
// https://github.com/MetaCubeX/mihomo/blob/Meta/adapter/outbound/hysteria.go // https://github.com/MetaCubeX/mihomo/blob/Meta/adapter/outbound/hysteria.go
type Hysteria struct { type Hysteria struct {
Server string `yaml:"server"` Server string `yaml:"server"`
Port int `yaml:"port,omitempty"` Port IntOrString `yaml:"port,omitempty"`
Ports string `yaml:"ports,omitempty"` Ports string `yaml:"ports,omitempty"`
Protocol string `yaml:"protocol,omitempty"` Protocol string `yaml:"protocol,omitempty"`
ObfsProtocol string `yaml:"obfs-protocol,omitempty"` // compatible with Stash ObfsProtocol string `yaml:"obfs-protocol,omitempty"` // compatible with Stash
Up string `yaml:"up"` Up string `yaml:"up"`
UpSpeed int `yaml:"up-speed,omitempty"` // compatible with Stash UpSpeed int `yaml:"up-speed,omitempty"` // compatible with Stash
Down string `yaml:"down"` Down string `yaml:"down"`
DownSpeed int `yaml:"down-speed,omitempty"` // compatible with Stash DownSpeed int `yaml:"down-speed,omitempty"` // compatible with Stash
Auth string `yaml:"auth,omitempty"` Auth string `yaml:"auth,omitempty"`
AuthString string `yaml:"auth-str,omitempty"` AuthString string `yaml:"auth-str,omitempty"`
Obfs string `yaml:"obfs,omitempty"` Obfs string `yaml:"obfs,omitempty"`
SNI string `yaml:"sni,omitempty"` SNI string `yaml:"sni,omitempty"`
ECHOpts ECHOptions `yaml:"ech-opts,omitempty"` ECHOpts ECHOptions `yaml:"ech-opts,omitempty"`
SkipCertVerify bool `yaml:"skip-cert-verify,omitempty"` SkipCertVerify bool `yaml:"skip-cert-verify,omitempty"`
Fingerprint string `yaml:"fingerprint,omitempty"` Fingerprint string `yaml:"fingerprint,omitempty"`
ALPN []string `yaml:"alpn,omitempty"` ALPN []string `yaml:"alpn,omitempty"`
CustomCA string `yaml:"ca,omitempty"` CustomCA string `yaml:"ca,omitempty"`
CustomCAString string `yaml:"ca-str,omitempty"` CustomCAString string `yaml:"ca-str,omitempty"`
ReceiveWindowConn int `yaml:"recv-window-conn,omitempty"` ReceiveWindowConn int `yaml:"recv-window-conn,omitempty"`
ReceiveWindow int `yaml:"recv-window,omitempty"` ReceiveWindow int `yaml:"recv-window,omitempty"`
DisableMTUDiscovery bool `yaml:"disable-mtu-discovery,omitempty"` DisableMTUDiscovery bool `yaml:"disable-mtu-discovery,omitempty"`
FastOpen bool `yaml:"fast-open,omitempty"` FastOpen bool `yaml:"fast-open,omitempty"`
HopInterval int `yaml:"hop-interval,omitempty"` HopInterval int `yaml:"hop-interval,omitempty"`
} }

36
model/proxy/hysteria2.go
View File

@@ -2,24 +2,24 @@ package proxy
// https://github.com/MetaCubeX/mihomo/blob/Meta/adapter/outbound/hysteria2.go // https://github.com/MetaCubeX/mihomo/blob/Meta/adapter/outbound/hysteria2.go
type Hysteria2 struct { type Hysteria2 struct {
Server string `yaml:"server"` Server string `yaml:"server"`
Port int `yaml:"port,omitempty"` Port IntOrString `yaml:"port,omitempty"`
Ports string `yaml:"ports,omitempty"` Ports string `yaml:"ports,omitempty"`
HopInterval int `yaml:"hop-interval,omitempty"` HopInterval int `yaml:"hop-interval,omitempty"`
Up string `yaml:"up,omitempty"` Up string `yaml:"up,omitempty"`
Down string `yaml:"down,omitempty"` Down string `yaml:"down,omitempty"`
Password string `yaml:"password,omitempty"` Password string `yaml:"password,omitempty"`
Obfs string `yaml:"obfs,omitempty"` Obfs string `yaml:"obfs,omitempty"`
ObfsPassword string `yaml:"obfs-password,omitempty"` ObfsPassword string `yaml:"obfs-password,omitempty"`
SNI string `yaml:"sni,omitempty"` SNI string `yaml:"sni,omitempty"`
ECHOpts ECHOptions `yaml:"ech-opts,omitempty"` ECHOpts ECHOptions `yaml:"ech-opts,omitempty"`
SkipCertVerify bool `yaml:"skip-cert-verify,omitempty"` SkipCertVerify bool `yaml:"skip-cert-verify,omitempty"`
Fingerprint string `yaml:"fingerprint,omitempty"` Fingerprint string `yaml:"fingerprint,omitempty"`
ALPN []string `yaml:"alpn,omitempty"` ALPN []string `yaml:"alpn,omitempty"`
CustomCA string `yaml:"ca,omitempty"` CustomCA string `yaml:"ca,omitempty"`
CustomCAString string `yaml:"ca-str,omitempty"` CustomCAString string `yaml:"ca-str,omitempty"`
CWND int `yaml:"cwnd,omitempty"` CWND int `yaml:"cwnd,omitempty"`
UdpMTU int `yaml:"udp-mtu,omitempty"` UdpMTU int `yaml:"udp-mtu,omitempty"`
// quic-go special config // quic-go special config
InitialStreamReceiveWindow uint64 `yaml:"initial-stream-receive-window,omitempty"` InitialStreamReceiveWindow uint64 `yaml:"initial-stream-receive-window,omitempty"`

21
model/proxy/proxy.go
View File

@@ -2,10 +2,31 @@ package proxy
import ( import (
"fmt" "fmt"
"strconv"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"
) )
type IntOrString int
func (i *IntOrString) UnmarshalYAML(value *yaml.Node) error {
intVal := 0
err := yaml.Unmarshal([]byte(value.Value), &intVal)
if err == nil {
*i = IntOrString(intVal)
}
strVal := ""
err = yaml.Unmarshal([]byte(value.Value), &strVal)
if err == nil {
_int, err := strconv.ParseInt(strVal, 10, 64)
if err != nil {
*i = IntOrString(_int)
}
return err
}
return nil
}
type HTTPOptions struct { type HTTPOptions struct {
Method string `yaml:"method,omitempty"` Method string `yaml:"method,omitempty"`
Path []string `yaml:"path,omitempty"` Path []string `yaml:"path,omitempty"`

2
model/proxy/shadowsocks.go
View File

@@ -3,7 +3,7 @@ package proxy
// https://github.com/MetaCubeX/mihomo/blob/Meta/adapter/outbound/shadowsocks.go // https://github.com/MetaCubeX/mihomo/blob/Meta/adapter/outbound/shadowsocks.go
type ShadowSocks struct { type ShadowSocks struct {
Server string `yaml:"server"` Server string `yaml:"server"`
Port int `yaml:"port"` Port IntOrString `yaml:"port"`
Password string `yaml:"password"` Password string `yaml:"password"`
Cipher string `yaml:"cipher"` Cipher string `yaml:"cipher"`
UDP bool `yaml:"udp,omitempty"` UDP bool `yaml:"udp,omitempty"`

18
model/proxy/shadowsocksr.go
View File

@@ -2,13 +2,13 @@ package proxy
// https://github.com/MetaCubeX/mihomo/blob/Meta/adapter/outbound/shadowsocksr.go // https://github.com/MetaCubeX/mihomo/blob/Meta/adapter/outbound/shadowsocksr.go
type ShadowSocksR struct { type ShadowSocksR struct {
Server string `yaml:"server"` Server string `yaml:"server"`
Port int `yaml:"port"` Port IntOrString `yaml:"port"`
Password string `yaml:"password"` Password string `yaml:"password"`
Cipher string `yaml:"cipher"` Cipher string `yaml:"cipher"`
Obfs string `yaml:"obfs"` Obfs string `yaml:"obfs"`
ObfsParam string `yaml:"obfs-param,omitempty"` ObfsParam string `yaml:"obfs-param,omitempty"`
Protocol string `yaml:"protocol"` Protocol string `yaml:"protocol"`
ProtocolParam string `yaml:"protocol-param,omitempty"` ProtocolParam string `yaml:"protocol-param,omitempty"`
UDP bool `yaml:"udp,omitempty"` UDP bool `yaml:"udp,omitempty"`
} }

16
model/proxy/socks.go
View File

@@ -2,12 +2,12 @@ package proxy
// https://github.com/MetaCubeX/mihomo/blob/Meta/adapter/outbound/socks5.go // https://github.com/MetaCubeX/mihomo/blob/Meta/adapter/outbound/socks5.go
type Socks struct { type Socks struct {
Server string `yaml:"server"` Server string `yaml:"server"`
Port int `yaml:"port"` Port IntOrString `yaml:"port"`
UserName string `yaml:"username,omitempty"` UserName string `yaml:"username,omitempty"`
Password string `yaml:"password,omitempty"` Password string `yaml:"password,omitempty"`
TLS bool `yaml:"tls,omitempty"` TLS bool `yaml:"tls,omitempty"`
UDP bool `yaml:"udp,omitempty"` UDP bool `yaml:"udp,omitempty"`
SkipCertVerify bool `yaml:"skip-cert-verify,omitempty"` SkipCertVerify bool `yaml:"skip-cert-verify,omitempty"`
Fingerprint string `yaml:"fingerprint,omitempty"` Fingerprint string `yaml:"fingerprint,omitempty"`
} }

2
model/proxy/trojan.go
View File

@@ -3,7 +3,7 @@ package proxy
// https://github.com/MetaCubeX/mihomo/blob/Meta/adapter/outbound/trojan.go // https://github.com/MetaCubeX/mihomo/blob/Meta/adapter/outbound/trojan.go
type Trojan struct { type Trojan struct {
Server string `yaml:"server"` Server string `yaml:"server"`
Port int `yaml:"port"` Port IntOrString `yaml:"port"`
Password string `yaml:"password"` Password string `yaml:"password"`
ALPN []string `yaml:"alpn,omitempty"` ALPN []string `yaml:"alpn,omitempty"`
SNI string `yaml:"sni,omitempty"` SNI string `yaml:"sni,omitempty"`

2
model/proxy/vless.go
View File

@@ -3,7 +3,7 @@ package proxy
// https://github.com/MetaCubeX/mihomo/blob/Meta/adapter/outbound/vless.go // https://github.com/MetaCubeX/mihomo/blob/Meta/adapter/outbound/vless.go
type Vless struct { type Vless struct {
Server string `yaml:"server"` Server string `yaml:"server"`
Port int `yaml:"port"` Port IntOrString `yaml:"port"`
UUID string `yaml:"uuid"` UUID string `yaml:"uuid"`
Flow string `yaml:"flow,omitempty"` Flow string `yaml:"flow,omitempty"`
TLS bool `yaml:"tls,omitempty"` TLS bool `yaml:"tls,omitempty"`

4
model/proxy/vmess.go
View File

@@ -3,9 +3,9 @@ package proxy
// https://github.com/MetaCubeX/mihomo/blob/Meta/adapter/outbound/vmess.go // https://github.com/MetaCubeX/mihomo/blob/Meta/adapter/outbound/vmess.go
type Vmess struct { type Vmess struct {
Server string `yaml:"server"` Server string `yaml:"server"`
Port int `yaml:"port"` Port IntOrString `yaml:"port"`
UUID string `yaml:"uuid"` UUID string `yaml:"uuid"`
AlterID int `yaml:"alterId"` AlterID IntOrString `yaml:"alterId"`
Cipher string `yaml:"cipher"` Cipher string `yaml:"cipher"`
UDP bool `yaml:"udp,omitempty"` UDP bool `yaml:"udp,omitempty"`
Network string `yaml:"network,omitempty"` Network string `yaml:"network,omitempty"`

90
model/subscription.go
View File

@@ -14,51 +14,51 @@ type NodeList struct {
// https://github.com/MetaCubeX/mihomo/blob/Meta/config/config.go RawConfig // https://github.com/MetaCubeX/mihomo/blob/Meta/config/config.go RawConfig
type Subscription struct { type Subscription struct {
Port int `yaml:"port,omitempty" json:"port"` Port proxy.IntOrString `yaml:"port,omitempty" json:"port"`
SocksPort int `yaml:"socks-port,omitempty" json:"socks-port"` SocksPort proxy.IntOrString `yaml:"socks-port,omitempty" json:"socks-port"`
RedirPort int `yaml:"redir-port,omitempty" json:"redir-port"` RedirPort proxy.IntOrString `yaml:"redir-port,omitempty" json:"redir-port"`
TProxyPort int `yaml:"tproxy-port,omitempty" json:"tproxy-port"` TProxyPort proxy.IntOrString `yaml:"tproxy-port,omitempty" json:"tproxy-port"`
MixedPort int `yaml:"mixed-port,omitempty" json:"mixed-port"` MixedPort proxy.IntOrString `yaml:"mixed-port,omitempty" json:"mixed-port"`
ShadowSocksConfig string `yaml:"ss-config,omitempty" json:"ss-config"` ShadowSocksConfig string `yaml:"ss-config,omitempty" json:"ss-config"`
VmessConfig string `yaml:"vmess-config,omitempty" json:"vmess-config"` VmessConfig string `yaml:"vmess-config,omitempty" json:"vmess-config"`
InboundTfo bool `yaml:"inbound-tfo,omitempty" json:"inbound-tfo"` InboundTfo bool `yaml:"inbound-tfo,omitempty" json:"inbound-tfo"`
InboundMPTCP bool `yaml:"inbound-mptcp,omitempty" json:"inbound-mptcp"` InboundMPTCP bool `yaml:"inbound-mptcp,omitempty" json:"inbound-mptcp"`
Authentication []string `yaml:"authentication,omitempty" json:"authentication"` Authentication []string `yaml:"authentication,omitempty" json:"authentication"`
SkipAuthPrefixes []netip.Prefix `yaml:"skip-auth-prefixes,omitempty" json:"skip-auth-prefixes"` SkipAuthPrefixes []netip.Prefix `yaml:"skip-auth-prefixes,omitempty" json:"skip-auth-prefixes"`
LanAllowedIPs []netip.Prefix `yaml:"lan-allowed-ips,omitempty" json:"lan-allowed-ips"` LanAllowedIPs []netip.Prefix `yaml:"lan-allowed-ips,omitempty" json:"lan-allowed-ips"`
LanDisAllowedIPs []netip.Prefix `yaml:"lan-disallowed-ips,omitempty" json:"lan-disallowed-ips"` LanDisAllowedIPs []netip.Prefix `yaml:"lan-disallowed-ips,omitempty" json:"lan-disallowed-ips"`
AllowLan bool `yaml:"allow-lan,omitempty" json:"allow-lan"` AllowLan bool `yaml:"allow-lan,omitempty" json:"allow-lan"`
BindAddress string `yaml:"bind-address,omitempty" json:"bind-address"` BindAddress string `yaml:"bind-address,omitempty" json:"bind-address"`
Mode string `yaml:"mode,omitempty" json:"mode"` Mode string `yaml:"mode,omitempty" json:"mode"`
UnifiedDelay bool `yaml:"unified-delay,omitempty" json:"unified-delay"` UnifiedDelay bool `yaml:"unified-delay,omitempty" json:"unified-delay"`
LogLevel string `yaml:"log-level,omitempty" json:"log-level"` LogLevel string `yaml:"log-level,omitempty" json:"log-level"`
IPv6 bool `yaml:"ipv6,omitempty" json:"ipv6"` IPv6 bool `yaml:"ipv6,omitempty" json:"ipv6"`
ExternalController string `yaml:"external-controller,omitempty" json:"external-controller"` ExternalController string `yaml:"external-controller,omitempty" json:"external-controller"`
ExternalControllerPipe string `yaml:"external-controller-pipe,omitempty" json:"external-controller-pipe"` ExternalControllerPipe string `yaml:"external-controller-pipe,omitempty" json:"external-controller-pipe"`
ExternalControllerUnix string `yaml:"external-controller-unix,omitempty" json:"external-controller-unix"` ExternalControllerUnix string `yaml:"external-controller-unix,omitempty" json:"external-controller-unix"`
ExternalControllerTLS string `yaml:"external-controller-tls,omitempty" json:"external-controller-tls"` ExternalControllerTLS string `yaml:"external-controller-tls,omitempty" json:"external-controller-tls"`
ExternalControllerCors C.RawCors `yaml:"external-controller-cors,omitempty" json:"external-controller-cors"` ExternalControllerCors C.RawCors `yaml:"external-controller-cors,omitempty" json:"external-controller-cors"`
ExternalUI string `yaml:"external-ui,omitempty" json:"external-ui"` ExternalUI string `yaml:"external-ui,omitempty" json:"external-ui"`
ExternalUIURL string `yaml:"external-ui-url,omitempty" json:"external-ui-url"` ExternalUIURL string `yaml:"external-ui-url,omitempty" json:"external-ui-url"`
ExternalUIName string `yaml:"external-ui-name,omitempty" json:"external-ui-name"` ExternalUIName string `yaml:"external-ui-name,omitempty" json:"external-ui-name"`
ExternalDohServer string `yaml:"external-doh-server,omitempty" json:"external-doh-server"` ExternalDohServer string `yaml:"external-doh-server,omitempty" json:"external-doh-server"`
Secret string `yaml:"secret,omitempty" json:"secret"` Secret string `yaml:"secret,omitempty" json:"secret"`
Interface string `yaml:"interface-name,omitempty" json:"interface-name"` Interface string `yaml:"interface-name,omitempty" json:"interface-name"`
RoutingMark int `yaml:"routing-mark,omitempty" json:"routing-mark"` RoutingMark int `yaml:"routing-mark,omitempty" json:"routing-mark"`
Tunnels []LC.Tunnel `yaml:"tunnels,omitempty" json:"tunnels"` Tunnels []LC.Tunnel `yaml:"tunnels,omitempty" json:"tunnels"`
GeoAutoUpdate bool `yaml:"geo-auto-update,omitempty" json:"geo-auto-update"` GeoAutoUpdate bool `yaml:"geo-auto-update,omitempty" json:"geo-auto-update"`
GeoUpdateInterval int `yaml:"geo-update-interval,omitempty" json:"geo-update-interval"` GeoUpdateInterval int `yaml:"geo-update-interval,omitempty" json:"geo-update-interval"`
GeodataMode bool `yaml:"geodata-mode,omitempty" json:"geodata-mode"` GeodataMode bool `yaml:"geodata-mode,omitempty" json:"geodata-mode"`
GeodataLoader string `yaml:"geodata-loader,omitempty" json:"geodata-loader"` GeodataLoader string `yaml:"geodata-loader,omitempty" json:"geodata-loader"`
GeositeMatcher string `yaml:"geosite-matcher,omitempty" json:"geosite-matcher"` GeositeMatcher string `yaml:"geosite-matcher,omitempty" json:"geosite-matcher"`
TCPConcurrent bool `yaml:"tcp-concurrent,omitempty" json:"tcp-concurrent"` TCPConcurrent bool `yaml:"tcp-concurrent,omitempty" json:"tcp-concurrent"`
FindProcessMode string `yaml:"find-process-mode,omitempty" json:"find-process-mode"` FindProcessMode string `yaml:"find-process-mode,omitempty" json:"find-process-mode"`
GlobalClientFingerprint string `yaml:"global-client-fingerprint,omitempty" json:"global-client-fingerprint"` GlobalClientFingerprint string `yaml:"global-client-fingerprint,omitempty" json:"global-client-fingerprint"`
GlobalUA string `yaml:"global-ua,omitempty" json:"global-ua"` GlobalUA string `yaml:"global-ua,omitempty" json:"global-ua"`
ETagSupport bool `yaml:"etag-support,omitempty" json:"etag-support"` ETagSupport bool `yaml:"etag-support,omitempty" json:"etag-support"`
KeepAliveIdle int `yaml:"keep-alive-idle,omitempty" json:"keep-alive-idle"` KeepAliveIdle int `yaml:"keep-alive-idle,omitempty" json:"keep-alive-idle"`
KeepAliveInterval int `yaml:"keep-alive-interval,omitempty" json:"keep-alive-interval"` KeepAliveInterval int `yaml:"keep-alive-interval,omitempty" json:"keep-alive-interval"`
DisableKeepAlive bool `yaml:"disable-keep-alive,omitempty" json:"disable-keep-alive"` DisableKeepAlive bool `yaml:"disable-keep-alive,omitempty" json:"disable-keep-alive"`
ProxyProvider map[string]map[string]any `yaml:"proxy-providers,omitempty" json:"proxy-providers"` ProxyProvider map[string]map[string]any `yaml:"proxy-providers,omitempty" json:"proxy-providers"`
RuleProvider map[string]RuleProvider `yaml:"rule-providers,omitempty" json:"rule-providers"` RuleProvider map[string]RuleProvider `yaml:"rule-providers,omitempty" json:"rule-providers"`

2
parser/anytls.go
View File

@@ -68,7 +68,7 @@ func (p *AnytlsParser) Parse(config ParseConfig, proxy string) (P.Proxy, error)
Name: remarks, Name: remarks,
Anytls: P.Anytls{ Anytls: P.Anytls{
Server: server, Server: server,
Port: port, Port: P.IntOrString(port),
Password: password, Password: password,
SNI: sni, SNI: sni,
SkipCertVerify: insecureBool, SkipCertVerify: insecureBool,

2
parser/hysteria.go
View File

@@ -76,7 +76,7 @@ func (p *HysteriaParser) Parse(config ParseConfig, proxy string) (P.Proxy, error
Name: remarks, Name: remarks,
Hysteria: P.Hysteria{ Hysteria: P.Hysteria{
Server: server, Server: server,
Port: port, Port: P.IntOrString(port),
Up: upmbps, Up: upmbps,
Down: downmbps, Down: downmbps,
Auth: auth, Auth: auth,

2
parser/hysteria2.go
View File

@@ -68,7 +68,7 @@ func (p *Hysteria2Parser) Parse(config ParseConfig, proxy string) (P.Proxy, erro
Name: remarks, Name: remarks,
Hysteria2: P.Hysteria2{ Hysteria2: P.Hysteria2{
Server: server, Server: server,
Port: port, Port: P.IntOrString(port),
Password: password, Password: password,
Obfs: obfs, Obfs: obfs,
ObfsPassword: obfsPassword, ObfsPassword: obfsPassword,

2
parser/shadowsocks.go
View File

@@ -108,7 +108,7 @@ func (p *ShadowsocksParser) Parse(config ParseConfig, proxy string) (P.Proxy, er
Cipher: method, Cipher: method,
Password: password, Password: password,
Server: server, Server: server,
Port: port, Port: P.IntOrString(port),
UDP: config.UseUDP, UDP: config.UseUDP,
}, },
} }

2
parser/shadowsocksr.go
View File

@@ -94,7 +94,7 @@ func (p *ShadowsocksRParser) Parse(config ParseConfig, proxy string) (P.Proxy, e
Name: remarks, Name: remarks,
ShadowSocksR: P.ShadowSocksR{ ShadowSocksR: P.ShadowSocksR{
Server: server, Server: server,
Port: port, Port: P.IntOrString(port),
Protocol: protocol, Protocol: protocol,
Cipher: method, Cipher: method,
Obfs: obfs, Obfs: obfs,

2
parser/socks.go
View File

@@ -79,7 +79,7 @@ func (p *SocksParser) Parse(config ParseConfig, proxy string) (P.Proxy, error) {
Name: remarks, Name: remarks,
Socks: P.Socks{ Socks: P.Socks{
Server: server, Server: server,
Port: port, Port: P.IntOrString(port),
UserName: username, UserName: username,
Password: password, Password: password,
TLS: tls == "true", TLS: tls == "true",

2
parser/trojan.go
View File

@@ -63,7 +63,7 @@ func (p *TrojanParser) Parse(config ParseConfig, proxy string) (P.Proxy, error)
insecureBool := insecure == "1" insecureBool := insecure == "1"
result := P.Trojan{ result := P.Trojan{
Server: server, Server: server,
Port: port, Port: P.IntOrString(port),
Password: password, Password: password,
Network: network, Network: network,
UDP: udp == "true", UDP: udp == "true",

2
parser/vless.go
View File

@@ -66,7 +66,7 @@ func (p *VlessParser) Parse(config ParseConfig, proxy string) (P.Proxy, error) {
result := P.Vless{ result := P.Vless{
Server: server, Server: server,
Port: port, Port: P.IntOrString(port),
UUID: uuid, UUID: uuid,
Flow: flow, Flow: flow,
UDP: udp == "true", UDP: udp == "true",

4
parser/vmess.go
View File

@@ -109,9 +109,9 @@ func (p *VmessParser) Parse(config ParseConfig, proxy string) (P.Proxy, error) {
result := P.Vmess{ result := P.Vmess{
Server: vmess.Add, Server: vmess.Add,
Port: port, Port: P.IntOrString(port),
UUID: vmess.Id, UUID: vmess.Id,
AlterID: aid, AlterID: P.IntOrString(aid),
Cipher: vmess.Scy, Cipher: vmess.Scy,
UDP: config.UseUDP, UDP: config.UseUDP,
} }

33
test/yaml_test.go Normal file
View File

@@ -0,0 +1,33 @@
package test
import (
"testing"
"github.com/bestnite/sub2clash/model/proxy"
"gopkg.in/yaml.v3"
)
type testStruct struct {
A proxy.IntOrString `yaml:"a"`
}
func TestUnmarshal(t *testing.T) {
yamlData1 := `a: 123`
res := testStruct{}
err := yaml.Unmarshal([]byte(yamlData1), &res)
if err != nil {
t.Errorf("failed to unmarshal yaml: %v", err)
}
if res.A != 123 {
t.Errorf("expected 123, but got %v", res.A)
}
yamlData2 := `a: "123"`
err = yaml.Unmarshal([]byte(yamlData2), &res)
if err != nil {
t.Errorf("failed to unmarshal yaml: %v", err)
}
if res.A != 123 {
t.Errorf("expected 123, but got %v", res.A)
}
}