Merge pull request #63 from pingchieh/main

添加Anytls协议

README.md

@@ -18,6 +18,7 @@
   - Hysteria （Clash.Meta）
   - Hysteria2 （Clash.Meta）
   - Socks5
+  - Anytls （Clash.Meta）
 
 ## 使用
 

api/handler/default.go

@@ -233,6 +233,21 @@ func BuildSub(clashType model.ClashType, query validator.SubValidator, template
 	return temp, nil
 }
 
+func fetchSubscriptionUserInfo(url string, userAgent string) (string, error) {
+	resp, err := common.Head(url, common.WithUserAgent(userAgent))
+	if err != nil {
+		logger.Logger.Debug("创建 HEAD 请求失败", zap.Error(err))
+		return "", err
+	}
+	defer resp.Body.Close()
+	if userInfo := resp.Header.Get("subscription-userinfo"); userInfo != "" {
+		return userInfo, nil
+	}
+
+	logger.Logger.Debug("目标 URL 未返回 subscription-userinfo 头", zap.Error(err))
+	return "", err
+}
+
 func MergeSubAndTemplate(temp *model.Subscription, sub *model.Subscription, igcg bool) {
 
 	var countryGroupNames []string

api/handler/meta.go

@@ -25,6 +25,14 @@ func SubHandler(c *gin.Context) {
 		return
 	}
 
+	if len(query.Subs) == 1 {
+		userInfoHeader, err := fetchSubscriptionUserInfo(query.Subs[0], "clash")
+		if err != nil {
+			c.String(http.StatusInternalServerError, err.Error())
+		}
+		c.Header("subscription-userinfo", userInfoHeader)
+	}
+
 	if query.NodeListMode {
 		nodelist := model.NodeList{}
 		nodelist.Proxies = sub.Proxies

common/get.go

@@ -58,3 +58,45 @@ func Get(url string, options ...GetOption) (resp *http.Response, err error) {
 	}
 	return nil, fmt.Errorf("请求失败：%v", err)
 }
+
+func Head(url string, options ...GetOption) (resp *http.Response, err error) {
+	retryTimes := config.Default.RequestRetryTimes
+	haveTried := 0
+	retryDelay := time.Second
+
+	// 解析可选参数（如 User-Agent）
+	getConfig := GetConfig{}
+	for _, option := range options {
+		option(&getConfig)
+	}
+
+	var req *http.Request
+	var headResp *http.Response
+
+	for haveTried < retryTimes {
+		client := &http.Client{}
+		req, err = http.NewRequest("HEAD", url, nil)
+		if err != nil {
+			haveTried++
+			time.Sleep(retryDelay)
+			continue
+		}
+
+		// 设置 User-Agent（如果提供）
+		if getConfig.userAgent != "" {
+			req.Header.Set("User-Agent", getConfig.userAgent)
+		}
+
+		headResp, err = client.Do(req)
+		if err != nil {
+			haveTried++
+			time.Sleep(retryDelay)
+			continue
+		}
+
+		// HEAD 请求不检查 ContentLength，因为没有响应体
+		return headResp, nil
+	}
+
+	return nil, fmt.Errorf("HEAD 请求失败：%v", err)
+}

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 {

constant/prefix.go

@@ -10,4 +10,5 @@ const (
 	VLESSPrefix        string = "vless://"
 	VMessPrefix        string = "vmess://"
 	SocksPrefix        string = "socks"
+	AnytlsPrefix       string = "anytls://"
 )

model/clash.go

@@ -27,6 +27,7 @@ func GetSupportProxyTypes(clashType ClashType) map[string]bool {
 			"hysteria":  true,
 			"hysteria2": true,
 			"socks5":    true,
+			"anytls":    true,
 		}
 	}
 	return nil

model/proxy.go

@@ -69,6 +69,9 @@ type Proxy struct {
 	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
 	}

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,
+	}
+}

model/rule_provider.go

@@ -6,6 +6,7 @@ type RuleProvider struct {
 	Url      string `yaml:"url,omitempty"`
 	Path     string `yaml:"path,omitempty"`
 	Interval int    `yaml:"interval,omitempty"`
+	Format string    `yaml:"format,omitempty"`
 }
 
 type Payload struct {

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
+}