🐛 Fix vless parser cannot correctly parse some reality/grpc fields

.github/workflows/docker.yml

@@ -23,6 +23,7 @@ jobs:
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
+            type=match,pattern=(alpha|beta|rc),group=1
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -51,3 +52,4 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          platforms: linux/amd64,linux/arm64,linux/arm/v7

.gitignore

@@ -5,3 +5,4 @@ logs
 data
 .env
 .vscode/settings.json
+test

README.md

@@ -1,5 +1,7 @@
 # sub2clash
 
+> Sing-box 用户？看看另一个项目 [sub2sing-box](https://github.com/nitezs/sub2sing-box)
+
 将订阅链接转换为 Clash、Clash.Meta 配置  
 [预览](https://www.nite07.com/sub)
 
@@ -7,8 +9,8 @@
 
 - 开箱即用的规则、策略组配置
 - 自动根据节点名称按国家划分策略组
--   支持多订阅合并
+- 多订阅合并
--   支持添加自定义 Rule Provider、Rule
+- 自定义 Rule Provider、Rule
 - 支持多种协议
   - Shadowsocks
   - ShadowsocksR
@@ -20,7 +22,7 @@
 
 ## 使用
 
-### 运行
+### 部署
 
 - [docker compose](./docker-compose.yml)
 - 运行[二进制文件](https://github.com/nitezs/sub2clash/releases/latest)

api/route.go

@@ -18,7 +18,6 @@ var staticFiles embed.FS
 func SetRoute(r *gin.Engine) {
 	r.Use(middleware.ZapLogger())
 
-	// 使用内嵌的模板文件
 	tpl, err := template.ParseFS(staticFiles, "static/*")
 	if err != nil {
 		log.Fatalf("Error parsing templates: %v", err)
@@ -33,9 +32,6 @@ func SetRoute(r *gin.Engine) {
 	r.GET(
 		"/", func(c *gin.Context) {
 			version := constant.Version
-			if len(constant.Version) > 7 {
-				version = constant.Version[:7]
-			}
 			c.HTML(
 				200, "index.html", gin.H{
 					"Version": version,

parser/vless.go

@@ -110,6 +110,7 @@ func ParseVless(proxy string) (model.Proxy, error) {
 
 	if security == "reality" {
 		result.TLS = true
+		result.Servername = sni
 		result.RealityOpts = model.RealityOptions{
 			PublicKey: pbk,
 			ShortID:   sid,
@@ -133,7 +134,9 @@ func ParseVless(proxy string) (model.Proxy, error) {
 
 	if _type == "grpc" {
 		result.Network = "grpc"
-		result.Servername = serviceName
+		result.GrpcOpts = model.GrpcOptions{
+			GrpcServiceName: serviceName,
+		}
 	}
 
 	if _type == "http" {

test/parser_test.go

@@ -1,22 +0,0 @@
-package test
-
-import (
-	"strings"
-	"testing"
-)
-
-func TestParser(t *testing.T) {
-	// 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()
-	// }
-	// bytes, err := yaml.Marshal(res)
-	// if err != nil {
-	// 	t.Log(err.Error())
-	// 	t.Fail()
-	// }
-	// t.Log(string(bytes))
-	t.Log(strings.SplitN("123456", "/?", 2))
-
-}