Merge pull request #14 from nitezs/dev

Dev
2024-12-23 21:24:42 -05:00 · 2024-02-19 13:12:12 +08:00 · 2024-02-19 13:12:12 +08:00 · 3309a0c208
commit 3309a0c208
parent 50877b1691 f51958bd5b
28 changed files with 10493 additions and 10327 deletions
--- a/.env.example
+++ b/.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=/
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@ -2,16 +2,16 @@
 #  hooks:
 #    - go mod tidy
 builds:
-  - 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 }}"
+    - 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 }}"
--- a/.vscode/launch.json
+++ b/.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'"
+        }
+    ]
+}
--- a/API_README.md
+++ b/API_README.md
@ -2,20 +2,20 @@

 获取 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`   | 只输出节点                                                                                                                                                                       |                                                                                                                                                                       |
+| 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`

--- a/README.md
+++ b/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,20 +28,20 @@

 可以通过编辑 .env 文件来修改默认配置，docker 直接添加环境变量

-| 变量名                   | 说明                                                        | 默认值                   |
-|-----------------------|-----------------------------------------------------------|-----------------------|
-| 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`                   |
+| 变量名                   | 说明                                     | 默认值                   |
+|-----------------------|----------------------------------------|-----------------------|
+| 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                                       
+### API

-[API文档](./API_README.md)
+[API 文档](./API_README.md)

 ### 模板

--- a/api/controller/clash.go
+++ b/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) {
--- a/api/controller/default.go
+++ b/api/controller/default.go
@ -4,8 +4,6 @@ import (
 	"crypto/sha256"
 	"encoding/hex"
 	"errors"
-	"go.uber.org/zap"
-	"gopkg.in/yaml.v3"
 	"net/url"
 	"regexp"
 	"sort"
@ -16,6 +14,9 @@ import (
 	"sub2clash/parser"
 	"sub2clash/utils"
 	"sub2clash/validator"
+
+	"go.uber.org/zap"
+	"gopkg.in/yaml.v3"
 )

 func BuildSub(clashType model.ClashType, query validator.SubValidator, template string) (
@ -30,9 +31,8 @@ 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),
@ -40,7 +40,11 @@ func BuildSub(clashType model.ClashType, query validator.SubValidator, template
 			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),
@ -72,7 +76,7 @@ func BuildSub(clashType model.ClashType, query validator.SubValidator, template
 		err = yaml.Unmarshal(data, &sub)
 		newProxies := make([]model.Proxy, 0)
 		if err != nil {
-			reg, _ := regexp.Compile("(ssr|ss|vmess|trojan|vless)://")
+			reg, _ := regexp.Compile("(ssr|ss|vmess|trojan|vless|hysteria)://")
 			if reg.Match(data) {
 				p := utils.ParseProxy(strings.Split(string(data), "\n")...)
 				newProxies = p
--- a/api/controller/meta.go
+++ b/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) {
--- a/api/controller/short_link.go
+++ b/api/controller/short_link.go
@ -2,9 +2,6 @@ package controller

 import (
 	"errors"
-	"github.com/gin-gonic/gin"
-	"go.uber.org/zap"
-	"gorm.io/gorm"
 	"io"
 	"net/http"
 	"strconv"
@ -16,6 +13,10 @@ import (
 	"sub2clash/utils/database"
 	"sub2clash/validator"
 	"time"
+
+	"github.com/gin-gonic/gin"
+	"go.uber.org/zap"
+	"gorm.io/gorm"
 )

 func ShortLinkGenHandler(c *gin.Context) {
--- a/api/route.go
+++ b/api/route.go
@ -2,13 +2,14 @@ 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 static
--- a/api/static/index.html
+++ b/api/static/index.html
@ -1,258 +1,285 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="zh-CN">
-  <head>
-    <meta charset="UTF-8" />
-    <meta content="width=device-width, initial-scale=1.0" name="viewport" />
+<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"
+            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"
+            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;
-      }
+        .container {
+            max-width: 800px;
+        }

-      .btn-xs {
-        padding: 2px 2px; /* 调整内边距以减小按钮大小 */
-        font-size: 10px; /* 设置字体大小 */
-        line-height: 1.2; /* 调整行高 */
-        border-radius: 3px; /* 可选的边框半径调整 */
-        height: 25px;
-        width: 25px;
-      }
+        .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">
+</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>
+        >通用订阅链接转 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">
+    <!-- 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>
+            <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">
+    </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>
+            <option value="clash">Clash</option>
+            <option value="meta">Clash.Meta</option>
        </select>
-      </div>
-      <!-- Template -->
-      <div class="form-group mb-3">
+    </div>
+    <!-- Template -->
+    <div class="form-group mb-3">
        <label for="template">模板链接或名称:</label>
        <input
-          class="form-control"
-          id="template"
-          name="template"
-          placeholder="输入外部模板链接或内部模板名称（可选）"
-          type="text"
+                class="form-control"
+                id="template"
+                name="template"
+                placeholder="输入外部模板链接或内部模板名称（可选）"
+                type="text"
        />
-      </div>
-      <!-- Subscription Link -->
-      <div class="form-group mb-3">
+    </div>
+    <!-- Subscription Link -->
+    <div class="form-group mb-3">
        <label for="sub">订阅链接:</label>
        <textarea
-          class="form-control"
-          id="sub"
-          name="sub"
-          placeholder="每行输入一个订阅链接"
-          rows="5"
+                class="form-control"
+                id="sub"
+                name="sub"
+                placeholder="每行输入一个订阅链接"
+                rows="5"
        ></textarea>
-      </div>
-      <!-- Proxy Link -->
-      <div class="form-group mb-3">
+    </div>
+    <!-- Proxy Link -->
+    <div class="form-group mb-3">
        <label for="proxy">节点分享链接:</label>
        <textarea
-          class="form-control"
-          id="proxy"
-          name="proxy"
-          placeholder="每行输入一个节点分享链接"
-          rows="5"
+                class="form-control"
+                id="proxy"
+                name="proxy"
+                placeholder="每行输入一个节点分享链接"
+                rows="5"
        ></textarea>
-      </div>
-      <!-- Refresh -->
-      <div class="form-check mb-3">
+    </div>
+    <!-- Refresh -->
+    <div class="form-check mb-3">
        <input
-          class="form-check-input"
-          id="refresh"
-          name="refresh"
-          type="checkbox"
+                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">
+        <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"
+                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">
+        <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"
+                class="form-check-input"
+                id="autoTest"
+                name="autoTest"
+                type="checkbox"
        />
        <label class="form-check-label" for="autoTest"
-          >国家策略组自动测速</label
+        >国家策略组自动测速</label
        >
-      </div>
-      <!-- Lazy -->
-      <div class="form-check mb-3">
-        <input class="form-check-input" id="lazy" name="lazy" type="checkbox" />
+    </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
+        >自动测速启用 lazy 模式</label
        >
-      </div>
-      <!-- Rule Provider -->
-      <div class="form-group mb-3" id="ruleProviderGroup">
+    </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"
+                class="btn btn-primary mb-1 btn-xs"
+                onclick="addRuleProvider()"
+                type="button"
        >
-          +
+            +
        </button>
-      </div>
-      <!-- Rule -->
-      <div class="form-group mb-3" id="ruleGroup">
+    </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"
+                class="btn btn-primary mb-1 btn-xs"
+                onclick="addRule()"
+                type="button"
        >
-          +
+            +
        </button>
-      </div>
-      <!-- Sort -->
-      <div class="form-group mb-3">
+    </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>
+            <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">
+    </div>
+    <!-- Remove -->
+    <div class="form-group mb-3">
        <label for="remove">排除节点:</label>
        <input
-          class="form-control"
-          type="text"
-          name="remove"
-          id="remove"
-          placeholder="正则表达式"
+                class="form-control"
+                type="text"
+                name="remove"
+                id="remove"
+                placeholder="正则表达式"
        />
-      </div>
-      <!-- Rename  -->
-      <div class="form-group mb-3" id="replaceGroup">
+    </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"
+                class="btn btn-primary mb-1 btn-xs"
+                onclick="addReplace()"
+                type="button"
        >
-          +
+            +
        </button>
-      </div>
+    </div>

-      <!-- Display the API Link -->
-      <div class="form-group mb-5">
+    <!-- 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>
+            <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>
+            <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>
+    </div>
+    <!-- footer-->
+    <footer>
        <p class="text-center">
-          Powered by
-          <a class="link-primary" href="https://github.com/nitezs/sub2clash"
+            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>
+    </footer>
+</div>
+</body>
 </html>
--- a/api/static/index.js
+++ b/api/static/index.js
@ -1,329 +1,335 @@
 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;
+    // 清除简单输入框和复选框的值
+    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");
+    // 清除由 createRuleProvider, createReplace, 和 createRule 创建的所有额外输入组
+    clearInputGroup("ruleProviderGroup");
+    clearInputGroup("replaceGroup");
+    clearInputGroup("ruleGroup");
 }

 function generateURI() {
-  const queryParams = [];
+    const queryParams = [];

-  // 获取 API Endpoint
-  const endpoint = document.getElementById("endpoint").value;
+    // 获取 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;
+    // 获取并组合订阅链接
+    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;
    }
-  });
-  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;
+    // 获取并组合节点分享链接
+    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 (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 中存在空值，请检查后重试！");
+    if (noSub && noProxy) {
+        alert("订阅链接和节点分享链接不能同时为空！");
        return "";
-      }
-      ruleList.push(`[${rule},${prepend},${group}]`);
    }
-  }
-  queryParams.push(`rule=${encodeURIComponent(ruleList.join(","))}`);
+    // 获取复选框的值
+    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 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 "";
+    // 获取模板链接或名称（如果存在）
+    const template = document.getElementById("template").value;
+    if (template.trim() !== "") {
+        queryParams.push(`template=${encodeURIComponent(template)}`);
    }
-    replaceList.push(`[${replaceStr},${replaceTo}]`);
-  }
-  queryParams.push(`replace=${encodeURIComponent(replaceList.join(","))}`);

-  return `${endpoint}?${queryParams.join("&")}`;
+    // 获取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;
+    // 获取输入框中的 URL
+    const inputURL = document.getElementById("urlInput").value;

-  if (!inputURL) {
-    alert("请输入有效的链接！");
-    return;
-  }
+    if (!inputURL) {
+        alert("请输入有效的链接！");
+        return;
+    }

-  let url;
-  try {
-    url = new URL(inputURL);
-  } catch (_) {
-    alert("无效的链接！");
-    return;
-  }
+    let url;
+    try {
+        url = new URL(inputURL);
+    } catch (_) {
+        alert("无效的链接！");
+        return;
+    }

-  // 清除现有的输入框值
-  clearExistingValues();
+    // 清除现有的输入框值
+    clearExistingValues();

-  // 获取查询参数
-  const params = new URLSearchParams(url.search);
+    // 获取查询参数
+    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;
-  }
+    // 分配值到对应的输入框
+    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("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("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("refresh")) {
+        document.getElementById("refresh").checked =
+            params.get("refresh") === "true";
+    }

-  if (params.has("autoTest")) {
-    document.getElementById("autoTest").checked =
-      params.get("autoTest") === "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("lazy")) {
+        document.getElementById("lazy").checked = params.get("lazy") === "true";
+    }

-  if (params.has("template")) {
-    document.getElementById("template").value = decodeURIComponent(
-      params.get("template"),
-    );
-  }
+    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("sort")) {
+        document.getElementById("sort").value = params.get("sort");
+    }

-  if (params.has("remove")) {
-    document.getElementById("remove").value = decodeURIComponent(
-      params.get("remove"),
-    );
-  }
+    if (params.has("remove")) {
+        document.getElementById("remove").value = decodeURIComponent(
+            params.get("remove")
+        );
+    }

-  if (params.has("replace")) {
-    parseAndFillReplaceParams(decodeURIComponent(params.get("replace")));
-  }
+    if (params.has("replace")) {
+        parseAndFillReplaceParams(decodeURIComponent(params.get("replace")));
+    }

-  if (params.has("ruleProvider")) {
-    parseAndFillRuleProviderParams(
-      decodeURIComponent(params.get("ruleProvider")),
-    );
-  }
+    if (params.has("ruleProvider")) {
+        parseAndFillRuleProviderParams(
+            decodeURIComponent(params.get("ruleProvider"))
+        );
+    }

-  if (params.has("rule")) {
-    parseAndFillRuleParams(decodeURIComponent(params.get("rule")));
-  }
+    if (params.has("rule")) {
+        parseAndFillRuleParams(decodeURIComponent(params.get("rule")));
+    }

-  if (params.has("nodeList")) {
-    document.getElementById("nodeList").checked =
-      params.get("nodeList") === "true";
-  }
+    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);
-  }
+    // 清空第二个之后的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 >
+    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);
-  }
+        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);
-  }
+    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);
-  }
+    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);
-  }
+    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 = `
+    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">
@ -331,85 +337,85 @@ function createRuleProvider() {
            <input type="text" class="form-control" name="ruleProvider" placeholder="Name">
            <button type="button" class="btn btn-danger" onclick="removeElement(this)">删除</button>
        `;
-  return div;
+    return div;
 }

 function createReplace() {
-  const div = document.createElement("div");
-  div.classList.add("input-group", "mb-2");
-  div.innerHTML = `
+    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;
+    return div;
 }

 function createRule() {
-  const div = document.createElement("div");
-  div.classList.add("input-group", "mb-2");
-  div.innerHTML = `
+    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;
+    return div;
 }

 function addRuleProvider() {
-  const div = createRuleProvider();
-  document.getElementById("ruleProviderGroup").appendChild(div);
+    const div = createRuleProvider();
+    document.getElementById("ruleProviderGroup").appendChild(div);
 }

 function addRule() {
-  const div = createRule();
-  document.getElementById("ruleGroup").appendChild(div);
+    const div = createRule();
+    document.getElementById("ruleGroup").appendChild(div);
 }

 function addReplace() {
-  const div = createReplace();
-  document.getElementById("replaceGroup").appendChild(div);
+    const div = createReplace();
+    document.getElementById("replaceGroup").appendChild(div);
 }

 function removeElement(button) {
-  button.parentElement.remove();
+    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}`;
+    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("生成短链失败，请重试！");
-    });
+    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("生成短链失败，请重试！");
+        });
 }
