🐛 Fix trojan parser missing fields

constant/prefix.go

@@ -0,0 +1,11 @@
+package constant
+
+const (
+	HysteriaPrefix    string = "hysteria://"
+	Hysteria2Prefix1  string = "hysteria2://"
+	Hysteria2Prefix2  string = "hy2://"
+	ShadowsocksPrefix string = "ss://"
+	TrojanPrefix      string = "trojan://"
+	VLESSPrefix       string = "vless://"
+	VMessPrefix       string = "vmess://"
+)

parser/error.go

@@ -0,0 +1,24 @@
+package parser
+
+type ParseError struct {
+	Type    ParseErrorType
+	Message string
+	Raw     string
+}
+
+type ParseErrorType string
+
+const (
+	ErrInvalidPrefix     ParseErrorType = "invalid url prefix"
+	ErrInvalidStruct     ParseErrorType = "invalid struct"
+	ErrInvalidPort       ParseErrorType = "invalid port number"
+	ErrCannotParseParams ParseErrorType = "cannot parse query parameters"
+	ErrInvalidBase64     ParseErrorType = "invalid base64"
+)
+
+func (e *ParseError) Error() string {
+	if e.Message != "" {
+		return string(e.Type) + ": " + e.Message + " \"" + e.Raw + "\""
+	}
+	return string(e.Type)
+}

parser/port.go

@@ -0,0 +1,23 @@
+package parser
+
+import (
+	"strconv"
+)
+
+func ParsePort(portStr string) (int, error) {
+	port, err := strconv.Atoi(portStr)
+
+	if err != nil {
+		return 0, &ParseError{
+			Type:    ErrInvalidPort,
+			Message: portStr,
+		}
+	}
+	if port < 1 || port > 65535 {
+		return 0, &ParseError{
+			Type:    ErrInvalidPort,
+			Message: portStr,
+		}
+	}
+	return port, nil
+}

parser/trojan.go

@@ -1,53 +1,133 @@
 package parser
 
 import (
-	"fmt"
 	"net/url"
-	"strconv"
 	"strings"
+	"sub2clash/constant"
 	"sub2clash/model"
 )
 
