update: 增加警告提示

fix: reality parsing

.env.example

@@ -5,4 +5,4 @@ REQUEST_RETRY_TIMES=3
 REQUEST_MAX_FILE_SIZE=1048576
 CACHE_EXPIRE=300
 LOG_LEVEL=info
-BASE_PATH=/
+BASE_PATH=/

.github/workflows/docker.yml

@@ -47,6 +47,9 @@ jobs:
         with:
           context: .
           file: ./Dockerfile
+          build-args: |
+            dev=true
+            version=${{ github.sha }}
           push: true
           tags: ghcr.io/${{ github.repository }}:${{ steps.set_tag.outputs.tag }}
 
@@ -56,6 +59,9 @@ jobs:
         with:
           context: .
           file: ./Dockerfile
+          build-args: |
+            dev=false 
+            version=${{ steps.set_tag.outputs.tag }}
           push: true
           tags: |
             ghcr.io/${{ github.repository }}:${{ steps.set_tag.outputs.tag }}

.github/workflows/go.yml

@@ -23,12 +23,10 @@ jobs:
 
       - name: Build
         run: |
-          LDFLAGS="-s -w"
+          LDFLAGS="-s -w -X config.Version=${{ github.ref_name }}"
           
           # Linux
-          CGO_ENABLED=0 GOOS=linux GOARCH=386 go build -ldflags="$LDFLAGS" -o output/sub2clash-linux-386 main.go
           CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="$LDFLAGS" -o output/sub2clash-linux-amd64 main.go
-          CGO_ENABLED=0 GOOS=linux GOARCH=arm go build -ldflags="$LDFLAGS" -o output/sub2clash-linux-arm main.go
           CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags="$LDFLAGS" -o output/sub2clash-linux-arm64 main.go
           
           # Darwin
@@ -36,9 +34,7 @@ jobs:
           CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -ldflags="$LDFLAGS" -o output/sub2clash-darwin-arm64 main.go
           
           # Windows
-          CGO_ENABLED=0 GOOS=windows GOARCH=386 go build -ldflags="$LDFLAGS" -o output/sub2clash-windows-386.exe main.go
           CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -ldflags="$LDFLAGS" -o output/sub2clash-windows-amd64.exe main.go
-          CGO_ENABLED=0 GOOS=windows GOARCH=arm go build -ldflags="$LDFLAGS" -o output/sub2clash-windows-arm.exe main.go
           CGO_ENABLED=0 GOOS=windows GOARCH=arm64 go build -ldflags="$LDFLAGS" -o output/sub2clash-windows-arm64.exe main.go
 
       - name: Create Release
@@ -52,16 +48,6 @@ jobs:
           draft: false
           prerelease: false
 
-      - name: Upload Release Asset (Linux 386)
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./output/sub2clash-linux-386
-          asset_name: sub2clash-linux-386
-          asset_content_type: application/octet-stream
-
       - name: Upload Release Asset (Linux amd64)
         uses: actions/upload-release-asset@v1
         env:
@@ -72,16 +58,6 @@ jobs:
           asset_name: sub2clash-linux-amd64
           asset_content_type: application/octet-stream
 
-      - name: Upload Release Asset (Linux arm)
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./output/sub2clash-linux-arm
-          asset_name: sub2clash-linux-arm
-          asset_content_type: application/octet-stream
-
       - name: Upload Release Asset (Linux arm64)
         uses: actions/upload-release-asset@v1
         env:
@@ -112,16 +88,6 @@ jobs:
           asset_name: sub2clash-darwin-arm64
           asset_content_type: application/octet-stream
 
-      - name: Upload Release Asset (Windows 386)
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./output/sub2clash-windows-386.exe
-          asset_name: sub2clash-windows-386.exe
-          asset_content_type: application/octet-stream
-
       - name: Upload Release Asset (Windows amd64)
         uses: actions/upload-release-asset@v1
         env:
@@ -132,16 +98,6 @@ jobs:
           asset_name: sub2clash-windows-amd64.exe
           asset_content_type: application/octet-stream
 
-      - name: Upload Release Asset (Windows arm)
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./output/sub2clash-windows-arm.exe
-          asset_name: sub2clash-windows-arm.exe
-          asset_content_type: application/octet-stream
-
       - name: Upload Release Asset (Windows arm64)
         uses: actions/upload-release-asset@v1
         env:

.gitignore

@@ -3,4 +3,5 @@ dist
 subs
 test
 logs
-sub2clash.db
+sub2clash.db
+.env

.goreleaser.yaml

@@ -2,18 +2,16 @@
 #  hooks:
 #    - go mod tidy
 builds:
-  - env:
-      - CGO_ENABLED=0
-    goos:
-      - linux
-      - windows
-      - darwin
-    goarch:
-      - amd64
-      - arm
-      - arm64
-      - 386
-    ldflags:
-      - -s -w
-    no_unique_dist_dir: true
-    binary: "{{ .ProjectName }}-{{ .Os }}-{{ .Arch }}"
+    - env:
+          - CGO_ENABLED=0
+      goos:
+          - linux
+          - windows
+          - darwin
+      goarch:
+          - amd64
+          - arm64
+      ldflags:
+          - -s -w -X sub2clash/config.Version={{ .Version }}
+      no_unique_dist_dir: true
+      binary: "{{ .ProjectName }}-{{ .Os }}-{{ .Arch }}"

.vscode/launch.json

@@ -0,0 +1,13 @@
+{
+    "configurations": [
+        {
+            "name": "Debug",
+            "type": "go",
+            "request": "launch",
+            "mode": "debug",
+            "program": "${workspaceFolder}/main.go",
+            "output": "${workspaceFolder}/dist/main.exe",
+            "buildFlags": "-ldflags '-X sub2clash/config.Dev=true -X sub2clash/config.Version=dev'"
+        }
+    ]
+}

API_README.md

@@ -0,0 +1,37 @@
+# `/clash`, `/meta`
+
+获取 Clash/Clash.Meta 配置链接
+
+| Query 参数     | 类型     | 是否必须              | 默认值       | 说明                                                                                                                                                                            |
+|--------------|--------|-------------------|-----------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| sub          | string | sub/proxy 至少有一项存在 | -         | 订阅链接，可以在链接结尾加上`#名称`，来给订阅中的节点加上统一前缀（可以输入多个，用 `,` 分隔）                                                                                                                           |
+| proxy        | string | sub/proxy 至少有一项存在 | -         | 节点分享链接（可以输入多个，用 `,` 分隔）                                                                                                                                                       |
+| refresh      | bool   | 否                 | `false`   | 强制刷新配置（默认缓存 5 分钟）                                                                                                                                                             |
+| template     | string | 否                 | -         | 外部模板链接或内部模板名称                                                                                                                                                                 |
+| ruleProvider | string | 否                 | -         | 格式 `[Behavior,Url,Group,Prepend,Name],[Behavior,Url,Group,Prepend,Name]...`，其中 `Group` 是该规则集使用的策略组名，`Prepend` 为 bool 类型，如果为 `true` 规则将被添加到规则列表顶部，否则添加到规则列表底部（会调整到 MATCH 规则之前） |
+| rule         | string | 否                 | -         | 格式 `[Rule,Prepend],[Rule,Prepend]...`，其中 `Prepend` 为 bool 类型，如果为 `true` 规则将被添加到规则列表顶部，否则添加到规则列表底部（会调整到 MATCH 规则之前）                                                            |
+| autoTest     | bool   | 否                 | `false`   | 国家策略组是否自动测速                                                                                                                                                                   |
+| lazy         | bool   | 否                 | `false`   | 自动测速是否启用 lazy                                                                                                                                                                 |
+| sort         | string | 否                 | `nameasc` | 国家策略组排序策略，可选值 `nameasc`、`namedesc`、`sizeasc`、`sizedesc`                                                                                                                       |
+| replace      | string | 否                 | -         | 通过正则表达式重命名节点，格式 `[<ReplaceKey>,<ReplaceTo>],[<ReplaceKey>,<ReplaceTo>]...`                                                                                                    |
+| remove       | string | 否                 | -         | 通过正则表达式删除节点                                                                                                                                                                   |
+| nodeList     | bool   | 否                 | `false`   | 只输出节点                                                                                                                                                                         |
+
+# `/short`
+
+获取短链，Content-Type 为 `application/json`
+具体参考使用可以参考 [api\templates\index.html](api/static/index.html)
+
+| Body 参数  | 类型     | 是否必须 | 默认值 | 说明               |
+|----------|--------|------|-----|------------------|
+| url      | string | 是    | -   | 需要转换的 Query 参数部分 |
+| password | string | 否    | -   | 短链密码             |
+
+# `/s/:hash`
+
+短链跳转
+`hash` 为动态路由参数，可以通过 `/short` 接口获取
+
+| Query 参数 | 类型     | 是否必须 | 默认值 | 说明   |
+|----------|--------|------|-----|------|
+| password | string | 否    | -   | 短链密码 |

Dockerfile

@@ -9,8 +9,12 @@ WORKDIR /app
 COPY . .
 RUN go mod download
 
+# 获取参数
+ARG version
+ARG dev
+
 # 使用 -ldflags 参数进行编译
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -o sub2clash main.go
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-s -w -X sub2clash/config.Version=${version} -X sub2clash/config.Dev=${dev}" -o sub2clash main.go
 
 FROM alpine:latest
 

README.md

@@ -1,18 +1,21 @@
 # sub2clash
 