--- a/config/config.go
+++ b/config/config.go
@ -2,9 +2,10 @@ package config

 import (
 	"errors"
-	"github.com/joho/godotenv"
 	"os"
 	"strconv"
+
+	"github.com/joho/godotenv"
 )

 type Config struct {
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -1,21 +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
-      - ./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
+    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
--- a/logger/logger.go
+++ b/logger/logger.go
@ -1,11 +1,12 @@
 package logger

 import (
-	"go.uber.org/zap"
-	"go.uber.org/zap/zapcore"
 	"path/filepath"
 	"sync"
 	"time"
+
+	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
 )

 var (
--- a/main.go
+++ b/main.go
@ -2,8 +2,6 @@ package main

 import (
 	_ "embed"
-	"github.com/gin-gonic/gin"
-	"go.uber.org/zap"
 	"io"
 	"strconv"
 	"sub2clash/api"
@ -11,6 +9,9 @@ import (
 	"sub2clash/logger"
 	"sub2clash/utils"
 	"sub2clash/utils/database"
+
+	"github.com/gin-gonic/gin"
+	"go.uber.org/zap"
 )

 //go:embed templates/template_meta.yaml
--- a/middleware/logger.go
+++ b/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 {
--- a/model/clash.go
+++ b/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
--- a/model/proxy.go
+++ b/model/proxy.go
@ -45,6 +45,11 @@ type Proxy struct {
 	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) {
@ -59,6 +64,8 @@ func (p Proxy) MarshalYAML() (interface{}, error) {
 		return ProxyToVless(p), nil
 	case "trojan":
 		return ProxyToTrojan(p), nil
+	case "hysteria2":
+		return ProxyToHysteria2(p), nil
 	}
 	return nil, nil
 }
--- a/model/proxy_hysteria2.go
+++ b/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,
+	}
+}
--- a/model/proxy_vmess.go
+++ b/model/proxy_vmess.go
@ -16,8 +16,8 @@ type GrpcOptions struct {
 }

 type RealityOptions struct {
-	PublicKey string `proxy:"public-key"`
-	ShortID   string `proxy:"short-id"`
+	PublicKey string `yaml:"public-key"`
+	ShortID   string `yaml:"short-id,omitempty"`
 }

 type WSOptions struct {
--- a/parser/hysteria2.go
+++ b/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
+}
--- a/parser/vless.go
+++ b/parser/vless.go
@ -36,17 +36,17 @@ 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"),
+		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"),
 		},
--- a/templates/template_clash.yaml
+++ b/templates/template_clash.yaml
--- a/templates/template_meta.yaml
+++ b/templates/template_meta.yaml
@ -5,123 +5,123 @@ mode: Rule
 log-level: info
 proxies:
 proxy-groups:
-  - 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
+    - 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,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,漏网之鱼
+    - 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,漏网之鱼
--- a/utils/database/database.go
+++ b/utils/database/database.go
@ -1,13 +1,14 @@
 package database

 import (
-	"github.com/glebarez/sqlite"
-	"go.uber.org/zap"
-	"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
--- a/utils/proxy.go
+++ b/utils/proxy.go
@ -1,11 +1,12 @@
 package utils

 import (
-	"go.uber.org/zap"
 	"strings"
 	"sub2clash/logger"
 	"sub2clash/model"
 	"sub2clash/parser"
+
+	"go.uber.org/zap"
 )

 func GetContryName(countryKey string) string {
@ -126,6 +127,9 @@ 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 {
--- a/validator/sub.go
+++ b/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 {
@ -72,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(`\[(.*?)\]`)