Merge pull request #59 from timerzz/main

fix 修复Get函数重试结束后，返回nil,nil的bug

.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

.github/workflows/docker.yml

@@ -0,0 +1,55 @@
+name: docker
+
+on:
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  prepare-and-build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            nite07/sub2clash
+            ghcr.io/nitezs/sub2clash
+          tags: |
+            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
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Login to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          build-args: |
+            "version=${{ github.ref_name }}"
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          platforms: linux/amd64,linux/arm64,linux/arm/v7

.github/workflows/release.yml

@@ -0,0 +1,28 @@
+name: release
+
+on:
+  push:
+    tags:
+      - "v*"
+
+permissions:
+  contents: write
+
+jobs:
+  goreleaser:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v4
+
+      - name: Run GoReleaser
+        uses: goreleaser/goreleaser-action@v5
+        with:
+          distribution: goreleaser
+          version: latest
+          args: release --clean
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -4,4 +4,6 @@ subs
 logs
 data
 .env
-.vscode/settings.json
+.vscode/settings.json
+test
+*test.go

.goreleaser.yaml

@@ -28,3 +28,5 @@ archives:
       - LICENSE
       - README.md
       - templates
+release:
+  draft: true

.vscode/launch.json

@@ -5,7 +5,7 @@
             "type": "go",
             "request": "launch",
             "mode": "debug",
-            "program": "${workspaceFolder}/main.go",
+            "program": "${workspaceFolder}",
             "output": "${workspaceFolder}/dist/main.exe",
             "buildFlags": "-ldflags '-X sub2clash/constant.Version=dev'"
         }

.woodpecker/docker.yml

@@ -1,21 +0,0 @@
-when:
-  - event: tag
-    ref: refs/tags/v*
-
-steps:
-  - name: prepare-tags
-    image: bash
-    commands:
-      - |
-        echo "${CI_COMMIT_TAG##v}" > .tags
-        if ! echo "${CI_COMMIT_TAG}" | grep -Eq "beta|alpha"; then
-          echo "latest" > .tags
-        fi
-  - name: build
-    image: woodpeckerci/plugin-docker-buildx
-    settings:
-      platforms: linux/amd64
-      repo: nite07/sub2clash
-      username: nite07
-      password:
-        from_secret: docker_password

.woodpecker/release.yml