-将订阅链接转换为 Clash、Clash.Meta 配置
+将订阅链接转换为 Clash、Clash.Meta 配置  
+[预览](https://www.nite07.com/sub)
 
 ## 特性
 
 - 开箱即用的规则、策略组配置
 - 自动根据节点名称按国家划分策略组
 - 支持多订阅合并
+- 支持添加自定义 Rule Provider、Rule
 - 支持多种协议
     - Shadowsocks
     - ShadowsocksR
     - Vmess
-    - Vless
+    - Vless （Clash.Meta）
     - Trojan
+    - Hysteria2 （Clash.Meta）
 
 ## 使用
 
@@ -25,36 +28,31 @@
 
 可以通过编辑 .env 文件来修改默认配置，docker 直接添加环境变量
 
-| 变量名                   | 说明                                                        | 默认值                   |
-|-----------------------|-----------------------------------------------------------|-----------------------|
-| BASE_PATH             | 程序运行子路径，例如将服务反代在 `https://example.com/sub` 则此变量值应为 `/sub` | `/`                   |
-| PORT                  | 端口                                                        | `8011`                |
-| META_TEMPLATE         | meta 模板文件名                                                | `template_meta.yaml`  |
-| CLASH_TEMPLATE        | clash 模板文件名                                               | `template_clash.yaml` |
-| REQUEST_RETRY_TIMES   | Get 请求重试次数                                                | `3`                   |
-| REQUEST_MAX_FILE_SIZE | Get 请求订阅文件最大大小（byte）                                      | `1048576`             |
-| CACHE_EXPIRE          | 订阅缓存时间（秒）                                                 | `300`                 |
-| LOG_LEVEL             | 日志等级，可选值 `debug`,`info`,`warn`,`error`                    | `info`                |
+| 变量名                   | 说明                                     | 默认值                   |
+|-----------------------|----------------------------------------|-----------------------|
+| PORT                  | 端口                                     | `8011`                |
+| META_TEMPLATE         | 默认 meta 模板文件名                          | `template_meta.yaml`  |
+| CLASH_TEMPLATE        | 默认 clash 模板文件名                         | `template_clash.yaml` |
+| REQUEST_RETRY_TIMES   | Get 请求重试次数                             | `3`                   |
+| REQUEST_MAX_FILE_SIZE | Get 请求订阅文件最大大小（byte）                   | `1048576`             |
+| CACHE_EXPIRE          | 订阅缓存时间（秒）                              | `300`                 |
+| LOG_LEVEL             | 日志等级，可选值 `debug`,`info`,`warn`,`error` | `info`                |
+| SHORT_LINK_LENGTH     | 短链长度                                   | `6`                   |
 
 ### API
 
-#### `/clash`, `/meta`
+[API 文档](./API_README.md)
 
-获取 Clash/Clash.Meta 配置链接
+### 模板
 
-| Query 参数     | 类型     | 是否必须              | 默认值       | 说明                                                                                                                                                                          |
-|--------------|--------|-------------------|-----------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| sub          | string | sub/proxy 至少有一项存在 | -         | 订阅链接（可以输入多个，用 `,` 分隔）                                                                                                                                                       |
-| proxy        | string | sub/proxy 至少有一项存在 | -         | 节点分享链接（可以输入多个，用 `,` 分隔）                                                                                                                                                     |
-| refresh      | bool   | 否                 | `false`   | 强制刷新配置（默认缓存 5 分钟）                                                                                                                                                           |
-| template     | string | 否                 | -         | 外部模板链接或内部模板名称                                                                                                                                                               |
-| ruleProvider | string | 否                 | -         | 格式 `[Behavior,Url,Group,Prepend,Name],[Behavior,Url,Group,Prepend,Name]...`，其中 `Group` 是该规则集所走的策略组名，`Prepend` 为 bool 类型，如果为 `true` 规则将被添加到规则列表顶部，否则添加到规则列表底部（会调整到MATCH规则之前） | 
-| rule         | string | 否                 | -         | 格式 `[Rule,Prepend],[Rule,Prepend]...`，其中 `Prepend` 为 bool 类型，如果为 `true` 规则将被添加到规则列表顶部，否则添加到规则列表底部（会调整到MATCH规则之前）                                                            | 
-| autoTest     | bool   | 否                 | `false`   | 国家策略组是否自动测速                                                                                                                                                                 |
-| lazy         | bool   | 否                 | `false`   | 自动测速是否启用 lazy                                                                                                                                                               |
-| sort         | string | 否                 | `nameasc` | 国家策略组排序策略，可选值 `nameasc`、`namedesc`、`sizeasc`、`sizedesc`                                                                                                                     |
+可以通过变量自定义模板中的策略组代理节点  
+解释的不太清楚，可以参考下方默认模板
 
-## 默认模板
+- `<all>` 为添加所有节点
+- `<countries>` 为添加所有国家策略组
+- `<地区二位字母代码>` 为添加指定地区所有节点，例如 `<hk>` 将添加所有香港节点
+
+#### 默认模板
 
 - [Clash](./templates/template_clash.yaml)
 - [Clash.Meta](./templates/template_meta.yaml)
@@ -62,5 +60,3 @@
 ## 已知问题
 
 [代理链接解析](./parser)还没有经过严格测试，可能会出现解析错误的情况，如果出现问题请提交 issue
-
-## TODO

api/controller/clash.go

@@ -1,12 +1,13 @@
 package controller
 
 import (
-	"github.com/gin-gonic/gin"
-	"gopkg.in/yaml.v3"
 	"net/http"
 	"sub2clash/config"
 	"sub2clash/model"
 	"sub2clash/validator"
+
+	"github.com/gin-gonic/gin"
+	"gopkg.in/yaml.v3"
 )
 
 func SubmodHandler(c *gin.Context) {
@@ -22,6 +23,17 @@ func SubmodHandler(c *gin.Context) {
 		return
 	}
 	// 输出
+	if query.NodeListMode {
+		nodelist := model.NodeList{}
+		nodelist.Proxies = sub.Proxies
+		marshal, err := yaml.Marshal(nodelist)
+		if err != nil {
+			c.String(http.StatusInternalServerError, "YAML序列化失败: "+err.Error())
+			return
+		}
+		c.String(http.StatusOK, string(marshal))
+		return
+	}
 	marshal, err := yaml.Marshal(sub)
 	if err != nil {
 		c.String(http.StatusInternalServerError, "YAML序列化失败: "+err.Error())

api/controller/default.go

@@ -4,14 +4,19 @@ import (
 	"crypto/sha256"
 	"encoding/hex"
 	"errors"
-	"gopkg.in/yaml.v3"
 	"net/url"
 	"regexp"
+	"sort"
+	"strconv"
 	"strings"
+	"sub2clash/logger"
 	"sub2clash/model"
 	"sub2clash/parser"
 	"sub2clash/utils"
 	"sub2clash/validator"
+
+	"go.uber.org/zap"
+	"gopkg.in/yaml.v3"
 )
 
 func BuildSub(clashType model.ClashType, query validator.SubValidator, template string) (
@@ -26,55 +31,174 @@ func BuildSub(clashType model.ClashType, query validator.SubValidator, template
 	if query.Template != "" {
 		template = query.Template
 	}
-	_, err = url.ParseRequestURI(template)
-	if err != nil {
-		templateBytes, err = utils.LoadTemplate(template)
+	if strings.HasPrefix(template, "http") {
+		templateBytes, err = utils.LoadSubscription(template, query.Refresh)
 		if err != nil {
+			logger.Logger.Debug(
+				"load template failed", zap.String("template", template), zap.Error(err),
+			)
 			return nil, errors.New("加载模板失败: " + err.Error())
 		}
 	} else {
-		templateBytes, err = utils.LoadSubscription(template, query.Refresh)
+		unescape, err := url.QueryUnescape(template)
 		if err != nil {
 			return nil, errors.New("加载模板失败: " + err.Error())
 		}
+		templateBytes, err = utils.LoadTemplate(unescape)
+		if err != nil {
+			logger.Logger.Debug(
+				"load template failed", zap.String("template", template), zap.Error(err),
+			)
+			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 := utils.LoadSubscription(query.Subs[i], query.Refresh)
+		subName := ""
+		if strings.Contains(query.Subs[i], "#") {
+			subName = query.Subs[i][strings.LastIndex(query.Subs[i], "#")+1:]
+		}
 		if err != nil {
+			logger.Logger.Debug(
+				"load subscription failed", zap.String("url", query.Subs[i]), zap.Error(err),
+			)
 			return nil, errors.New("加载订阅失败: " + err.Error())
 		}
 		// 解析订阅
-		var proxyList []model.Proxy
 		err = yaml.Unmarshal(data, &sub)
+		newProxies := make([]model.Proxy, 0)
 		if err != nil {
-			reg, _ := regexp.Compile("(ssr|ss|vmess|trojan|http|https)://")
+			reg, _ := regexp.Compile("(ssr|ss|vmess|trojan|vless|hysteria)://")
 			if reg.Match(data) {
-				proxyList = utils.ParseProxy(strings.Split(string(data), "\n")...)
+				p := utils.ParseProxy(strings.Split(string(data), "\n")...)
+				newProxies = p
 			} else {
 				// 如果无法直接解析，尝试Base64解码
 				base64, err := parser.DecodeBase64(string(data))
 				if err != nil {
+					logger.Logger.Debug(
+						"parse subscription failed", zap.String("url", query.Subs[i]),
+						zap.String("data", string(data)),
+						zap.Error(err),
+					)
 					return nil, errors.New("加载订阅失败: " + err.Error())
 				}
-				proxyList = utils.ParseProxy(strings.Split(base64, "\n")...)
+				p := utils.ParseProxy(strings.Split(base64, "\n")...)
+				newProxies = p
 			}
 		} else {
-			proxyList = sub.Proxies
+			newProxies = sub.Proxies
 		}
-		utils.AddProxy(sub, query.AutoTest, query.Lazy, query.Sort, clashType, proxyList...)
+		if subName != "" {
+			for i := range newProxies {
+				newProxies[i].SubName = subName
+			}
+		}
+		proxyList = append(proxyList, newProxies...)
 	}
-	// 处理自定义代理
-	utils.AddProxy(
-		sub, query.AutoTest, query.Lazy, query.Sort, clashType,
-		utils.ParseProxy(query.Proxies...)...,
-	)
-	MergeSubAndTemplate(temp, sub)
+	// 添加自定义节点
+	if len(query.Proxies) != 0 {
+		proxyList = append(proxyList, utils.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
+		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 {
+			removeReg, err := regexp.Compile(query.Remove)
+			if err != nil {
+				logger.Logger.Debug("remove regexp compile failed", zap.Error(err))
+				return nil, errors.New("remove 参数非法: " + err.Error())
+			}
+			// 删除匹配到的节点
+			if removeReg.MatchString(proxyList[i].Name) {
+				continue // 如果匹配到要删除的元素，跳过该元素，不添加到新切片中
+			}
+			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)
+			if err != nil {
+				logger.Logger.Debug("replace regexp compile failed", zap.Error(err))
+				return nil, errors.New("replace 参数非法: " + err.Error())
+			}
+			replaceRegs = append(replaceRegs, replaceReg)
+		}
+		for i := range proxyList {
+			// 重命名匹配到的节点
+			for j, v := range replaceRegs {
+				if err != nil {
+					logger.Logger.Debug("replace regexp compile failed", zap.Error(err))
+					return nil, errors.New("replaceName 参数非法: " + err.Error())
+				}
+				if v.MatchString(proxyList[i].Name) {
+					proxyList[i].Name = v.ReplaceAllString(
+						proxyList[i].Name, query.ReplaceTo[j],
+					)
+				}
+			}
+		}
+	}
+	// 重名检测
+	names := make(map[string]int)
+	for i := range proxyList {
+		if _, exist := names[proxyList[i].Name]; exist {
+			proxyList[i].Name = proxyList[i].Name + " " + strconv.Itoa(names[proxyList[i].Name])
+		}
+		names[proxyList[i].Name] = names[proxyList[i].Name] + 1
+	}
+	// trim
+	for i := range proxyList {
+		proxyList[i].Name = strings.TrimSpace(proxyList[i].Name)
+	}
+	// 将新增节点都添加到临时变量 t 中，防止策略组排序错乱
+	var t = &model.Subscription{}
+	utils.AddProxy(t, query.AutoTest, query.Lazy, clashType, proxyList...)
+	// 排序策略组
+	switch query.Sort {
+	case "sizeasc":
+		sort.Sort(model.ProxyGroupsSortBySize(t.ProxyGroups))
+	case "sizedesc":
+		sort.Sort(sort.Reverse(model.ProxyGroupsSortBySize(t.ProxyGroups)))
+	case "nameasc":
+		sort.Sort(model.ProxyGroupsSortByName(t.ProxyGroups))
+	case "namedesc":
+		sort.Sort(sort.Reverse(model.ProxyGroupsSortByName(t.ProxyGroups)))
+	default:
+		sort.Sort(model.ProxyGroupsSortByName(t.ProxyGroups))
+	}
+	// 合并新节点和模板
+	MergeSubAndTemplate(temp, t)
 	// 处理自定义规则
 	for _, v := range query.Rules {
 		if v.Prepend {
@@ -118,28 +242,45 @@ func MergeSubAndTemplate(temp *model.Subscription, sub *model.Subscription) {
 			)
 		}
 	}
+	var proxyNames []string
+	for _, proxy := range sub.Proxies {
+		proxyNames = append(proxyNames, proxy.Name)
+	}
 	// 将订阅中的节点添加到模板中
 	temp.Proxies = append(temp.Proxies, sub.Proxies...)
 	// 将订阅中的策略组添加到模板中
-	skipGroups := []string{"全球直连", "广告拦截", "手动切换"}
 	for i := range temp.ProxyGroups {
-		skip := false
-		for _, v := range skipGroups {
-			if strings.Contains(temp.ProxyGroups[i].Name, v) {
-				if v == "手动切换" {
-					proxies := make([]string, 0, len(sub.Proxies))
-					for _, p := range sub.Proxies {
-						proxies = append(proxies, p.Name)
-					}
-					temp.ProxyGroups[i].Proxies = proxies
-				}
-				skip = true
-				continue
+		if temp.ProxyGroups[i].IsCountryGrop {
+			continue
+		}
+		newProxies := make([]string, 0)
+		countryGroupMap := make(map[string]model.ProxyGroup)
+		for _, v := range sub.ProxyGroups {
+			if v.IsCountryGrop {
+				countryGroupMap[v.Name] = v
 			}
 		}
-		if !skip {
-			temp.ProxyGroups[i].Proxies = append(temp.ProxyGroups[i].Proxies, countryGroupNames...)
+		for j := range temp.ProxyGroups[i].Proxies {
+			reg := regexp.MustCompile("<(.*?)>")
+			if reg.Match([]byte(temp.ProxyGroups[i].Proxies[j])) {
+				key := reg.FindStringSubmatch(temp.ProxyGroups[i].Proxies[j])[1]
+				switch key {
+				case "all":
+					newProxies = append(newProxies, proxyNames...)
+				case "countries":
+					newProxies = append(newProxies, countryGroupNames...)
+				default:
+					if len(key) == 2 {
+						newProxies = append(
+							newProxies, countryGroupMap[utils.GetContryName(key)].Proxies...,
+						)
+					}
+				}
+			} else {
+				newProxies = append(newProxies, temp.ProxyGroups[i].Proxies[j])
+			}
 		}
+		temp.ProxyGroups[i].Proxies = newProxies
 	}
 	temp.ProxyGroups = append(temp.ProxyGroups, sub.ProxyGroups...)
 }

api/controller/meta.go

@@ -2,12 +2,13 @@ package controller
 
 import (
 	_ "embed"
-	"github.com/gin-gonic/gin"
-	"gopkg.in/yaml.v3"
 	"net/http"
 	"sub2clash/config"
 	"sub2clash/model"
 	"sub2clash/validator"
+
+	"github.com/gin-gonic/gin"
+	"gopkg.in/yaml.v3"
 )
 
 func SubHandler(c *gin.Context) {
@@ -23,6 +24,17 @@ func SubHandler(c *gin.Context) {
 		return
 	}
 	// 输出
+	if query.NodeListMode {
+		nodelist := model.NodeList{}
+		nodelist.Proxies = sub.Proxies
+		marshal, err := yaml.Marshal(nodelist)
+		if err != nil {
+			c.String(http.StatusInternalServerError, "YAML序列化失败: "+err.Error())
+			return
+		}
+		c.String(http.StatusOK, string(marshal))
+		return
+	}
 	marshal, err := yaml.Marshal(sub)
 	if err != nil {
 		c.String(http.StatusInternalServerError, "YAML序列化失败: "+err.Error())

api/controller/short_link.go

@@ -1,15 +1,22 @@
 package controller
 
 import (
-	"crypto/sha256"
-	"encoding/hex"
-	"github.com/gin-gonic/gin"
+	"errors"
+	"io"
 	"net/http"
+	"strconv"
+	"strings"
 	"sub2clash/config"
+	"sub2clash/logger"
 	"sub2clash/model"
+	"sub2clash/utils"
 	"sub2clash/utils/database"
 	"sub2clash/validator"
 	"time"
+
+	"github.com/gin-gonic/gin"
+	"go.uber.org/zap"
+	"gorm.io/gorm"
 )
 
 func ShortLinkGenHandler(c *gin.Context) {
@@ -18,36 +25,85 @@ func ShortLinkGenHandler(c *gin.Context) {
 	if err := c.ShouldBind(&params); err != nil {
 		c.String(400, "参数错误: "+err.Error())
 	}
-	// 生成短链接
-	//hash := utils.RandomString(6)
-	shortLink := sha256.Sum224([]byte(params.Url))
-	hash := hex.EncodeToString(shortLink[:])
-	// 存入数据库
-	database.DB.FirstOrCreate(
+	if strings.TrimSpace(params.Url) == "" {
+		c.String(400, "参数错误")
+		return
+	}
+	// 生成hash
+	hash := utils.RandomString(config.Default.ShortLinkLength)
+	var item model.ShortLink
+	result := database.FindShortLinkByUrl(params.Url, &item)
+	if result.Error == nil {
+		if item.Password != params.Password {
+			item.Password = params.Password
+			database.SaveShortLink(&item)
+			c.String(200, item.Hash+"?password="+params.Password)
+		} else {
+			c.String(200, item.Hash)
+		}
+		return
+	} else {
+		if !errors.Is(result.Error, gorm.ErrRecordNotFound) {
+			c.String(500, "数据库错误: "+result.Error.Error())
+			return
+		}
+	}
+	// 如果记录存在则重新生成hash，直到记录不存在
+	result = database.FindShortLinkByHash(hash, &item)
+	for result.Error == nil {
+		hash = utils.RandomString(config.Default.ShortLinkLength)
+		result = database.FindShortLinkByHash(hash, &item)
+	}
+	// 创建记录
+	database.FirstOrCreateShortLink(
 		&model.ShortLink{
 			Hash:            hash,
 			Url:             params.Url,
 			LastRequestTime: -1,
+			Password:        params.Password,
 		},
 	)
 	// 返回短链接
+	if params.Password != "" {
+		hash += "?password=" + params.Password
+	}
 	c.String(200, hash)
 }
 
 func ShortLinkGetHandler(c *gin.Context) {
 	// 获取动态路由
 	hash := c.Param("hash")
-	// 查询数据库
-	var shortLink model.ShortLink
-	result := database.DB.Where("hash = ?", hash).First(&shortLink)
-	// 更新最后访问时间
-	shortLink.LastRequestTime = time.Now().Unix()
-	database.DB.Save(&shortLink)
-	// 重定向
-	if result.Error != nil {
-		c.String(404, "未找到短链接")
+	password := c.Query("password")
+	if strings.TrimSpace(hash) == "" {
+		c.String(400, "参数错误")
 		return
 	}
-	uri := config.Default.BasePath + shortLink.Url
-	c.Redirect(http.StatusTemporaryRedirect, uri)
+	// 查询数据库
+	var shortLink model.ShortLink
+	result := database.FindShortLinkByHash(hash, &shortLink)
+	// 重定向
+	if result.Error != nil {
+		c.String(404, "未找到短链接或密码错误")
+		return
+	}
+	if shortLink.Password != "" && shortLink.Password != password {
+		c.String(404, "未找到短链接或密码错误")
+		return
+	}
+	// 更新最后访问时间
+	shortLink.LastRequestTime = time.Now().Unix()
+	database.SaveShortLink(&shortLink)
+	get, err := utils.Get("http://localhost:" + strconv.Itoa(config.Default.Port) + "/" + shortLink.Url)
+	if err != nil {
+		logger.Logger.Debug("get short link data failed", zap.Error(err))
+		c.String(500, "请求错误: "+err.Error())
+		return
+	}
+	all, err := io.ReadAll(get.Body)
+	if err != nil {
+		logger.Logger.Debug("read short link data failed", zap.Error(err))
+		c.String(500, "读取错误: "+err.Error())
+		return
+	}
+	c.String(http.StatusOK, string(all))
 }

api/route.go

@@ -2,22 +2,45 @@ package api
 
 import (
 	"embed"
-	"github.com/gin-gonic/gin"
 	"html/template"
+	"log"
+	"net/http"
 	"sub2clash/api/controller"
+	"sub2clash/config"
 	"sub2clash/middleware"
+
+	"github.com/gin-gonic/gin"
 )
 
-//go:embed templates/*
-var templates embed.FS
+//go:embed static
+var staticFiles embed.FS
 
 func SetRoute(r *gin.Engine) {
 	r.Use(middleware.ZapLogger())
+
 	// 使用内嵌的模板文件
-	r.SetHTMLTemplate(template.Must(template.New("").ParseFS(templates, "templates/*")))
+	tpl, err := template.ParseFS(staticFiles, "static/*")
+	if err != nil {
+		log.Fatalf("Error parsing templates: %v", err)
+	}
+	r.SetHTMLTemplate(tpl)
+
+	r.GET(
+		"/static/*filepath", func(c *gin.Context) {
+			c.FileFromFS("static/"+c.Param("filepath"), http.FS(staticFiles))
+		},
+	)
 	r.GET(
 		"/", func(c *gin.Context) {
-			c.HTML(200, "index.html", nil)
+			version := config.Version
+			if len(config.Version) > 7 {
+				version = config.Version[:7]
+			}
+			c.HTML(
+				200, "index.html", gin.H{
+					"Version": version,
+				},
+			)
 		},
 	)
 	r.GET(

api/static/index.html

@@ -0,0 +1,285 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+    <meta charset="UTF-8"/>
+    <meta content="width=device-width, initial-scale=1.0" name="viewport"/>
+    <title>sub2clash</title>
+    <!-- Bootstrap CSS -->
+    <link
+            crossorigin="anonymous"
+            href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css"
+            integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN"
+            rel="stylesheet"
+    />
+    <!-- Bootstrap JS -->
+    <script
+            crossorigin="anonymous"
+            integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL"
+            src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"
+    ></script>
+    <!-- Axios -->
+    <script src="https://cdn.jsdelivr.net/npm/axios@latest/dist/axios.min.js"></script>
+    <script src="./static/index.js"></script>
+    <style>
+        .container {
+            max-width: 800px;
+        }
+
+        .btn-xs {
+            padding: 2px 2px; /* 调整内边距以减小按钮大小 */
+            font-size: 10px; /* 设置字体大小 */
+            line-height: 1.2; /* 调整行高 */
+            border-radius: 3px; /* 可选的边框半径调整 */
+            height: 25px;
+            width: 25px;
+        }
+    </style>
+</head>
+<body class="bg-light">
+<div class="container mt-5">
+    <div class="mb-4">
+        <h2>sub2clash</h2>
+        <span class="text-muted fst-italic"
+        >通用订阅链接转 Clash(Meta) 配置工具
+                    <a
+                            href="https://github.com/nitezs/sub2clash#clash-meta"
+                            target="_blank"
+                    >使用文档</a
+                    ></span
+        ><br><span class="text-muted fst-italic"
+    >注意：本程序非纯前端程序，输入的订阅将被后端缓存，请确保您信任当前站点</span
+    >
+    </div>
+
+    <!-- Input URL -->
+    <div class="form-group mb-5">
+        <label for="apiLink">解析链接:</label>
+        <div class="input-group mb-2">
+            <input
+                    class="form-control"
+                    id="urlInput"
+                    type="text"
+                    placeholder="通过生成的链接重新填写下方设置"
+            />
+            <button
+                    class="btn btn-primary"
+                    onclick="parseInputURL()"
+                    type="button"
+            >
+                解析
+            </button>
+        </div>
+    </div>
+    <!-- API Endpoint -->
+    <div class="form-group mb-3">
+        <label for="endpoint">客户端类型:</label>
+        <select class="form-control" id="endpoint" name="endpoint">
+            <option value="clash">Clash</option>
+            <option value="meta">Clash.Meta</option>
+        </select>
+    </div>
+    <!-- Template -->
+    <div class="form-group mb-3">
+        <label for="template">模板链接或名称:</label>
+        <input
+                class="form-control"
+                id="template"
+                name="template"
+                placeholder="输入外部模板链接或内部模板名称（可选）"
+                type="text"
+        />
+    </div>
+    <!-- Subscription Link -->
+    <div class="form-group mb-3">
+        <label for="sub">订阅链接:</label>
+        <textarea
+                class="form-control"
+                id="sub"
+                name="sub"
+                placeholder="每行输入一个订阅链接"
+                rows="5"
+        ></textarea>
+    </div>
+    <!-- Proxy Link -->
+    <div class="form-group mb-3">
+        <label for="proxy">节点分享链接:</label>
+        <textarea
+                class="form-control"
+                id="proxy"
+                name="proxy"
+                placeholder="每行输入一个节点分享链接"
+                rows="5"
+        ></textarea>
+    </div>
+    <!-- Refresh -->
+    <div class="form-check mb-3">
+        <input
+                class="form-check-input"
+                id="refresh"
+                name="refresh"
+                type="checkbox"
+        />
+        <label class="form-check-label" for="refresh"
+        >强制重新获取订阅</label
+        >
+    </div>
+    <!-- Node List -->
+    <div class="form-check mb-3">
+        <input
+                class="form-check-input"
+                id="nodeList"
+                name="nodeList"
+                type="checkbox"
+        />
+        <label class="form-check-label" for="nodeList"
+        >输出为 Node List</label
+        >
+    </div>
+    <!-- Auto Test -->
+    <div class="form-check mb-3">
+        <input
+                class="form-check-input"
+                id="autoTest"
+                name="autoTest"
+                type="checkbox"
+        />
+        <label class="form-check-label" for="autoTest"
+        >国家策略组自动测速</label
+        >
+    </div>
+    <!-- Lazy -->
+    <div class="form-check mb-3">
+        <input
+                class="form-check-input"
+                id="lazy"
+                name="lazy"
+                type="checkbox"
+        />
+        <label class="form-check-label" for="lazy"
+        >自动测速启用 lazy 模式</label
+        >
+    </div>
+    <!-- Rule Provider -->
+    <div class="form-group mb-3" id="ruleProviderGroup">
+        <label>Rule Provider:</label>
+        <button
+                class="btn btn-primary mb-1 btn-xs"
+                onclick="addRuleProvider()"
+                type="button"
+        >
+            +
+        </button>
+    </div>
+    <!-- Rule -->
+    <div class="form-group mb-3" id="ruleGroup">
+        <label>规则:</label>
+        <button
+                class="btn btn-primary mb-1 btn-xs"
+                onclick="addRule()"
+                type="button"
+        >
+            +
+        </button>
+    </div>
+    <!-- Sort -->
+    <div class="form-group mb-3">
+        <label for="sort">国家策略组排序规则:</label>
+        <select class="form-control" id="sort" name="sort">
+            <option value="nameasc">名称（升序）</option>
+            <option value="namedesc">名称（降序）</option>
+            <option value="sizeasc">节点数量（升序）</option>
+            <option value="sizedesc">节点数量（降序）</option>
+        </select>
+    </div>
+    <!-- Remove -->
+    <div class="form-group mb-3">
+        <label for="remove">排除节点:</label>
+        <input
+                class="form-control"
+                type="text"
+                name="remove"
+                id="remove"
+                placeholder="正则表达式"
+        />
+    </div>
+    <!-- Rename  -->
+    <div class="form-group mb-3" id="replaceGroup">
+        <label>节点名称替换:</label>
+        <button
+                class="btn btn-primary mb-1 btn-xs"
+                onclick="addReplace()"
+                type="button"
+        >
+            +
+        </button>
+    </div>
+
+    <!-- Display the API Link -->
+    <div class="form-group mb-5">
+        <label for="apiLink">配置链接:</label>
+        <div class="input-group mb-2">
+            <input
+                    class="form-control"
+                    id="apiLink"
+                    readonly
+                    type="text"
+            />
+            <button
+                    class="btn btn-primary"
+                    onclick="generateURL()"
+                    type="button"
+            >
+                生成链接
+            </button>
+            <button
+                    class="btn btn-primary"
+                    onclick="copyToClipboard('apiLink',this)"
+                    type="button"
+            >
+                复制链接
+            </button>
+        </div>
+        <div class="input-group">
+            <input
+                    class="form-control"
+                    id="apiShortLink"
+                    readonly
+                    type="text"
+            />
+            <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="copyToClipboard('apiShortLink',this)"
+                    type="button"
+            >
+                复制短链
+            </button>
+        </div>
+    </div>
+    <!-- footer-->
+    <footer>
+        <p class="text-center">
+            Powered by
+            <a
+                    class="link-primary"
+                    href="https://github.com/nitezs/sub2clash"
+            >sub2clash</a
+            >
+        </p>
+        <p class="text-center">Version {{.Version}}</p>
+    </footer>
+</div>
+</body>
+</html>

api/static/index.js

@@ -0,0 +1,421 @@
+function clearExistingValues() {
+    // 清除简单输入框和复选框的值
+    document.getElementById("endpoint").value = "clash";
+    document.getElementById("sub").value = "";
+    document.getElementById("proxy").value = "";
+    document.getElementById("refresh").checked = false;
+    document.getElementById("autoTest").checked = false;
+    document.getElementById("lazy").checked = false;
+    document.getElementById("template").value = "";
+    document.getElementById("sort").value = "nameasc";
+    document.getElementById("remove").value = "";
+    document.getElementById("apiLink").value = "";
+    document.getElementById("apiShortLink").value = "";
+    document.getElementById("password").value = "";
+    document.getElementById("nodeList").checked = false;
+
+    // 清除由 createRuleProvider, createReplace, 和 createRule 创建的所有额外输入组
+    clearInputGroup("ruleProviderGroup");
+    clearInputGroup("replaceGroup");
+    clearInputGroup("ruleGroup");
+}
+
+function generateURI() {
+    const queryParams = [];
+
+    // 获取 API Endpoint
+    const endpoint = document.getElementById("endpoint").value;
+
+    // 获取并组合订阅链接
+    let subLines = document
+        .getElementById("sub")
+        .value.split("\n")
+        .filter((line) => line.trim() !== "");
+    let noSub = false;
+    // 去除 subLines 中空元素
+    subLines = subLines.map((item) => {
+        if (item !== "") {
+            return item;
+        }
+    });
+    if (subLines.length > 0) {
+        queryParams.push(`sub=${encodeURIComponent(subLines.join(","))}`);
+    } else {
+        noSub = true;
+    }
+
+    // 获取并组合节点分享链接
+    let proxyLines = document
+        .getElementById("proxy")
+        .value.split("\n")
+        .filter((line) => line.trim() !== "");
+    let noProxy = false;
+    // 去除 proxyLines 中空元素
+    proxyLines = proxyLines.map((item) => {
+        if (item !== "") {
+            return item;
+        }
+    });
+    if (proxyLines.length > 0) {
+        queryParams.push(`proxy=${encodeURIComponent(proxyLines.join(","))}`);
+    } else {
+        noProxy = true;
+    }
+    if (noSub && noProxy) {
+        alert("订阅链接和节点分享链接不能同时为空！");
+        return "";
+    }
+    // 获取复选框的值
+    const refresh = document.getElementById("refresh").checked;
+    queryParams.push(`refresh=${refresh ? "true" : "false"}`);
+    const autoTest = document.getElementById("autoTest").checked;
+    queryParams.push(`autoTest=${autoTest ? "true" : "false"}`);
+    const lazy = document.getElementById("lazy").checked;
+    queryParams.push(`lazy=${lazy ? "true" : "false"}`);
+    const nodeList = document.getElementById("nodeList").checked;
+    queryParams.push(`nodeList=${nodeList ? "true" : "false"}`);
+
+    // 获取模板链接或名称（如果存在）
+    const template = document.getElementById("template").value;
+    if (template.trim() !== "") {
+        queryParams.push(`template=${encodeURIComponent(template)}`);
+    }
+
+    // 获取Rule Provider和规则
+    const ruleProviders = document.getElementsByName("ruleProvider");
+    const rules = document.getElementsByName("rule");
+    let providers = [];
+    for (let i = 0; i < ruleProviders.length / 5; i++) {
+        let baseIndex = i * 5;
+        let behavior = ruleProviders[baseIndex].value;
+        let url = ruleProviders[baseIndex + 1].value;
+        let group = ruleProviders[baseIndex + 2].value;
+        let prepend = ruleProviders[baseIndex + 3].value;
+        let name = ruleProviders[baseIndex + 4].value;
+        // 是否存在空值
+        if (
+            behavior.trim() === "" ||
+            url.trim() === "" ||
+            group.trim() === "" ||
+            prepend.trim() === "" ||
+            name.trim() === ""
+        ) {
+            alert("Rule Provider 中存在空值，请检查后重试！");
+            return "";
+        }
+        providers.push(`[${behavior},${url},${group},${prepend},${name}]`);
+    }
+    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;
+            // 是否存在空值
+            if (
+                rule.trim() === "" ||
+                prepend.trim() === "" ||
+                group.trim() === ""
+            ) {
+                alert("Rule 中存在空值，请检查后重试！");
+                return "";
+            }
+            ruleList.push(`[${rule},${prepend},${group}]`);
+        }
+    }
+    queryParams.push(`rule=${encodeURIComponent(ruleList.join(","))}`);
+
+    // 获取排序策略
+    const sort = document.getElementById("sort").value;
+    queryParams.push(`sort=${sort}`);
+
+    // 获取删除节点的正则表达式
+    const remove = document.getElementById("remove").value;
+    if (remove.trim() !== "") {
+        queryParams.push(`remove=${encodeURIComponent(remove)}`);
+    }
+
+    // 获取替换节点名称的正则表达式
+    let replaceList = [];
+    const replaces = document.getElementsByName("replace");
+    for (let i = 0; i < replaces.length / 2; i++) {
+        let replaceStr = `<${replaces[i * 2].value}>`;
+        let replaceTo = `<${replaces[i * 2 + 1].value}>`;
+        if (replaceStr.trim() === "") {
+            alert("重命名设置中存在空值，请检查后重试！");
+            return "";
+        }
+        replaceList.push(`[${replaceStr},${replaceTo}]`);
+    }
+    queryParams.push(`replace=${encodeURIComponent(replaceList.join(","))}`);
+
+    return `${endpoint}?${queryParams.join("&")}`;
+}
+
+// 将输入框中的 URL 解析为参数
+function parseInputURL() {
+    // 获取输入框中的 URL
+    const inputURL = document.getElementById("urlInput").value;
+
+    if (!inputURL) {
+        alert("请输入有效的链接！");
+        return;
+    }
+
+    let url;
+    try {
+        url = new URL(inputURL);
+    } catch (_) {
+        alert("无效的链接！");
+        return;
+    }
+
+    // 清除现有的输入框值
+    clearExistingValues();
+
+    // 获取查询参数
+    const params = new URLSearchParams(url.search);
+
+    // 分配值到对应的输入框
+    const pathSections = url.pathname.split("/");
+    const lastSection = pathSections[pathSections.length - 1];
+    const clientTypeSelect = document.getElementById("endpoint");
+    switch (lastSection.toLowerCase()) {
+        case "meta":
+            clientTypeSelect.value = "meta";
+            break;
+        case "clash":
+        default:
+            clientTypeSelect.value = "clash";
+            break;
+    }
+
+    if (params.has("sub")) {
+        document.getElementById("sub").value = decodeURIComponent(
+            params.get("sub")
+        )
+            .split(",")
+            .join("\n");
+    }
+
+    if (params.has("proxy")) {
+        document.getElementById("proxy").value = decodeURIComponent(
+            params.get("proxy")
+        )
+            .split(",")
+            .join("\n");
+    }
+
+    if (params.has("refresh")) {
+        document.getElementById("refresh").checked =
+            params.get("refresh") === "true";
+    }
+
+    if (params.has("autoTest")) {
+        document.getElementById("autoTest").checked =
+            params.get("autoTest") === "true";
+    }
+
+    if (params.has("lazy")) {
+        document.getElementById("lazy").checked = params.get("lazy") === "true";
+    }
+
+    if (params.has("template")) {
+        document.getElementById("template").value = decodeURIComponent(
+            params.get("template")
+        );
+    }
+
+    if (params.has("sort")) {
+        document.getElementById("sort").value = params.get("sort");
+    }
+
+    if (params.has("remove")) {
+        document.getElementById("remove").value = decodeURIComponent(
+            params.get("remove")
+        );
+    }
+
+    if (params.has("replace")) {
+        parseAndFillReplaceParams(decodeURIComponent(params.get("replace")));
+    }
+
+    if (params.has("ruleProvider")) {
+        parseAndFillRuleProviderParams(
+            decodeURIComponent(params.get("ruleProvider"))
+        );
+    }
+
+    if (params.has("rule")) {
+        parseAndFillRuleParams(decodeURIComponent(params.get("rule")));
+    }
+
+    if (params.has("nodeList")) {
+        document.getElementById("nodeList").checked =
+            params.get("nodeList") === "true";
+    }
+}
+
+function clearInputGroup(groupId) {
+    // 清空第二个之后的child
+    const group = document.getElementById(groupId);
+    while (group.children.length > 2) {
+        group.removeChild(group.lastChild);
+    }
+}
+
+function parseAndFillReplaceParams(replaceParams) {
+    const replaceGroup = document.getElementById("replaceGroup");
+    let matches;
+    const regex = /\[(<.*?>),(<.*?>)\]/g;
+    const str = decodeURIComponent(replaceParams);
+    while ((matches = regex.exec(str)) !== null) {
+        const div = createReplace();
+        const original = matches[1].slice(1, -1); // Remove < and >
+        const replacement = matches[2].slice(1, -1); // Remove < and >
+
+        div.children[0].value = original;
+        div.children[1].value = replacement;
+        replaceGroup.appendChild(div);
+    }
+}
+
+function parseAndFillRuleProviderParams(ruleProviderParams) {
+    const ruleProviderGroup = document.getElementById("ruleProviderGroup");
+    let matches;
+    const regex = /\[(.*?),(.*?),(.*?),(.*?),(.*?)\]/g;
+    const str = decodeURIComponent(ruleProviderParams);
+    while ((matches = regex.exec(str)) !== null) {
+        const div = createRuleProvider();
+        div.children[0].value = matches[1];
+        div.children[1].value = matches[2];
+        div.children[2].value = matches[3];
+        div.children[3].value = matches[4];
+        div.children[4].value = matches[5];
+        ruleProviderGroup.appendChild(div);
+    }
+}
+
+function parseAndFillRuleParams(ruleParams) {
+    const ruleGroup = document.getElementById("ruleGroup");
+    let matches;
+    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);
+    }
+}
+
+async function copyToClipboard(elem, e) {
+    const apiLinkInput = document.querySelector(`#${elem}`).value;
+    try {
+        await navigator.clipboard.writeText(apiLinkInput);
+        let text = e.textContent;
+        e.addEventListener("mouseout", function () {
+            e.textContent = text;
+        });
+        e.textContent = "复制成功";
+    } catch (err) {
+        console.error("复制到剪贴板失败:", err);
+    }
+}
+
+function createRuleProvider() {
+    const div = document.createElement("div");
+    div.classList.add("input-group", "mb-2");
+    div.innerHTML = `
+            <input type="text" class="form-control" name="ruleProvider" placeholder="Behavior">
+            <input type="text" class="form-control" name="ruleProvider" placeholder="Url">
+            <input type="text" class="form-control" name="ruleProvider" placeholder="Group">
+            <input type="text" class="form-control" name="ruleProvider" placeholder="Prepend">
+            <input type="text" class="form-control" name="ruleProvider" placeholder="Name">
+            <button type="button" class="btn btn-danger" onclick="removeElement(this)">删除</button>
+        `;
+    return div;
+}
+
+function createReplace() {
+    const div = document.createElement("div");
+    div.classList.add("input-group", "mb-2");
+    div.innerHTML = `
+            <input type="text" class="form-control" name="replace" placeholder="原字符串（正则表达式）">
+            <input type="text" class="form-control" name="replace" placeholder="替换为（可为空）">
+            <button type="button" class="btn btn-danger" onclick="removeElement(this)">删除</button>
+        `;
+    return div;
+}
+
+function createRule() {
+    const div = document.createElement("div");
+    div.classList.add("input-group", "mb-2");
+    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;
+}
+
+function addRuleProvider() {
+    const div = createRuleProvider();
+    document.getElementById("ruleProviderGroup").appendChild(div);
+}
+
+function addRule() {
+    const div = createRule();
+    document.getElementById("ruleGroup").appendChild(div);
+}
+
+function addReplace() {
+    const div = createReplace();
+    document.getElementById("replaceGroup").appendChild(div);
+}
+
+function removeElement(button) {
+    button.parentElement.remove();
+}
+
+function generateURL() {
+    const apiLink = document.getElementById("apiLink");
+    let uri = generateURI();
+    if (uri === "") {
+        return;
+    }
+    apiLink.value = `${window.location.origin}${window.location.pathname}${uri}`;
+}
+
+function generateShortLink() {
+    const apiShortLink = document.getElementById("apiShortLink");
+    const password = document.getElementById("password");
+    let uri = generateURI();
+    if (uri === "") {
+        return;
+    }
+    axios
+        .post(
+            "./short",
+            {
+                url: uri,
+                password: password.value.trim(),
+            },
+            {
+                headers: {
+                    "Content-Type": "application/json",
+                },
+            }
+        )
+        .then((response) => {
+            apiShortLink.value = `${window.location.origin}${window.location.pathname}s/${response.data}`;
+        })
+        .catch((error) => {
+            console.log(error);
+            alert("生成短链失败，请重试！");
+        });
+}

api/templates/index.html

@@ -1,317 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh-CN">
-
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>sub2clash</title>
-
-    <!-- Bootstrap CSS -->
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet"
-          integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
-
-    <!-- Bootstrap JS -->
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"
-            integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL"
-            crossorigin="anonymous"></script>
-
-    <!-- Axios -->
-    <script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
-
-    <style>
-        .container {
-            max-width: 800px;
-        }
-
-        .btn-xs {
-            padding: 2px 2px; /* 调整内边距以减小按钮大小 */
-            font-size: 10px; /* 设置字体大小 */
-            line-height: 1.2; /* 调整行高 */
-            border-radius: 3px; /* 可选的边框半径调整 */
-            height: 25px;
-            width: 25px;
-        }
-    </style>
-</head>
-
-<body class="bg-light">
-
-<div class="container mt-5">
-    <div class="mb-4">
-        <h2>sub2clash</h2>
-        <span class="text-muted fst-italic">通用订阅链接转 Clash(Meta) 配置工具 <a
-                href="https://github.com/nitezs/sub2clash#clash-meta" target="_blank">使用文档</a></span>
-    </div>
-
-    <form id="apiForm">
-
-        <!-- API Endpoint -->
-        <div class="form-group mb-3">
-            <label for="endpoint">客户端类型:</label>
-            <select class="form-control" id="endpoint" name="endpoint">
-                <option value="clash">Clash</option>
-                <option value="meta">Clash.Meta</option>
-            </select>
-        </div>
-
-        <!-- Subscription Link -->
-        <div class="form-group mb-3">
-            <label for="sub">订阅链接:</label>
-            <textarea class="form-control" id="sub" name="sub" rows="5" placeholder="每行输入一个订阅链接"></textarea>
-        </div>
-
-        <!-- Proxy Link -->
-        <div class="form-group mb-3">
-            <label for="proxy">节点分享链接:</label>
-            <textarea class="form-control" id="proxy" name="proxy" rows="5"
-                      placeholder="每行输入一个节点分享链接"></textarea>
-        </div>
-
-        <!-- Refresh -->
-        <div class="form-check mb-3">
-            <input type="checkbox" class="form-check-input" id="refresh" name="refresh">
-            <label class="form-check-label" for="refresh">强制刷新配置</label>
-        </div>
-
-        <!-- Template -->
-        <div class="form-group mb-3">
-            <label for="template">模板链接或名称（可选）:</label>
-            <input type="text" class="form-control" id="template" name="template"
-                   placeholder="输入外部模板链接或内部模板名称">
-        </div>
-
-        <!-- Rule Provider -->
-        <div class="form-group mb-3" id="ruleProviderGroup">
-            <label>Rule Provider:</label>
-            <button type="button" class="btn btn-primary mb-1 btn-xs" onclick="addRuleProvider()">+</button>
-        </div>
-
-        <!-- Rule -->
-        <div class="form-group mb-3" id="ruleGroup">
-            <label>规则:</label>
-            <button type="button" class="btn btn-primary mb-1 btn-xs" onclick="addRule()">+</button>
-        </div>
-
-        <!-- Auto Test -->
-        <div class="form-check mb-3">
-            <input type="checkbox" class="form-check-input" id="autoTest" name="autoTest">
-            <label class="form-check-label" for="autoTest">指定国家策略组是否自动测速</label>
-        </div>
-
-        <!-- Lazy -->
-        <div class="form-check mb-3">
-            <input type="checkbox" class="form-check-input" id="lazy" name="lazy">
-            <label class="form-check-label" for="lazy">自动测速是否启用 lazy</label>
-        </div>
-
-        <!-- Sort -->
-        <div class="form-group mb-3">
-            <label for="sort">国家策略组排序策略:</label>
-            <select class="form-control" id="sort" name="sort">
-                <option value="nameasc">名称（升序）</option>
-                <option value="namedesc">名称（降序）</option>
-                <option value="sizeasc">节点数量（升序）</option>
-                <option value="sizedesc">节点数量（降序）</option>
-            </select>
-        </div>
-    </form>
-
-    <!-- Display the API Link -->
-    <div class="form-group mb-5">
-        <label for="apiLink">配置链接:</label>
-        <div class="input-group mb-2">
-            <input type="text" class="form-control" id="apiLink" readonly>
-            <button class="btn btn-primary" type="button" onclick="generateURL()">生成链接</button>
-            <button class="btn btn-primary" type="button" onclick="copyToClipboard('apiLink',this)">复制链接</button>
-        </div>
-        <div class="input-group">
-            <input type="text" class="form-control" id="apiShortLink" readonly>
-            <button class="btn btn-primary" type="button" onclick="generateShortLink()">生成短链</button>
-            <button class="btn btn-primary" type="button" onclick="copyToClipboard('apiShortLink',this)">复制短链
-            </button>
-        </div>
-    </div>
-
-    <!-- footer-->
-    <footer>
-        <p class="text-center">Powered by <a class="link-primary"
-                                             href="https://github.com/nitezs/sub2clash">sub2clash</a></p>
-    </footer>
-
-</div>
-
-<script>
-    async function copyToClipboard(elem, e) {
-        const apiLinkInput = document.querySelector(`#${elem}`).value;
-        try {
-            await navigator.clipboard.writeText(apiLinkInput);
-            let text = e.textContent;
-            e.addEventListener("mouseout", function () {
-                e.textContent = text;
-            });
-            e.textContent = "复制成功";
-        } catch (err) {
-            console.error('复制到剪贴板失败:', err);
-        }
-    }
-
-    function createRuleProvider() {
-        const div = document.createElement('div');
-        div.classList.add('input-group', 'mb-2');
-        div.innerHTML = `
-            <input type="text" class="form-control" name="ruleProvider" placeholder="Behavior">
-            <input type="text" class="form-control" name="ruleProvider" placeholder="Url">
-            <input type="text" class="form-control" name="ruleProvider" placeholder="Group">
-            <input type="text" class="form-control" name="ruleProvider" placeholder="Prepend">
-            <input type="text" class="form-control" name="ruleProvider" placeholder="Name">
-            <button type="button" class="btn btn-danger" onclick="removeElement(this)">删除</button>
-        `;
-        return div;
-    }
-
-    function createRule() {
-        const div = document.createElement('div');
-        div.classList.add('input-group', 'mb-2');
-        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;
-    }
-
-    function addRuleProvider() {
-        const div = createRuleProvider();
-        document.getElementById('ruleProviderGroup').appendChild(div);
-    }
-
-    function addRule() {
-        const div = createRule();
-        document.getElementById('ruleGroup').appendChild(div);
-    }
-
-    function removeElement(button) {
-        button.parentElement.remove();
-    }
-
-    function generateURI() {
-        const queryParams = [];
-
-        // 获取 API Endpoint
-        const endpoint = document.getElementById("endpoint").value;
-
-        // 获取并组合订阅链接
-        let subLines = document.getElementById("sub").value.split('\n').filter(line => line.trim() !== "");
-        let noSub = false
-        // 去除 subLines 中空元素
-        subLines = subLines.map((item) => {
-            if (item !== "") {
-                return item;
-            }
-        });
-        if (subLines.length > 0) {
-            queryParams.push(`sub=${encodeURIComponent(subLines.join(','))}`);
-        } else {
-            noSub = true
-        }
-
-        // 获取并组合节点分享链接
-        let proxyLines = document.getElementById("proxy").value.split('\n').filter(line => line.trim() !== "");
-        let noProxy = false
-        // 去除 proxyLines 中空元素
-        proxyLines = proxyLines.map((item) => {
-            if (item !== "") {
-                return item;
-            }
-        });
-        if (proxyLines.length > 0) {
-            queryParams.push(`proxy=${encodeURIComponent(proxyLines.join(','))}`);
-        } else {
-            noProxy = true
-        }
-        if (noSub && noProxy) {
-            alert("订阅链接和节点分享链接不能同时为空！")
-            return
-        }
-        // 获取复选框的值
-        const refresh = document.getElementById("refresh").checked;
-        queryParams.push(`refresh=${refresh ? 'true' : 'false'}`);
-        const autoTest = document.getElementById("autoTest").checked;
-        queryParams.push(`autoTest=${autoTest ? 'true' : 'false'}`);
-        const lazy = document.getElementById("lazy").checked;
-        queryParams.push(`lazy=${lazy ? 'true' : 'false'}`);
-
-        // 获取模板链接或名称（如果存在）
-        const template = document.getElementById("template").value;
-        if (template.trim() !== "") {
-            queryParams.push(`template=${encodeURIComponent(template)}`);
-        }
-
-        // 获取Rule Provider和规则
-        const ruleProviders = document.getElementsByName("ruleProvider");
-        const rules = document.getElementsByName("rule");
-        let providers = [];
-        for (let i = 0; i < ruleProviders.length / 5; i++) {
-            let baseIndex = i * 5;
-            let behavior = ruleProviders[baseIndex].value;
-            let url = ruleProviders[baseIndex + 1].value;
-            let group = ruleProviders[baseIndex + 2].value;
-            let prepend = ruleProviders[baseIndex + 3].value;
-            let name = ruleProviders[baseIndex + 4].value;
-            // 是否存在空值
-            if (behavior.trim() === "" || url.trim() === "" || group.trim() === "" || prepend.trim() === "" || name.trim() === "") {
-                alert("Rule Provider 中存在空值，请检查后重试！");
-                return;
-            }
-            providers.push(`[${behavior},${url},${group},${prepend},${name}]`);
-        }
-        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;
-                // 是否存在空值
-                if (rule.trim() === "" || prepend.trim() === "" || group.trim() === "") {
-                    alert("Rule 中存在空值，请检查后重试！");
-                    return;
-                }
-                ruleList.push(`[${rule},${prepend},${group}]`);
-            }
-        }
-        queryParams.push(`rule=${encodeURIComponent(ruleList.join(','))}`);
-
-        // 获取排序策略
-        const sort = document.getElementById("sort").value;
-        queryParams.push(`sort=${sort}`);
-        return `${endpoint}?${queryParams.join('&')}`;
-    }
-
-    function generateURL() {
-        const apiLink = document.getElementById("apiLink");
-        apiLink.value = `${window.location.origin}${window.location.pathname}${generateURI()}`;
-    }
-
-    function generateShortLink() {
-        const apiShortLink = document.getElementById("apiShortLink");
-
-        axios.post("./short", {
-            "url": generateURI()
-        }, {
-            headers: {
-                "Content-Type": "application/json"
-            }
-        }).then((response) => {
-            apiShortLink.value = `${window.location.origin}${window.location.pathname}s/${response.data}`;
-        }).catch((error) => {
-            console.log(error);
-            alert("生成短链失败，请重试！");
-        })
-    }
-</script>
-
-</body>
-</html>

config/config.go

@@ -1,9 +1,11 @@
 package config
 
 import (
-	"github.com/joho/godotenv"
+	"errors"
 	"os"
 	"strconv"
+
+	"github.com/joho/godotenv"
 )
 
 type Config struct {
@@ -14,12 +16,15 @@ type Config struct {
 	RequestMaxFileSize int64
 	CacheExpire        int64
 	LogLevel           string
-	BasePath           string
+	//BasePath           string
+	ShortLinkLength int
 }
 
 var Default *Config
+var Version string
+var Dev string
 
-func init() {
+func LoadConfig() error {
 	Default = &Config{
 		MetaTemplate:       "template_meta.yaml",
 		ClashTemplate:      "template_clash.yaml",
@@ -28,13 +33,14 @@ func init() {
 		Port:               8011,
 		CacheExpire:        60 * 5,
 		LogLevel:           "info",
-		BasePath:           "/",
+		//BasePath:           "/",
+		ShortLinkLength: 6,
 	}
 	_ = godotenv.Load()
 	if os.Getenv("PORT") != "" {
 		atoi, err := strconv.Atoi(os.Getenv("PORT"))
 		if err != nil {
-			panic("PORT invalid")
+			return errors.New("PORT invalid")
 		}
 		Default.Port = atoi
 	}
@@ -47,31 +53,39 @@ func init() {
 	if os.Getenv("REQUEST_RETRY_TIMES") != "" {
 		atoi, err := strconv.Atoi(os.Getenv("REQUEST_RETRY_TIMES"))
 		if err != nil {
-			panic("REQUEST_RETRY_TIMES invalid")
+			return errors.New("REQUEST_RETRY_TIMES invalid")
 		}
 		Default.RequestRetryTimes = atoi
 	}
 	if os.Getenv("REQUEST_MAX_FILE_SIZE") != "" {
 		atoi, err := strconv.Atoi(os.Getenv("REQUEST_MAX_FILE_SIZE"))
 		if err != nil {
-			panic("REQUEST_MAX_FILE_SIZE invalid")
+			return errors.New("REQUEST_MAX_FILE_SIZE invalid")
 		}
 		Default.RequestMaxFileSize = int64(atoi)
 	}
 	if os.Getenv("CACHE_EXPIRE") != "" {
 		atoi, err := strconv.Atoi(os.Getenv("CACHE_EXPIRE"))
 		if err != nil {
-			panic("CACHE_EXPIRE invalid")
+			return errors.New("CACHE_EXPIRE invalid")
 		}
 		Default.CacheExpire = int64(atoi)
 	}
 	if os.Getenv("LOG_LEVEL") != "" {
 		Default.LogLevel = os.Getenv("LOG_LEVEL")
 	}
-	if os.Getenv("BASE_PATH") != "" {
-		Default.BasePath = os.Getenv("BASE_PATH")
-		if Default.BasePath[len(Default.BasePath)-1] != '/' {
-			Default.BasePath += "/"
+	//if os.Getenv("BASE_PATH") != "" {
+	//	Default.BasePath = os.Getenv("BASE_PATH")
+	//	if Default.BasePath[len(Default.BasePath)-1] != '/' {
+	//		Default.BasePath += "/"
+	//	}
+	//}
+	if os.Getenv("SHORT_LINK_LENGTH") != "" {
+		atoi, err := strconv.Atoi(os.Getenv("SHORT_LINK_LENGTH"))
+		if err != nil {
+			return errors.New("SHORT_LINK_LENGTH invalid")
 		}
+		Default.ShortLinkLength = atoi
 	}
+	return nil
 }

docker-compose.yml

@@ -1,20 +1,21 @@
-version: '3'
+version: "3"
 
 services:
-  sub2clash:
-    container_name: sub2clash
-    restart: unless-stopped
-    image: ghcr.io/nitezs/sub2clash:latest
-    ports:
-      - "8011:8011"
-    volumes:
-      - ./logs:/app/logs
-      # - ./templates:/app/templates
-    # environment:
-    #   - PORT=8011
-    #   - META_TEMPLATE=template_meta.yaml
-    #   - PROXY_TEMPLATE=template_clash.yaml
-    #   - REQUEST_RETRY_TIMES=3
-    #   - REQUEST_MAX_FILE_SIZE=1048576
-    #   - CACHE_EXPIRE=300
-    #   - LOG_LEVEL=info
+    sub2clash:
+        container_name: sub2clash
+        restart: unless-stopped
+        image: ghcr.io/nitezs/sub2clash:latest
+        ports:
+            - "8011:8011"
+        volumes:
+            - ./logs:/app/logs
+            - ./templates:/app/templates
+            - ./data:/app/data
+        # environment:
+        #   - PORT=8011
+        #   - META_TEMPLATE=template_meta.yaml
+        #   - PROXY_TEMPLATE=template_clash.yaml
+        #   - REQUEST_RETRY_TIMES=3
+        #   - REQUEST_MAX_FILE_SIZE=1048576
+        #   - CACHE_EXPIRE=300
+        #   - LOG_LEVEL=info

logger/logger.go

@@ -1,21 +1,22 @@
 package logger
 
 import (
-	"go.uber.org/zap"
-	"go.uber.org/zap/zapcore"
 	"path/filepath"
-	"sub2clash/config"
-	"sub2clash/utils"
 	"sync"
 	"time"
+
+	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
 )
 
 var (
-	Logger *zap.Logger
-	lock   sync.Mutex
+	Logger   *zap.Logger
+	lock     sync.Mutex
+	logLevel string
 )
 
-func init() {
+func InitLogger(level string) {
+	logLevel = level
 	buildLogger()
 	go rotateLogs()
 }
@@ -24,7 +25,7 @@ func buildLogger() {
 	lock.Lock()
 	defer lock.Unlock()
 	var level zapcore.Level
-	switch config.Default.LogLevel {
+	switch logLevel {
 	case "error":
 		level = zap.ErrorLevel
 	case "debug":
@@ -36,10 +37,6 @@ func buildLogger() {
 	default:
 		level = zap.InfoLevel
 	}
-	err := utils.MKDir("logs")
-	if err != nil {
-		panic("创建日志失败" + err.Error())
-	}
 	zapConfig := zap.NewProductionConfig()
 	zapConfig.Encoding = "console"
 	zapConfig.EncoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder
@@ -47,9 +44,10 @@ func buildLogger() {
 	zapConfig.OutputPaths = []string{"stdout", getLogFileName("info")}
 	zapConfig.ErrorOutputPaths = []string{"stderr", getLogFileName("error")}
 	zapConfig.Level = zap.NewAtomicLevelAt(level)
+	var err error
 	Logger, err = zapConfig.Build()
 	if err != nil {
-		panic("创建日志失败" + err.Error())
+		panic("log failed" + err.Error())
 	}
 }
 

main.go

@@ -2,17 +2,16 @@ package main
 
 import (
 	_ "embed"
-	"github.com/gin-gonic/gin"
-	"go.uber.org/zap"
 	"io"
-	"os"
-	"path/filepath"
 	"strconv"
 	"sub2clash/api"
 	"sub2clash/config"
 	"sub2clash/logger"
 	"sub2clash/utils"
 	"sub2clash/utils/database"
+
+	"github.com/gin-gonic/gin"
+	"go.uber.org/zap"
 )
 
 //go:embed templates/template_meta.yaml
@@ -21,43 +20,45 @@ var templateMeta string
 //go:embed templates/template_clash.yaml
 var templateClash string
 
-func writeTemplate(path string, template string) error {
-	tPath := filepath.Join(
-		"templates", path,
-	)
-	if _, err := os.Stat(tPath); os.IsNotExist(err) {
-		file, err := os.Create(tPath)
-		if err != nil {
-			return err
-		}
-		defer func(file *os.File) {
-			_ = file.Close()
-		}(file)
-		_, err = file.WriteString(template)
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
 func init() {
-	if err := utils.MKDir("subs"); err != nil {
-		os.Exit(1)
-	}
-	if err := utils.MKDir("templates"); err != nil {
-		os.Exit(1)
-	}
-	if err := writeTemplate(config.Default.MetaTemplate, templateMeta); err != nil {
-		os.Exit(1)
-	}
-	if err := writeTemplate(config.Default.ClashTemplate, templateClash); err != nil {
-		os.Exit(1)
-	}
-	err := database.ConnectDB()
+	var err error
+	// 创建文件夹
+	err = utils.MkEssentialDir()
 	if err != nil {
-		panic(err)
+		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))
+	}
+	// 检查更新
+	if config.Dev != "true" {
+		go func() {
+			update, newVersion, err := utils.CheckUpdate()
+			if err != nil {
+				logger.Logger.Warn("check update failed", zap.Error(err))
+			}
+			if update {
+				logger.Logger.Info("new version is available", zap.String("version", newVersion))
+			}
+		}()
+	} else {
+		logger.Logger.Info("running in dev mode")
+	}
+	// 写入默认模板
+	err = utils.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))
+	}
+	logger.Logger.Info("database connect success")
 }
 
 func main() {
@@ -69,10 +70,10 @@ func main() {
 	r := gin.Default()
 	// 设置路由
 	api.SetRoute(r)
-	logger.Logger.Info("Server is running at http://localhost:" + strconv.Itoa(config.Default.Port))
+	logger.Logger.Info("server is running at http://localhost:" + strconv.Itoa(config.Default.Port))
 	err := r.Run(":" + strconv.Itoa(config.Default.Port))
 	if err != nil {
-		logger.Logger.Error("Server run error", zap.Error(err))
+		logger.Logger.Error("server running failed", zap.Error(err))
 		return
 	}
 }

middleware/logger.go

@@ -1,11 +1,12 @@
 package middleware
 
 import (
-	"github.com/gin-gonic/gin"
-	"go.uber.org/zap"
 	"strconv"
 	"sub2clash/logger"
 	"time"
+
+	"github.com/gin-gonic/gin"
+	"go.uber.org/zap"
 )
 
 func ZapLogger() gin.HandlerFunc {

model/clash.go

@@ -18,11 +18,12 @@ func GetSupportProxyTypes(clashType ClashType) map[string]bool {
 	}
 	if clashType == ClashMeta {
 		return map[string]bool{
-			"ss":     true,
-			"ssr":    true,
-			"vmess":  true,
-			"trojan": true,
-			"vless":  true,
+			"ss":        true,
+			"ssr":       true,
+			"vmess":     true,
+			"trojan":    true,
+			"vless":     true,
+			"hysteria2": true,
 		}
 	}
 	return nil

model/github.go

@@ -0,0 +1,12 @@
+package model
+
+type Tags []struct {
+	Name       string `json:"name"`
+	ZipballUrl string `json:"zipball_url"`
+	TarballUrl string `json:"tarball_url"`
+	Commit     struct {
+		Sha string `json:"sha"`
+		Url string `json:"url"`
+	}
+	NodeId string `json:"node_id"`
+}

model/proxy.go

@@ -1,83 +1,71 @@
 package model
 
-type PluginOptsStruct struct {
-	Mode string `yaml:"mode"`
-}
-
 type SmuxStruct struct {
 	Enabled bool `yaml:"enable"`
 }
 
-type HeaderStruct struct {
-	Host string `yaml:"Host"`
-}
-
-type WSOptsStruct struct {
-	Path                string       `yaml:"path,omitempty"`
-	Headers             HeaderStruct `yaml:"headers,omitempty"`
-	MaxEarlyData        int          `yaml:"max-early-data,omitempty"`
-	EarlyDataHeaderName string       `yaml:"early-data-header-name,omitempty"`
-}
-
-type Vmess struct {
-	V    string `json:"v"`
-	Ps   string `json:"ps"`
-	Add  string `json:"add"`
-	Port string `json:"port"`
-	Id   string `json:"id"`
-	Aid  string `json:"aid"`
-	Scy  string `json:"scy"`
-	Net  string `json:"net"`
-	Type string `json:"type"`
-	Host string `json:"host"`
-	Path string `json:"path"`
-	Tls  string `json:"tls"`
-	Sni  string `json:"sni"`
-	Alpn string `json:"alpn"`
-	Fp   string `json:"fp"`
-}
-
-type GRPCOptsStruct struct {
-	GRPCServiceName string `yaml:"grpc-service-name,omitempty"`
-}
-
-type RealityOptsStruct struct {
-	PublicKey string `yaml:"public-key,omitempty"`
-	ShortId   string `yaml:"short-id,omitempty"`
-}
-
 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"`
-	UdpOverTcp        bool              `yaml:"udp-over-tcp,omitempty"`
-	UdpOverTcpVersion string            `yaml:"udp-over-tcp-version,omitempty"`
-	Plugin            string            `yaml:"plugin,omitempty"`
-	PluginOpts        PluginOptsStruct  `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            WSOptsStruct      `yaml:"ws-opts,omitempty"`
-	AlterID           string            `yaml:"alterId,omitempty"`
-	GRPCOpts          GRPCOptsStruct    `yaml:"grpc-opts,omitempty"`
-	RealityOpts       RealityOptsStruct `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"`
+	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"`
+}
+
+func (p Proxy) MarshalYAML() (interface{}, error) {
+	switch p.Type {
+	case "vmess":
+		return ProxyToVmess(p), nil
+	case "ss":
+		return ProxyToShadowSocks(p), nil
+	case "ssr":
+		return ProxyToShadowSocksR(p), nil
+	case "vless":
+		return ProxyToVless(p), nil
+	case "trojan":
+		return ProxyToTrojan(p), nil
+	case "hysteria2":
+		return ProxyToHysteria2(p), nil
+	}
+	return nil, nil
 }

model/proxy_group.go

@@ -15,6 +15,89 @@ type ProxyGroup struct {
 	Tolerance     int      `yaml:"tolerance,omitempty"`
 	Lazy          bool     `yaml:"lazy"`
 	Size          int      `yaml:"-"`
+	DisableUDP    bool     `yaml:"disable-udp,omitempty"`
+	Strategy      string   `yaml:"strategy,omitempty"`
+}
+
+type SelectProxyGroup struct {
+	Name       string   `yaml:"name,omitempty"`
+	Type       string   `yaml:"type,omitempty"`
+	Proxies    []string `yaml:"proxies,omitempty"`
+	DisableUDP bool     `yaml:"disable-udp,omitempty"`
+}
+
+type UrlTestProxyGroup struct {
+	Name       string   `yaml:"name,omitempty"`
+	Type       string   `yaml:"type,omitempty"`
+	Proxies    []string `yaml:"proxies,omitempty"`
+	Url        string   `yaml:"url,omitempty"`
+	Interval   int      `yaml:"interval,omitempty"`
+	Tolerance  int      `yaml:"tolerance,omitempty"`
+	Lazy       bool     `yaml:"lazy"`
+	DisableUDP bool     `yaml:"disable-udp,omitempty"`
+}
+
+type LoadBalanceProxyGroup struct {
+	Name       string   `yaml:"name,omitempty"`
+	Type       string   `yaml:"type,omitempty"`
+	Proxies    []string `yaml:"proxies,omitempty"`
+	DisableUDP bool     `yaml:"disable-udp,omitempty"`
+	Url        string   `yaml:"url,omitempty"`
+	Interval   int      `yaml:"interval,omitempty"`
+	Lazy       bool     `yaml:"lazy"`
+	Strategy   string   `yaml:"strategy,omitempty"`
+}
+
+type RelayProxyGroup struct {
+	Name    string   `yaml:"name,omitempty"`
+	Type    string   `yaml:"type,omitempty"`
+	Proxies []string `yaml:"proxies,omitempty"`
+}
+
+func (p ProxyGroup) MarshalYAML() (interface{}, error) {
+	switch p.Type {
+	case "select":
+		return SelectProxyGroup{
+			Name:       p.Name,
+			Type:       p.Type,
+			Proxies:    p.Proxies,
+			DisableUDP: p.DisableUDP,
+		}, nil
+	case "url-test", "fallback":
+		return UrlTestProxyGroup{
+			Name:       p.Name,
+			Type:       p.Type,
+			Proxies:    p.Proxies,
+			Url:        p.Url,
+			Interval:   p.Interval,
+			Tolerance:  p.Tolerance,
+			Lazy:       p.Lazy,
+			DisableUDP: p.DisableUDP,
+		}, nil
+	case "load-balance":
+		return LoadBalanceProxyGroup{
+			Name:       p.Name,
+			Type:       p.Type,
+			Proxies:    p.Proxies,
+			DisableUDP: p.DisableUDP,
+			Url:        p.Url,
+			Interval:   p.Interval,
+			Lazy:       p.Lazy,
+			Strategy:   p.Strategy,
+		}, nil
+	case "relay":
+		return RelayProxyGroup{
+			Name:    p.Name,
+			Type:    p.Type,
+			Proxies: p.Proxies,
+		}, nil
+	default:
+		return SelectProxyGroup{
+			Name:    p.Name,
+			Type:    p.Type,
+			Proxies: p.Proxies,
+		}, nil
+	}
 }
 
 type ProxyGroupsSortByName []ProxyGroup
@@ -39,7 +122,6 @@ func (p ProxyGroupsSortByName) Less(i, j int) bool {
 	bestMatch, _, _ := matcher.Match(language.Make("zh"))
 	// 使用最佳匹配的语言进行排序
 	c := collate.New(bestMatch)
-
 	return c.CompareString(p[i].Name, p[j].Name) < 0
 }
 

model/proxy_hysteria2.go

@@ -0,0 +1,41 @@
+package model
+
+type Hysteria2 struct {
+	Type           string   `yaml:"type"`
+	Name           string   `yaml:"name"`
+	Server         string   `yaml:"server"`
+	Port           int      `yaml:"port"`
+	Up             string   `yaml:"up,omitempty"`
+	Down           string   `yaml:"down,omitempty"`
+	Password       string   `yaml:"password,omitempty"`
+	Obfs           string   `yaml:"obfs,omitempty"`
+	ObfsPassword   string   `yaml:"obfs-password,omitempty"`
+	SNI            string   `yaml:"sni,omitempty"`
+	SkipCertVerify bool     `yaml:"skip-cert-verify,omitempty"`
+	Fingerprint    string   `yaml:"fingerprint,omitempty"`
+	ALPN           []string `yaml:"alpn,omitempty"`
+	CustomCA       string   `yaml:"ca,omitempty"`
+	CustomCAString string   `yaml:"ca-str,omitempty"`
+	CWND           int      `yaml:"cwnd,omitempty"`
+}
+
+func ProxyToHysteria2(p Proxy) Hysteria2 {
+	return Hysteria2{
+		Type:           "hysteria2",
+		Name:           p.Name,
+		Server:         p.Server,
+		Port:           p.Port,
+		Up:             p.Up,
+		Down:           p.Down,
+		Password:       p.Password,
+		Obfs:           p.Obfs,
+		ObfsPassword:   p.ObfsParam,
+		SNI:            p.Sni,
+		SkipCertVerify: p.SkipCertVerify,
+		Fingerprint:    p.Fingerprint,
+		ALPN:           p.Alpn,
+		CustomCA:       p.CustomCA,
+		CustomCAString: p.CustomCAString,
+		CWND:           p.CWND,
+	}
+}

model/proxy_shadowsocks.go

@@ -0,0 +1,33 @@
+package model
+
+type ShadowSocks struct {
+	Type              string         `yaml:"type"`
+	Name              string         `yaml:"name"`
+	Server            string         `yaml:"server"`
+	Port              int            `yaml:"port"`
+	Password          string         `yaml:"password"`
+	Cipher            string         `yaml:"cipher"`
+	UDP               bool           `yaml:"udp,omitempty"`
+	Plugin            string         `yaml:"plugin,omitempty"`
+	PluginOpts        map[string]any `yaml:"plugin-opts,omitempty"`
+	UDPOverTCP        bool           `yaml:"udp-over-tcp,omitempty"`
+	UDPOverTCPVersion int            `yaml:"udp-over-tcp-version,omitempty"`
+	ClientFingerprint string         `yaml:"client-fingerprint,omitempty"`
+}
+
+func ProxyToShadowSocks(p Proxy) ShadowSocks {
+	return ShadowSocks{
+		Type:              "ss",
+		Name:              p.Name,
+		Server:            p.Server,
+		Port:              p.Port,
+		Password:          p.Password,
+		Cipher:            p.Cipher,
+		UDP:               p.UDP,
+		Plugin:            p.Plugin,
+		PluginOpts:        p.PluginOpts,
+		UDPOverTCP:        p.UDPOverTCP,
+		UDPOverTCPVersion: p.UDPOverTCPVersion,
+		ClientFingerprint: p.ClientFingerprint,
+	}
+}

model/proxy_shadowsocksr.go

@@ -0,0 +1,31 @@
+package model
+
+type ShadowSocksR struct {
+	Type          string `yaml:"type"`
+	Name          string `yaml:"name"`
+	Server        string `yaml:"server"`
+	Port          int    `yaml:"port"`
+	Password      string `yaml:"password"`
+	Cipher        string `yaml:"cipher"`
+	Obfs          string `yaml:"obfs"`
+	ObfsParam     string `yaml:"obfs-param,omitempty"`
+	Protocol      string `yaml:"protocol"`
+	ProtocolParam string `yaml:"protocol-param,omitempty"`
+	UDP           bool   `yaml:"udp,omitempty"`
+}
+
+func ProxyToShadowSocksR(p Proxy) ShadowSocksR {
+	return ShadowSocksR{
+		Type:          "ssr",
+		Name:          p.Name,
+		Server:        p.Server,
+		Port:          p.Port,
+		Password:      p.Password,
+		Cipher:        p.Cipher,
+		Obfs:          p.Obfs,
+		ObfsParam:     p.ObfsParam,
+		Protocol:      p.Protocol,
+		ProtocolParam: p.ProtocolParam,
+		UDP:           p.UDP,
+	}
+}

model/proxy_trojan.go

@@ -0,0 +1,39 @@
+package model
+
+type Trojan struct {
+	Type              string         `yaml:"type"`
+	Name              string         `yaml:"name"`
+	Server            string         `yaml:"server"`
+	Port              int            `yaml:"port"`
+	Password          string         `yaml:"password"`
+	ALPN              []string       `yaml:"alpn,omitempty"`
+	SNI               string         `yaml:"sni,omitempty"`
+	SkipCertVerify    bool           `yaml:"skip-cert-verify,omitempty"`
+	Fingerprint       string         `yaml:"fingerprint,omitempty"`
+	UDP               bool           `yaml:"udp,omitempty"`
+	Network           string         `yaml:"network,omitempty"`
+	RealityOpts       RealityOptions `yaml:"reality-opts,omitempty"`
+	GrpcOpts          GrpcOptions    `yaml:"grpc-opts,omitempty"`
+	WSOpts            WSOptions      `yaml:"ws-opts,omitempty"`
+	ClientFingerprint string         `yaml:"client-fingerprint,omitempty"`
+}
+
+func ProxyToTrojan(p Proxy) Trojan {
+	return Trojan{
+		Type:              "trojan",
+		Name:              p.Name,
+		Server:            p.Server,
+		Port:              p.Port,
+		Password:          p.Password,
+		ALPN:              p.Alpn,
+		SNI:               p.Sni,
+		SkipCertVerify:    p.SkipCertVerify,
+		Fingerprint:       p.Fingerprint,
+		UDP:               p.UDP,
+		Network:           p.Network,
+		RealityOpts:       p.RealityOpts,
+		GrpcOpts:          p.GrpcOpts,
+		WSOpts:            p.WSOpts,
+		ClientFingerprint: p.ClientFingerprint,
+	}
+}

model/proxy_vless.go

@@ -0,0 +1,57 @@
+package model
+
+type Vless struct {
+	Type              string            `yaml:"type"`
+	Name              string            `yaml:"name"`
+	Server            string            `yaml:"server"`
+	Port              int               `yaml:"port"`
+	UUID              string            `yaml:"uuid"`
+	Flow              string            `yaml:"flow,omitempty"`
+	TLS               bool              `yaml:"tls,omitempty"`
+	ALPN              []string          `yaml:"alpn,omitempty"`
+	UDP               bool              `yaml:"udp,omitempty"`
+	PacketAddr        bool              `yaml:"packet-addr,omitempty"`
+	XUDP              bool              `yaml:"xudp,omitempty"`
+	PacketEncoding    string            `yaml:"packet-encoding,omitempty"`
+	Network           string            `yaml:"network,omitempty"`
+	RealityOpts       RealityOptions    `yaml:"reality-opts,omitempty"`
+	HTTPOpts          HTTPOptions       `yaml:"http-opts,omitempty"`
+	HTTP2Opts         HTTP2Options      `yaml:"h2-opts,omitempty"`
+	GrpcOpts          GrpcOptions       `yaml:"grpc-opts,omitempty"`
+	WSOpts            WSOptions         `yaml:"ws-opts,omitempty"`
+	WSPath            string            `yaml:"ws-path,omitempty"`
+	WSHeaders         map[string]string `yaml:"ws-headers,omitempty"`
+	SkipCertVerify    bool              `yaml:"skip-cert-verify,omitempty"`
+	Fingerprint       string            `yaml:"fingerprint,omitempty"`
+	ServerName        string            `yaml:"servername,omitempty"`
+	ClientFingerprint string            `yaml:"client-fingerprint,omitempty"`
+}
+
+func ProxyToVless(p Proxy) Vless {
+	return Vless{
+		Type:              "vless",
+		Name:              p.Name,
+		Server:            p.Server,
+		Port:              p.Port,
+		UUID:              p.UUID,
+		Flow:              p.Flow,
+		TLS:               p.TLS,
+		ALPN:              p.Alpn,
+		UDP:               p.UDP,
+		PacketAddr:        p.PacketAddr,
+		XUDP:              p.XUDP,
+		PacketEncoding:    p.PacketEncoding,
+		Network:           p.Network,
+		RealityOpts:       p.RealityOpts,
+		HTTPOpts:          p.HTTPOpts,
+		HTTP2Opts:         p.HTTP2Opts,
+		GrpcOpts:          p.GrpcOpts,
+		WSOpts:            p.WSOpts,
+		WSPath:            p.WSOpts.Path,
+		WSHeaders:         p.WSOpts.Headers,
+		SkipCertVerify:    p.SkipCertVerify,
+		Fingerprint:       p.Fingerprint,
+		ServerName:        p.Servername,
+		ClientFingerprint: p.ClientFingerprint,
+	}
+}

model/proxy_vmess.go

@@ -0,0 +1,104 @@
+package model
+
+type HTTPOptions struct {
+	Method  string              `proxy:"method,omitempty"`
+	Path    []string            `proxy:"path,omitempty"`
+	Headers map[string][]string `proxy:"headers,omitempty"`
+}
+
+type HTTP2Options struct {
+	Host []string `proxy:"host,omitempty"`
+	Path string   `proxy:"path,omitempty"`
+}
+
+type GrpcOptions struct {
+	GrpcServiceName string `proxy:"grpc-service-name,omitempty"`
+}
+
+type RealityOptions struct {
+	PublicKey string `yaml:"public-key"`
+	ShortID   string `yaml:"short-id,omitempty"`
+}
+
+type WSOptions struct {
+	Path                string            `proxy:"path,omitempty"`
+	Headers             map[string]string `proxy:"headers,omitempty"`
+	MaxEarlyData        int               `proxy:"max-early-data,omitempty"`
+	EarlyDataHeaderName string            `proxy:"early-data-header-name,omitempty"`
+}
+
+type VmessJson struct {
+	V    string      `json:"v"`
+	Ps   string      `json:"ps"`
+	Add  string      `json:"add"`
+	Port interface{} `json:"port"`
+	Id   string      `json:"id"`
+	Aid  interface{} `json:"aid"`
+	Scy  string      `json:"scy"`
+	Net  string      `json:"net"`
+	Type string      `json:"type"`
+	Host string      `json:"host"`
+	Path string      `json:"path"`
+	Tls  string      `json:"tls"`
+	Sni  string      `json:"sni"`
+	Alpn string      `json:"alpn"`
+	Fp   string      `json:"fp"`
+}
+
+type Vmess struct {
+	Type                string         `yaml:"type"`
+	Name                string         `yaml:"name"`
+	Server              string         `yaml:"server"`
+	Port                int            `yaml:"port"`
+	UUID                string         `yaml:"uuid"`
+	AlterID             int            `yaml:"alterId"`
+	Cipher              string         `yaml:"cipher"`
+	UDP                 bool           `yaml:"udp,omitempty"`
+	Network             string         `yaml:"network,omitempty"`
+	TLS                 bool           `yaml:"tls,omitempty"`
+	ALPN                []string       `yaml:"alpn,omitempty"`
+	SkipCertVerify      bool           `yaml:"skip-cert-verify,omitempty"`
+	Fingerprint         string         `yaml:"fingerprint,omitempty"`
+	ServerName          string         `yaml:"servername,omitempty"`
+	RealityOpts         RealityOptions `yaml:"reality-opts,omitempty"`
+	HTTPOpts            HTTPOptions    `yaml:"http-opts,omitempty"`
+	HTTP2Opts           HTTP2Options   `yaml:"h2-opts,omitempty"`
+	GrpcOpts            GrpcOptions    `yaml:"grpc-opts,omitempty"`
+	WSOpts              WSOptions      `yaml:"ws-opts,omitempty"`
+	PacketAddr          bool           `yaml:"packet-addr,omitempty"`
+	XUDP                bool           `yaml:"xudp,omitempty"`
+	PacketEncoding      string         `yaml:"packet-encoding,omitempty"`
+	GlobalPadding       bool           `yaml:"global-padding,omitempty"`
+	AuthenticatedLength bool           `yaml:"authenticated-length,omitempty"`
+	ClientFingerprint   string         `yaml:"client-fingerprint,omitempty"`
+}
+
+func ProxyToVmess(p Proxy) Vmess {
+	return Vmess{
+		Type:                "vmess",
+		Name:                p.Name,
+		Server:              p.Server,
+		Port:                p.Port,
+		UUID:                p.UUID,
+		AlterID:             p.AlterID,
+		Cipher:              p.Cipher,
+		UDP:                 p.UDP,
+		Network:             p.Network,
+		TLS:                 p.TLS,
+		ALPN:                p.Alpn,
+		SkipCertVerify:      p.SkipCertVerify,
+		Fingerprint:         p.Fingerprint,
+		ServerName:          p.Servername,
+		RealityOpts:         p.RealityOpts,
+		HTTPOpts:            p.HTTPOpts,
+		HTTP2Opts:           p.HTTP2Opts,
+		GrpcOpts:            p.GrpcOpts,
+		WSOpts:              p.WSOpts,
+		PacketAddr:          p.PacketAddr,
+		XUDP:                p.XUDP,
+		PacketEncoding:      p.PacketEncoding,
+		GlobalPadding:       p.GlobalPadding,
+		AuthenticatedLength: p.AuthenticatedLength,
+		ClientFingerprint:   p.ClientFingerprint,
+	}
+}

model/short_link.go

@@ -3,5 +3,6 @@ package model
 type ShortLink struct {
 	Hash            string `gorm:"primary_key"`
 	Url             string
+	Password        string
 	LastRequestTime int64
 }

model/sub.go

@@ -12,3 +12,7 @@ type Subscription struct {
 	Rules              []string                `yaml:"rules,omitempty"`
 	RuleProviders      map[string]RuleProvider `yaml:"rule-providers,omitempty,omitempty"`
 }
+
+type NodeList struct {
+	Proxies []Proxy `yaml:"proxies,omitempty"`
+}

parser/base64.go

@@ -2,9 +2,14 @@ package parser
 
 import (
 	"encoding/base64"
+	"strings"
 )
 
 func DecodeBase64(s string) (string, error) {
+	s = strings.TrimSpace(s)
+	if len(s)%4 != 0 {
+		s += strings.Repeat("=", 4-len(s)%4)
+	}
 	decodeStr, err := base64.StdEncoding.DecodeString(s)
 	if err != nil {
 		return "", err

parser/hysteria2.go

@@ -0,0 +1,51 @@
+package parser
+
+import (
+	"errors"
+	"net/url"
+	"strconv"
+	"strings"
+	"sub2clash/model"
+)
+
+func ParseHysteria2(proxy string) (model.Proxy, error) {
+	// 判断是否以 hysteria2:// 开头
+	if !strings.HasPrefix(proxy, "hysteria2://") {
+		return model.Proxy{}, errors.New("invalid hysteria2 Url")
+	}
+	// 分割
+	parts := strings.SplitN(strings.TrimPrefix(proxy, "hysteria2://"), "@", 2)
+	if len(parts) != 2 {
+		return model.Proxy{}, errors.New("invalid hysteria2 Url")
+	}
+	// 分割
+	serverInfo := strings.SplitN(parts[1], "/?", 2)
+	serverAndPort := strings.SplitN(serverInfo[0], ":", 2)
+	if len(serverAndPort) == 1 {
+		serverAndPort = append(serverAndPort, "443")
+	} else if len(serverAndPort) != 2 {
+		return model.Proxy{}, errors.New("invalid hysteria2 Url")
+	}
+	params, err := url.ParseQuery(serverInfo[1])
+	if err != nil {
+		return model.Proxy{}, errors.New("invalid hysteria2 Url")
+	}
+	// 获取端口
+	port, err := strconv.Atoi(serverAndPort[1])
+	if err != nil {
+		return model.Proxy{}, errors.New("invalid hysteria2 Url")
+	}
+	// 返回结果
+	result := model.Proxy{
+		Type:           "hysteria2",
+		Name:           params.Get("name"),
+		Server:         serverAndPort[0],
+		Port:           port,
+		Password:       parts[0],
+		Obfs:           params.Get("obfs"),
+		ObfsParam:      params.Get("obfs-password"),
+		Sni:            params.Get("sni"),
+		SkipCertVerify: params.Get("insecure") == "1",
+	}
+	return result, nil
+}

parser/ss.go

@@ -1,7 +1,7 @@
 package parser
 
 import (
-	"fmt"
+	"errors"
 	"net/url"
 	"strconv"
 	"strings"
@@ -12,35 +12,35 @@ import (
 func ParseSS(proxy string) (model.Proxy, error) {
 	// 判断是否以 ss:// 开头
 	if !strings.HasPrefix(proxy, "ss://") {
-		return model.Proxy{}, fmt.Errorf("无效的 ss Url")
+		return model.Proxy{}, errors.New("invalid ss Url")
 	}
 	// 分割
 	parts := strings.SplitN(strings.TrimPrefix(proxy, "ss://"), "@", 2)
 	if len(parts) != 2 {
-		return model.Proxy{}, fmt.Errorf("无效的 ss Url")
+		return model.Proxy{}, errors.New("invalid ss Url")
 	}
 	if !strings.Contains(parts[0], ":") {
 		// 解码
 		decoded, err := DecodeBase64(parts[0])
 		if err != nil {
-			return model.Proxy{}, err
+			return model.Proxy{}, errors.New("invalid ss Url" + err.Error())
 		}
 		parts[0] = decoded
 	}
 	credentials := strings.SplitN(parts[0], ":", 2)
 	if len(credentials) != 2 {
-		return model.Proxy{}, fmt.Errorf("无效的 ss 凭证")
+		return model.Proxy{}, errors.New("invalid ss Url")
 	}
 	// 分割
 	serverInfo := strings.SplitN(parts[1], "#", 2)
 	serverAndPort := strings.SplitN(serverInfo[0], ":", 2)
 	if len(serverAndPort) != 2 {
-		return model.Proxy{}, fmt.Errorf("无效的 ss 服务器和端口")
+		return model.Proxy{}, errors.New("invalid ss Url")
 	}
 	// 转换端口字符串为数字
 	port, err := strconv.Atoi(strings.TrimSpace(serverAndPort[1]))
 	if err != nil {
-		return model.Proxy{}, err
+		return model.Proxy{}, errors.New("invalid ss Url" + err.Error())
 	}
 	// 返回结果
 	result := model.Proxy{
@@ -56,7 +56,7 @@ func ParseSS(proxy string) (model.Proxy, error) {
 	if len(serverInfo) == 2 {
 		unescape, err := url.QueryUnescape(serverInfo[1])
 		if err != nil {
-			return model.Proxy{}, err
+			return model.Proxy{}, errors.New("invalid ss Url" + err.Error())
 		}
 		result.Name = strings.TrimSpace(unescape)
 	} else {

parser/ssr.go

@@ -11,7 +11,7 @@ import (
 func ParseShadowsocksR(proxy string) (model.Proxy, error) {
 	// 判断是否以 ssr:// 开头
 	if !strings.HasPrefix(proxy, "ssr://") {
-		return model.Proxy{}, fmt.Errorf("无效的 ssr Url")
+		return model.Proxy{}, fmt.Errorf("invalid ssr Url")
 	}
 	var err error
 	proxy = strings.TrimPrefix(proxy, "ssr://")

parser/trojan.go

@@ -11,12 +11,12 @@ import (
 func ParseTrojan(proxy string) (model.Proxy, error) {
 	// 判断是否以 trojan:// 开头
 	if !strings.HasPrefix(proxy, "trojan://") {
-		return model.Proxy{}, fmt.Errorf("无效的 trojan Url")
+		return model.Proxy{}, fmt.Errorf("invalid trojan Url")
 	}
 	// 分割
 	parts := strings.SplitN(strings.TrimPrefix(proxy, "trojan://"), "@", 2)
 	if len(parts) != 2 {
-		return model.Proxy{}, fmt.Errorf("无效的 trojan Url")
+		return model.Proxy{}, fmt.Errorf("invalid trojan Url")
 	}
 	// 分割
 	serverInfo := strings.SplitN(parts[1], "#", 2)
@@ -27,7 +27,7 @@ func ParseTrojan(proxy string) (model.Proxy, error) {
 		return model.Proxy{}, err
 	}
 	if len(serverAndPort) != 2 {
-		return model.Proxy{}, fmt.Errorf("无效的 trojan 服务器和端口")
+		return model.Proxy{}, fmt.Errorf("invalid trojan")
 	}
 	// 处理端口
 	port, err := strconv.Atoi(strings.TrimSpace(serverAndPort[1]))

parser/vless.go

@@ -11,12 +11,12 @@ import (
 func ParseVless(proxy string) (model.Proxy, error) {
 	// 判断是否以 vless:// 开头
 	if !strings.HasPrefix(proxy, "vless://") {
-		return model.Proxy{}, fmt.Errorf("无效的 vless Url")
+		return model.Proxy{}, fmt.Errorf("invalid vless Url")
 	}
 	// 分割
 	parts := strings.SplitN(strings.TrimPrefix(proxy, "vless://"), "@", 2)
 	if len(parts) != 2 {
-		return model.Proxy{}, fmt.Errorf("无效的 vless Url")
+		return model.Proxy{}, fmt.Errorf("invalid vless Url")
 	}
 	// 分割
 	serverInfo := strings.SplitN(parts[1], "#", 2)
@@ -27,7 +27,7 @@ func ParseVless(proxy string) (model.Proxy, error) {
 		return model.Proxy{}, err
 	}
 	if len(serverAndPort) != 2 {
-		return model.Proxy{}, fmt.Errorf("无效的 vless 服务器和端口")
+		return model.Proxy{}, fmt.Errorf("invalid vless")
 	}
 	// 处理端口
 	port, err := strconv.Atoi(strings.TrimSpace(serverAndPort[1]))
@@ -36,18 +36,18 @@ func ParseVless(proxy string) (model.Proxy, error) {
 	}
 	// 返回结果
 	result := model.Proxy{
-		Type:        "vless",
-		Server:      strings.TrimSpace(serverAndPort[0]),
-		Port:        port,
-		UUID:        strings.TrimSpace(parts[0]),
-		UDP:         true,
-		Sni:         params.Get("sni"),
-		Network:     params.Get("type"),
-		TLS:         params.Get("security") == "tls",
-		Flow:        params.Get("flow"),
-		Fingerprint: params.Get("fp"),
-		Servername:  params.Get("sni"),
-		RealityOpts: model.RealityOptsStruct{
+		Type:              "vless",
+		Server:            strings.TrimSpace(serverAndPort[0]),
+		Port:              port,
+		UUID:              strings.TrimSpace(parts[0]),
+		UDP:               true,
+		Sni:               params.Get("sni"),
+		Network:           params.Get("type"),
+		TLS:               params.Get("security") == "reality",
+		Flow:              params.Get("flow"),
+		ClientFingerprint: params.Get("fp"),
+		Servername:        params.Get("sni"),
+		RealityOpts: model.RealityOptions{
 			PublicKey: params.Get("pbk"),
 		},
 	}
@@ -55,16 +55,16 @@ func ParseVless(proxy string) (model.Proxy, error) {
 		result.Alpn = strings.Split(params.Get("alpn"), ",")
 	}
 	if params.Get("type") == "ws" {
-		result.WSOpts = model.WSOptsStruct{
+		result.WSOpts = model.WSOptions{
 			Path: params.Get("path"),
-			Headers: model.HeaderStruct{
-				Host: params.Get("host"),
+			Headers: map[string]string{
+				"Host": params.Get("host"),
 			},
 		}
 	}
 	if params.Get("type") == "grpc" {
-		result.GRPCOpts = model.GRPCOptsStruct{
-			GRPCServiceName: params.Get("serviceName"),
+		result.GrpcOpts = model.GrpcOptions{
+			GrpcServiceName: params.Get("serviceName"),
 		}
 	}
 	// 如果有节点名称

parser/vmess.go

@@ -3,7 +3,6 @@ package parser
 import (
 	"encoding/json"
 	"errors"
-	"fmt"
 	"strconv"
 	"strings"
 	"sub2clash/model"
@@ -12,24 +11,42 @@ import (
 func ParseVmess(proxy string) (model.Proxy, error) {
 	// 判断是否以 vmess:// 开头
 	if !strings.HasPrefix(proxy, "vmess://") {
-		return model.Proxy{}, fmt.Errorf("无效的 vmess Url")
+		return model.Proxy{}, errors.New("invalid vmess url")
 	}
 	// 解码
 	base64, err := DecodeBase64(strings.TrimPrefix(proxy, "vmess://"))
 	if err != nil {
-		return model.Proxy{}, errors.New("无效的 vmess Url")
+		return model.Proxy{}, errors.New("invalid vmess url" + err.Error())
 	}
 	// 解析
-	var vmess model.Vmess
+	var vmess model.VmessJson
 	err = json.Unmarshal([]byte(base64), &vmess)
 	if err != nil {
-		return model.Proxy{}, errors.New("无效的 vmess Url")
+		return model.Proxy{}, errors.New("invalid vmess url" + err.Error())
 	}
-	// 处理端口
-	port, err := strconv.Atoi(strings.TrimSpace(vmess.Port))
-	if err != nil {
-		return model.Proxy{}, errors.New("无效的 vmess Url")
+	// 解析端口
+	port := 0
+	switch vmess.Port.(type) {
+	case string:
+		port, err = strconv.Atoi(vmess.Port.(string))
+		if err != nil {
+			return model.Proxy{}, errors.New("invalid vmess url" + err.Error())
+		}
+	case float64:
+		port = int(vmess.Port.(float64))
 	}
+	// 解析Aid
+	aid := 0
+	switch vmess.Aid.(type) {
+	case string:
+		aid, err = strconv.Atoi(vmess.Aid.(string))
+		if err != nil {
+			return model.Proxy{}, errors.New("invalid vmess url" + err.Error())
+		}
+	case float64:
+		aid = int(vmess.Aid.(float64))
+	}
+	// 设置默认值
 	if vmess.Scy == "" {
 		vmess.Scy = "auto"
 	}
@@ -46,7 +63,7 @@ func ParseVmess(proxy string) (model.Proxy, error) {
 		Server:            vmess.Add,
 		Port:              port,
 		UUID:              vmess.Id,
-		AlterID:           vmess.Aid,
+		AlterID:           aid,
 		Cipher:            vmess.Scy,
 		UDP:               true,
 		TLS:               vmess.Tls == "tls",
@@ -57,10 +74,10 @@ func ParseVmess(proxy string) (model.Proxy, error) {
 		Network:           vmess.Net,
 	}
 	if vmess.Net == "ws" {
-		result.WSOpts = model.WSOptsStruct{
+		result.WSOpts = model.WSOptions{
 			Path: vmess.Path,
-			Headers: model.HeaderStruct{
-				Host: vmess.Host,
+			Headers: map[string]string{
+				"Host": vmess.Host,
 			},
 		}
 	}

templates/template_meta.yaml

@@ -5,63 +5,123 @@ mode: Rule
 log-level: info
 proxies:
 proxy-groups:
-  - name: 节点选择
-    type: select
-    proxies:
-      - 手动切换
-      - DIRECT
-  - name: 手动切换
-    type: select
-    proxies:
-  - name: 微软服务
-    type: select
-    proxies:
-      - 节点选择
-      - 手动切换
-      - DIRECT
-  - name: 游戏平台
-    type: select
-    proxies:
-      - 节点选择
-      - 手动切换
-      - DIRECT
-  - name: 巴哈姆特
-    type: select
-    proxies:
-      - 节点选择
-      - 手动切换
-      - DIRECT
-  - name: 哔哩哔哩
-    type: select
-    proxies:
-      - 节点选择
-      - 手动切换
-      - DIRECT
-  - name: 全球直连
-    type: select
-    proxies:
-      - DIRECT
-      - 节点选择
-  - name: 广告拦截
-    type: select
-    proxies:
-      - REJECT
-      - DIRECT
-  - name: 漏网之鱼
-    type: select
-    proxies:
-      - 节点选择
-      - 手动切换
-      - DIRECT
+    - name: 节点选择
+      type: select
+      proxies:
+          - <countries>
+          - 手动切换
+          - DIRECT
+    - name: 手动切换
+      type: select
+      proxies:
+          - <all>
+    - name: 游戏平台（中国）
+      type: select
+      proxies:
+          - 节点选择
+          - <countries>
+          - 手动切换
+          - DIRECT
+    - name: 游戏平台（全球）
+      type: select
+      proxies:
+          - 节点选择
+          - <countries>
+          - 手动切换
+          - DIRECT
+    - name: 巴哈姆特
+      type: select
+      proxies:
+          - 节点选择
+          - <countries>
+          - 手动切换
+          - DIRECT
+    - name: 哔哩哔哩
+      type: select
+      proxies:
+          - 节点选择
+          - <countries>
+          - 手动切换
+          - DIRECT
+    - name: Telegram
+      type: select
+      proxies:
+          - 节点选择
+          - <countries>
+          - 手动切换
+          - DIRECT
+    - name: OpenAI
+      type: select
+      proxies:
+          - 节点选择
+          - <countries>
+          - 手动切换
+          - DIRECT
+    - name: Youtube
+      type: select
+      proxies:
+          - 节点选择
+          - <countries>
+          - 手动切换
+          - DIRECT
+    - name: Microsoft
+      type: select
+      proxies:
+          - 节点选择
+          - <countries>
+          - 手动切换
+          - DIRECT
+    - name: Onedrive
+      type: select
+      proxies:
+          - 节点选择
+          - <countries>
+          - 手动切换
+          - DIRECT
+    - name: Apple
+      type: select
+      proxies:
+          - 节点选择
+          - <countries>
+          - 手动切换
+          - DIRECT
+    - name: Netflix
+      type: select
+      proxies:
+          - 节点选择
+          - <countries>
+          - 手动切换
+          - DIRECT
+    - name: 广告拦截
+      type: select
+      proxies:
+          - REJECT
+          - DIRECT
+    - name: 漏网之鱼
+      type: select
+      proxies:
+          - 节点选择
+          - <countries>
+          - 手动切换
+          - DIRECT
 rules:
-  - GEOSITE,private,全球直连,no-resolve
-  - GEOIP,private,全球直连
-  - GEOSITE,category-ads-all,广告拦截
-  - GEOSITE,microsoft,微软服务
-  - GEOSITE,bilibili,哔哩哔哩
-  - GEOSITE,bahamut,巴哈姆特
-  - GEOSITE,category-games,游戏平台
-  - GEOSITE,geolocation-!cn,节点选择
-  - GEOSITE,CN,全球直连
-  - GEOIP,CN,全球直连
-  - MATCH,漏网之鱼
+    - GEOSITE,private,DIRECT,no-resolve
+    - GEOIP,private,DIRECT
+    - GEOSITE,category-ads-all,广告拦截
+    - GEOSITE,microsoft,Microsoft
+    - GEOSITE,apple,Apple
+    - GEOSITE,netflix,Netflix
+    - GEOIP,netflix,Netflix
+    - GEOSITE,onedrive,Onedrive
+    - GEOSITE,youtube,Youtube
+    - GEOSITE,telegram,Telegram
+    - GEOIP,telegram,Telegram
+    - GEOSITE,openai,OpenAI
+    - GEOSITE,bilibili,哔哩哔哩
+    - GEOSITE,bahamut,巴哈姆特
+    - GEOSITE,category-games@cn,游戏平台（中国）
+    - GEOSITE,category-games,游戏平台（全球）
+    - GEOSITE,geolocation-!cn,节点选择
+    - GEOSITE,CN,DIRECT
+    - GEOIP,CN,DIRECT
+    - MATCH,漏网之鱼

utils/check_update.go

@@ -0,0 +1,33 @@
+package utils
+
+import (
+	"encoding/json"
+	"errors"
+	"io"
+	"sub2clash/config"
+	"sub2clash/model"
+)
+
+func CheckUpdate() (bool, string, error) {
+	get, err := Get("https://api.github.com/repos/nitezs/sub2clash/tags")
+	if err != nil {
+		return false, "", errors.New("get version info failed" + err.Error())
+
+	}
+	var version model.Tags
+	all, err := io.ReadAll(get.Body)
+	if err != nil {
+		return false, "", errors.New("get version info failed" + err.Error())
+
+	}
+	err = json.Unmarshal(all, &version)
+	if err != nil {
+		return false, "", errors.New("get version info failed" + err.Error())
+
+	}
+	if version[0].Name == config.Version {
+		return false, "", nil
+	} else {
+		return true, version[0].Name, nil
+	}
+}

utils/database/database.go

@@ -1,18 +1,31 @@
 package database
 
 import (
-	"github.com/glebarez/sqlite"
-	"gorm.io/gorm"
+	"path/filepath"
+	"sub2clash/logger"
 	"sub2clash/model"
+	"sub2clash/utils"
+
+	"github.com/glebarez/sqlite"
+	"go.uber.org/zap"
+	"gorm.io/gorm"
 )
 
 var DB *gorm.DB
 
 func ConnectDB() error {
 	// 用上面的数据库连接初始化 gorm
-	db, err := gorm.Open(sqlite.Open("sub2clash.db"), &gorm.Config{})
+	err := utils.MKDir("data")
 	if err != nil {
-		panic(err)
+		return err
+	}
+	db, err := gorm.Open(
+		sqlite.Open(filepath.Join("data", "sub2clash.db")), &gorm.Config{
+			Logger: nil,
+		},
+	)
+	if err != nil {
+		return err
 	}
 	if err != nil {
 		return err
@@ -24,3 +37,23 @@ func ConnectDB() error {
 	}
 	return nil
 }
+
+func FindShortLinkByUrl(url string, shortLink *model.ShortLink) *gorm.DB {
+	logger.Logger.Debug("find short link by url", zap.String("url", url))
+	return DB.Where("url = ?", url).First(&shortLink)
+}
+
+func FindShortLinkByHash(hash string, shortLink *model.ShortLink) *gorm.DB {
+	logger.Logger.Debug("find short link by hash", zap.String("hash", hash))
+	return DB.Where("hash = ?", hash).First(&shortLink)
+}
+
+func SaveShortLink(shortLink *model.ShortLink) {
+	logger.Logger.Debug("save short link", zap.String("hash", shortLink.Hash))
+	DB.Save(shortLink)
+}
+
+func FirstOrCreateShortLink(shortLink *model.ShortLink) {
+	logger.Logger.Debug("first or create short link", zap.String("hash", shortLink.Hash))
+	DB.FirstOrCreate(shortLink)
+}

utils/get.go

@@ -12,7 +12,15 @@ func Get(url string) (resp *http.Response, err error) {
 	haveTried := 0
 	retryDelay := time.Second // 延迟1秒再重试
 	for haveTried < retryTimes {
-		get, err := http.Get(url)
+		client := &http.Client{}
+		//client.Timeout = time.Second * 10
+		req, err := http.NewRequest("GET", url, nil)
+		if err != nil {
+			haveTried++
+			time.Sleep(retryDelay)
+			continue
+		}
+		get, err := client.Do(req)
 		if err != nil {
 			haveTried++
 			time.Sleep(retryDelay)

utils/mkdir.go

@@ -0,0 +1,30 @@
+package utils
+
+import (
+	"errors"
+	"os"
+)
+
+func MKDir(dir string) error {
+	if _, err := os.Stat(dir); os.IsNotExist(err) {
+		err := os.MkdirAll(dir, os.ModePerm)
+		if err != nil {
+
+			return err
+		}
+	}
+	return nil
+}
+
+func MkEssentialDir() error {
+	if err := MKDir("subs"); err != nil {
+		return errors.New("create subs dir failed" + err.Error())
+	}
+	if err := MKDir("templates"); err != nil {
+		return errors.New("create templates dir failed" + err.Error())
+	}
+	if err := MKDir("logs"); err != nil {
+		return errors.New("create logs dir failed" + err.Error())
+	}
+	return nil
+}

utils/os.go

@@ -1,16 +0,0 @@
-package utils
-
-import (
-	"os"
-)
-
-func MKDir(dir string) error {
-	if _, err := os.Stat(dir); os.IsNotExist(err) {
-		err := os.MkdirAll(dir, os.ModePerm)
-		if err != nil {
-
-			return err
-		}
-	}
-	return nil
-}

utils/proxy.go

@@ -1,13 +1,15 @@
 package utils
 
 import (
-	"sort"
 	"strings"
+	"sub2clash/logger"
 	"sub2clash/model"
 	"sub2clash/parser"
+
+	"go.uber.org/zap"
 )
 
-func GetContryName(proxy model.Proxy) string {
+func GetContryName(countryKey string) string {
 	// 创建一个切片包含所有的国家映射
 	countryMaps := []map[string]string{
 		model.CountryFlag,
@@ -17,25 +19,42 @@ func GetContryName(proxy model.Proxy) string {
 	}
 
 	// 对每一个映射进行检查
-	for _, countryMap := range countryMaps {
+	for i, countryMap := range countryMaps {
+		if i == 2 {
+			// 对ISO匹配做特殊处理
+			// 根据常用分割字符分割字符串
+			splitChars := []string{"-", "_", " "}
+			key := make([]string, 0)
+			for _, splitChar := range splitChars {
+				slic := strings.Split(countryKey, splitChar)
+				for _, v := range slic {
+					if len(v) == 2 {
+						key = append(key, v)
+					}
+				}
+			}
+			// 对每一个分割后的字符串进行检查
+			for _, v := range key {
+				// 如果匹配到了国家
+				if country, ok := countryMap[strings.ToUpper(v)]; ok {
+					return country
+				}
+			}
+		}
 		for k, v := range countryMap {
-			if strings.Contains(proxy.Name, k) {
+			if strings.Contains(countryKey, k) {
 				return v
 			}
 		}
 	}
-
 	return "其他地区"
 }
 
 func AddProxy(
 	sub *model.Subscription, autotest bool,
-	lazy bool, sortStrategy string,
-	clashType model.ClashType, proxies ...model.Proxy,
+	lazy bool, clashType model.ClashType, proxies ...model.Proxy,
 ) {
-	newCountryGroupNames := make([]string, 0)
 	proxyTypes := model.GetSupportProxyTypes(clashType)
-
 	// 添加节点
 	for _, proxy := range proxies {
 		if !proxyTypes[proxy.Type] {
@@ -43,7 +62,7 @@ func AddProxy(
 		}
 		sub.Proxies = append(sub.Proxies, proxy)
 		haveProxyGroup := false
-		countryName := GetContryName(proxy)
+		countryName := GetContryName(proxy.Name)
 		for i := range sub.ProxyGroups {
 			group := &sub.ProxyGroups[i]
 
@@ -82,29 +101,8 @@ func AddProxy(
 				}
 			}
 			sub.ProxyGroups = append(sub.ProxyGroups, newGroup)
-			newCountryGroupNames = append(newCountryGroupNames, countryName)
 		}
 	}
-	// 统计国家策略组数量
-	countryGroupCount := 0
-	for i := range sub.ProxyGroups {
-		if sub.ProxyGroups[i].IsCountryGrop {
-			countryGroupCount++
-		}
-	}
-	// 对国家策略组进行排序
-	switch sortStrategy {
-	case "sizeasc":
-		sort.Sort(model.ProxyGroupsSortBySize(sub.ProxyGroups[:countryGroupCount]))
-	case "sizedesc":
-		sort.Sort(sort.Reverse(model.ProxyGroupsSortBySize(sub.ProxyGroups[:countryGroupCount])))
-	case "nameasc":
-		sort.Sort(model.ProxyGroupsSortByName(sub.ProxyGroups[:countryGroupCount]))
-	case "namedesc":
-		sort.Sort(sort.Reverse(model.ProxyGroupsSortByName(sub.ProxyGroups[:countryGroupCount])))
-	default:
-		sort.Sort(model.ProxyGroupsSortByName(sub.ProxyGroups[:countryGroupCount]))
-	}
 }
 
 func ParseProxy(proxies ...string) []model.Proxy {
@@ -129,8 +127,15 @@ func ParseProxy(proxies ...string) []model.Proxy {
 			if strings.HasPrefix(proxy, "ssr://") {
 				proxyItem, err = parser.ParseShadowsocksR(proxy)
 			}
+			if strings.HasPrefix(proxy, "hysteria2://") {
+				proxyItem, err = parser.ParseHysteria2(proxy)
+			}
 			if err == nil {
 				result = append(result, proxyItem)
+			} else {
+				logger.Logger.Debug(
+					"parse proxy failed", zap.String("proxy", proxy), zap.Error(err),
+				)
 			}
 		}
 	}

utils/sub.go

@@ -35,7 +35,9 @@ func LoadSubscription(url string, refresh bool) ([]byte, error) {
 			return nil, err
 		}
 		defer func(file *os.File) {
-			_ = file.Close()
+			if file != nil {
+				_ = file.Close()
+			}
 		}(file)
 		fileLock.RLock()
 		defer fileLock.RUnlock()
@@ -56,7 +58,9 @@ func FetchSubscriptionFromAPI(url string) ([]byte, error) {
 		return nil, err
 	}
 	defer func(Body io.ReadCloser) {
-		_ = Body.Close()
+		if Body != nil {
+			_ = Body.Close()
+		}
 	}(resp.Body)
 	data, err := io.ReadAll(resp.Body)
 	if err != nil {
@@ -67,7 +71,9 @@ func FetchSubscriptionFromAPI(url string) ([]byte, error) {
 		return nil, err
 	}
 	defer func(file *os.File) {
-		_ = file.Close()
+		if file != nil {
+			_ = file.Close()
+		}
 	}(file)
 	fileLock.Lock()
 	defer fileLock.Unlock()

utils/template.go

@@ -17,7 +17,9 @@ func LoadTemplate(template string) ([]byte, error) {
 			return nil, err
 		}
 		defer func(file *os.File) {
-			_ = file.Close()
+			if file != nil {
+				_ = file.Close()
+			}
 		}(file)
 		result, err := io.ReadAll(file)
 		if err != nil {

utils/write_default_template.go

@@ -0,0 +1,39 @@
+package utils
+
+import (
+	"os"
+	"path/filepath"
+	"sub2clash/config"
+)
+
+func writeTemplate(path string, template string) error {
+	tPath := filepath.Join(
+		"templates", path,
+	)
+	if _, err := os.Stat(tPath); os.IsNotExist(err) {
+		file, err := os.Create(tPath)
+		if err != nil {
+			return err
+		}
+		defer func(file *os.File) {
+			if file != nil {
+				_ = file.Close()
+			}
+		}(file)
+		_, err = file.WriteString(template)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func WriteDefalutTemplate(templateMeta string, templateClash string) error {
+	if err := writeTemplate(config.Default.MetaTemplate, templateMeta); err != nil {
+		return err
+	}
+	if err := writeTemplate(config.Default.ClashTemplate, templateClash); err != nil {
+		return err
+	}
+	return nil
+}

validator/short_link.go

@@ -1,9 +1,11 @@
 package validator
 
 type ShortLinkGenValidator struct {
-	Url string `form:"url" binding:"required"`
+	Url      string `form:"url" binding:"required"`
+	Password string `form:"password"`
 }
 
 type ShortLinkGetValidator struct {
-	Hash string `form:"hash" binding:"required"`
+	Hash     string `form:"hash" binding:"required"`
+	Password string `form:"password"`
 }

validator/sub.go

@@ -4,11 +4,11 @@ import (
 	"crypto/sha256"
 	"encoding/hex"
 	"errors"
-	"github.com/gin-gonic/gin"
 	"net/url"
-	"os"
 	"regexp"
 	"strings"
+
+	"github.com/gin-gonic/gin"
 )
 
 type SubValidator struct {
@@ -25,6 +25,11 @@ type SubValidator struct {
 	AutoTest      bool                 `form:"autoTest,default=false" binding:""`
 	Lazy          bool                 `form:"lazy,default=false" binding:""`
 	Sort          string               `form:"sort" binding:""`
+	Remove        string               `form:"remove" binding:""`
+	Replace       string               `form:"replace" binding:""`
+	ReplaceKeys   []string             `form:"-" binding:""`
+	ReplaceTo     []string             `form:"-" binding:""`
+	NodeListMode  bool                 `form:"nodeList,default=false" binding:""`
 }
 
 type RuleProviderStruct struct {
@@ -67,13 +72,13 @@ func ParseQuery(c *gin.Context) (SubValidator, error) {
 		query.Proxies = nil
 	}
 	if query.Template != "" {
-		uri, err := url.ParseRequestURI(query.Template)
-		if err != nil {
-			if strings.Contains(query.Template, string(os.PathSeparator)) {
+		if strings.HasPrefix(query.Template, "http") {
+			uri, err := url.ParseRequestURI(query.Template)
+			if err != nil {
 				return SubValidator{}, err
 			}
+			query.Template = uri.String()
 		}
-		query.Template = uri.String()
 	}
 	if query.RuleProvider != "" {
 		reg := regexp.MustCompile(`\[(.*?)\]`)
@@ -135,5 +140,17 @@ func ParseQuery(c *gin.Context) (SubValidator, error) {
 	} else {
 		query.Rules = nil
 	}
+	if strings.TrimSpace(query.Replace) != "" {
+		reg := regexp.MustCompile(`\[<(.*?)>,<(.*?)>\]`)
+		replaces := reg.FindAllStringSubmatch(query.Replace, -1)
+		for i := range replaces {
+			length := len(replaces[i])
+			if length != 3 {
+				return SubValidator{}, errors.New("参数错误: replace 格式错误")
+			}
+			query.ReplaceKeys = append(query.ReplaceKeys, replaces[i][1])
+			query.ReplaceTo = append(query.ReplaceTo, replaces[i][2])
+		}
+	}
 	return query, nil
 }