+// ParseTrojan 解析给定的Trojan代理URL并返回Proxy结构。
 func ParseTrojan(proxy string) (model.Proxy, error) {
-	// 判断是否以 trojan:// 开头
+	if !strings.HasPrefix(proxy, constant.TrojanPrefix) {
-	if !strings.HasPrefix(proxy, "trojan://") {
+		return model.Proxy{}, &ParseError{Type: ErrInvalidPrefix, Raw: proxy}
-		return model.Proxy{}, fmt.Errorf("invalid trojan Url")
 	}
-	// 分割
+
-	parts := strings.SplitN(strings.TrimPrefix(proxy, "trojan://"), "@", 2)
+	proxy = strings.TrimPrefix(proxy, constant.TrojanPrefix)
-	if len(parts) != 2 {
+	urlParts := strings.SplitN(proxy, "@", 2)
-		return model.Proxy{}, fmt.Errorf("invalid trojan Url")
+	if len(urlParts) != 2 {
+		return model.Proxy{}, &ParseError{
+			Type:    ErrInvalidStruct,
+			Message: "missing character '@' in url",
+			Raw:     proxy,
+		}
 	}
-	// 分割
+	password := strings.TrimSpace(urlParts[0])
-	serverInfo := strings.SplitN(parts[1], "#", 2)
+
+	serverInfo := strings.SplitN(urlParts[1], "#", 2)
 	serverAndPortAndParams := strings.SplitN(serverInfo[0], "?", 2)
+	if len(serverAndPortAndParams) != 2 {
+		return model.Proxy{}, &ParseError{
+			Type:    ErrInvalidStruct,
+			Message: "missing character '?' in url",
+			Raw:     proxy,
+		}
+	}
+
 	serverAndPort := strings.SplitN(serverAndPortAndParams[0], ":", 2)
+	if len(serverAndPort) != 2 {
+		return model.Proxy{}, &ParseError{
+			Type:    ErrInvalidStruct,
+			Message: "missing server host or port",
+			Raw:     proxy,
+		}
+	}
+	server, portStr := serverAndPort[0], serverAndPort[1]
+
 	params, err := url.ParseQuery(serverAndPortAndParams[1])
 	if err != nil {
-		return model.Proxy{}, err
+		return model.Proxy{}, &ParseError{
+			Type:    ErrCannotParseParams,
+			Raw:     proxy,
+			Message: err.Error(),
+		}
 	}
-	if len(serverAndPort) != 2 {
+
-		return model.Proxy{}, fmt.Errorf("invalid trojan")
+	port, err := ParsePort(portStr)
-	}
-	// 处理端口
-	port, err := strconv.Atoi(strings.TrimSpace(serverAndPort[1]))
 	if err != nil {
 		return model.Proxy{}, err
 	}
-	// 返回结果
+
+	remarks := ""
+	if len(serverInfo) == 2 {
+		remarks, _ = url.QueryUnescape(strings.TrimSpace(serverInfo[1]))
+	} else {
+		remarks = serverAndPort[0]
+	}
+
+	network, security, alpnStr, sni, pbk, sid, fp, path, host, serviceName := params.Get("type"), params.Get("security"), params.Get("alpn"), params.Get("sni"), params.Get("pbk"), params.Get("sid"), params.Get("fp"), params.Get("path"), params.Get("host"), params.Get("serviceName")
+
+	var alpn []string
+	if strings.Contains(alpnStr, ",") {
+		alpn = strings.Split(alpnStr, ",")
+	} else {
+		alpn = nil
+	}
+
+	// enableUTLS := fp != ""
+
+	// 构建Proxy结构体
 	result := model.Proxy{
 		Type:     "trojan",
-		Server:   strings.TrimSpace(serverAndPort[0]),
+		Server:   server,
 		Port:     port,
-		UDP:      true,
+		Password: password,
-		Password: strings.TrimSpace(parts[0]),
+		Name:     remarks,
-		Sni:      params.Get("sni"),
+		Network:  network,
 	}
-	// 如果有节点名称
+
-	if len(serverInfo) == 2 {
+	if security == "xtls" || security == "tls" {
-		result.Name, _ = url.QueryUnescape(strings.TrimSpace(serverInfo[1]))
+		result.Alpn = alpn
-	} else {
+		result.Sni = sni
-		result.Name = serverAndPort[0]
+		result.TLS = true
 	}
+
+	if security == "reality" {
+		result.TLS = true
+		result.Sni = sni
+		result.RealityOpts = model.RealityOptions{
+			PublicKey: pbk,
+			ShortID:   sid,
+		}
+		result.Fingerprint = fp
+	}
+
+	if network == "ws" {
+		result.Network = "ws"
+		result.WSOpts = model.WSOptions{
+			Path: path,
+			Headers: map[string]string{
+				"Host": host,
+			},
+		}
+	}
+
+	if network == "http" {
+		result.HTTP2Opts = model.HTTP2Options{
+			Host: []string{host},
+			Path: path,
+		}
+	}
+
+	if network == "quic" {
+		// 未查到相关支持文档
+	}
+
+	if network == "grpc" {
+		result.GrpcOpts = model.GrpcOptions{
+			GrpcServiceName: serviceName,
+		}
+	}
+
 	return result, nil
 }

test/parser_test.go

@@ -8,7 +8,7 @@ import (
 )
 
 func TestHy2Parser(t *testing.T) {
-	res, err := parser.ParseHysteria2("hysteria2://letmein@example.com/?insecure=1&obfs=salamander&obfs-password=gawrgura&pinSHA256=deadbeef&sni=real.example.com")
+	res, err := parser.ParseTrojan("trojan://Abse64hhjewrs@test.com:8443?type=ws&path=%2Fx&host=test.com&security=tls&fp=&alpn=http%2F1.1&sni=test.com#test")
 	if err != nil {
 		t.Log(err.Error())
 		t.Fail()