@@ -1,20 +0,0 @@
-when:
-  - event: tag
-    ref: refs/tags/v*
-
-steps:
-  - name: build
-    image: goreleaser/goreleaser:latest
-    commands:
-      - goreleaser release --clean --skip publish
-      - mkdir release
-      - mv dist/*.tar.gz release/
-      - mv dist/*.zip release/
-  - name: release
-    image: woodpeckerci/plugin-gitea-release
-    settings:
-      files: release/*
-      api_key:
-        from_secret: forgejo_token
-      base-url: https://git.nite07.com
-      draft: true

README.md

@@ -5,25 +5,26 @@
 
 ## 特性
 
--   开箱即用的规则、策略组配置
--   自动根据节点名称按国家划分策略组
--   支持多订阅合并
--   支持添加自定义 Rule Provider、Rule
--   支持多种协议
-    -   Shadowsocks
-    -   ShadowsocksR
-    -   Vmess
-    -   Vless （Clash.Meta）
-    -   Trojan
-    -   Hysteria （Clash.Meta）
-    -   Hysteria2 （Clash.Meta）
+- 开箱即用的规则、策略组配置
+- 自动根据节点名称按国家划分策略组
+- 多订阅合并
+- 自定义 Rule Provider、Rule
+- 支持多种协议
+  - Shadowsocks
+  - ShadowsocksR
+  - Vmess
+  - Vless （Clash.Meta）
+  - Trojan
+  - Hysteria （Clash.Meta）
+  - Hysteria2 （Clash.Meta）
+  - Socks5
 
 ## 使用
 
-### 运行
+### 部署
 
--   [docker compose](./docker-compose.yml)
--   运行[二进制文件](https://github.com/nitezs/sub2clash/releases/latest)
+- [docker compose](./docker-compose.yml)
+- 运行[二进制文件](https://github.com/nitezs/sub2clash/releases/latest)
 
 ### 配置
 
@@ -49,11 +50,11 @@
 可以通过变量自定义模板中的策略组代理节点  
 具体参考下方默认模板
 
--   `<all>` 为添加所有节点
--   `<countries>` 为添加所有国家策略组
--   `<地区二位字母代码>` 为添加指定地区所有节点，例如 `<hk>` 将添加所有香港节点
+- `<all>` 为添加所有节点
+- `<countries>` 为添加所有国家策略组
+- `<地区二位字母代码>` 为添加指定地区所有节点，例如 `<hk>` 将添加所有香港节点
 
 #### 默认模板
 
--   [Clash](./templates/template_clash.yaml)
--   [Clash.Meta](./templates/template_meta.yaml)
+- [Clash](./templates/template_clash.yaml)
+- [Clash.Meta](./templates/template_meta.yaml)

api/handler/clash.go

@@ -2,16 +2,17 @@ package handler
 
 import (
 	"net/http"
-	"sub2clash/config"
-	"sub2clash/model"
-	"sub2clash/validator"
+
+	"github.com/nitezs/sub2clash/config"
+	"github.com/nitezs/sub2clash/model"
+	"github.com/nitezs/sub2clash/validator"
 
 	"github.com/gin-gonic/gin"
 	"gopkg.in/yaml.v3"
 )
 
 func SubmodHandler(c *gin.Context) {
-	// 从请求中获取参数
+
 	query, err := validator.ParseQuery(c)
 	if err != nil {
 		c.String(http.StatusBadRequest, err.Error())
@@ -22,7 +23,7 @@ func SubmodHandler(c *gin.Context) {
 		c.String(http.StatusInternalServerError, err.Error())
 		return
 	}
-	// 输出
+
 	if query.NodeListMode {
 		nodelist := model.NodeList{}
 		nodelist.Proxies = sub.Proxies

api/handler/default.go

@@ -9,11 +9,12 @@ import (
 	"sort"
 	"strconv"
 	"strings"
-	"sub2clash/common"
-	"sub2clash/logger"
-	"sub2clash/model"
-	"sub2clash/parser"
-	"sub2clash/validator"
+
+	"github.com/nitezs/sub2clash/common"
+	"github.com/nitezs/sub2clash/logger"
+	"github.com/nitezs/sub2clash/model"
+	"github.com/nitezs/sub2clash/parser"
+	"github.com/nitezs/sub2clash/validator"
 
 	"go.uber.org/zap"
 	"gopkg.in/yaml.v3"
@@ -22,17 +23,17 @@ import (
 func BuildSub(clashType model.ClashType, query validator.SubValidator, template string) (
 	*model.Subscription, error,
 ) {
-	// 定义变量
+
 	var temp = &model.Subscription{}
 	var sub = &model.Subscription{}
 	var err error
 	var templateBytes []byte
-	// 加载模板
+
 	if query.Template != "" {
 		template = query.Template
 	}
 	if strings.HasPrefix(template, "http") {
-		templateBytes, err = common.LoadSubscription(template, query.Refresh)
+		templateBytes, err = common.LoadSubscription(template, query.Refresh, query.UserAgent)
 		if err != nil {
 			logger.Logger.Debug(
 				"load template failed", zap.String("template", template), zap.Error(err),
@@ -52,16 +53,16 @@ func BuildSub(clashType model.ClashType, query validator.SubValidator, template
 			return nil, errors.New("加载模板失败: " + err.Error())
 		}
 	}
-	// 解析模板
+
 	err = yaml.Unmarshal(templateBytes, &temp)
 	if err != nil {
 		logger.Logger.Debug("parse template failed", zap.Error(err))
 		return nil, errors.New("解析模板失败: " + err.Error())
 	}
 	var proxyList []model.Proxy
-	// 加载订阅
+
 	for i := range query.Subs {
-		data, err := common.LoadSubscription(query.Subs[i], query.Refresh)
+		data, err := common.LoadSubscription(query.Subs[i], query.Refresh, query.UserAgent)
 		subName := ""
 		if strings.Contains(query.Subs[i], "#") {
 			subName = query.Subs[i][strings.LastIndex(query.Subs[i], "#")+1:]
@@ -72,7 +73,7 @@ func BuildSub(clashType model.ClashType, query validator.SubValidator, template
 			)
 			return nil, errors.New("加载订阅失败: " + err.Error())
 		}
-		// 解析订阅
+
 		err = yaml.Unmarshal(data, &sub)
 		var newProxies []model.Proxy
 		if err != nil {
@@ -81,7 +82,7 @@ func BuildSub(clashType model.ClashType, query validator.SubValidator, template
 				p := common.ParseProxy(strings.Split(string(data), "\n")...)
 				newProxies = p
 			} else {
-				// 如果无法直接解析，尝试Base64解码
+
 				base64, err := parser.DecodeBase64(string(data))
 				if err != nil {
 					logger.Logger.Debug(
@@ -104,28 +105,31 @@ func BuildSub(clashType model.ClashType, query validator.SubValidator, template
 		}
 		proxyList = append(proxyList, newProxies...)
 	}
-	// 添加自定义节点
+
 	if len(query.Proxies) != 0 {
 		proxyList = append(proxyList, common.ParseProxy(query.Proxies...)...)
 	}
-	// 给节点添加订阅名称
+
 	for i := range proxyList {
 		if proxyList[i].SubName != "" {
 			proxyList[i].Name = strings.TrimSpace(proxyList[i].SubName) + " " + strings.TrimSpace(proxyList[i].Name)
 		}
 	}
-	// 去掉配置相同的节点
+
 	proxies := make(map[string]*model.Proxy)
 	newProxies := make([]model.Proxy, 0, len(proxyList))
 	for i := range proxyList {
 		key := proxyList[i].Server + strconv.Itoa(proxyList[i].Port) + proxyList[i].Type + proxyList[i].UUID + proxyList[i].Password
+		if proxyList[i].Network == "ws" {
+			key += proxyList[i].WSOpts.Path + proxyList[i].WSOpts.Headers["Host"]
+		}
 		if _, exist := proxies[key]; !exist {
 			proxies[key] = &proxyList[i]
 			newProxies = append(newProxies, proxyList[i])
 		}
 	}
 	proxyList = newProxies
-	// 删除节点
+
 	if strings.TrimSpace(query.Remove) != "" {
 		newProxyList := make([]model.Proxy, 0, len(proxyList))
 		for i := range proxyList {
@@ -134,17 +138,17 @@ func BuildSub(clashType model.ClashType, query validator.SubValidator, template
 				logger.Logger.Debug("remove regexp compile failed", zap.Error(err))
 				return nil, errors.New("remove 参数非法: " + err.Error())
 			}
-			// 删除匹配到的节点
+
 			if removeReg.MatchString(proxyList[i].Name) {
-				continue // 如果匹配到要删除的元素，跳过该元素，不添加到新切片中
+				continue
 			}
-			newProxyList = append(newProxyList, proxyList[i]) // 将要保留的元素添加到新切片中
+			newProxyList = append(newProxyList, proxyList[i])
 		}
 		proxyList = newProxyList
 	}
-	// 重命名
+
 	if len(query.ReplaceKeys) != 0 {
-		// 创建重命名正则表达式
+
 		replaceRegs := make([]*regexp.Regexp, 0, len(query.ReplaceKeys))
 		for _, v := range query.ReplaceKeys {
 			replaceReg, err := regexp.Compile(v)
@@ -155,7 +159,7 @@ func BuildSub(clashType model.ClashType, query validator.SubValidator, template
 			replaceRegs = append(replaceRegs, replaceReg)
 		}
 		for i := range proxyList {
-			// 重命名匹配到的节点
+
 			for j, v := range replaceRegs {
 				if v.MatchString(proxyList[i].Name) {
 					proxyList[i].Name = v.ReplaceAllString(
@@ -165,7 +169,7 @@ func BuildSub(clashType model.ClashType, query validator.SubValidator, template
 			}
 		}
 	}
-	// 重名检测
+
 	names := make(map[string]int)
 	for i := range proxyList {
 		if _, exist := names[proxyList[i].Name]; exist {
@@ -175,14 +179,14 @@ func BuildSub(clashType model.ClashType, query validator.SubValidator, template
 			names[proxyList[i].Name] = 0
 		}
 	}
-	// trim
+
 	for i := range proxyList {
 		proxyList[i].Name = strings.TrimSpace(proxyList[i].Name)
 	}
-	// 将新增节点都添加到临时变量 t 中，防止策略组排序错乱
+
 	var t = &model.Subscription{}
 	common.AddProxy(t, query.AutoTest, query.Lazy, clashType, proxyList...)
-	// 排序策略组
+
 	switch query.Sort {
 	case "sizeasc":
 		sort.Sort(model.ProxyGroupsSortBySize(t.ProxyGroups))
@@ -195,9 +199,9 @@ func BuildSub(clashType model.ClashType, query validator.SubValidator, template
 	default:
 		sort.Sort(model.ProxyGroupsSortByName(t.ProxyGroups))
 	}
-	// 合并新节点和模板
+
 	MergeSubAndTemplate(temp, t, query.IgnoreCountryGrooup)
-	// 处理自定义规则
+
 	for _, v := range query.Rules {
 		if v.Prepend {
 			common.PrependRules(temp, v.Rule)
@@ -205,7 +209,7 @@ func BuildSub(clashType model.ClashType, query validator.SubValidator, template
 			common.AppendRules(temp, v.Rule)
 		}
 	}
-	// 处理自定义 ruleProvider
+
 	for _, v := range query.RuleProviders {
 		hash := sha256.Sum224([]byte(v.Url))
 		name := hex.EncodeToString(hash[:])
@@ -230,8 +234,7 @@ func BuildSub(clashType model.ClashType, query validator.SubValidator, template
 }
 
 func MergeSubAndTemplate(temp *model.Subscription, sub *model.Subscription, igcg bool) {
-	// 只合并节点、策略组
-	// 统计所有国家策略组名称
+
 	var countryGroupNames []string
 	for _, proxyGroup := range sub.ProxyGroups {
 		if proxyGroup.IsCountryGrop {
@@ -244,9 +247,9 @@ func MergeSubAndTemplate(temp *model.Subscription, sub *model.Subscription, igcg
 	for _, proxy := range sub.Proxies {
 		proxyNames = append(proxyNames, proxy.Name)
 	}
-	// 将订阅中的节点添加到模板中
+
 	temp.Proxies = append(temp.Proxies, sub.Proxies...)
-	// 将订阅中的策略组添加到模板中
+
 	for i := range temp.ProxyGroups {
 		if temp.ProxyGroups[i].IsCountryGrop {
 			continue

api/handler/meta.go

@@ -3,16 +3,17 @@ package handler
 import (
 	_ "embed"
 	"net/http"
-	"sub2clash/config"
-	"sub2clash/model"
-	"sub2clash/validator"
+
+	"github.com/nitezs/sub2clash/config"
+	"github.com/nitezs/sub2clash/model"
+	"github.com/nitezs/sub2clash/validator"
 
 	"github.com/gin-gonic/gin"
 	"gopkg.in/yaml.v3"
 )
 
 func SubHandler(c *gin.Context) {
-	// 从请求中获取参数
+
 	query, err := validator.ParseQuery(c)
 	if err != nil {
 		c.String(http.StatusBadRequest, err.Error())
@@ -23,7 +24,7 @@ func SubHandler(c *gin.Context) {
 		c.String(http.StatusInternalServerError, err.Error())
 		return
 	}
-	// 输出
+
 	if query.NodeListMode {
 		nodelist := model.NodeList{}
 		nodelist.Proxies = sub.Proxies

api/handler/short_link.go

@@ -7,11 +7,11 @@ import (
 	"strings"
 	"time"
 
-	"sub2clash/common"
-	"sub2clash/common/database"
-	"sub2clash/config"
-	"sub2clash/model"
-	"sub2clash/validator"
+	"github.com/nitezs/sub2clash/common"
+	"github.com/nitezs/sub2clash/common/database"
+	"github.com/nitezs/sub2clash/config"
+	"github.com/nitezs/sub2clash/model"
+	"github.com/nitezs/sub2clash/validator"
 
 	"github.com/gin-gonic/gin"
 )
@@ -32,16 +32,41 @@ func GenerateLinkHandler(c *gin.Context) {
 		return
 	}
 
-	hash, err := generateUniqueHash()
-	if err != nil {
-		respondWithError(c, http.StatusInternalServerError, "生成短链接失败")
-		return
+	var hash string
+	var password string
+	var err error
+	
+	if params.CustomID != "" {
+		// 检查自定义ID是否已存在
+		exists, err := database.CheckShortLinkHashExists(params.CustomID)
+		if err != nil {
+			respondWithError(c, http.StatusInternalServerError, "数据库错误")
+			return
+		}
+		if exists {
+			respondWithError(c, http.StatusBadRequest, "短链已存在")
+			return
+		}
+		hash = params.CustomID
+		password = params.Password
+	} else {
+		// 自动生成短链ID和密码
+		hash, err = generateUniqueHash()
+		if err != nil {
+			respondWithError(c, http.StatusInternalServerError, "生成短链接失败")
+			return
+		}
+		if params.Password == "" {
+			password = common.RandomString(8) // 生成8位随机密码
+		} else {
+			password = params.Password
+		}
 	}
 
 	shortLink := model.ShortLink{
 		Hash:     hash,
 		Url:      params.Url,
-		Password: params.Password,
+		Password: password,
 	}
 
 	if err := database.SaveShortLink(&shortLink); err != nil {
@@ -49,10 +74,12 @@ func GenerateLinkHandler(c *gin.Context) {
 		return
 	}
 
-	if params.Password != "" {
-		hash += "?password=" + params.Password
+	// 返回生成的短链ID和密码
+	response := map[string]string{
+		"hash": hash,
+		"password": password,
 	}
-	c.String(http.StatusOK, hash)
+	c.JSON(http.StatusOK, response)
 }
 
 func generateUniqueHash() (string, error) {
@@ -74,11 +101,27 @@ func UpdateLinkHandler(c *gin.Context) {
 		respondWithError(c, http.StatusBadRequest, "参数错误: "+err.Error())
 		return
 	}
+
+	// 先获取原有的短链接
+	existingLink, err := database.FindShortLinkByHash(params.Hash)
+	if err != nil {
+		respondWithError(c, http.StatusNotFound, "未找到短链接")
+		return
+	}
+
+	// 验证密码
+	if existingLink.Password != params.Password {
+		respondWithError(c, http.StatusUnauthorized, "密码错误")
+		return
+	}
+
+	// 更新URL，但保持原密码不变
 	shortLink := model.ShortLink{
 		Hash:     params.Hash,
 		Url:      params.Url,
-		Password: params.Password,
+		Password: existingLink.Password, // 保持原密码不变
 	}
+
 	if err := database.SaveShortLink(&shortLink); err != nil {
 		respondWithError(c, http.StatusInternalServerError, "数据库错误")
 		return
@@ -88,7 +131,7 @@ func UpdateLinkHandler(c *gin.Context) {
 }
 
 func GetRawConfHandler(c *gin.Context) {
-	// 获取动态路由参数
+
 	hash := c.Param("hash")
 	password := c.Query("password")
 
@@ -97,27 +140,24 @@ func GetRawConfHandler(c *gin.Context) {
 		return
 	}
 
-	// 查询数据库中的短链接
 	shortLink, err := database.FindShortLinkByHash(hash)
 	if err != nil {
 		c.String(http.StatusNotFound, "未找到短链接或密码错误")
 		return
 	}
 
-	// 校验密码
 	if shortLink.Password != "" && shortLink.Password != password {
 		c.String(http.StatusNotFound, "未找到短链接或密码错误")
 		return
 	}
 
-	// 更新最后访问时间
 	shortLink.LastRequestTime = time.Now().Unix()
 	err = database.SaveShortLink(shortLink)
 	if err != nil {
 		respondWithError(c, http.StatusInternalServerError, "数据库错误")
 		return
 	}
-	// 请求短链接指向的URL
+
 	response, err := http.Get("http://localhost:" + strconv.Itoa(config.Default.Port) + "/" + shortLink.Url)
 	if err != nil {
 		respondWithError(c, http.StatusInternalServerError, "请求错误: "+err.Error())
@@ -125,13 +165,35 @@ func GetRawConfHandler(c *gin.Context) {
 	}
 	defer response.Body.Close()
 
-	// 读取响应内容
 	all, err := io.ReadAll(response.Body)
 	if err != nil {
 		respondWithError(c, http.StatusInternalServerError, "读取错误: "+err.Error())
 		return
 	}
 
-	// 返回响应内容
 	c.String(http.StatusOK, string(all))
 }
+
+func GetRawConfUriHandler(c *gin.Context) {
+
+	hash := c.Query("hash")
+	password := c.Query("password")
+
+	if strings.TrimSpace(hash) == "" {
+		c.String(http.StatusBadRequest, "参数错误")
+		return
+	}
+
+	shortLink, err := database.FindShortLinkByHash(hash)
+	if err != nil {
+		c.String(http.StatusNotFound, "未找到短链接或密码错误")
+		return
+	}
+
+	if shortLink.Password != "" && shortLink.Password != password {
+		c.String(http.StatusNotFound, "未找到短链接或密码错误")
+		return
+	}
+
+	c.String(http.StatusOK, shortLink.Url)
+}

api/route.go

@@ -5,9 +5,10 @@ import (
 	"html/template"
 	"log"
 	"net/http"
-	"sub2clash/api/handler"
-	"sub2clash/constant"
-	"sub2clash/middleware"
+
+	"github.com/nitezs/sub2clash/api/handler"
+	"github.com/nitezs/sub2clash/constant"
+	"github.com/nitezs/sub2clash/middleware"
 
 	"github.com/gin-gonic/gin"
 )
@@ -18,7 +19,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 +33,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,
@@ -48,4 +45,5 @@ func SetRoute(r *gin.Engine) {
 	r.GET("/s/:hash", handler.GetRawConfHandler)
 	r.POST("/short", handler.GenerateLinkHandler)
 	r.PUT("/short", handler.UpdateLinkHandler)
+	r.GET("/short", handler.GetRawConfUriHandler)
 }

api/static/index.html

@@ -75,6 +75,12 @@
             <label for="proxy">节点分享链接:</label>
             <textarea class="form-control" id="proxy" name="proxy" placeholder="每行输入一个节点分享链接" rows="5"></textarea>
         </div>
+        <!-- User Agent -->
+        <div class="form-group mb-3">
+            <label for="user-agent">ua标识:</label>
+            <textarea class="form-control" id="user-agent" name="user-agent"
+                placeholder="用于获取订阅的http请求中的user-agent标识(可选)" rows="3"></textarea>
+        </div>
         <!-- Refresh -->
         <div class="form-check mb-3">
             <input class="form-check-input" id="refresh" name="refresh" type="checkbox" />
@@ -141,24 +147,27 @@
         <div class="form-group mb-5">
             <label for="apiLink">配置链接:</label>
             <div class="input-group mb-2">
-                <input class="form-control" id="apiLink" type="text" placeholder="链接" />
+                <input class="form-control bg-light" id="apiLink" type="text" placeholder="链接" readonly style="cursor: not-allowed;" />
                 <button class="btn btn-primary" onclick="copyToClipboard('apiLink',this)" type="button">
                     复制链接
                 </button>
             </div>
-            <div class="input-group">
-                <input class="form-control" id="apiShortLink" type="text" placeholder="链接" />
-                <input class="form-control" id="password" type="text" placeholder="密码" />
+            <div class="input-group mb-2">
+                <input class="form-control" id="customId" type="text" placeholder="短链ID（可选）" />
+                <input class="form-control" id="password" type="text" placeholder="密码（可选）" />
                 <button class="btn btn-primary" onclick="generateShortLink()" type="button">
                     生成短链
                 </button>
-                <button class="btn btn-primary" onclick="updateShortLink()" type="button">
-                    更新短链
-                </button>
                 <button class="btn btn-primary" onclick="copyToClipboard('apiShortLink',this)" type="button">
                     复制短链
                 </button>
             </div>
+            <div class="input-group">
+                <input class="form-control bg-light" id="apiShortLink" type="text" placeholder="短链接" readonly style="cursor: not-allowed;" />
+                <button class="btn btn-primary" onclick="updateShortLink()" type="button">
+                    更新短链
+                </button>
+            </div>
         </div>
 
         <!-- footer-->
@@ -172,4 +181,5 @@
     </div>
 </body>
 <script src="./static/index.js"></script>
+
 </html>

api/static/index.js

@@ -1,3 +1,15 @@
+function setInputReadOnly(input, readonly) {
+  if (readonly) {
+    input.readOnly = true;
+    input.classList.add('bg-light');
+    input.style.cursor = 'not-allowed';
+  } else {
+    input.readOnly = false;
+    input.classList.remove('bg-light');
+    input.style.cursor = 'auto';
+  }
+}
+
 function clearExistingValues() {
   // 清除简单输入框和复选框的值
   document.getElementById("endpoint").value = "clash";
@@ -12,7 +24,23 @@ function clearExistingValues() {
   document.getElementById("remove").value = "";
   document.getElementById("apiLink").value = "";
   document.getElementById("apiShortLink").value = "";
-  document.getElementById("password").value = "";
+  
+  // 恢复短链ID和密码输入框状态
+  const customIdInput = document.getElementById("customId");
+  const passwordInput = document.getElementById("password");
+  const generateButton = document.querySelector('button[onclick="generateShortLink()"]');
+  
+  customIdInput.value = "";
+  setInputReadOnly(customIdInput, false);
+  
+  passwordInput.value = "";
+  setInputReadOnly(passwordInput, false);
+  
+  // 恢复生成短链按钮状态
+  generateButton.disabled = false;
+  generateButton.classList.remove('btn-secondary');
+  generateButton.classList.add('btn-primary');
+  
   document.getElementById("nodeList").checked = false;
 
   // 清除由 createRuleProvider, createReplace, 和 createRule 创建的所有额外输入组
@@ -66,6 +94,11 @@ function generateURI() {
     // alert("订阅链接和节点分享链接不能同时为空！");
     return "";
   }
+
+  // 获取订阅user-agent标识
+  const userAgent = document.getElementById("user-agent").value;
+  queryParams.push(`userAgent=${encodeURIComponent(userAgent)}`);
+
   // 获取复选框的值
   const refresh = document.getElementById("refresh").checked;
   queryParams.push(`refresh=${refresh ? "true" : "false"}`);
@@ -111,17 +144,16 @@ function generateURI() {
   queryParams.push(`ruleProvider=${encodeURIComponent(providers.join(","))}`);
 
   let ruleList = [];
-  for (let i = 0; i < rules.length / 3; i++) {
-    if (rules[i * 3].value.trim() !== "") {
-      let rule = rules[i * 3].value;
-      let prepend = rules[i * 3 + 1].value;
-      let group = rules[i * 3 + 2].value;
+  for (let i = 0; i < rules.length / 2; i++) {
+    if (rules[i * 2].value.trim() !== "") {
+      let rule = rules[i * 2].value;
+      let prepend = rules[i * 2 + 1].value;
       // 是否存在空值
-      if (rule.trim() === "" || prepend.trim() === "" || group.trim() === "") {
+      if (rule.trim() === "" || prepend.trim() === "") {
         // alert("Rule 中存在空值，请检查后重试！");
         return "";
       }
-      ruleList.push(`[${rule},${prepend},${group}]`);
+      ruleList.push(`[${rule},${prepend}]`);
     }
   }
   queryParams.push(`rule=${encodeURIComponent(ruleList.join(","))}`);
@@ -175,13 +207,41 @@ async function parseInputURL() {
     let hash = url.pathname.substring(url.pathname.lastIndexOf("/s/") + 3);
     let q = new URLSearchParams();
     let password = url.searchParams.get("password");
+    if (password === null) {
+      alert("仅可解析加密短链");
+      return;
+    }
     q.append("hash", hash);
     q.append("password", password);
     try {
       const response = await axios.get("./short?" + q.toString());
       url = new URL(window.location.href + response.data);
-      document.querySelector("#apiShortLink").value = inputURL;
-      document.querySelector("#password").value = password;
+      
+      // 回显配置链接
+      const apiLinkInput = document.querySelector("#apiLink");
+      apiLinkInput.value = `${window.location.origin}${window.location.pathname}${response.data}`;
+      setInputReadOnly(apiLinkInput, true);
+      
+      // 回显短链相关信息
+      const apiShortLinkInput = document.querySelector("#apiShortLink");
+      apiShortLinkInput.value = inputURL;
+      setInputReadOnly(apiShortLinkInput, true);
+      
+      // 设置短链ID和密码，并设置为只读
+      const customIdInput = document.querySelector("#customId");
+      const passwordInput = document.querySelector("#password");
+      const generateButton = document.querySelector('button[onclick="generateShortLink()"]');
+      
+      customIdInput.value = hash;
+      setInputReadOnly(customIdInput, true);
+      
+      passwordInput.value = password;
+      setInputReadOnly(passwordInput, true);
+      
+      // 禁用生成短链按钮
+      generateButton.disabled = true;
+      generateButton.classList.add('btn-secondary');
+      generateButton.classList.remove('btn-primary');
     } catch (error) {
       console.log(error);
       alert("获取短链失败，请检查密码！");
@@ -247,6 +307,17 @@ async function parseInputURL() {
     );
   }
 
+  if (params.has("userAgent")) {
+    document.getElementById("user-agent").value = decodeURIComponent(
+      params.get("userAgent")
+    );
+  }
+
+  if (params.has("ignoreCountryGroup")) {
+    document.getElementById("igcg").checked = 
+      params.get("ignoreCountryGroup") === "true";
+  }
+
   if (params.has("replace")) {
     parseAndFillReplaceParams(decodeURIComponent(params.get("replace")));
   }
@@ -310,13 +381,12 @@ function parseAndFillRuleProviderParams(ruleProviderParams) {
 function parseAndFillRuleParams(ruleParams) {
   const ruleGroup = document.getElementById("ruleGroup");
   let matches;
-  const regex = /\[(.*?),(.*?),(.*?)\]/g;
+  const regex = /\[(.*?),(.*?)\]/g;
   const str = decodeURIComponent(ruleParams);
   while ((matches = regex.exec(str)) !== null) {
     const div = createRule();
     div.children[0].value = matches[1];
     div.children[1].value = matches[2];
-    div.children[2].value = matches[3];
     ruleGroup.appendChild(div);
   }
 }
@@ -366,7 +436,6 @@ function createRule() {
   div.innerHTML = `
             <input type="text" class="form-control" name="rule" placeholder="Rule">
             <input type="text" class="form-control" name="rule" placeholder="Prepend">
-            <input type="text" class="form-control" name="rule" placeholder="Group">
             <button type="button" class="btn btn-danger" onclick="removeElement(this)">删除</button>
         `;
   return div;
@@ -422,21 +491,25 @@ function generateURL() {
     return;
   }
   apiLink.value = `${window.location.origin}${window.location.pathname}${uri}`;
+  setInputReadOnly(apiLink, true);
 }
 
 function generateShortLink() {
   const apiShortLink = document.getElementById("apiShortLink");
   const password = document.getElementById("password");
+  const customId = document.getElementById("customId");
   let uri = generateURI();
   if (uri === "") {
     return;
   }
+
   axios
     .post(
       "./short",
       {
         url: uri,
         password: password.value.trim(),
+        customId: customId.value.trim()
       },
       {
         headers: {
@@ -445,11 +518,20 @@ function generateShortLink() {
       }
     )
     .then((response) => {
-      apiShortLink.value = `${window.location.origin}${window.location.pathname}s/${response.data}`;
+      // 设置返回的短链ID和密码
+      customId.value = response.data.hash;
+      password.value = response.data.password;
+      // 生成完整的短链接
+      const shortLink = `${window.location.origin}${window.location.pathname}s/${response.data.hash}?password=${response.data.password}`;
+      apiShortLink.value = shortLink;
     })
     .catch((error) => {
       console.log(error);
-      alert("生成短链失败，请重试！");
+      if (error.response && error.response.data) {
+        alert(error.response.data);
+      } else {
+        alert("生成短链失败，请重试！");
+      }
     });
 }
 
@@ -462,7 +544,7 @@ function updateShortLink() {
     hash = u.pathname.substring(u.pathname.lastIndexOf("/s/") + 3);
   }
   if (password.value.trim() === "") {
-    alert("请输入密码！");
+    alert("请输入原密码进行验证！");
     return;
   }
   let uri = generateURI();
@@ -484,11 +566,17 @@ function updateShortLink() {
       }
     )
     .then((response) => {
-      alert("更新短链成功！");
+      alert(`短链 ${hash} 更新成功！`);
     })
     .catch((error) => {
       console.log(error);
-      alert(error.response.data);
+      if (error.response && error.response.status === 401) {
+        alert("密码错误，请输入正确的原密码！");
+      } else if (error.response && error.response.data) {
+        alert(error.response.data);
+      } else {
+        alert("更新短链失败，请重试！");
+      }
     });
 }
 

common/database/database.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"path/filepath"
 
-	"sub2clash/model"
+	"github.com/nitezs/sub2clash/model"
 
 	"go.etcd.io/bbolt"
 )
@@ -13,16 +13,14 @@ import (
 var DB *bbolt.DB
 
 func ConnectDB() error {
-	// 确保数据目录存在
 	path := filepath.Join("data", "sub2clash.db")
-	// 打开或创建数据库文件
+
 	db, err := bbolt.Open(path, 0600, nil)
 	if err != nil {
 		return err
 	}
 	DB = db
 
-	// 确保存储桶存在
 	return db.Update(func(tx *bbolt.Tx) error {
 		_, err := tx.CreateBucketIfNotExists([]byte("ShortLinks"))
 		return err

common/get.go

@@ -2,31 +2,53 @@ package common
 
 import (
 	"errors"
+	"fmt"
 	"net/http"
-	"sub2clash/config"
 	"time"
+
+	"github.com/nitezs/sub2clash/config"
 )
 
-func Get(url string) (resp *http.Response, err error) {
+type GetConfig struct {
+	userAgent string
+}
+
+type GetOption func(*GetConfig)
+
+func WithUserAgent(userAgent string) GetOption {
+	return func(config *GetConfig) {
+		config.userAgent = userAgent
+	}
+}
+
+func Get(url string, options ...GetOption) (resp *http.Response, err error) {
 	retryTimes := config.Default.RequestRetryTimes
 	haveTried := 0
-	retryDelay := time.Second // 延迟1秒再重试
+	retryDelay := time.Second
+	getConfig := GetConfig{}
+	for _, option := range options {
+		option(&getConfig)
+	}
+	var req *http.Request
+	var get *http.Response
 	for haveTried < retryTimes {
 		client := &http.Client{}
 		//client.Timeout = time.Second * 10
-		req, err := http.NewRequest("GET", url, nil)
+		req, err = http.NewRequest("GET", url, nil)
 		if err != nil {
 			haveTried++
 			time.Sleep(retryDelay)
 			continue
 		}
-		get, err := client.Do(req)
+		if getConfig.userAgent != "" {
+			req.Header.Set("User-Agent", getConfig.userAgent)
+		}
+		get, err = client.Do(req)
 		if err != nil {
 			haveTried++
 			time.Sleep(retryDelay)
 			continue
 		} else {
-			// 如果文件大小大于设定，直接返回错误
 			if get != nil && get.ContentLength > config.Default.RequestMaxFileSize {
 				return nil, errors.New("文件过大")
 			}
@@ -34,5 +56,5 @@ func Get(url string) (resp *http.Response, err error) {
 		}
 
 	}
-	return nil, err
+	return nil, fmt.Errorf("请求失败：%v", err)
 }

common/proxy.go

@@ -2,16 +2,17 @@ package common
 
 import (
 	"strings"
-	"sub2clash/constant"
-	"sub2clash/logger"
-	"sub2clash/model"
-	"sub2clash/parser"
+
+	"github.com/nitezs/sub2clash/constant"
+	"github.com/nitezs/sub2clash/logger"
+	"github.com/nitezs/sub2clash/model"
+	"github.com/nitezs/sub2clash/parser"
 
 	"go.uber.org/zap"
 )
 
 func GetContryName(countryKey string) string {
-	// 创建一个切片包含所有的国家映射
+
 	countryMaps := []map[string]string{
 		model.CountryFlag,
 		model.CountryChineseName,
@@ -19,11 +20,9 @@ func GetContryName(countryKey string) string {
 		model.CountryEnglishName,
 	}
 
-	// 对每一个映射进行检查
 	for i, countryMap := range countryMaps {
 		if i == 2 {
-			// 对ISO匹配做特殊处理
-			// 根据常用分割字符分割字符串
+
 			splitChars := []string{"-", "_", " "}
 			key := make([]string, 0)
 			for _, splitChar := range splitChars {
@@ -34,9 +33,9 @@ func GetContryName(countryKey string) string {
 					}
 				}
 			}
-			// 对每一个分割后的字符串进行检查
+
 			for _, v := range key {
-				// 如果匹配到了国家
+
 				if country, ok := countryMap[strings.ToUpper(v)]; ok {
 					return country
 				}
@@ -56,7 +55,7 @@ func AddProxy(
 	lazy bool, clashType model.ClashType, proxies ...model.Proxy,
 ) {
 	proxyTypes := model.GetSupportProxyTypes(clashType)
-	// 添加节点
+
 	for _, proxy := range proxies {
 		if !proxyTypes[proxy.Type] {
 			continue
@@ -106,7 +105,7 @@ func ParseProxy(proxies ...string) []model.Proxy {
 		if proxy != "" {
 			var proxyItem model.Proxy
 			var err error
-			// 解析节点
+
 			if strings.HasPrefix(proxy, constant.ShadowsocksPrefix) {
 				proxyItem, err = parser.ParseShadowsocks(proxy)
 			}
@@ -128,6 +127,9 @@ func ParseProxy(proxies ...string) []model.Proxy {
 			if strings.HasPrefix(proxy, constant.HysteriaPrefix) {
 				proxyItem, err = parser.ParseHysteria(proxy)
 			}
+			if strings.HasPrefix(proxy, constant.SocksPrefix) {
+				proxyItem, err = parser.ParseSocks(proxy)
+			}
 			if err == nil {
 				result = append(result, proxyItem)
 			} else {

common/random_string.go

@@ -3,7 +3,7 @@ package common
 import "math/rand"
 
 func RandomString(length int) string {
-	// 生成随机字符串
+
 	const charset = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 	var result []byte
 	for i := 0; i < length; i++ {

common/rule.go

@@ -3,7 +3,8 @@ package common
 import (
 	"fmt"
 	"strings"
-	"sub2clash/model"
+
+	"github.com/nitezs/sub2clash/model"
 )
 
 func PrependRuleProvider(

common/sub.go

@@ -8,17 +8,18 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
-	"sub2clash/config"
 	"sync"
 	"time"
+
+	"github.com/nitezs/sub2clash/config"
 )
 
 var subsDir = "subs"
 var fileLock sync.RWMutex
 
-func LoadSubscription(url string, refresh bool) ([]byte, error) {
+func LoadSubscription(url string, refresh bool, userAgent string) ([]byte, error) {
 	if refresh {
-		return FetchSubscriptionFromAPI(url)
+		return FetchSubscriptionFromAPI(url, userAgent)
 	}
 	hash := sha256.Sum224([]byte(url))
 	fileName := filepath.Join(subsDir, hex.EncodeToString(hash[:]))
@@ -27,9 +28,9 @@ func LoadSubscription(url string, refresh bool) ([]byte, error) {
 		if !os.IsNotExist(err) {
 			return nil, err
 		}
-		return FetchSubscriptionFromAPI(url)
+		return FetchSubscriptionFromAPI(url, userAgent)
 	}
-	lastGetTime := stat.ModTime().Unix() // 单位是秒
+	lastGetTime := stat.ModTime().Unix()
 	if lastGetTime+config.Default.CacheExpire > time.Now().Unix() {
 		file, err := os.Open(fileName)
 		if err != nil {
@@ -48,13 +49,13 @@ func LoadSubscription(url string, refresh bool) ([]byte, error) {
 		}
 		return subContent, nil
 	}
-	return FetchSubscriptionFromAPI(url)
+	return FetchSubscriptionFromAPI(url, userAgent)
 }
 
-func FetchSubscriptionFromAPI(url string) ([]byte, error) {
+func FetchSubscriptionFromAPI(url string, userAgent string) ([]byte, error) {
 	hash := sha256.Sum224([]byte(url))
 	fileName := filepath.Join(subsDir, hex.EncodeToString(hash[:]))
-	resp, err := Get(url)
+	resp, err := Get(url, WithUserAgent(userAgent))
 	if err != nil {
 		return nil, err
 	}

common/template.go

@@ -7,8 +7,6 @@ import (
 	"path/filepath"
 )
 
-// LoadTemplate 加载模板
-// templates 模板文件名
 func LoadTemplate(template string) ([]byte, error) {
 	tPath := filepath.Join("templates", template)
 	if _, err := os.Stat(tPath); err == nil {

common/write_default_template.go

@@ -3,7 +3,8 @@ package common
 import (
 	"os"
 	"path/filepath"
-	"sub2clash/config"
+
+	"github.com/nitezs/sub2clash/config"
 )
 
 func writeTemplate(path string, template string) error {

constant/prefix.go

@@ -9,4 +9,5 @@ const (
 	TrojanPrefix       string = "trojan://"
 	VLESSPrefix        string = "vless://"
 	VMessPrefix        string = "vmess://"
+	SocksPrefix        string = "socks"
 )

go.mod

@@ -1,4 +1,4 @@
-module sub2clash
+module github.com/nitezs/sub2clash
 
 go 1.21
 

main.go

@@ -4,11 +4,12 @@ import (
 	_ "embed"
 	"io"
 	"strconv"
-	"sub2clash/api"
-	"sub2clash/common"
-	"sub2clash/common/database"
-	"sub2clash/config"
-	"sub2clash/logger"
+
+	"github.com/nitezs/sub2clash/api"
+	"github.com/nitezs/sub2clash/common"
+	"github.com/nitezs/sub2clash/common/database"
+	"github.com/nitezs/sub2clash/config"
+	"github.com/nitezs/sub2clash/logger"
 
 	"github.com/gin-gonic/gin"
 	"go.uber.org/zap"
@@ -22,24 +23,24 @@ var templateClash string
 
 func init() {
 	var err error
-	// 创建文件夹
+
 	err = common.MkEssentialDir()
 	if err != nil {
 		logger.Logger.Panic("create essential dir failed", zap.Error(err))
 	}
-	// 加载配置
+
 	err = config.LoadConfig()
-	// 初始化日志
+
 	logger.InitLogger(config.Default.LogLevel)
 	if err != nil {
 		logger.Logger.Panic("load config failed", zap.Error(err))
 	}
-	// 写入默认模板
+
 	err = common.WriteDefalutTemplate(templateMeta, templateClash)
 	if err != nil {
 		logger.Logger.Panic("write default template failed", zap.Error(err))
 	}
-	// 连接数据库
+
 	err = database.ConnectDB()
 	if err != nil {
 		logger.Logger.Panic("database connect failed", zap.Error(err))
@@ -48,13 +49,13 @@ func init() {
 }
 
 func main() {
-	// 设置运行模式
+
 	gin.SetMode(gin.ReleaseMode)
-	// 关闭 Gin 的日志输出
+
 	gin.DefaultWriter = io.Discard
-	// 创建路由
+
 	r := gin.Default()
-	// 设置路由
+
 	api.SetRoute(r)
 	logger.Logger.Info("server is running at http://localhost:" + strconv.Itoa(config.Default.Port))
 	err := r.Run(":" + strconv.Itoa(config.Default.Port))

middleware/logger.go

@@ -2,9 +2,10 @@ package middleware
 
 import (
 	"strconv"
-	"sub2clash/logger"
 	"time"
 
+	"github.com/nitezs/sub2clash/logger"
+
 	"github.com/gin-gonic/gin"
 	"go.uber.org/zap"
 )

model/clash.go

@@ -14,6 +14,7 @@ func GetSupportProxyTypes(clashType ClashType) map[string]bool {
 			"ssr":    true,
 			"vmess":  true,
 			"trojan": true,
+			"socks5": true,
 		}
 	}
 	if clashType == ClashMeta {
@@ -25,6 +26,7 @@ func GetSupportProxyTypes(clashType ClashType) map[string]bool {
 			"vless":     true,
 			"hysteria":  true,
 			"hysteria2": true,
+			"socks5":    true,
 		}
 	}
 	return nil

model/country_code_map.go

@@ -1,8 +1,5 @@
 package model
 
-// https://zh.wikipedia.org/wiki/%E5%8C%BA%E5%9F%9F%E6%8C%87%E7%A4%BA%E7%AC%A6
-// https://zh.wikipedia.org/zh-sg/ISO_3166-1%E4%BA%8C%E4%BD%8D%E5%AD%97%E6%AF%8D%E4%BB%A3%E7%A0%81
-
 var CountryEnglishName = map[string]string{
 	"Andorra":                        "安道尔(AD)",
 	"United Arab Emirates":           "阿联酋(AE)",

model/proxy.go

@@ -5,62 +5,83 @@ 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"`
-	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"`
+	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"`
 }
 
+type WireGuardPeerOption struct {
+	Server       string   `yaml:"server"`
+	Port         int      `yaml:"port"`
+	PublicKey    string   `yaml:"public-key,omitempty"`
+	PreSharedKey string   `yaml:"pre-shared-key,omitempty"`
+	Reserved     []uint8  `yaml:"reserved,omitempty"`
+	AllowedIPs   []string `yaml:"allowed-ips,omitempty"`
+}
+
+type _Proxy Proxy
+
 func (p Proxy) MarshalYAML() (interface{}, error) {
 	switch p.Type {
 	case "vmess":
@@ -77,6 +98,7 @@ func (p Proxy) MarshalYAML() (interface{}, error) {
 		return ProxyToHysteria(p), nil
 	case "hysteria2":
 		return ProxyToHysteria2(p), nil
+	default:
+		return _Proxy(p), nil
 	}
-	return nil, nil
 }

model/proxy_group.go

@@ -9,12 +9,12 @@ type ProxyGroup struct {
 	Type                string   `yaml:"type,omitempty"`
 	Name                string   `yaml:"name,omitempty"`
 	Proxies             []string `yaml:"proxies,omitempty"`
-	IsCountryGrop       bool     `yaml:"-"` // 是否是国家分组
+	IsCountryGrop       bool     `yaml:"-"`
 	Url                 string   `yaml:"url,omitempty"`
 	Interval            int      `yaml:"interval,omitempty"`
 	Tolerance           int      `yaml:"tolerance,omitempty"`
 	Lazy                bool     `yaml:"lazy"`
-	Size                int      `yaml:"-"` // 代理数量
+	Size                int      `yaml:"-"`
 	DisableUDP          bool     `yaml:"disable-udp,omitempty"`
 	Strategy            string   `yaml:"strategy,omitempty"`
 	Icon                string   `yaml:"icon,omitempty"`
@@ -42,16 +42,15 @@ func (p ProxyGroupsSortBySize) Len() int {
 }
 
 func (p ProxyGroupsSortByName) Less(i, j int) bool {
-	// 定义一组备选语言：首选英语，其次中文
+
 	tags := []language.Tag{
 		language.English,
 		language.Chinese,
 	}
 	matcher := language.NewMatcher(tags)
 
-	// 假设我们的请求语言是 "zh"（中文），则使用匹配器找到最佳匹配的语言
 	bestMatch, _, _ := matcher.Match(language.Make("zh"))
-	// 使用最佳匹配的语言进行排序
+
 	c := collate.New(bestMatch)
 	return c.CompareString(p[i].Name, p[j].Name) < 0
 }

model/proxy_hysteria.go

@@ -7,11 +7,11 @@ type Hysteria struct {
 	Port                int      `yaml:"port,omitempty"`
 	Ports               string   `yaml:"ports,omitempty"`
 	Protocol            string   `yaml:"protocol,omitempty"`
-	ObfsProtocol        string   `yaml:"obfs-protocol,omitempty"` // compatible with Stash
+	ObfsProtocol        string   `yaml:"obfs-protocol,omitempty"`
 	Up                  string   `yaml:"up"`
-	UpSpeed             int      `yaml:"up-speed,omitempty"` // compatible with Stash
+	UpSpeed             int      `yaml:"up-speed,omitempty"`
 	Down                string   `yaml:"down"`
-	DownSpeed           int      `yaml:"down-speed,omitempty"` // compatible with Stash
+	DownSpeed           int      `yaml:"down-speed,omitempty"`
 	Auth                string   `yaml:"auth,omitempty"`
 	AuthStringOLD       string   `yaml:"auth_str,omitempty"`
 	AuthString          string   `yaml:"auth-str,omitempty"`

model/sub.go

@@ -103,7 +103,6 @@ type IPTables struct {
 	DnsRedirect      bool     `yaml:"dns-redirect,omitempty" json:"dns-redirect"`
 }
 
-// EBpf config
 type EBpf struct {
 	RedirectToTun []string `yaml:"redirect-to-tun,omitempty" json:"redirect-to-tun"`
 	AutoRedir     []string `yaml:"auto-redir,omitempty" json:"auto-redir"`

parser/base64.go

@@ -7,7 +7,7 @@ import (
 
 func DecodeBase64(s string) (string, error) {
 	s = strings.TrimSpace(s)
-	// url safe
+
 	if strings.Contains(s, "-") || strings.Contains(s, "_") {
 		s = strings.Replace(s, "-", "+", -1)
 		s = strings.Replace(s, "_", "/", -1)

parser/hysteria.go

@@ -1,11 +1,13 @@
 package parser
 
 import (
+	"fmt"
 	"net/url"
 	"strconv"
 	"strings"
-	"sub2clash/constant"
-	"sub2clash/model"
+
+	"github.com/nitezs/sub2clash/constant"
+	"github.com/nitezs/sub2clash/model"
 )
 
 func ParseHysteria(proxy string) (model.Proxy, error) {
@@ -13,25 +15,31 @@ func ParseHysteria(proxy string) (model.Proxy, error) {
 		return model.Proxy{}, &ParseError{Type: ErrInvalidPrefix, Raw: proxy}
 	}
 
-	proxy = strings.TrimPrefix(proxy, constant.HysteriaPrefix)
-	urlParts := strings.SplitN(proxy, "?", 2)
-	if len(urlParts) != 2 {
+	link, err := url.Parse(proxy)
+	if err != nil {
 		return model.Proxy{}, &ParseError{
 			Type:    ErrInvalidStruct,
-			Message: "missing character '?' in url",
+			Message: "url parse error",
+			Raw:     proxy,
+		}
+	}
+	server := link.Hostname()
+	if server == "" {
+		return model.Proxy{}, &ParseError{
+			Type:    ErrInvalidStruct,
+			Message: "missing server host",
 			Raw:     proxy,
 		}
 	}
 
-	serverInfo := strings.SplitN(urlParts[0], ":", 2)
-	if len(serverInfo) != 2 {
+	portStr := link.Port()
+	if portStr == "" {
 		return model.Proxy{}, &ParseError{
 			Type:    ErrInvalidStruct,
-			Message: "missing server host or port",
+			Message: "missing server port",
 			Raw:     proxy,
 		}
 	}
-	server, portStr := serverInfo[0], serverInfo[1]
 
 	port, err := ParsePort(portStr)
 	if err != nil {
@@ -42,16 +50,9 @@ func ParseHysteria(proxy string) (model.Proxy, error) {
 		}
 	}
 
-	params, err := url.ParseQuery(urlParts[1])
-	if err != nil {
-		return model.Proxy{}, &ParseError{
-			Type:    ErrCannotParseParams,
-			Raw:     proxy,
-			Message: err.Error(),
-		}
-	}
+	query := link.Query()
 
-	protocol, auth, insecure, upmbps, downmbps, obfs, alpnStr := params.Get("protocol"), params.Get("auth"), params.Get("insecure"), params.Get("upmbps"), params.Get("downmbps"), params.Get("obfs"), params.Get("alpn")
+	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")
 	insecureBool, err := strconv.ParseBool(insecure)
 	if err != nil {
 		insecureBool = false
@@ -63,10 +64,11 @@ func ParseHysteria(proxy string) (model.Proxy, error) {
 		alpn = strings.Split(alpnStr, ",")
 	}
 
-	remarks := server + ":" + portStr
-	if params.Get("remarks") != "" {
-		remarks = params.Get("remarks")
+	remarks := link.Fragment
+	if remarks == "" {
+		remarks = fmt.Sprintf("%s:%s", server, portStr)
 	}
+	remarks = strings.TrimSpace(remarks)
 
 	result := model.Proxy{
 		Type:           "hysteria",
@@ -77,7 +79,7 @@ func ParseHysteria(proxy string) (model.Proxy, error) {
 		Down:           downmbps,
 		Auth:           auth,
 		Obfs:           obfs,
-		SkipCertVerify: insecure == "1",
+		SkipCertVerify: insecureBool,
 		Alpn:           alpn,
 		Protocol:       protocol,
 		AllowInsecure:  insecureBool,

parser/hysteria2.go

@@ -1,10 +1,12 @@
 package parser
 
 import (
+	"fmt"
 	"net/url"
 	"strings"
-	"sub2clash/constant"
-	"sub2clash/model"
+
+	"github.com/nitezs/sub2clash/constant"
+	"github.com/nitezs/sub2clash/model"
 )
 
 func ParseHysteria2(proxy string) (model.Proxy, error) {
@@ -13,64 +15,53 @@ func ParseHysteria2(proxy string) (model.Proxy, error) {
 		return model.Proxy{}, &ParseError{Type: ErrInvalidPrefix, Raw: proxy}
 	}
 
-	proxy = strings.TrimPrefix(proxy, constant.Hysteria2Prefix1)
-	proxy = strings.TrimPrefix(proxy, constant.Hysteria2Prefix2)
-	urlParts := strings.SplitN(proxy, "@", 2)
-	if len(urlParts) != 2 {
+	link, err := url.Parse(proxy)
+	if err != nil {
 		return model.Proxy{}, &ParseError{
 			Type:    ErrInvalidStruct,
-			Message: "missing character '@' in url",
-			Raw:     proxy,
-		}
-	}
-	password := urlParts[0]
-
-	serverInfo := strings.SplitN(urlParts[1], "/?", 2)
-	if len(serverInfo) != 2 {
-		return model.Proxy{}, &ParseError{
-			Type:    ErrInvalidStruct,
-			Message: "missing params in url",
-			Raw:     proxy,
-		}
-	}
-	paramStr := serverInfo[1]
-
-	serverAndPort := strings.SplitN(serverInfo[0], ":", 2)
-	var server string
-	var portStr string
-	if len(serverAndPort) == 1 {
-		portStr = "443"
-	} else if len(serverAndPort) == 2 {
-		server, portStr = serverAndPort[0], serverAndPort[1]
-	} else {
-		return model.Proxy{}, &ParseError{
-			Type:    ErrInvalidStruct,
-			Message: "missing server host or port",
+			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,
-			Message: err.Error(),
-			Raw:     proxy,
+			Type: ErrInvalidPort,
+			Raw:  portStr,
 		}
 	}
-
-	params, err := url.ParseQuery(paramStr)
-	if err != nil {
-		return model.Proxy{}, &ParseError{
-			Type:    ErrCannotParseParams,
-			Raw:     proxy,
-			Message: err.Error(),
-		}
-	}
-
-	remarks, network, obfs, obfsPassword, pinSHA256, insecure, sni := params.Get("name"), params.Get("network"), params.Get("obfs"), params.Get("obfs-password"), params.Get("pinSHA256"), params.Get("insecure"), params.Get("sni")
-	enableTLS := pinSHA256 != ""
+	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 != ""
 	insecureBool := insecure == "1"
+	remarks := link.Fragment
+	if remarks == "" {
+		remarks = fmt.Sprintf("%s:%s", server, portStr)
+	}
+	remarks = strings.TrimSpace(remarks)
 
 	result := model.Proxy{
 		Type:           "hysteria2",

parser/shadowsocks.go

@@ -1,83 +1,98 @@
 package parser
 
 import (
+	"fmt"
 	"net/url"
 	"strings"
-	"sub2clash/constant"
-	"sub2clash/model"
+
+	"github.com/nitezs/sub2clash/constant"
+	"github.com/nitezs/sub2clash/model"
 )
 
 func ParseShadowsocks(proxy string) (model.Proxy, error) {
 	if !strings.HasPrefix(proxy, constant.ShadowsocksPrefix) {
 		return model.Proxy{}, &ParseError{Type: ErrInvalidPrefix, Raw: proxy}
 	}
-
-	proxy = strings.TrimPrefix(proxy, constant.ShadowsocksPrefix)
-	urlParts := strings.SplitN(proxy, "@", 2)
-	if len(urlParts) != 2 {
-		return model.Proxy{}, &ParseError{
-			Type:    ErrInvalidStruct,
-			Message: "missing character '@' in url",
-			Raw:     proxy,
-		}
-	}
-
-	var serverAndPort []string
-	if !strings.Contains(urlParts[0], ":") {
-		decoded, err := DecodeBase64(urlParts[0])
+	if !strings.Contains(proxy, "@") {
+		s := strings.SplitN(proxy, "#", 2)
+		d, err := DecodeBase64(strings.TrimPrefix(s[0], "ss://"))
 		if err != nil {
 			return model.Proxy{}, &ParseError{
 				Type:    ErrInvalidStruct,
-				Message: "invalid base64 encoded",
+				Message: "url parse error",
 				Raw:     proxy,
 			}
 		}
-		urlParts[0] = decoded
+		if len(s) == 2 {
+			proxy = "ss://" + d + "#" + s[1]
+		} else {
+			proxy = "ss://" + d
+		}
 	}
-	credentials := strings.SplitN(urlParts[0], ":", 2)
-	if len(credentials) != 2 {
+	link, err := url.Parse(proxy)
+	if err != nil {
 		return model.Proxy{}, &ParseError{
 			Type:    ErrInvalidStruct,
-			Message: "missing server host or port",
+			Message: "url parse error",
 			Raw:     proxy,
 		}
 	}
-	method, password := credentials[0], credentials[1]
 
-	serverInfo := strings.SplitN(urlParts[1], "#", 2)
-	serverAndPort = strings.SplitN(serverInfo[0], ":", 2)
-	server, portStr := serverAndPort[0], serverAndPort[1]
-	if len(serverInfo) != 2 {
+	server := link.Hostname()
+	if server == "" {
 		return model.Proxy{}, &ParseError{
 			Type:    ErrInvalidStruct,
-			Message: "missing server host or port",
+			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,
-			Message: err.Error(),
-			Raw:     proxy,
+			Type: ErrInvalidStruct,
+			Raw:  proxy,
 		}
 	}
 
-	var remarks string
-	if len(serverInfo) == 2 {
-		unescape, err := url.QueryUnescape(serverInfo[1])
+	method := link.User.Username()
+	password, _ := link.User.Password()
+
+	if password == "" {
+		user, err := DecodeBase64(method)
+		if err == nil {
+			methodAndPass := strings.SplitN(user, ":", 2)
+			if len(methodAndPass) == 2 {
+				method = methodAndPass[0]
+				password = methodAndPass[1]
+			}
+		}
+	}
+	if isLikelyBase64(password) {
+		password, err = DecodeBase64(password)
 		if err != nil {
 			return model.Proxy{}, &ParseError{
 				Type:    ErrInvalidStruct,
-				Message: "cannot unescape remarks",
+				Message: "password decode error",
 				Raw:     proxy,
 			}
 		}
-		remarks = strings.TrimSpace(unescape)
-	} else {
-		remarks = strings.TrimSpace(server + ":" + portStr)
 	}
 
+	remarks := link.Fragment
+	if remarks == "" {
+		remarks = fmt.Sprintf("%s:%s", server, portStr)
+	}
+	remarks = strings.TrimSpace(remarks)
+
 	result := model.Proxy{
 		Type:     "ss",
 		Cipher:   method,
@@ -89,3 +104,17 @@ func ParseShadowsocks(proxy string) (model.Proxy, error) {
 
 	return result, nil
 }
+
+func isLikelyBase64(s string) bool {
+	if len(s)%4 == 0 && strings.HasSuffix(s, "=") && !strings.Contains(strings.TrimSuffix(s, "="), "=") {
+		s = strings.TrimSuffix(s, "=")
+		chars := "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
+		for _, c := range s {
+			if !strings.ContainsRune(chars, c) {
+				return false
+			}
+		}
+		return true
+	}
+	return false
+}

parser/shadowsocksr.go

@@ -4,8 +4,9 @@ import (
 	"net/url"
 	"strconv"
 	"strings"
-	"sub2clash/constant"
-	"sub2clash/model"
+
+	"github.com/nitezs/sub2clash/constant"
+	"github.com/nitezs/sub2clash/model"
 )
 
 func ParseShadowsocksR(proxy string) (model.Proxy, error) {
@@ -27,7 +28,14 @@ func ParseShadowsocksR(proxy string) (model.Proxy, error) {
 	protocol := parts[2]
 	method := parts[3]
 	obfs := parts[4]
-	password := parts[5]
+	password, err := DecodeBase64(parts[5])
+	if err != nil {
+		return model.Proxy{}, &ParseError{
+			Type:    ErrInvalidStruct,
+			Raw:     proxy,
+			Message: err.Error(),
+		}
+	}
 	port, err := ParsePort(parts[1])
 	if err != nil {
 		return model.Proxy{}, &ParseError{

parser/socks.go

@@ -0,0 +1,79 @@
+package parser
+
+import (
+	"fmt"
+	"github.com/nitezs/sub2clash/constant"
+	"github.com/nitezs/sub2clash/model"
+	"net/url"
+	"strings"
+)
+
+func ParseSocks(proxy string) (model.Proxy, error) {
+	if !strings.HasPrefix(proxy, constant.SocksPrefix) {
+		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,
+		}
+	}
+	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,
+		}
+	}
+
+	remarks := link.Fragment
+	if remarks == "" {
+		remarks = fmt.Sprintf("%s:%s", server, portStr)
+	}
+	remarks = strings.TrimSpace(remarks)
+
+	encodeStr := link.User.Username()
+	var username, password string
+	if encodeStr != "" {
+		decodeStr, err := DecodeBase64(encodeStr)
+		splitStr := strings.Split(decodeStr, ":")
+		if err != nil {
+			return model.Proxy{}, &ParseError{
+				Type:    ErrInvalidStruct,
+				Message: "url parse error",
+				Raw:     proxy,
+			}
+		}
+		username = splitStr[0]
+		if len(splitStr) == 2 {
+			password = splitStr[1]
+		}
+	}
+	return model.Proxy{
+		Type:     "socks5",
+		Name:     remarks,
+		Server:   server,
+		Port:     port,
+		Username: username,
+		Password: password,
+	}, nil
+
+}

parser/trojan.go

@@ -1,55 +1,43 @@
 package parser
 
 import (
+	"fmt"
 	"net/url"
 	"strings"
-	"sub2clash/constant"
-	"sub2clash/model"
+
+	"github.com/nitezs/sub2clash/constant"
+	"github.com/nitezs/sub2clash/model"
 )
 
-// ParseTrojan 解析给定的Trojan代理URL并返回Proxy结构。
 func ParseTrojan(proxy string) (model.Proxy, error) {
 	if !strings.HasPrefix(proxy, constant.TrojanPrefix) {
 		return model.Proxy{}, &ParseError{Type: ErrInvalidPrefix, Raw: proxy}
 	}
 
-	proxy = strings.TrimPrefix(proxy, constant.TrojanPrefix)
-	urlParts := strings.SplitN(proxy, "@", 2)
-	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(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])
+	link, err := url.Parse(proxy)
 	if err != nil {
 		return model.Proxy{}, &ParseError{
-			Type:    ErrCannotParseParams,
+			Type:    ErrInvalidStruct,
+			Message: "url parse error",
+			Raw:     proxy,
+		}
+	}
+
+	password := link.User.Username()
+	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,
-			Message: err.Error(),
 		}
 	}
 
@@ -62,14 +50,14 @@ func ParseTrojan(proxy string) (model.Proxy, error) {
 		}
 	}
 
-	remarks := ""
-	if len(serverInfo) == 2 {
-		remarks, _ = url.QueryUnescape(strings.TrimSpace(serverInfo[1]))
-	} else {
-		remarks = serverAndPort[0]
+	remarks := link.Fragment
+	if remarks == "" {
+		remarks = fmt.Sprintf("%s:%s", server, portStr)
 	}
+	remarks = strings.TrimSpace(remarks)
 
-	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")
+	query := link.Query()
+	network, security, alpnStr, sni, pbk, sid, fp, path, host, serviceName := query.Get("type"), query.Get("security"), query.Get("alpn"), query.Get("sni"), query.Get("pbk"), query.Get("sid"), query.Get("fp"), query.Get("path"), query.Get("host"), query.Get("serviceName")
 
 	var alpn []string
 	if strings.Contains(alpnStr, ",") {
@@ -78,9 +66,6 @@ func ParseTrojan(proxy string) (model.Proxy, error) {
 		alpn = nil
 	}
 
-	// enableUTLS := fp != ""
-
-	// 构建Proxy结构体
 	result := model.Proxy{
 		Type:     "trojan",
 		Server:   server,
@@ -116,14 +101,6 @@ func ParseTrojan(proxy string) (model.Proxy, error) {
 		}
 	}
 
-	// if network == "http" {
-	// 	// 未查到相关支持文档
-	// }
-
-	// if network == "quic" {
-	// 	// 未查到相关支持文档
-	// }
-
 	if network == "grpc" {
 		result.GrpcOpts = model.GrpcOptions{
 			GrpcServiceName: serviceName,

parser/vless.go

@@ -1,10 +1,12 @@
 package parser
 
 import (
+	"fmt"
 	"net/url"
 	"strings"
-	"sub2clash/constant"
-	"sub2clash/model"
+
+	"github.com/nitezs/sub2clash/constant"
+	"github.com/nitezs/sub2clash/model"
 )
 
 func ParseVless(proxy string) (model.Proxy, error) {
@@ -12,34 +14,24 @@ func ParseVless(proxy string) (model.Proxy, error) {
 		return model.Proxy{}, &ParseError{Type: ErrInvalidPrefix, Raw: proxy}
 	}
 
-	urlParts := strings.SplitN(strings.TrimPrefix(proxy, constant.VLESSPrefix), "@", 2)
-	if len(urlParts) != 2 {
+	link, err := url.Parse(proxy)
+	if err != nil {
 		return model.Proxy{}, &ParseError{
 			Type:    ErrInvalidStruct,
-			Message: "missing character '@' in url",
+			Message: "url parse error",
 			Raw:     proxy,
 		}
 	}
 
-	serverInfo := strings.SplitN(urlParts[1], "#", 2)
-	serverAndPortAndParams := strings.SplitN(serverInfo[0], "?", 2)
-	if len(serverAndPortAndParams) != 2 {
+	server := link.Hostname()
+	if server == "" {
 		return model.Proxy{}, &ParseError{
 			Type:    ErrInvalidStruct,
-			Message: "missing character '?' in url",
+			Message: "missing server host",
 			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]
+	portStr := link.Port()
 	port, err := ParsePort(portStr)
 	if err != nil {
 		return model.Proxy{}, &ParseError{
@@ -49,40 +41,10 @@ func ParseVless(proxy string) (model.Proxy, error) {
 		}
 	}
 
-	params, err := url.ParseQuery(serverAndPortAndParams[1])
-	if err != nil {
-		return model.Proxy{}, &ParseError{
-			Type:    ErrCannotParseParams,
-			Raw:     proxy,
-			Message: err.Error(),
-		}
-	}
+	query := link.Query()
+	uuid := link.User.Username()
+	flow, security, alpnStr, sni, insecure, fp, pbk, sid, path, host, serviceName, _type := query.Get("flow"), query.Get("security"), query.Get("alpn"), query.Get("sni"), query.Get("allowInsecure"), query.Get("fp"), query.Get("pbk"), query.Get("sid"), query.Get("path"), query.Get("host"), query.Get("serviceName"), query.Get("type")
 
-	remarks := ""
-	if len(serverInfo) == 2 {
-		if strings.Contains(serverInfo[1], "|") {
-			remarks = strings.SplitN(serverInfo[1], "|", 2)[1]
-		} else {
-			remarks, err = url.QueryUnescape(serverInfo[1])
-			if err != nil {
-				return model.Proxy{}, &ParseError{
-					Type:    ErrCannotParseParams,
-					Raw:     proxy,
-					Message: err.Error(),
-				}
-			}
-		}
-	} else {
-		remarks, err = url.QueryUnescape(server)
-		if err != nil {
-			return model.Proxy{}, err
-		}
-	}
-
-	uuid := strings.TrimSpace(urlParts[0])
-	flow, security, alpnStr, sni, insecure, fp, pbk, sid, path, host, serviceName, _type := params.Get("flow"), params.Get("security"), params.Get("alpn"), params.Get("sni"), params.Get("allowInsecure"), params.Get("fp"), params.Get("pbk"), params.Get("sid"), params.Get("path"), params.Get("host"), params.Get("serviceName"), params.Get("type")
-
-	// enableUTLS := fp != ""
 	insecureBool := insecure == "1"
 	var alpn []string
 	if strings.Contains(alpnStr, ",") {
@@ -90,6 +52,11 @@ func ParseVless(proxy string) (model.Proxy, error) {
 	} else {
 		alpn = nil
 	}
+	remarks := link.Fragment
+	if remarks == "" {
+		remarks = fmt.Sprintf("%s:%s", server, portStr)
+	}
+	remarks = strings.TrimSpace(remarks)
 
 	result := model.Proxy{
 		Type:   "vless",
@@ -105,15 +72,17 @@ func ParseVless(proxy string) (model.Proxy, error) {
 		result.Alpn = alpn
 		result.Sni = sni
 		result.AllowInsecure = insecureBool
-		result.Fingerprint = fp
+		result.ClientFingerprint = fp
 	}
 
 	if security == "reality" {
 		result.TLS = true
+		result.Servername = sni
 		result.RealityOpts = model.RealityOptions{
 			PublicKey: pbk,
 			ShortID:   sid,
 		}
+		result.ClientFingerprint = fp
 	}
 
 	if _type == "ws" {
@@ -127,16 +96,19 @@ func ParseVless(proxy string) (model.Proxy, error) {
 		}
 	}
 
-	// if _type == "quic" {
-	// 	// 未查到相关支持文档
-	// }
-
 	if _type == "grpc" {
 		result.Network = "grpc"
-		result.Servername = serviceName
+		result.GrpcOpts = model.GrpcOptions{
+			GrpcServiceName: serviceName,
+		}
 	}
 
 	if _type == "http" {
+		result.HTTPOpts = model.HTTPOptions{}
+		result.HTTPOpts.Headers = map[string][]string{}
+
+		result.HTTPOpts.Path = strings.Split(path, ",")
+
 		hosts, err := url.QueryUnescape(host)
 		if err != nil {
 			return model.Proxy{}, &ParseError{
@@ -146,10 +118,9 @@ func ParseVless(proxy string) (model.Proxy, error) {
 			}
 		}
 		result.Network = "http"
-		result.HTTPOpts = model.HTTPOptions{
-			Headers: map[string][]string{"Host": strings.Split(hosts, ",")},
+		if hosts != "" {
+			result.HTTPOpts.Headers["host"] = strings.Split(host, ",")
 		}
-
 	}
 
 	return result, nil

parser/vmess.go

@@ -5,8 +5,9 @@ import (
 	"net/url"
 	"strconv"
 	"strings"
-	"sub2clash/constant"
-	"sub2clash/model"
+
+	"github.com/nitezs/sub2clash/constant"
+	"github.com/nitezs/sub2clash/model"
 )
 
 func ParseVmess(proxy string) (model.Proxy, error) {
@@ -100,10 +101,6 @@ func ParseVmess(proxy string) (model.Proxy, error) {
 		}
 	}
 
-	// if vmess.Net == "quic" {
-	// 	// 未查到相关支持文档
-	// }
-
 	if vmess.Net == "grpc" {
 		result.GrpcOpts = model.GrpcOptions{
 			GrpcServiceName: vmess.Path,

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

validator/short_link.go

@@ -3,10 +3,11 @@ package validator
 type ShortLinkGenValidator struct {
 	Url      string `form:"url" binding:"required"`
 	Password string `form:"password"`
+	CustomID string `form:"customId"`
 }
 
 type GetUrlValidator struct {
-	Hash     string `form:"hash" binding:"required"` // Hash: 短链接
+	Hash     string `form:"hash" binding:"required"`
 	Password string `form:"password"`
 }
 

validator/sub.go

@@ -31,6 +31,7 @@ type SubValidator struct {
 	ReplaceTo           []string             `form:"-" binding:""`
 	NodeListMode        bool                 `form:"nodeList,default=false" binding:""`
 	IgnoreCountryGrooup bool                 `form:"ignoreCountryGroup,default=false" binding:""`
+	UserAgent           string               `form:"userAgent" binding:""`
 }
 
 type RuleProviderStruct struct {
@@ -110,7 +111,7 @@ func ParseQuery(c *gin.Context) (SubValidator, error) {
 				},
 			)
 		}
-		// 校验 Rule-Provider 是否有重名
+
 		names := make(map[string]bool)
 		for _, ruleProvider := range query.RuleProviders {
 			if _, ok := names[ruleProvider.Name]; ok {