diff --git a/README.md b/README.md index eeab6db..54b9568 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,7 @@ - Hysteria （Clash.Meta） - Hysteria2 （Clash.Meta） - Socks5 + - Anytls （Clash.Meta） ## 使用 diff --git a/common/proxy.go b/common/proxy.go index 47f5aeb..bf65344 100644 --- a/common/proxy.go +++ b/common/proxy.go @@ -130,6 +130,9 @@ func ParseProxy(proxies ...string) []model.Proxy { if strings.HasPrefix(proxy, constant.SocksPrefix) { proxyItem, err = parser.ParseSocks(proxy) } + if strings.HasPrefix(proxy, constant.AnytlsPrefix) { + proxyItem, err = parser.ParseAnytls(proxy) + } if err == nil { result = append(result, proxyItem) } else { diff --git a/constant/prefix.go b/constant/prefix.go index bc85e7b..395ca14 100644 --- a/constant/prefix.go +++ b/constant/prefix.go @@ -10,4 +10,5 @@ const ( VLESSPrefix string = "vless://" VMessPrefix string = "vmess://" SocksPrefix string = "socks" + AnytlsPrefix string = "anytls://" ) diff --git a/model/clash.go b/model/clash.go index 39906b0..25d6804 100644 --- a/model/clash.go +++ b/model/clash.go @@ -27,6 +27,7 @@ func GetSupportProxyTypes(clashType ClashType) map[string]bool { "hysteria": true, "hysteria2": true, "socks5": true, + "anytls": true, } } return nil diff --git a/model/proxy.go b/model/proxy.go index 59520d3..8759e99 100644 --- a/model/proxy.go +++ b/model/proxy.go @@ -5,70 +5,73 @@ type SmuxStruct struct { } type Proxy struct { - Name string `yaml:"name,omitempty"` - Server string `yaml:"server,omitempty"` - Port int `yaml:"port,omitempty"` - Type string `yaml:"type,omitempty"` - Cipher string `yaml:"cipher,omitempty"` - Username string `yaml:"username,omitempty"` - Password string `yaml:"password,omitempty"` - UDP bool `yaml:"udp,omitempty"` - UUID string `yaml:"uuid,omitempty"` - Network string `yaml:"network,omitempty"` - Flow string `yaml:"flow,omitempty"` - TLS bool `yaml:"tls,omitempty"` - ClientFingerprint string `yaml:"client-fingerprint,omitempty"` - Plugin string `yaml:"plugin,omitempty"` - PluginOpts map[string]any `yaml:"plugin-opts,omitempty"` - Smux SmuxStruct `yaml:"smux,omitempty"` - Sni string `yaml:"sni,omitempty"` - AllowInsecure bool `yaml:"allow-insecure,omitempty"` - Fingerprint string `yaml:"fingerprint,omitempty"` - SkipCertVerify bool `yaml:"skip-cert-verify,omitempty"` - Alpn []string `yaml:"alpn,omitempty"` - XUDP bool `yaml:"xudp,omitempty"` - Servername string `yaml:"servername,omitempty"` - WSOpts WSOptions `yaml:"ws-opts,omitempty"` - AlterID int `yaml:"alterId,omitempty"` - GrpcOpts GrpcOptions `yaml:"grpc-opts,omitempty"` - RealityOpts RealityOptions `yaml:"reality-opts,omitempty"` - Protocol string `yaml:"protocol,omitempty"` - Obfs string `yaml:"obfs,omitempty"` - ObfsParam string `yaml:"obfs-param,omitempty"` - ProtocolParam string `yaml:"protocol-param,omitempty"` - Remarks []string `yaml:"remarks,omitempty"` - HTTPOpts HTTPOptions `yaml:"http-opts,omitempty"` - HTTP2Opts HTTP2Options `yaml:"h2-opts,omitempty"` - PacketAddr bool `yaml:"packet-addr,omitempty"` - PacketEncoding string `yaml:"packet-encoding,omitempty"` - GlobalPadding bool `yaml:"global-padding,omitempty"` - AuthenticatedLength bool `yaml:"authenticated-length,omitempty"` - UDPOverTCP bool `yaml:"udp-over-tcp,omitempty"` - UDPOverTCPVersion int `yaml:"udp-over-tcp-version,omitempty"` - SubName string `yaml:"-"` - Up string `yaml:"up,omitempty"` - Down string `yaml:"down,omitempty"` - CustomCA string `yaml:"ca,omitempty"` - CustomCAString string `yaml:"ca-str,omitempty"` - CWND int `yaml:"cwnd,omitempty"` - Auth string `yaml:"auth,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"` - Ports string `yaml:"ports,omitempty"` - AuthStringOLD string `yaml:"auth_str,omitempty"` - AuthString string `yaml:"auth-str,omitempty"` - Ip string `yaml:"ip,omitempty"` - Ipv6 string `yaml:"ipv6,omitempty"` - PrivateKey string `yaml:"private-key,omitempty"` - Workers int `yaml:"workers,omitempty"` - MTU int `yaml:"mtu,omitempty"` - PersistentKeepalive int `yaml:"persistent-keepalive,omitempty"` - Peers []WireGuardPeerOption `yaml:"peers,omitempty"` - RemoteDnsResolve bool `yaml:"remote-dns-resolve,omitempty"` - Dns []string `yaml:"dns,omitempty"` + Name string `yaml:"name,omitempty"` + Server string `yaml:"server,omitempty"` + Port int `yaml:"port,omitempty"` + Type string `yaml:"type,omitempty"` + Cipher string `yaml:"cipher,omitempty"` + Username string `yaml:"username,omitempty"` + Password string `yaml:"password,omitempty"` + UDP bool `yaml:"udp,omitempty"` + UUID string `yaml:"uuid,omitempty"` + Network string `yaml:"network,omitempty"` + Flow string `yaml:"flow,omitempty"` + TLS bool `yaml:"tls,omitempty"` + ClientFingerprint string `yaml:"client-fingerprint,omitempty"` + Plugin string `yaml:"plugin,omitempty"` + PluginOpts map[string]any `yaml:"plugin-opts,omitempty"` + Smux SmuxStruct `yaml:"smux,omitempty"` + Sni string `yaml:"sni,omitempty"` + AllowInsecure bool `yaml:"allow-insecure,omitempty"` + Fingerprint string `yaml:"fingerprint,omitempty"` + SkipCertVerify bool `yaml:"skip-cert-verify,omitempty"` + Alpn []string `yaml:"alpn,omitempty"` + XUDP bool `yaml:"xudp,omitempty"` + Servername string `yaml:"servername,omitempty"` + WSOpts WSOptions `yaml:"ws-opts,omitempty"` + AlterID int `yaml:"alterId,omitempty"` + GrpcOpts GrpcOptions `yaml:"grpc-opts,omitempty"` + RealityOpts RealityOptions `yaml:"reality-opts,omitempty"` + Protocol string `yaml:"protocol,omitempty"` + Obfs string `yaml:"obfs,omitempty"` + ObfsParam string `yaml:"obfs-param,omitempty"` + ProtocolParam string `yaml:"protocol-param,omitempty"` + Remarks []string `yaml:"remarks,omitempty"` + HTTPOpts HTTPOptions `yaml:"http-opts,omitempty"` + HTTP2Opts HTTP2Options `yaml:"h2-opts,omitempty"` + PacketAddr bool `yaml:"packet-addr,omitempty"` + PacketEncoding string `yaml:"packet-encoding,omitempty"` + GlobalPadding bool `yaml:"global-padding,omitempty"` + AuthenticatedLength bool `yaml:"authenticated-length,omitempty"` + UDPOverTCP bool `yaml:"udp-over-tcp,omitempty"` + UDPOverTCPVersion int `yaml:"udp-over-tcp-version,omitempty"` + SubName string `yaml:"-"` + Up string `yaml:"up,omitempty"` + Down string `yaml:"down,omitempty"` + CustomCA string `yaml:"ca,omitempty"` + CustomCAString string `yaml:"ca-str,omitempty"` + CWND int `yaml:"cwnd,omitempty"` + Auth string `yaml:"auth,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"` + Ports string `yaml:"ports,omitempty"` + AuthStringOLD string `yaml:"auth_str,omitempty"` + AuthString string `yaml:"auth-str,omitempty"` + Ip string `yaml:"ip,omitempty"` + Ipv6 string `yaml:"ipv6,omitempty"` + PrivateKey string `yaml:"private-key,omitempty"` + Workers int `yaml:"workers,omitempty"` + MTU int `yaml:"mtu,omitempty"` + PersistentKeepalive int `yaml:"persistent-keepalive,omitempty"` + Peers []WireGuardPeerOption `yaml:"peers,omitempty"` + RemoteDnsResolve bool `yaml:"remote-dns-resolve,omitempty"` + Dns []string `yaml:"dns,omitempty"` + IdleSessionCheckInterval int `yaml:"idle-session-check-interval,omitempty"` + IdleSessionTimeout int `yaml:"idle-session-timeout,omitempty"` + MinIdleSession int `yaml:"min-idle-session,omitempty"` } type WireGuardPeerOption struct { @@ -98,6 +101,8 @@ func (p Proxy) MarshalYAML() (interface{}, error) { return ProxyToHysteria(p), nil case "hysteria2": return ProxyToHysteria2(p), nil + case "anytls": + return ProxyToAnytls(p), nil default: return _Proxy(p), nil } diff --git a/model/proxy_anytls.go b/model/proxy_anytls.go new file mode 100644 index 0000000..00fffc6 --- /dev/null +++ b/model/proxy_anytls.go @@ -0,0 +1,37 @@ +package model + +type Anytls struct { + Type string `yaml:"type"` + Name string `yaml:"name"` + 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"` +} + +func ProxyToAnytls(p Proxy) Anytls { + return Anytls{ + Type: "anytls", + Name: p.Name, + Server: p.Server, + Port: p.Port, + Password: p.Password, + Alpn: p.Alpn, + SNI: p.Sni, + ClientFingerprint: p.ClientFingerprint, + SkipCertVerify: p.SkipCertVerify, + Fingerprint: p.Fingerprint, + UDP: p.UDP, + IdleSessionCheckInterval: p.IdleSessionCheckInterval, + IdleSessionTimeout: p.IdleSessionTimeout, + MinIdleSession: p.MinIdleSession, + } +} diff --git a/parser/anytls.go b/parser/anytls.go new file mode 100644 index 0000000..05a6630 --- /dev/null +++ b/parser/anytls.go @@ -0,0 +1,74 @@ +package parser + +import ( + "fmt" + "net/url" + "strings" + + "github.com/nitezs/sub2clash/constant" + "github.com/nitezs/sub2clash/model" +) + +func ParseAnytls(proxy string) (model.Proxy, error) { + if !strings.HasPrefix(proxy, constant.AnytlsPrefix) { + return model.Proxy{}, &ParseError{Type: ErrInvalidPrefix, Raw: proxy} + } + + link, err := url.Parse(proxy) + if err != nil { + return model.Proxy{}, &ParseError{ + Type: ErrInvalidStruct, + Message: "url parse error", + Raw: proxy, + } + } + + username := link.User.Username() + password, exist := link.User.Password() + if !exist { + password = username + } + + query := link.Query() + server := link.Hostname() + if server == "" { + return model.Proxy{}, &ParseError{ + Type: ErrInvalidStruct, + Message: "missing server host", + Raw: proxy, + } + } + portStr := link.Port() + if portStr == "" { + return model.Proxy{}, &ParseError{ + Type: ErrInvalidStruct, + Message: "missing server port", + Raw: proxy, + } + } + port, err := ParsePort(portStr) + if err != nil { + return model.Proxy{}, &ParseError{ + Type: ErrInvalidPort, + Raw: portStr, + } + } + insecure, sni := query.Get("insecure"), query.Get("sni") + insecureBool := insecure == "1" + remarks := link.Fragment + if remarks == "" { + remarks = fmt.Sprintf("%s:%s", server, portStr) + } + remarks = strings.TrimSpace(remarks) + + result := model.Proxy{ + Type: "anytls", + Name: remarks, + Server: server, + Port: port, + Password: password, + Sni: sni, + SkipCertVerify: insecureBool, + } + return result, nil +}