From f88ae52a293e52554aae6d15554667e0350f64d5 Mon Sep 17 00:00:00 2001 From: nite Date: Thu, 12 Jun 2025 14:19:00 +1000 Subject: [PATCH] Unify parts of the model with MetaCubeX. --- common/proxy.go | 8 +- common/rule.go | 30 ++-- common/sub.go | 38 ++--- go.mod | 105 ++++++++++++- go.sum | 284 +++++++++++++++++++++++++++++++++--- model/proxy/anytls.go | 26 ++-- model/proxy/hysteria.go | 50 +++---- model/proxy/hysteria2.go | 43 +++--- model/proxy/proxy.go | 5 + model/proxy/shadowsocks.go | 1 + model/proxy/shadowsocksr.go | 1 + model/proxy/socks.go | 13 +- model/proxy/trojan.go | 14 +- model/proxy/vless.go | 7 +- model/proxy/vmess.go | 5 +- model/subscription.go | 273 +++++++++------------------------- parser/anytls.go | 2 +- parser/hysteria.go | 6 +- parser/hysteria2.go | 9 +- parser/socks.go | 2 +- parser/trojan.go | 8 +- parser/vless.go | 7 +- parser/vmess.go | 4 +- server/handler/sub.go | 2 +- 24 files changed, 590 insertions(+), 353 deletions(-) diff --git a/common/proxy.go b/common/proxy.go index 03322ec..b7e28fd 100644 --- a/common/proxy.go +++ b/common/proxy.go @@ -56,11 +56,11 @@ func AddProxy( if !proxyTypes[proxy.Type] { continue } - sub.Proxies = append(sub.Proxies, proxy) + sub.Proxy = append(sub.Proxy, proxy) haveProxyGroup := false countryName := GetContryName(proxy.Name) - for i := range sub.ProxyGroups { - group := &sub.ProxyGroups[i] + for i := range sub.ProxyGroup { + group := &sub.ProxyGroup[i] if group.Name == countryName { group.Proxies = append(group.Proxies, proxy.Name) group.Size++ @@ -90,7 +90,7 @@ func AddProxy( Size: 1, } } - sub.ProxyGroups = append(sub.ProxyGroups, newGroup) + sub.ProxyGroup = append(sub.ProxyGroup, newGroup) } } } diff --git a/common/rule.go b/common/rule.go index 593e877..56832a4 100644 --- a/common/rule.go +++ b/common/rule.go @@ -10,10 +10,10 @@ import ( func PrependRuleProvider( sub *model.Subscription, providerName string, group string, provider model.RuleProvider, ) { - if sub.RuleProviders == nil { - sub.RuleProviders = make(map[string]model.RuleProvider) + if sub.RuleProvider == nil { + sub.RuleProvider = make(map[string]model.RuleProvider) } - sub.RuleProviders[providerName] = provider + sub.RuleProvider[providerName] = provider PrependRules( sub, fmt.Sprintf("RULE-SET,%s,%s", providerName, group), @@ -23,29 +23,29 @@ func PrependRuleProvider( func AppenddRuleProvider( sub *model.Subscription, providerName string, group string, provider model.RuleProvider, ) { - if sub.RuleProviders == nil { - sub.RuleProviders = make(map[string]model.RuleProvider) + if sub.RuleProvider == nil { + sub.RuleProvider = make(map[string]model.RuleProvider) } - sub.RuleProviders[providerName] = provider + sub.RuleProvider[providerName] = provider AppendRules(sub, fmt.Sprintf("RULE-SET,%s,%s", providerName, group)) } func PrependRules(sub *model.Subscription, rules ...string) { - if sub.Rules == nil { - sub.Rules = make([]string, 0) + if sub.Rule == nil { + sub.Rule = make([]string, 0) } - sub.Rules = append(rules, sub.Rules...) + sub.Rule = append(rules, sub.Rule...) } func AppendRules(sub *model.Subscription, rules ...string) { - if sub.Rules == nil { - sub.Rules = make([]string, 0) + if sub.Rule == nil { + sub.Rule = make([]string, 0) } - matchRule := sub.Rules[len(sub.Rules)-1] + matchRule := sub.Rule[len(sub.Rule)-1] if strings.Contains(matchRule, "MATCH") { - sub.Rules = append(sub.Rules[:len(sub.Rules)-1], rules...) - sub.Rules = append(sub.Rules, matchRule) + sub.Rule = append(sub.Rule[:len(sub.Rule)-1], rules...) + sub.Rule = append(sub.Rule, matchRule) return } - sub.Rules = append(sub.Rules, rules...) + sub.Rule = append(sub.Rule, rules...) } diff --git a/common/sub.go b/common/sub.go index cb47a82..b8e7596 100644 --- a/common/sub.go +++ b/common/sub.go @@ -170,7 +170,7 @@ func BuildSub(clashType model.ClashType, query model.SubConfig, template string, newProxies = p } } else { - newProxies = sub.Proxies + newProxies = sub.Proxy } if subName != "" { for i := range newProxies { @@ -180,7 +180,7 @@ func BuildSub(clashType model.ClashType, query model.SubConfig, template string, proxyList = append(proxyList, newProxies...) } - if len(query.Proxies) != 0 { + if len(query.Proxy) != 0 { proxyList = append(proxyList, parser.ParseProxies(query.Proxies...)...) } @@ -265,15 +265,15 @@ func BuildSub(clashType model.ClashType, query model.SubConfig, template string, switch query.Sort { case "sizeasc": - sort.Sort(model.ProxyGroupsSortBySize(t.ProxyGroups)) + sort.Sort(model.ProxyGroupsSortBySize(t.ProxyGroup)) case "sizedesc": - sort.Sort(sort.Reverse(model.ProxyGroupsSortBySize(t.ProxyGroups))) + sort.Sort(sort.Reverse(model.ProxyGroupsSortBySize(t.ProxyGroup))) case "nameasc": - sort.Sort(model.ProxyGroupsSortByName(t.ProxyGroups)) + sort.Sort(model.ProxyGroupsSortByName(t.ProxyGroup)) case "namedesc": - sort.Sort(sort.Reverse(model.ProxyGroupsSortByName(t.ProxyGroups))) + sort.Sort(sort.Reverse(model.ProxyGroupsSortByName(t.ProxyGroup))) default: - sort.Sort(model.ProxyGroupsSortByName(t.ProxyGroups)) + sort.Sort(model.ProxyGroupsSortByName(t.ProxyGroup)) } MergeSubAndTemplate(temp, t, query.IgnoreCountryGrooup) @@ -328,7 +328,7 @@ func FetchSubscriptionUserInfo(url string, userAgent string, retryTimes int) (st func MergeSubAndTemplate(temp *model.Subscription, sub *model.Subscription, igcg bool) { var countryGroupNames []string - for _, proxyGroup := range sub.ProxyGroups { + for _, proxyGroup := range sub.ProxyGroup { if proxyGroup.IsCountryGrop { countryGroupNames = append( countryGroupNames, proxyGroup.Name, @@ -336,27 +336,27 @@ func MergeSubAndTemplate(temp *model.Subscription, sub *model.Subscription, igcg } } var proxyNames []string - for _, proxy := range sub.Proxies { + for _, proxy := range sub.Proxy { proxyNames = append(proxyNames, proxy.Name) } - temp.Proxies = append(temp.Proxies, sub.Proxies...) + temp.Proxy = append(temp.Proxy, sub.Proxy...) - for i := range temp.ProxyGroups { - if temp.ProxyGroups[i].IsCountryGrop { + for i := range temp.ProxyGroup { + if temp.ProxyGroup[i].IsCountryGrop { continue } newProxies := make([]string, 0) countryGroupMap := make(map[string]model.ProxyGroup) - for _, v := range sub.ProxyGroups { + for _, v := range sub.ProxyGroup { if v.IsCountryGrop { countryGroupMap[v.Name] = v } } - for j := range temp.ProxyGroups[i].Proxies { + for j := range temp.ProxyGroup[i].Proxies { reg := regexp.MustCompile("<(.*?)>") - if reg.Match([]byte(temp.ProxyGroups[i].Proxies[j])) { - key := reg.FindStringSubmatch(temp.ProxyGroups[i].Proxies[j])[1] + if reg.Match([]byte(temp.ProxyGroup[i].Proxies[j])) { + key := reg.FindStringSubmatch(temp.ProxyGroup[i].Proxies[j])[1] switch key { case "all": newProxies = append(newProxies, proxyNames...) @@ -374,12 +374,12 @@ func MergeSubAndTemplate(temp *model.Subscription, sub *model.Subscription, igcg } } } else { - newProxies = append(newProxies, temp.ProxyGroups[i].Proxies[j]) + newProxies = append(newProxies, temp.ProxyGroup[i].Proxies[j]) } } - temp.ProxyGroups[i].Proxies = newProxies + temp.ProxyGroup[i].Proxies = newProxies } if !igcg { - temp.ProxyGroups = append(temp.ProxyGroups, sub.ProxyGroups...) + temp.ProxyGroup = append(temp.ProxyGroup, sub.ProxyGroup...) } } diff --git a/go.mod b/go.mod index 827420d..6d761cb 100644 --- a/go.mod +++ b/go.mod @@ -6,47 +6,140 @@ toolchain go1.24.3 require ( github.com/gin-gonic/gin v1.10.1 + github.com/metacubex/mihomo v1.19.10 github.com/spf13/viper v1.20.1 go.etcd.io/bbolt v1.3.9 go.uber.org/zap v1.27.0 - golang.org/x/text v0.21.0 + golang.org/x/text v0.22.0 gopkg.in/natefinch/lumberjack.v2 v2.2.1 gopkg.in/yaml.v3 v3.0.1 resty.dev/v3 v3.0.0-beta.3 ) require ( + github.com/3andne/restls-client-go v0.1.6 // indirect + github.com/RyuaNerin/go-krypto v1.3.0 // indirect + github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344 // indirect + github.com/andybalholm/brotli v1.0.6 // indirect + github.com/bahlo/generic-list-go v0.2.0 // indirect + github.com/buger/jsonparser v1.1.1 // indirect github.com/bytedance/sonic v1.11.6 // indirect github.com/bytedance/sonic/loader v0.1.1 // indirect + github.com/cloudflare/circl v1.3.7 // indirect github.com/cloudwego/base64x v0.1.4 // indirect github.com/cloudwego/iasm v0.2.0 // indirect - github.com/fsnotify/fsnotify v1.8.0 // indirect + github.com/coreos/go-iptables v0.8.0 // indirect + github.com/dlclark/regexp2 v1.11.5 // indirect + github.com/ebitengine/purego v0.8.3 // indirect + github.com/enfein/mieru/v3 v3.13.0 // indirect + github.com/ericlagergren/aegis v0.0.0-20250325060835-cd0defd64358 // indirect + github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391 // indirect + github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1 // indirect + github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010 // indirect + github.com/fsnotify/fsnotify v1.9.0 // indirect github.com/gabriel-vasile/mimetype v1.4.3 // indirect + github.com/gaukas/godicttls v0.0.4 // indirect github.com/gin-contrib/sse v0.1.0 // indirect + github.com/go-ole/go-ole v1.3.0 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-playground/validator/v10 v10.20.0 // indirect + github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect github.com/go-viper/mapstructure/v2 v2.2.1 // indirect + github.com/gobwas/httphead v0.1.0 // indirect + github.com/gobwas/pool v0.2.1 // indirect + github.com/gobwas/ws v1.4.0 // indirect github.com/goccy/go-json v0.10.2 // indirect + github.com/gofrs/uuid/v5 v5.3.2 // indirect + github.com/google/btree v1.1.3 // indirect + github.com/google/go-cmp v0.6.0 // indirect + github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect + github.com/hashicorp/yamux v0.1.2 // indirect + github.com/insomniacslk/dhcp v0.0.0-20250109001534-8abf58130905 // indirect + github.com/josharian/native v1.1.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/cpuid/v2 v2.2.7 // indirect + github.com/klauspost/compress v1.17.9 // indirect + github.com/klauspost/cpuid/v2 v2.2.9 // indirect github.com/leodido/go-urn v1.4.0 // indirect + github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect + github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 // indirect + github.com/mailru/easyjson v0.7.7 // indirect github.com/mattn/go-isatty v0.0.20 // indirect + github.com/mdlayher/netlink v1.7.2 // indirect + github.com/mdlayher/socket v0.4.1 // indirect + github.com/metacubex/amneziawg-go v0.0.0-20240922133038-fdf3a4d5a4ab // indirect + github.com/metacubex/bart v0.20.5 // indirect + github.com/metacubex/bbolt v0.0.0-20240822011022-aed6d4850399 // indirect + github.com/metacubex/chacha v0.1.2 // indirect + github.com/metacubex/fswatch v0.1.1 // indirect + github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 // indirect + github.com/metacubex/gvisor v0.0.0-20250324165734-5857f47bd43b // indirect + github.com/metacubex/nftables v0.0.0-20250503052935-30a69ab87793 // indirect + github.com/metacubex/quic-go v0.52.1-0.20250522021943-aef454b9e639 // indirect + github.com/metacubex/randv2 v0.2.0 // indirect + github.com/metacubex/sing v0.5.3 // indirect + github.com/metacubex/sing-mux v0.3.2 // indirect + github.com/metacubex/sing-quic v0.0.0-20250523120938-f1a248e5ec7f // indirect + github.com/metacubex/sing-shadowsocks v0.2.10 // indirect + github.com/metacubex/sing-shadowsocks2 v0.2.4 // indirect + github.com/metacubex/sing-shadowtls v0.0.0-20250503063515-5d9f966d17a2 // indirect + github.com/metacubex/sing-tun v0.4.6-0.20250524142129-9d110c0af70c // indirect + github.com/metacubex/sing-vmess v0.2.2 // indirect + github.com/metacubex/sing-wireguard v0.0.0-20250503063753-2dc62acc626f // indirect + github.com/metacubex/smux v0.0.0-20250503055512-501391591dee // indirect + github.com/metacubex/tfo-go v0.0.0-20250516165257-e29c16ae41d4 // indirect + github.com/metacubex/utls v1.7.3 // indirect + github.com/metacubex/wireguard-go v0.0.0-20240922131502-c182e7471181 // indirect + github.com/miekg/dns v1.1.63 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/mroth/weightedrand/v2 v2.1.0 // indirect + github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7 // indirect + github.com/onsi/ginkgo/v2 v2.9.5 // indirect + github.com/openacid/low v0.1.21 // indirect + github.com/oschwald/maxminddb-golang v1.12.0 // indirect github.com/pelletier/go-toml/v2 v2.2.3 // indirect + github.com/pierrec/lz4/v4 v4.1.14 // indirect + github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect + github.com/puzpuzpuz/xsync/v3 v3.5.1 // indirect + github.com/quic-go/qpack v0.4.0 // indirect + github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a // indirect github.com/sagikazarmark/locafero v0.7.0 // indirect + github.com/samber/lo v1.50.0 // indirect + github.com/shirou/gopsutil/v4 v4.25.1 // indirect + github.com/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b // indirect + github.com/sina-ghaderi/rabaead v0.0.0-20220730151906-ab6e06b96e8c // indirect + github.com/sina-ghaderi/rabbitio v0.0.0-20220730151941-9ce26f4f872e // indirect + github.com/sirupsen/logrus v1.9.3 // indirect github.com/sourcegraph/conc v0.3.0 // indirect github.com/spf13/afero v1.12.0 // indirect github.com/spf13/cast v1.7.1 // indirect github.com/spf13/pflag v1.0.6 // indirect github.com/subosito/gotenv v1.6.0 // indirect + github.com/tklauser/go-sysconf v0.3.12 // indirect + github.com/tklauser/numcpus v0.6.1 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect + github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923 // indirect github.com/ugorji/go/codec v1.2.12 // indirect + github.com/vishvananda/netns v0.0.4 // indirect + github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect + github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect + github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + gitlab.com/go-extension/aes-ccm v0.0.0-20230221065045-e58665ef23c7 // indirect + gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect + go.uber.org/mock v0.4.0 // indirect go.uber.org/multierr v1.11.0 // indirect + go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect golang.org/x/arch v0.8.0 // indirect - golang.org/x/crypto v0.32.0 // indirect - golang.org/x/net v0.33.0 // indirect - golang.org/x/sys v0.29.0 // indirect + golang.org/x/crypto v0.33.0 // indirect + golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e // indirect + golang.org/x/mod v0.20.0 // indirect + golang.org/x/net v0.35.0 // indirect + golang.org/x/sync v0.11.0 // indirect + golang.org/x/sys v0.30.0 // indirect + golang.org/x/time v0.8.0 // indirect + golang.org/x/tools v0.24.0 // indirect google.golang.org/protobuf v1.36.1 // indirect + lukechampine.com/blake3 v1.3.0 // indirect ) diff --git a/go.sum b/go.sum index 137c753..09c537f 100644 --- a/go.sum +++ b/go.sum @@ -1,24 +1,75 @@ +github.com/3andne/restls-client-go v0.1.6 h1:tRx/YilqW7iHpgmEL4E1D8dAsuB0tFF3uvncS+B6I08= +github.com/3andne/restls-client-go v0.1.6/go.mod h1:iEdTZNt9kzPIxjIGSMScUFSBrUH6bFRNg0BWlP4orEY= +github.com/RyuaNerin/go-krypto v1.3.0 h1:smavTzSMAx8iuVlGb4pEwl9MD2qicqMzuXR2QWp2/Pg= +github.com/RyuaNerin/go-krypto v1.3.0/go.mod h1:9R9TU936laAIqAmjcHo/LsaXYOZlymudOAxjaBf62UM= +github.com/RyuaNerin/testingutil v0.1.0 h1:IYT6JL57RV3U2ml3dLHZsVtPOP6yNK7WUVdzzlpNrss= +github.com/RyuaNerin/testingutil v0.1.0/go.mod h1:yTqj6Ta/ycHMPJHRyO12Mz3VrvTloWOsy23WOZH19AA= +github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344 h1:cDVUiFo+npB0ZASqnw4q90ylaVAbnYyx0JYqK4YcGok= +github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344/go.mod h1:9pIqrY6SXNL8vjRQE5Hd/OL5GyK/9MrGUWs87z/eFfk= +github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= +github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= +github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= +github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk= +github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xWbdbCW3pNTGyYg= +github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= +github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs= +github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= github.com/bytedance/sonic v1.11.6 h1:oUp34TzMlL+OY1OUWxHqsdkgC/Zfc85zGqw9siXjrc0= github.com/bytedance/sonic v1.11.6/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4= github.com/bytedance/sonic/loader v0.1.1 h1:c+e5Pt1k/cy5wMveRDyk2X4B9hF4g7an8N3zCYjJFNM= github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= +github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU= +github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA= github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y= github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w= github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg= github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= +github.com/coreos/go-iptables v0.8.0 h1:MPc2P89IhuVpLI7ETL/2tx3XZ61VeICZjYqDEgNsPRc= +github.com/coreos/go-iptables v0.8.0/go.mod h1:Qe8Bv2Xik5FyTXwgIbLAnv2sWSBmvWdFETJConOQ//Q= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dlclark/regexp2 v1.11.5 h1:Q/sSnsKerHeCkc/jSTNq1oCm7KiVgUMZRDUoRu0JQZQ= +github.com/dlclark/regexp2 v1.11.5/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= +github.com/ebitengine/purego v0.8.3 h1:K+0AjQp63JEZTEMZiwsI9g0+hAMNohwUOtY0RPGexmc= +github.com/ebitengine/purego v0.8.3/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ= +github.com/enfein/mieru/v3 v3.13.0 h1:eGyxLGkb+lut9ebmx+BGwLJ5UMbEc/wGIYO0AXEKy98= +github.com/enfein/mieru/v3 v3.13.0/go.mod h1:zJBUCsi5rxyvHM8fjFf+GLaEl4OEjjBXr1s5F6Qd3hM= +github.com/ericlagergren/aegis v0.0.0-20250325060835-cd0defd64358 h1:kXYqH/sL8dS/FdoFjr12ePjnLPorPo2FsnrHNuXSDyo= +github.com/ericlagergren/aegis v0.0.0-20250325060835-cd0defd64358/go.mod h1:hkIFzoiIPZYxdFOOLyDho59b7SrDfo+w3h+yWdlg45I= +github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391 h1:8j2RH289RJplhA6WfdaPqzg1MjH2K8wX5e0uhAxrw2g= +github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391/go.mod h1:K2R7GhgxrlJzHw2qiPWsCZXf/kXEJN9PLnQK73Ll0po= +github.com/ericlagergren/saferand v0.0.0-20220206064634-960a4dd2bc5c h1:RUzBDdZ+e/HEe2Nh8lYsduiPAZygUfVXJn0Ncj5sHMg= +github.com/ericlagergren/saferand v0.0.0-20220206064634-960a4dd2bc5c/go.mod h1:ETASDWf/FmEb6Ysrtd1QhjNedUU/ZQxBCRLh60bQ/UI= +github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1 h1:tlDMEdcPRQKBEz5nGDMvswiajqh7k8ogWRlhRwKy5mY= +github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1/go.mod h1:4RfsapbGx2j/vU5xC/5/9qB3kn9Awp1YDiEnN43QrJ4= +github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010 h1:fuGucgPk5dN6wzfnxl3D0D3rVLw4v2SbBT9jb4VnxzA= +github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010/go.mod h1:JtBcj7sBuTTRupn7c2bFspMDIObMJsVK8TeUvpShPok= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= -github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M= -github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= +github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k= +github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0= github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk= +github.com/gaukas/godicttls v0.0.4 h1:NlRaXb3J6hAnTmWdsEKb9bcSBD6BvcIjdGdeb0zfXbk= +github.com/gaukas/godicttls v0.0.4/go.mod h1:l6EenT4TLWgTdwslVb4sEMOCf7Bv0JAK67deKr9/NCI= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-gonic/gin v1.10.1 h1:T0ujvqyCSqRopADpgPgiTT63DUQVSfojyME59Ei63pQ= github.com/gin-gonic/gin v1.10.1/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y= +github.com/go-chi/chi/v5 v5.2.1 h1:KOIHODQj58PmL80G2Eak4WdvUzjSJSm0vG72crDCqb8= +github.com/go-chi/chi/v5 v5.2.1/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops= +github.com/go-chi/render v1.0.3 h1:AsXqd2a1/INaIfUSKq3G5uA8weYx20FOsM7uSoCyyt4= +github.com/go-chi/render v1.0.3/go.mod h1:/gr3hVkmYR0YlEy3LxCuVRFzEu9Ruok+gFqbIofjao0= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= +github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE= +github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= @@ -27,18 +78,49 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= github.com/go-playground/validator/v10 v10.20.0 h1:K9ISHbSaI0lyB2eWMPJo+kOS/FBExVwjEviJTixqxL8= github.com/go-playground/validator/v10 v10.20.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= github.com/go-viper/mapstructure/v2 v2.2.1 h1:ZAaOCxANMuZx5RCeg0mBdEZk7DZasvvZIxtHqx8aGss= github.com/go-viper/mapstructure/v2 v2.2.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= +github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU= +github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM= +github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og= +github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= +github.com/gobwas/ws v1.4.0 h1:CTaoG1tojrh4ucGPcoJFiAQUAsEWekEWvLy7GsVNqGs= +github.com/gobwas/ws v1.4.0/go.mod h1:G3gNqMNtPppf5XUz7O4shetPpcZ1VJ7zt18dlUeakrc= github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/gofrs/uuid/v5 v5.3.2 h1:2jfO8j3XgSwlz/wHqemAEugfnTlikAYHhnqQ8Xh4fE0= +github.com/gofrs/uuid/v5 v5.3.2/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg= +github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= +github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE= +github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/tink/go v1.6.1 h1:t7JHqO8Ath2w2ig5vjwQYJzhGEZymedQc90lQXUBa4I= +github.com/google/tink/go v1.6.1/go.mod h1:IGW53kTgag+st5yPhKKwJ6u2l+SSp5/v9XF7spovjlY= +github.com/hashicorp/yamux v0.1.2 h1:XtB8kyFOyHXYVFnwT5C3+Bdo8gArse7j2AQ0DA0Uey8= +github.com/hashicorp/yamux v0.1.2/go.mod h1:C+zze2n6e/7wshOZep2A70/aQU6QBRWJO/G6FT1wIns= +github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/insomniacslk/dhcp v0.0.0-20250109001534-8abf58130905 h1:q3OEI9RaN/wwcx+qgGo6ZaoJkCiDYe/gjDLfq7lQQF4= +github.com/insomniacslk/dhcp v0.0.0-20250109001534-8abf58130905/go.mod h1:VvGYjkZoJyKqlmT1yzakUs4mfKMNB0XdODP0+rdml6k= +github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= +github.com/josharian/native v1.0.1-0.20221213033349-c1e37c09b531/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w= +github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtLA= +github.com/josharian/native v1.1.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= -github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM= -github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= +github.com/klauspost/cpuid/v2 v2.2.9 h1:66ze0taIn2H33fBvCkXuv9BmCwDfafmiIVpKV9kKGuY= +github.com/klauspost/cpuid/v2 v2.2.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8= github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= @@ -46,21 +128,122 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= +github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4= +github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= +github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 h1:EnfXoSqDfSNJv0VBNqY/88RNnhSGYkrHaO0mmFGbVsc= +github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40/go.mod h1:vy1vK6wD6j7xX6O6hXe621WabdtNkou2h7uRtTfRMyg= +github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= +github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mdlayher/netlink v1.7.2 h1:/UtM3ofJap7Vl4QWCPDGXY8d3GIY2UGSDbK+QWmY8/g= +github.com/mdlayher/netlink v1.7.2/go.mod h1:xraEF7uJbxLhc5fpHL4cPe221LI2bdttWlU+ZGLfQSw= +github.com/mdlayher/socket v0.4.1 h1:eM9y2/jlbs1M615oshPQOHZzj6R6wMT7bX5NPiQvn2U= +github.com/mdlayher/socket v0.4.1/go.mod h1:cAqeGjoufqdxWkD7DkpyS+wcefOtmu5OQ8KuoJGIReA= +github.com/metacubex/amneziawg-go v0.0.0-20240922133038-fdf3a4d5a4ab h1:Chbw+/31UC14YFNr78pESt5Vowlc62zziw05JCUqoL4= +github.com/metacubex/amneziawg-go v0.0.0-20240922133038-fdf3a4d5a4ab/go.mod h1:xVKK8jC5Sd3hfh7WjmCq+HorehIbrBijaUWmcuKjPcI= +github.com/metacubex/bart v0.20.5 h1:XkgLZ17QxfxkqKdGsojoM2Zu01mmHyyQSFzt2/calTM= +github.com/metacubex/bart v0.20.5/go.mod h1:DCcyfP4MC+Zy7sLK7XeGuMw+P5K9mIRsYOBgiE8icsI= +github.com/metacubex/bbolt v0.0.0-20240822011022-aed6d4850399 h1:oBowHVKZycNtAFbZ6avaCSZJYeme2Nrj+4RpV2cNJig= +github.com/metacubex/bbolt v0.0.0-20240822011022-aed6d4850399/go.mod h1:4xcieuIK+M4bGQmQYZVqEaIYqjS1ahO4kXG7EmDgEro= +github.com/metacubex/chacha v0.1.2 h1:QulCq3eVm3TO6+4nVIWJtmSe7BT2GMrgVHuAoqRQnlc= +github.com/metacubex/chacha v0.1.2/go.mod h1:Djn9bPZxLTXbJFSeyo0/qzEzQI+gUSSzttuzZM75GH8= +github.com/metacubex/fswatch v0.1.1 h1:jqU7C/v+g0qc2RUFgmAOPoVvfl2BXXUXEumn6oQuxhU= +github.com/metacubex/fswatch v0.1.1/go.mod h1:czrTT7Zlbz7vWft8RQu9Qqh+JoX+Nnb+UabuyN1YsgI= +github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 h1:cjd4biTvOzK9ubNCCkQ+ldc4YSH/rILn53l/xGBFHHI= +github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759/go.mod h1:UHOv2xu+RIgLwpXca7TLrXleEd4oR3sPatW6IF8wU88= +github.com/metacubex/gvisor v0.0.0-20250324165734-5857f47bd43b h1:RUh4OdVPz/jDrM9MQ2ySuqu2aeBqcA8rtfWUYLZ8RtI= +github.com/metacubex/gvisor v0.0.0-20250324165734-5857f47bd43b/go.mod h1:8LpS0IJW1VmWzUm3ylb0e2SK5QDm5lO/2qwWLZgRpBU= +github.com/metacubex/mihomo v1.19.10 h1:GXCOA1rJNfU5qYSvo+UBUFksh61M0tjPfvlZ1OsYtfs= +github.com/metacubex/mihomo v1.19.10/go.mod h1:ih7BKy1pfqSvPRqaCcuFFK4oNRIFyBotoHX0PbhF7SQ= +github.com/metacubex/nftables v0.0.0-20250503052935-30a69ab87793 h1:1Qpuy+sU3DmyX9HwI+CrBT/oLNJngvBorR2RbajJcqo= +github.com/metacubex/nftables v0.0.0-20250503052935-30a69ab87793/go.mod h1:RjRNb4G52yAgfR+Oe/kp9G4PJJ97Fnj89eY1BFO3YyA= +github.com/metacubex/quic-go v0.52.1-0.20250522021943-aef454b9e639 h1:L+1brQNzBhCCxWlicwfK1TlceemCRmrDE4HmcVHc29w= +github.com/metacubex/quic-go v0.52.1-0.20250522021943-aef454b9e639/go.mod h1:Kc6h++Q/zf3AxcUCevJhJwgrskJumv+pZdR8g/E/10k= +github.com/metacubex/randv2 v0.2.0 h1:uP38uBvV2SxYfLj53kuvAjbND4RUDfFJjwr4UigMiLs= +github.com/metacubex/randv2 v0.2.0/go.mod h1:kFi2SzrQ5WuneuoLLCMkABtiBu6VRrMrWFqSPyj2cxY= +github.com/metacubex/sing v0.5.2/go.mod h1:ypf0mjwlZm0sKdQSY+yQvmsbWa0hNPtkeqyRMGgoN+w= +github.com/metacubex/sing v0.5.3 h1:QWdN16WFKMk06x4nzkc8SvZ7y2x+TLQrpkPoHs+WSVM= +github.com/metacubex/sing v0.5.3/go.mod h1:ypf0mjwlZm0sKdQSY+yQvmsbWa0hNPtkeqyRMGgoN+w= +github.com/metacubex/sing-mux v0.3.2 h1:nJv52pyRivHcaZJKk2JgxpaVvj1GAXG81scSa9N7ncw= +github.com/metacubex/sing-mux v0.3.2/go.mod h1:3rt1soewn0O6j89GCLmwAQFsq257u0jf2zQSPhTL3Bw= +github.com/metacubex/sing-quic v0.0.0-20250523120938-f1a248e5ec7f h1:mP3vIm+9hRFI0C0Vl3pE0NESF/L85FDbuB0tGgUii6I= +github.com/metacubex/sing-quic v0.0.0-20250523120938-f1a248e5ec7f/go.mod h1:JPTpf7fpnojsSuwRJExhSZSy63pVbp3VM39+zj+sAJM= +github.com/metacubex/sing-shadowsocks v0.2.10 h1:Pr7LDbjMANIQHl07zWgl1vDuhpsfDQUpZ8cX6DPabfg= +github.com/metacubex/sing-shadowsocks v0.2.10/go.mod h1:MtRM0ZZjR0kaDOzy9zWSt6/4/UlrnsNBq+1FNAF4vBk= +github.com/metacubex/sing-shadowsocks2 v0.2.4 h1:Ec0x3hHR7xkld5Z09IGh16wtUUpBb2HgqZ9DExd8Q7s= +github.com/metacubex/sing-shadowsocks2 v0.2.4/go.mod h1:WP8+S0kqtnSbX1vlIpo5i8Irm/ijZITEPBcZ26B5unY= +github.com/metacubex/sing-shadowtls v0.0.0-20250503063515-5d9f966d17a2 h1:gXU+MYPm7Wme3/OAY2FFzVq9d9GxPHOqu5AQfg/ddhI= +github.com/metacubex/sing-shadowtls v0.0.0-20250503063515-5d9f966d17a2/go.mod h1:mbfboaXauKJNIHJYxQRa+NJs4JU9NZfkA+I33dS2+9E= +github.com/metacubex/sing-tun v0.4.6-0.20250524142129-9d110c0af70c h1:Y6jk7AH5BEg9Dsvczrf/KokYsvxeKSZZlCLHg+hC4ro= +github.com/metacubex/sing-tun v0.4.6-0.20250524142129-9d110c0af70c/go.mod h1:HDaHDL6onAX2ZGbAGUXKp++PohRdNb7Nzt6zxzhox+U= +github.com/metacubex/sing-vmess v0.2.2 h1:nG6GIKF1UOGmlzs+BIetdGHkFZ20YqFVIYp5Htqzp+4= +github.com/metacubex/sing-vmess v0.2.2/go.mod h1:CVDNcdSLVYFgTHQlubr88d8CdqupAUDqLjROos+H9xk= +github.com/metacubex/sing-wireguard v0.0.0-20250503063753-2dc62acc626f h1:Sr/DYKYofKHKc4GF3qkRGNuj6XA6c0eqPgEDN+VAsYU= +github.com/metacubex/sing-wireguard v0.0.0-20250503063753-2dc62acc626f/go.mod h1:jpAkVLPnCpGSfNyVmj6Cq4YbuZsFepm/Dc+9BAOcR80= +github.com/metacubex/smux v0.0.0-20250503055512-501391591dee h1:lp6hJ+4wCLZu113awp7P6odM2okB5s60HUyF0FMqKmo= +github.com/metacubex/smux v0.0.0-20250503055512-501391591dee/go.mod h1:4bPD8HWx9jPJ9aE4uadgyN7D1/Wz3KmPy+vale8sKLE= +github.com/metacubex/tfo-go v0.0.0-20250516165257-e29c16ae41d4 h1:j1VRTiC9JLR4nUbSikx9OGdu/3AgFDqgcLj4GoqyQkc= +github.com/metacubex/tfo-go v0.0.0-20250516165257-e29c16ae41d4/go.mod h1:l9oLnLoEXyGZ5RVLsh7QCC5XsouTUyKk4F2nLm2DHLw= +github.com/metacubex/utls v1.7.3 h1:yDcMEWojFh+t8rU9X0HPcZDPAoFze/rIIyssqivzj8A= +github.com/metacubex/utls v1.7.3/go.mod h1:oknYT0qTOwE4hjPmZOEpzVdefnW7bAdGLvZcqmk4TLU= +github.com/metacubex/wireguard-go v0.0.0-20240922131502-c182e7471181 h1:hJLQviGySBuaynlCwf/oYgIxbVbGRUIKZCxdya9YrbQ= +github.com/metacubex/wireguard-go v0.0.0-20240922131502-c182e7471181/go.mod h1:phewKljNYiTVT31Gcif8RiCKnTUOgVWFJjccqYM8s+Y= +github.com/miekg/dns v1.1.63 h1:8M5aAw6OMZfFXTT7K5V0Eu5YiiL8l7nUAkyN6C9YwaY= +github.com/miekg/dns v1.1.63/go.mod h1:6NGHfjhpmr5lt3XPLuyfDJi5AXbNIPM9PY6H6sF1Nfs= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/mroth/weightedrand/v2 v2.1.0 h1:o1ascnB1CIVzsqlfArQQjeMy1U0NcIbBO5rfd5E/OeU= +github.com/mroth/weightedrand/v2 v2.1.0/go.mod h1:f2faGsfOGOwc1p94wzHKKZyTpcJUW7OJ/9U4yfiNAOU= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7 h1:1102pQc2SEPp5+xrS26wEaeb26sZy6k9/ZXlZN+eXE4= +github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7/go.mod h1:UqoUn6cHESlliMhOnKLWr+CBH+e3bazUPvFj1XZwAjs= +github.com/onsi/ginkgo/v2 v2.9.5 h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q= +github.com/onsi/ginkgo/v2 v2.9.5/go.mod h1:tvAoo1QUJwNEU2ITftXTpR7R1RbCzoZUOs3RonqW57k= +github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE= +github.com/onsi/gomega v1.27.6/go.mod h1:PIQNjfQwkP3aQAH7lf7j87O/5FiNr+ZR8+ipb+qQlhg= +github.com/openacid/errors v0.8.1/go.mod h1:GUQEJJOJE3W9skHm8E8Y4phdl2LLEN8iD7c5gcGgdx0= +github.com/openacid/low v0.1.21 h1:Tr2GNu4N/+rGRYdOsEHOE89cxUIaDViZbVmKz29uKGo= +github.com/openacid/low v0.1.21/go.mod h1:q+MsKI6Pz2xsCkzV4BLj7NR5M4EX0sGz5AqotpZDVh0= +github.com/openacid/must v0.1.3/go.mod h1:luPiXCuJlEo3UUFQngVQokV0MPGryeYvtCbQPs3U1+I= +github.com/openacid/testkeys v0.1.6/go.mod h1:MfA7cACzBpbiwekivj8StqX0WIRmqlMsci1c37CA3Do= +github.com/oschwald/maxminddb-golang v1.12.0 h1:9FnTOD0YOhP7DGxGsq4glzpGy5+w7pq50AS6wALUMYs= +github.com/oschwald/maxminddb-golang v1.12.0/go.mod h1:q0Nob5lTCqyQ8WT6FYgS1L7PXKVVbgiymefNwIjPzgY= github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M= github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc= +github.com/pierrec/lz4/v4 v4.1.14 h1:+fL8AQEZtz/ijeNnpduH0bROTu0O3NZAlPjQxGn8LwE= +github.com/pierrec/lz4/v4 v4.1.14/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw= +github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= +github.com/puzpuzpuz/xsync/v3 v3.5.1 h1:GJYJZwO6IdxN/IKbneznS6yPkVC+c3zyY/j19c++5Fg= +github.com/puzpuzpuz/xsync/v3 v3.5.1/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA= +github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo= +github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A= github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= +github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a h1:ObwtHN2VpqE0ZNjr6sGeT00J8uU7JF4cNUdb44/Duis= +github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a/go.mod h1:xLnfdiJbSp8rNqYEdIW/6eDO4mVoogml14Bh2hSiFpM= github.com/sagikazarmark/locafero v0.7.0 h1:5MqpDsTGNDhY8sGp0Aowyf0qKsPrhewaLSsFaodPcyo= github.com/sagikazarmark/locafero v0.7.0/go.mod h1:2za3Cg5rMaTMoG/2Ulr9AwtFaIppKXTRYnozin4aB5k= +github.com/samber/lo v1.50.0 h1:XrG0xOeHs+4FQ8gJR97zDz5uOFMW7OwFWiFVzqopKgY= +github.com/samber/lo v1.50.0/go.mod h1:RjZyNk6WSnUFRKK6EyOhsRJMqft3G+pg7dCWHQCWvsc= +github.com/shirou/gopsutil/v4 v4.25.1 h1:QSWkTc+fu9LTAWfkZwZ6j8MSUk4A2LV7rbH0ZqmLjXs= +github.com/shirou/gopsutil/v4 v4.25.1/go.mod h1:RoUCUpndaJFtT+2zsZzzmhvbfGoDCJ7nFXKJf8GqJbI= +github.com/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b h1:rXHg9GrUEtWZhEkrykicdND3VPjlVbYiLdX9J7gimS8= +github.com/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b/go.mod h1:X7qrxNQViEaAN9LNZOPl9PfvQtp3V3c7LTo0dvGi0fM= +github.com/sina-ghaderi/rabaead v0.0.0-20220730151906-ab6e06b96e8c h1:DjKMC30y6yjG3IxDaeAj3PCoRr+IsO+bzyT+Se2m2Hk= +github.com/sina-ghaderi/rabaead v0.0.0-20220730151906-ab6e06b96e8c/go.mod h1:NV/a66PhhWYVmUMaotlXJ8fIEFB98u+c8l/CQIEFLrU= +github.com/sina-ghaderi/rabbitio v0.0.0-20220730151941-9ce26f4f872e h1:ur8uMsPIFG3i4Gi093BQITvwH9znsz2VUZmnmwHvpIo= +github.com/sina-ghaderi/rabbitio v0.0.0-20220730151941-9ce26f4f872e/go.mod h1:+e5fBW3bpPyo+3uLo513gIUblc03egGjMM0+5GKbzK8= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= github.com/spf13/afero v1.12.0 h1:UcOPyRBYczmFn6yvphxkn9ZEOY65cpwGKb5mL36mrqs= @@ -74,52 +257,119 @@ github.com/spf13/viper v1.20.1/go.mod h1:P9Mdzt1zoHIG8m2eZQinpiBjo6kCmZSKBClNNqj github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= +github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU= +github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI= +github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk= +github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= +github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923 h1:tHNk7XK9GkmKUR6Gh8gVBKXc2MVSZ4G/NnWLtzw4gNA= +github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923/go.mod h1:eLL9Nub3yfAho7qB0MzZizFhTU2QkLeoVsWdHtDW264= github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE= github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= +github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= +github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= +github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= +github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1YX8= +github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM= +github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IUPn0Bjt8= +github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok= +github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g= +github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds= +github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc= +github.com/wk8/go-ordered-map/v2 v2.1.8/go.mod h1:5nJHM5DyteebpVlHnWMV0rPz6Zp7+xBAnxjb1X5vnTw= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +gitlab.com/go-extension/aes-ccm v0.0.0-20230221065045-e58665ef23c7 h1:UNrDfkQqiEYzdMlNsVvBYOAJWZjdktqFE9tQh5BT2+4= +gitlab.com/go-extension/aes-ccm v0.0.0-20230221065045-e58665ef23c7/go.mod h1:E+rxHvJG9H6PUdzq9NRG6csuLN3XUx98BfGOVWNYnXs= +gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec h1:FpfFs4EhNehiVfzQttTuxanPIT43FtkkCFypIod8LHo= +gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec/go.mod h1:BZ1RAoRPbCxum9Grlv5aeksu2H8BiKehBYooU2LFiOQ= go.etcd.io/bbolt v1.3.9 h1:8x7aARPEXiXbHmtUwAIv7eV2fQFHrLLavdiJ3uzJXoI= go.etcd.io/bbolt v1.3.9/go.mod h1:zaO32+Ti0PK1ivdPtgMESzuzL2VPoIG1PCQNvOdo/dE= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= +go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU= +go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= +go4.org/netipx v0.0.0-20231129151722-fdeea329fbba h1:0b9z3AuHCjxk0x/opv64kcgZLBseWJUpBw5I82+2U4M= +go4.org/netipx v0.0.0-20231129151722-fdeea329fbba/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y= golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= golang.org/x/arch v0.8.0 h1:3wRIsP3pM4yUptoR96otTUOXI367OS0+c9eeRi9doIc= golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= -golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc= -golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc= -golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= -golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= -golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= -golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus= +golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M= +golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e h1:I88y4caeGeuDQxgdoFPUq097j7kNfw6uvuiNxUBfcBk= +golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ= +golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0= +golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8= +golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w= +golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200217220822-9197077df867/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU= -golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= -golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= +golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU= +golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM= +golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY= +golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg= +golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24= +golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk= google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc= gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +lukechampine.com/blake3 v1.3.0 h1:sJ3XhFINmHSrYCgl958hscfIa3bw8x4DqMP3u1YvoYE= +lukechampine.com/blake3 v1.3.0/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k= nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50= resty.dev/v3 v3.0.0-beta.3 h1:3kEwzEgCnnS6Ob4Emlk94t+I/gClyoah7SnNi67lt+E= resty.dev/v3 v3.0.0-beta.3/go.mod h1:OgkqiPvTDtOuV4MGZuUDhwOpkY8enjOsjjMzeOHefy4= diff --git a/model/proxy/anytls.go b/model/proxy/anytls.go index 685ebb5..d8efa27 100644 --- a/model/proxy/anytls.go +++ b/model/proxy/anytls.go @@ -1,16 +1,18 @@ package proxy +// https://github.com/MetaCubeX/mihomo/blob/Meta/adapter/outbound/anytls.go type Anytls struct { - Server string `yaml:"server"` - Port int `yaml:"port"` - Password string `yaml:"password,omitempty"` - Alpn []string `yaml:"alpn,omitempty"` - Sni string `yaml:"sni,omitempty"` - ClientFingerprint string `yaml:"client-fingerprint,omitempty"` - SkipCertVerify bool `yaml:"skip-cert-verify,omitempty"` - Fingerprint string `yaml:"fingerprint,omitempty"` - UDP bool `yaml:"udp,omitempty"` - IdleSessionCheckInterval int `yaml:"idle-session-check-interval,omitempty"` - IdleSessionTimeout int `yaml:"idle-session-timeout,omitempty"` - MinIdleSession int `yaml:"min-idle-session,omitempty"` + Server string `yaml:"server"` + Port int `yaml:"port"` + Password string `yaml:"password"` + ALPN []string `yaml:"alpn,omitempty"` + SNI string `yaml:"sni,omitempty"` + ECHOpts ECHOptions `yaml:"ech-opts,omitempty"` + ClientFingerprint string `yaml:"client-fingerprint,omitempty"` + SkipCertVerify bool `yaml:"skip-cert-verify,omitempty"` + Fingerprint string `yaml:"fingerprint,omitempty"` + UDP bool `yaml:"udp,omitempty"` + IdleSessionCheckInterval int `yaml:"idle-session-check-interval,omitempty"` + IdleSessionTimeout int `yaml:"idle-session-timeout,omitempty"` + MinIdleSession int `yaml:"min-idle-session,omitempty"` } diff --git a/model/proxy/hysteria.go b/model/proxy/hysteria.go index e148d95..2d48fb5 100644 --- a/model/proxy/hysteria.go +++ b/model/proxy/hysteria.go @@ -1,29 +1,29 @@ package proxy +// https://github.com/MetaCubeX/mihomo/blob/Meta/adapter/outbound/hysteria.go type Hysteria struct { - Server string `yaml:"server"` - Port int `yaml:"port,omitempty"` - Ports string `yaml:"ports,omitempty"` - Protocol string `yaml:"protocol,omitempty"` - ObfsProtocol string `yaml:"obfs-protocol,omitempty"` - Up string `yaml:"up"` - UpSpeed int `yaml:"up-speed,omitempty"` - Down string `yaml:"down"` - DownSpeed int `yaml:"down-speed,omitempty"` - Auth string `yaml:"auth,omitempty"` - AuthStringOLD string `yaml:"auth_str,omitempty"` - AuthString string `yaml:"auth-str,omitempty"` - Obfs string `yaml:"obfs,omitempty"` - SNI string `yaml:"sni,omitempty"` - SkipCertVerify bool `yaml:"skip-cert-verify,omitempty"` - Fingerprint string `yaml:"fingerprint,omitempty"` - Alpn []string `yaml:"alpn,omitempty"` - CustomCA string `yaml:"ca,omitempty"` - CustomCAString string `yaml:"ca-str,omitempty"` - ReceiveWindowConn int `yaml:"recv-window-conn,omitempty"` - ReceiveWindow int `yaml:"recv-window,omitempty"` - DisableMTUDiscovery bool `yaml:"disable-mtu-discovery,omitempty"` - FastOpen bool `yaml:"fast-open,omitempty"` - HopInterval int `yaml:"hop-interval,omitempty"` - AllowInsecure bool `yaml:"allow-insecure,omitempty"` + Server string `yaml:"server"` + Port int `yaml:"port,omitempty"` + Ports string `yaml:"ports,omitempty"` + Protocol string `yaml:"protocol,omitempty"` + ObfsProtocol string `yaml:"obfs-protocol,omitempty"` // compatible with Stash + Up string `yaml:"up"` + UpSpeed int `yaml:"up-speed,omitempty"` // compatible with Stash + Down string `yaml:"down"` + DownSpeed int `yaml:"down-speed,omitempty"` // compatible with Stash + Auth string `yaml:"auth,omitempty"` + AuthString string `yaml:"auth-str,omitempty"` + Obfs string `yaml:"obfs,omitempty"` + SNI string `yaml:"sni,omitempty"` + ECHOpts ECHOptions `yaml:"ech-opts,omitempty"` + SkipCertVerify bool `yaml:"skip-cert-verify,omitempty"` + Fingerprint string `yaml:"fingerprint,omitempty"` + ALPN []string `yaml:"alpn,omitempty"` + CustomCA string `yaml:"ca,omitempty"` + CustomCAString string `yaml:"ca-str,omitempty"` + ReceiveWindowConn int `yaml:"recv-window-conn,omitempty"` + ReceiveWindow int `yaml:"recv-window,omitempty"` + DisableMTUDiscovery bool `yaml:"disable-mtu-discovery,omitempty"` + FastOpen bool `yaml:"fast-open,omitempty"` + HopInterval int `yaml:"hop-interval,omitempty"` } diff --git a/model/proxy/hysteria2.go b/model/proxy/hysteria2.go index 070285f..c1cae50 100644 --- a/model/proxy/hysteria2.go +++ b/model/proxy/hysteria2.go @@ -1,22 +1,29 @@ package proxy +// https://github.com/MetaCubeX/mihomo/blob/Meta/adapter/outbound/hysteria2.go type Hysteria2 struct { - Server string `yaml:"server"` - Port int `yaml:"port"` - Up string `yaml:"up,omitempty"` - Down string `yaml:"down,omitempty"` - Password string `yaml:"password,omitempty"` - Obfs string `yaml:"obfs,omitempty"` - ObfsPassword string `yaml:"obfs-password,omitempty"` - SNI string `yaml:"sni,omitempty"` - SkipCertVerify bool `yaml:"skip-cert-verify,omitempty"` - Fingerprint string `yaml:"fingerprint,omitempty"` - ALPN []string `yaml:"alpn,omitempty"` - CustomCA string `yaml:"ca,omitempty"` - CustomCAString string `yaml:"ca-str,omitempty"` - CWND int `yaml:"cwnd,omitempty"` - ObfsParam string `yaml:"obfs-param,omitempty"` - Sni string `yaml:"sni,omitempty"` - TLS bool `yaml:"tls,omitempty"` - Network string `yaml:"network,omitempty"` + Server string `yaml:"server"` + Port int `yaml:"port,omitempty"` + Ports string `yaml:"ports,omitempty"` + HopInterval int `yaml:"hop-interval,omitempty"` + Up string `yaml:"up,omitempty"` + Down string `yaml:"down,omitempty"` + Password string `yaml:"password,omitempty"` + Obfs string `yaml:"obfs,omitempty"` + ObfsPassword string `yaml:"obfs-password,omitempty"` + SNI string `yaml:"sni,omitempty"` + ECHOpts ECHOptions `yaml:"ech-opts,omitempty"` + SkipCertVerify bool `yaml:"skip-cert-verify,omitempty"` + Fingerprint string `yaml:"fingerprint,omitempty"` + ALPN []string `yaml:"alpn,omitempty"` + CustomCA string `yaml:"ca,omitempty"` + CustomCAString string `yaml:"ca-str,omitempty"` + CWND int `yaml:"cwnd,omitempty"` + UdpMTU int `yaml:"udp-mtu,omitempty"` + + // quic-go special config + InitialStreamReceiveWindow uint64 `yaml:"initial-stream-receive-window,omitempty"` + MaxStreamReceiveWindow uint64 `yaml:"max-stream-receive-window,omitempty"` + InitialConnectionReceiveWindow uint64 `yaml:"initial-connection-receive-window,omitempty"` + MaxConnectionReceiveWindow uint64 `yaml:"max-connection-receive-window,omitempty"` } diff --git a/model/proxy/proxy.go b/model/proxy/proxy.go index aa81491..d1752a2 100644 --- a/model/proxy/proxy.go +++ b/model/proxy/proxy.go @@ -42,6 +42,11 @@ type WireGuardPeerOption struct { AllowedIPs []string `yaml:"allowed-ips,omitempty"` } +type ECHOptions struct { + Enable bool `yaml:"enable,omitempty" obfs:"enable,omitempty"` + Config string `yaml:"config,omitempty" obfs:"config,omitempty"` +} + type Proxy struct { Type string Name string diff --git a/model/proxy/shadowsocks.go b/model/proxy/shadowsocks.go index 6b042c7..127a246 100644 --- a/model/proxy/shadowsocks.go +++ b/model/proxy/shadowsocks.go @@ -1,5 +1,6 @@ package proxy +// https://github.com/MetaCubeX/mihomo/blob/Meta/adapter/outbound/shadowsocks.go type ShadowSocks struct { Server string `yaml:"server"` Port int `yaml:"port"` diff --git a/model/proxy/shadowsocksr.go b/model/proxy/shadowsocksr.go index 1f1500e..74d669e 100644 --- a/model/proxy/shadowsocksr.go +++ b/model/proxy/shadowsocksr.go @@ -1,5 +1,6 @@ package proxy +// https://github.com/MetaCubeX/mihomo/blob/Meta/adapter/outbound/shadowsocksr.go type ShadowSocksR struct { Server string `yaml:"server"` Port int `yaml:"port"` diff --git a/model/proxy/socks.go b/model/proxy/socks.go index 418f4e5..c06c449 100644 --- a/model/proxy/socks.go +++ b/model/proxy/socks.go @@ -1,8 +1,13 @@ package proxy +// https://github.com/MetaCubeX/mihomo/blob/Meta/adapter/outbound/socks5.go type Socks struct { - Server string `yaml:"server,omitempty"` - Port int `yaml:"port,omitempty"` - Username string `yaml:"username,omitempty"` - Password string `yaml:"password,omitempty"` + Server string `yaml:"server"` + Port int `yaml:"port"` + UserName string `yaml:"username,omitempty"` + Password string `yaml:"password,omitempty"` + TLS bool `yaml:"tls,omitempty"` + UDP bool `yaml:"udp,omitempty"` + SkipCertVerify bool `yaml:"skip-cert-verify,omitempty"` + Fingerprint string `yaml:"fingerprint,omitempty"` } diff --git a/model/proxy/trojan.go b/model/proxy/trojan.go index b696b9c..20b71e0 100644 --- a/model/proxy/trojan.go +++ b/model/proxy/trojan.go @@ -1,18 +1,26 @@ package proxy +// https://github.com/MetaCubeX/mihomo/blob/Meta/adapter/outbound/trojan.go type Trojan struct { Server string `yaml:"server"` Port int `yaml:"port"` Password string `yaml:"password"` - Alpn []string `yaml:"alpn,omitempty"` - Sni string `yaml:"sni,omitempty"` + ALPN []string `yaml:"alpn,omitempty"` + SNI string `yaml:"sni,omitempty"` SkipCertVerify bool `yaml:"skip-cert-verify,omitempty"` Fingerprint string `yaml:"fingerprint,omitempty"` UDP bool `yaml:"udp,omitempty"` Network string `yaml:"network,omitempty"` + ECHOpts ECHOptions `yaml:"ech-opts,omitempty"` RealityOpts RealityOptions `yaml:"reality-opts,omitempty"` GrpcOpts GrpcOptions `yaml:"grpc-opts,omitempty"` WSOpts WSOptions `yaml:"ws-opts,omitempty"` + SSOpts TrojanSSOption `yaml:"ss-opts,omitempty"` ClientFingerprint string `yaml:"client-fingerprint,omitempty"` - TLS bool `yaml:"tls,omitempty"` +} + +type TrojanSSOption struct { + Enabled bool `yaml:"enabled,omitempty"` + Method string `yaml:"method,omitempty"` + Password string `yaml:"password,omitempty"` } diff --git a/model/proxy/vless.go b/model/proxy/vless.go index 27e4e47..72692e0 100644 --- a/model/proxy/vless.go +++ b/model/proxy/vless.go @@ -1,17 +1,19 @@ package proxy +// https://github.com/MetaCubeX/mihomo/blob/Meta/adapter/outbound/vless.go type Vless struct { Server string `yaml:"server"` Port int `yaml:"port"` UUID string `yaml:"uuid"` Flow string `yaml:"flow,omitempty"` TLS bool `yaml:"tls,omitempty"` - Alpn []string `yaml:"alpn,omitempty"` + ALPN []string `yaml:"alpn,omitempty"` UDP bool `yaml:"udp,omitempty"` PacketAddr bool `yaml:"packet-addr,omitempty"` XUDP bool `yaml:"xudp,omitempty"` PacketEncoding string `yaml:"packet-encoding,omitempty"` Network string `yaml:"network,omitempty"` + ECHOpts ECHOptions `yaml:"ech-opts,omitempty"` RealityOpts RealityOptions `yaml:"reality-opts,omitempty"` HTTPOpts HTTPOptions `yaml:"http-opts,omitempty"` HTTP2Opts HTTP2Options `yaml:"h2-opts,omitempty"` @@ -23,7 +25,4 @@ type Vless struct { Fingerprint string `yaml:"fingerprint,omitempty"` ServerName string `yaml:"servername,omitempty"` ClientFingerprint string `yaml:"client-fingerprint,omitempty"` - Sni string `yaml:"sni,omitempty"` - AllowInsecure bool `yaml:"allow-insecure,omitempty"` - Servername string `yaml:"servername,omitempty"` } diff --git a/model/proxy/vmess.go b/model/proxy/vmess.go index b597891..b45bdf2 100644 --- a/model/proxy/vmess.go +++ b/model/proxy/vmess.go @@ -1,5 +1,6 @@ package proxy +// https://github.com/MetaCubeX/mihomo/blob/Meta/adapter/outbound/vmess.go type Vmess struct { Server string `yaml:"server"` Port int `yaml:"port"` @@ -9,10 +10,11 @@ type Vmess struct { UDP bool `yaml:"udp,omitempty"` Network string `yaml:"network,omitempty"` TLS bool `yaml:"tls,omitempty"` - Alpn []string `yaml:"alpn,omitempty"` + ALPN []string `yaml:"alpn,omitempty"` SkipCertVerify bool `yaml:"skip-cert-verify,omitempty"` Fingerprint string `yaml:"fingerprint,omitempty"` ServerName string `yaml:"servername,omitempty"` + ECHOpts ECHOptions `yaml:"ech-opts,omitempty"` RealityOpts RealityOptions `yaml:"reality-opts,omitempty"` HTTPOpts HTTPOptions `yaml:"http-opts,omitempty"` HTTP2Opts HTTP2Options `yaml:"h2-opts,omitempty"` @@ -24,5 +26,4 @@ type Vmess struct { GlobalPadding bool `yaml:"global-padding,omitempty"` AuthenticatedLength bool `yaml:"authenticated-length,omitempty"` ClientFingerprint string `yaml:"client-fingerprint,omitempty"` - Servername string `yaml:"servername,omitempty"` } diff --git a/model/subscription.go b/model/subscription.go index 1f41ff4..88aa5f1 100644 --- a/model/subscription.go +++ b/model/subscription.go @@ -1,212 +1,83 @@ package model -import "github.com/bestnite/sub2clash/model/proxy" +import ( + "net/netip" + + "github.com/bestnite/sub2clash/model/proxy" + C "github.com/metacubex/mihomo/config" + LC "github.com/metacubex/mihomo/listener/config" +) type NodeList struct { - Proxies []proxy.Proxy `yaml:"proxies,omitempty"` + Proxy []proxy.Proxy `yaml:"proxies,omitempty" json:"proxies"` } +// https://github.com/MetaCubeX/mihomo/blob/Meta/config/config.go RawConfig type Subscription struct { - Port int `yaml:"port,omitempty" json:"port"` - SocksPort int `yaml:"socks-port,omitempty" json:"socks-port"` - RedirPort int `yaml:"redir-port,omitempty" json:"redir-port"` - TProxyPort int `yaml:"tproxy-port,omitempty" json:"tproxy-port"` - MixedPort int `yaml:"mixed-port,omitempty" json:"mixed-port"` - ShadowSocksConfig string `yaml:"ss-config,omitempty"` - VmessConfig string `yaml:"vmess-config,omitempty"` - InboundTfo bool `yaml:"inbound-tfo,omitempty"` - InboundMPTCP bool `yaml:"inbound-mptcp,omitempty"` - Authentication []string `yaml:"authentication,omitempty" json:"authentication"` - SkipAuthPrefixes []string `yaml:"skip-auth-prefixes,omitempty"` - LanAllowedIPs []string `yaml:"lan-allowed-ips,omitempty"` - LanDisAllowedIPs []string `yaml:"lan-disallowed-ips,omitempty"` - AllowLan bool `yaml:"allow-lan,omitempty" json:"allow-lan"` - BindAddress string `yaml:"bind-address,omitempty" json:"bind-address"` - Mode string `yaml:"mode,omitempty" json:"mode"` - UnifiedDelay bool `yaml:"unified-delay,omitempty" json:"unified-delay"` - LogLevel string `yaml:"log-level,omitempty" json:"log-level"` - IPv6 bool `yaml:"ipv6,omitempty" json:"ipv6"` - ExternalController string `yaml:"external-controller,omitempty"` - ExternalControllerTLS string `yaml:"external-controller-tls,omitempty"` - ExternalUI string `yaml:"external-ui,omitempty"` - ExternalUIURL string `yaml:"external-ui-url,omitempty" json:"external-ui-url"` - ExternalUIName string `yaml:"external-ui-name,omitempty" json:"external-ui-name"` - Secret string `yaml:"secret,omitempty"` - Interface string `yaml:"interface-name,omitempty"` - RoutingMark int `yaml:"routing-mark,omitempty"` - //Tunnels []LC.Tunnel `yaml:"tunnels,omitempty"` - GeoAutoUpdate bool `yaml:"geo-auto-update,omitempty" json:"geo-auto-update"` - GeoUpdateInterval int `yaml:"geo-update-interval,omitempty" json:"geo-update-interval"` - GeodataMode bool `yaml:"geodata-mode,omitempty" json:"geodata-mode"` - GeodataLoader string `yaml:"geodata-loader,omitempty" json:"geodata-loader"` - GeositeMatcher string `yaml:"geosite-matcher,omitempty" json:"geosite-matcher"` - TCPConcurrent bool `yaml:"tcp-concurrent,omitempty" json:"tcp-concurrent"` - FindProcessMode string `yaml:"find-process-mode,omitempty" json:"find-process-mode"` - GlobalClientFingerprint string `yaml:"global-client-fingerprint,omitempty"` - GlobalUA string `yaml:"global-ua,omitempty"` - KeepAliveInterval int `yaml:"keep-alive-interval,omitempty"` + Port int `yaml:"port,omitempty" json:"port"` + SocksPort int `yaml:"socks-port,omitempty" json:"socks-port"` + RedirPort int `yaml:"redir-port,omitempty" json:"redir-port"` + TProxyPort int `yaml:"tproxy-port,omitempty" json:"tproxy-port"` + MixedPort int `yaml:"mixed-port,omitempty" json:"mixed-port"` + ShadowSocksConfig string `yaml:"ss-config,omitempty" json:"ss-config"` + VmessConfig string `yaml:"vmess-config,omitempty" json:"vmess-config"` + InboundTfo bool `yaml:"inbound-tfo,omitempty" json:"inbound-tfo"` + InboundMPTCP bool `yaml:"inbound-mptcp,omitempty" json:"inbound-mptcp"` + Authentication []string `yaml:"authentication,omitempty" json:"authentication"` + SkipAuthPrefixes []netip.Prefix `yaml:"skip-auth-prefixes,omitempty" json:"skip-auth-prefixes"` + LanAllowedIPs []netip.Prefix `yaml:"lan-allowed-ips,omitempty" json:"lan-allowed-ips"` + LanDisAllowedIPs []netip.Prefix `yaml:"lan-disallowed-ips,omitempty" json:"lan-disallowed-ips"` + AllowLan bool `yaml:"allow-lan,omitempty" json:"allow-lan"` + BindAddress string `yaml:"bind-address,omitempty" json:"bind-address"` + Mode string `yaml:"mode,omitempty" json:"mode"` + UnifiedDelay bool `yaml:"unified-delay,omitempty" json:"unified-delay"` + LogLevel string `yaml:"log-level,omitempty" json:"log-level"` + IPv6 bool `yaml:"ipv6,omitempty" json:"ipv6"` + ExternalController string `yaml:"external-controller,omitempty" json:"external-controller"` + ExternalControllerPipe string `yaml:"external-controller-pipe,omitempty" json:"external-controller-pipe"` + ExternalControllerUnix string `yaml:"external-controller-unix,omitempty" json:"external-controller-unix"` + ExternalControllerTLS string `yaml:"external-controller-tls,omitempty" json:"external-controller-tls"` + ExternalControllerCors C.RawCors `yaml:"external-controller-cors,omitempty" json:"external-controller-cors"` + ExternalUI string `yaml:"external-ui,omitempty" json:"external-ui"` + ExternalUIURL string `yaml:"external-ui-url,omitempty" json:"external-ui-url"` + ExternalUIName string `yaml:"external-ui-name,omitempty" json:"external-ui-name"` + ExternalDohServer string `yaml:"external-doh-server,omitempty" json:"external-doh-server"` + Secret string `yaml:"secret,omitempty" json:"secret"` + Interface string `yaml:"interface-name,omitempty" json:"interface-name"` + RoutingMark int `yaml:"routing-mark,omitempty" json:"routing-mark"` + Tunnels []LC.Tunnel `yaml:"tunnels,omitempty" json:"tunnels"` + GeoAutoUpdate bool `yaml:"geo-auto-update,omitempty" json:"geo-auto-update"` + GeoUpdateInterval int `yaml:"geo-update-interval,omitempty" json:"geo-update-interval"` + GeodataMode bool `yaml:"geodata-mode,omitempty" json:"geodata-mode"` + GeodataLoader string `yaml:"geodata-loader,omitempty" json:"geodata-loader"` + GeositeMatcher string `yaml:"geosite-matcher,omitempty" json:"geosite-matcher"` + TCPConcurrent bool `yaml:"tcp-concurrent,omitempty" json:"tcp-concurrent"` + FindProcessMode string `yaml:"find-process-mode,omitempty" json:"find-process-mode"` + GlobalClientFingerprint string `yaml:"global-client-fingerprint,omitempty" json:"global-client-fingerprint"` + GlobalUA string `yaml:"global-ua,omitempty" json:"global-ua"` + ETagSupport bool `yaml:"etag-support,omitempty" json:"etag-support"` + KeepAliveIdle int `yaml:"keep-alive-idle,omitempty" json:"keep-alive-idle"` + KeepAliveInterval int `yaml:"keep-alive-interval,omitempty" json:"keep-alive-interval"` + DisableKeepAlive bool `yaml:"disable-keep-alive,omitempty" json:"disable-keep-alive"` - Sniffer RawSniffer `yaml:"sniffer,omitempty" json:"sniffer"` - ProxyProvider map[string]map[string]any `yaml:"proxy-providers,omitempty"` - RuleProviders map[string]RuleProvider `yaml:"rule-providers,omitempty"` + ProxyProvider map[string]map[string]any `yaml:"proxy-providers,omitempty" json:"proxy-providers"` + RuleProvider map[string]RuleProvider `yaml:"rule-providers,omitempty" json:"rule-providers"` + Proxy []proxy.Proxy `yaml:"proxies,omitempty" json:"proxies"` + ProxyGroup []ProxyGroup `yaml:"proxy-groups,omitempty" json:"proxy-groups"` + Rule []string `yaml:"rules,omitempty" json:"rule"` + SubRules map[string][]string `yaml:"sub-rules,omitempty" json:"sub-rules"` + Listeners []map[string]any `yaml:"listeners,omitempty" json:"listeners"` Hosts map[string]any `yaml:"hosts,omitempty" json:"hosts"` - NTP RawNTP `yaml:"ntp,omitempty" json:"ntp"` - DNS RawDNS `yaml:"dns,omitempty" json:"dns"` - Tun RawTun `yaml:"tun,omitempty"` - TuicServer RawTuicServer `yaml:"tuic-server,omitempty"` - EBpf EBpf `yaml:"ebpf,omitempty"` - IPTables IPTables `yaml:"iptables,omitempty"` - Experimental Experimental `yaml:"experimental,omitempty"` - Profile Profile `yaml:"profile,omitempty"` - GeoXUrl GeoXUrl `yaml:"geox-url,omitempty"` - Proxies []proxy.Proxy `yaml:"proxies,omitempty"` - ProxyGroups []ProxyGroup `yaml:"proxy-groups,omitempty"` - Rules []string `yaml:"rules,omitempty"` - SubRules map[string][]string `yaml:"sub-rules,omitempty"` - RawTLS TLS `yaml:"tls,omitempty"` - Listeners []map[string]any `yaml:"listeners,omitempty"` + DNS C.RawDNS `yaml:"dns,omitempty" json:"dns"` + NTP C.RawNTP `yaml:"ntp,omitempty" json:"ntp"` + Tun C.RawTun `yaml:"tun,omitempty" json:"tun"` + TuicServer C.RawTuicServer `yaml:"tuic-server,omitempty" json:"tuic-server"` + IPTables C.RawIPTables `yaml:"iptables,omitempty" json:"iptables"` + Experimental C.RawExperimental `yaml:"experimental,omitempty" json:"experimental"` + Profile C.RawProfile `yaml:"profile,omitempty" json:"profile"` + GeoXUrl C.RawGeoXUrl `yaml:"geox-url,omitempty" json:"geox-url"` + Sniffer C.RawSniffer `yaml:"sniffer,omitempty" json:"sniffer"` + TLS C.RawTLS `yaml:"tls,omitempty" json:"tls"` - ClashForAndroid RawClashForAndroid `yaml:"clash-for-android,omitempty" json:"clash-for-android"` -} - -type RawClashForAndroid struct { - AppendSystemDNS bool `yaml:"append-system-dns,omitempty" json:"append-system-dns"` - UiSubtitlePattern string `yaml:"ui-subtitle-pattern,omitempty" json:"ui-subtitle-pattern"` -} - -type TLS struct { - Certificate string `yaml:"certificate,omitempty"` - PrivateKey string `yaml:"private-key,omitempty"` - CustomTrustCert []string `yaml:"custom-certifactes,omitempty"` -} - -type GeoXUrl struct { - GeoIp string `yaml:"geoip,omitempty" json:"geoip"` - Mmdb string `yaml:"mmdb,omitempty" json:"mmdb"` - GeoSite string `yaml:"geosite,omitempty" json:"geosite"` -} - -type Experimental struct { - Fingerprints []string `yaml:"fingerprints,omitempty"` - QUICGoDisableGSO bool `yaml:"quic-go-disable-gso,omitempty"` - QUICGoDisableECN bool `yaml:"quic-go-disable-ecn,omitempty"` - IP4PEnable bool `yaml:"dialer-ip4p-convert,omitempty"` -} - -type Profile struct { - StoreSelected bool `yaml:"store-selected,omitempty"` - StoreFakeIP bool `yaml:"store-fake-ip,omitempty"` -} - -type IPTables struct { - Enable bool `yaml:"enable,omitempty" json:"enable"` - InboundInterface string `yaml:"inbound-interface,omitempty" json:"inbound-interface"` - Bypass []string `yaml:"bypass,omitempty" json:"bypass"` - DnsRedirect bool `yaml:"dns-redirect,omitempty" json:"dns-redirect"` -} - -type EBpf struct { - RedirectToTun []string `yaml:"redirect-to-tun,omitempty" json:"redirect-to-tun"` - AutoRedir []string `yaml:"auto-redir,omitempty" json:"auto-redir"` -} - -type RawSniffer struct { - Enable bool `yaml:"enable,omitempty" json:"enable"` - OverrideDest bool `yaml:"override-destination,omitempty" json:"override-destination"` - Sniffing []string `yaml:"sniffing,omitempty" json:"sniffing"` - ForceDomain []string `yaml:"force-domain,omitempty" json:"force-domain"` - SkipDomain []string `yaml:"skip-domain,omitempty" json:"skip-domain"` - Ports []string `yaml:"port-whitelist,omitempty" json:"port-whitelist"` - ForceDnsMapping bool `yaml:"force-dns-mapping,omitempty" json:"force-dns-mapping"` - ParsePureIp bool `yaml:"parse-pure-ip,omitempty" json:"parse-pure-ip"` - Sniff map[string]RawSniffingConfig `yaml:"sniff,omitempty" json:"sniff"` -} - -type RawSniffingConfig struct { - Ports []string `yaml:"ports,omitempty" json:"ports"` - OverrideDest *bool `yaml:"override-destination,omitempty" json:"override-destination"` -} - -type RawNTP struct { - Enable bool `yaml:"enable,omitempty"` - Server string `yaml:"server,omitempty"` - ServerPort int `yaml:"server-port,omitempty"` - Interval int `yaml:"interval,omitempty"` - DialerProxy string `yaml:"dialer-proxy,omitempty"` - WriteToSystem bool `yaml:"write-to-system,omitempty"` -} - -type RawDNS struct { - Enable bool `yaml:"enable,omitempty" json:"enable"` - PreferH3 bool `yaml:"prefer-h3,omitempty" json:"prefer-h3"` - IPv6 bool `yaml:"ipv6,omitempty" json:"ipv6"` - IPv6Timeout uint `yaml:"ipv6-timeout,omitempty" json:"ipv6-timeout"` - UseHosts bool `yaml:"use-hosts,omitempty" json:"use-hosts"` - NameServer []string `yaml:"nameserver,omitempty" json:"nameserver"` - Fallback []string `yaml:"fallback,omitempty" json:"fallback"` - FallbackFilter RawFallbackFilter `yaml:"fallback-filter,omitempty" json:"fallback-filter"` - Listen string `yaml:"listen,omitempty" json:"listen"` - EnhancedMode string `yaml:"enhanced-mode,omitempty" json:"enhanced-mode"` - FakeIPRange string `yaml:"fake-ip-range,omitempty" json:"fake-ip-range"` - FakeIPFilter []string `yaml:"fake-ip-filter,omitempty" json:"fake-ip-filter"` - DefaultNameserver []string `yaml:"default-nameserver,omitempty" json:"default-nameserver"` - CacheAlgorithm string `yaml:"cache-algorithm,omitempty" json:"cache-algorithm"` - //NameServerPolicy *orderedmap.OrderedMap[string, any] `yaml:"nameserver-policy,omitempty" json:"nameserver-policy"` - ProxyServerNameserver []string `yaml:"proxy-server-nameserver,omitempty" json:"proxy-server-nameserver"` -} - -type RawFallbackFilter struct { - GeoIP bool `yaml:"geoip,omitempty" json:"geoip"` - GeoIPCode string `yaml:"geoip-code,omitempty" json:"geoip-code"` - IPCIDR []string `yaml:"ipcidr,omitempty" json:"ipcidr"` - Domain []string `yaml:"domain,omitempty" json:"domain"` - GeoSite []string `yaml:"geosite,omitempty" json:"geosite"` -} - -type RawTun struct { - Enable bool `yaml:"enable,omitempty" json:"enable"` - Device string `yaml:"device,omitempty" json:"device"` - Stack string `yaml:"stack,omitempty" json:"stack"` - DNSHijack []string `yaml:"dns-hijack,omitempty" json:"dns-hijack"` - AutoRoute bool `yaml:"auto-route,omitempty" json:"auto-route"` - AutoDetectInterface bool `yaml:"auto-detect-interface,omitempty"` - RedirectToTun []string `yaml:"-,omitempty" json:"-"` - - MTU uint32 `yaml:"mtu,omitempty" json:"mtu,omitempty"` - GSO bool `yaml:"gso,omitempty" json:"gso,omitempty"` - GSOMaxSize uint32 `yaml:"gso-max-size,omitempty" json:"gso-max-size,omitempty"` - //Inet4Address []netip.Prefix `yaml:"inet4-address,omitempty" json:"inet4_address,omitempty"` - Inet6Address []uint32 `yaml:"inet6-address,omitempty" json:"inet6_address,omitempty"` - StrictRoute bool `yaml:"strict-route,omitempty" json:"strict_route,omitempty"` - Inet4RouteAddress []uint32 `yaml:"inet4-route-address,omitempty" json:"inet4_route_address,omitempty"` - Inet6RouteAddress []uint32 `yaml:"inet6-route-address,omitempty" json:"inet6_route_address,omitempty"` - Inet4RouteExcludeAddress []uint32 `yaml:"inet4-route-exclude-address,omitempty" json:"inet4_route_exclude_address,omitempty"` - Inet6RouteExcludeAddress []uint32 `yaml:"inet6-route-exclude-address,omitempty" json:"inet6_route_exclude_address,omitempty"` - IncludeInterface []string `yaml:"include-interface,omitempty" json:"include-interface,omitempty"` - ExcludeInterface []string `yaml:"exclude-interface,omitempty" json:"exclude-interface,omitempty"` - IncludeUID []uint32 `yaml:"include-uid,omitempty" json:"include_uid,omitempty"` - IncludeUIDRange []string `yaml:"include-uid-range,omitempty" json:"include_uid_range,omitempty"` - ExcludeUID []uint32 `yaml:"exclude-uid,omitempty" json:"exclude_uid,omitempty"` - ExcludeUIDRange []string `yaml:"exclude-uid-range,omitempty" json:"exclude_uid_range,omitempty"` - IncludeAndroidUser []int `yaml:"include-android-user,omitempty" json:"include_android_user,omitempty"` - IncludePackage []string `yaml:"include-package,omitempty" json:"include_package,omitempty"` - ExcludePackage []string `yaml:"exclude-package,omitempty" json:"exclude_package,omitempty"` - EndpointIndependentNat bool `yaml:"endpoint-independent-nat,omitempty" json:"endpoint_independent_nat,omitempty"` - UDPTimeout int64 `yaml:"udp-timeout,omitempty" json:"udp_timeout,omitempty"` - FileDescriptor int `yaml:"file-descriptor,omitempty" json:"file-descriptor"` -} - -type RawTuicServer struct { - Enable bool `yaml:"enable,omitempty" json:"enable"` - Listen string `yaml:"listen,omitempty" json:"listen"` - Token []string `yaml:"token,omitempty" json:"token"` - Users map[string]string `yaml:"users,omitempty" json:"users,omitempty"` - Certificate string `yaml:"certificate,omitempty" json:"certificate"` - PrivateKey string `yaml:"private-key,omitempty" json:"private-key"` - CongestionController string `yaml:"congestion-controller,omitempty" json:"congestion-controller,omitempty"` - MaxIdleTime int `yaml:"max-idle-time,omitempty" json:"max-idle-time,omitempty"` - AuthenticationTimeout int `yaml:"authentication-timeout,omitempty" json:"authentication-timeout,omitempty"` - ALPN []string `yaml:"alpn,omitempty" json:"alpn,omitempty"` - MaxUdpRelayPacketSize int `yaml:"max-udp-relay-packet-size,omitempty" json:"max-udp-relay-packet-size,omitempty"` - CWND int `yaml:"cwnd,omitempty" json:"cwnd,omitempty"` + ClashForAndroid C.RawClashForAndroid `yaml:"clash-for-android,omitempty" json:"clash-for-android"` } diff --git a/parser/anytls.go b/parser/anytls.go index d54b7a3..a371246 100644 --- a/parser/anytls.go +++ b/parser/anytls.go @@ -85,7 +85,7 @@ func (p *AnytlsParser) Parse(proxy string) (P.Proxy, error) { Server: server, Port: port, Password: password, - Sni: sni, + SNI: sni, SkipCertVerify: insecureBool, }, } diff --git a/parser/hysteria.go b/parser/hysteria.go index 8ac1122..0831499 100644 --- a/parser/hysteria.go +++ b/parser/hysteria.go @@ -69,7 +69,7 @@ func (p *HysteriaParser) Parse(proxy string) (P.Proxy, error) { query := link.Query() - protocol, auth, insecure, upmbps, downmbps, obfs, alpnStr := query.Get("protocol"), query.Get("auth"), query.Get("insecure"), query.Get("upmbps"), query.Get("downmbps"), query.Get("obfs"), query.Get("alpn") + protocol, auth, auth_str, insecure, upmbps, downmbps, obfs, alpnStr := query.Get("protocol"), query.Get("auth"), query.Get("auth-str"), query.Get("insecure"), query.Get("upmbps"), query.Get("downmbps"), query.Get("obfs"), query.Get("alpn") insecureBool, err := strconv.ParseBool(insecure) if err != nil { insecureBool = false @@ -96,11 +96,11 @@ func (p *HysteriaParser) Parse(proxy string) (P.Proxy, error) { Up: upmbps, Down: downmbps, Auth: auth, + AuthString: auth_str, Obfs: obfs, SkipCertVerify: insecureBool, - Alpn: alpn, + ALPN: alpn, Protocol: protocol, - AllowInsecure: insecureBool, }, } return result, nil diff --git a/parser/hysteria2.go b/parser/hysteria2.go index 47460a1..d56a72b 100644 --- a/parser/hysteria2.go +++ b/parser/hysteria2.go @@ -70,8 +70,7 @@ func (p *Hysteria2Parser) Parse(proxy string) (P.Proxy, error) { Raw: portStr, } } - network, obfs, obfsPassword, pinSHA256, insecure, sni := query.Get("network"), query.Get("obfs"), query.Get("obfs-password"), query.Get("pinSHA256"), query.Get("insecure"), query.Get("sni") - enableTLS := pinSHA256 != "" || sni != "" + obfs, obfsPassword, insecure, sni := query.Get("obfs"), query.Get("obfs-password"), query.Get("insecure"), query.Get("sni") insecureBool := insecure == "1" remarks := link.Fragment if remarks == "" { @@ -87,11 +86,9 @@ func (p *Hysteria2Parser) Parse(proxy string) (P.Proxy, error) { Port: port, Password: password, Obfs: obfs, - ObfsParam: obfsPassword, - Sni: sni, + ObfsPassword: obfsPassword, + SNI: sni, SkipCertVerify: insecureBool, - TLS: enableTLS, - Network: network, }, } return result, nil diff --git a/parser/socks.go b/parser/socks.go index c829d4f..41601e8 100644 --- a/parser/socks.go +++ b/parser/socks.go @@ -91,7 +91,7 @@ func (p *SocksParser) Parse(proxy string) (P.Proxy, error) { Socks: P.Socks{ Server: server, Port: port, - Username: username, + UserName: username, Password: password, }, }, nil diff --git a/parser/trojan.go b/parser/trojan.go index f3c65cc..f267ec6 100644 --- a/parser/trojan.go +++ b/parser/trojan.go @@ -91,14 +91,12 @@ func (p *TrojanParser) Parse(proxy string) (P.Proxy, error) { } if security == "xtls" || security == "tls" { - result.Alpn = alpn - result.Sni = sni - result.TLS = true + result.ALPN = alpn + result.SNI = sni } if security == "reality" { - result.TLS = true - result.Sni = sni + result.SNI = sni result.RealityOpts = P.RealityOptions{ PublicKey: pbk, ShortID: sid, diff --git a/parser/vless.go b/parser/vless.go index e36d9d9..bab9fbc 100644 --- a/parser/vless.go +++ b/parser/vless.go @@ -84,15 +84,14 @@ func (p *VlessParser) Parse(proxy string) (P.Proxy, error) { if security == "tls" { result.TLS = true - result.Alpn = alpn - result.Sni = sni - result.AllowInsecure = insecureBool + result.ALPN = alpn + result.SkipCertVerify = insecureBool result.ClientFingerprint = fp } if security == "reality" { result.TLS = true - result.Servername = sni + result.ServerName = sni result.RealityOpts = P.RealityOptions{ PublicKey: pbk, ShortID: sid, diff --git a/parser/vmess.go b/parser/vmess.go index d030a1f..908b86e 100644 --- a/parser/vmess.go +++ b/parser/vmess.go @@ -119,8 +119,8 @@ func (p *VmessParser) Parse(proxy string) (P.Proxy, error) { } result.TLS = true result.Fingerprint = vmess.Fp - result.Alpn = alpn - result.Servername = vmess.Sni + result.ALPN = alpn + result.ServerName = vmess.Sni } if vmess.Net == "ws" { diff --git a/server/handler/sub.go b/server/handler/sub.go index 76b66fe..91317b3 100644 --- a/server/handler/sub.go +++ b/server/handler/sub.go @@ -35,7 +35,7 @@ func SubHandler(model M.ClashType, template string) func(c *gin.Context) { if query.NodeListMode { nodelist := M.NodeList{} - nodelist.Proxies = sub.Proxies + nodelist.Proxy = sub.Proxy marshal, err := yaml.Marshal(nodelist) if err != nil { c.String(http.StatusInternalServerError, "YAML序列化失败: "+err.Error())