Dev (#2)

fix: 修复当订阅链接有多个 clash 配置时丢失节点的问题
update: 增加检测更新
modify: 修改数据库路径
modify: 修改短链生成逻辑
modify: 统一输出信息

.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

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

.goreleaser.yaml

@@ -10,10 +10,8 @@ builds:
       - darwin
     goarch:
       - amd64
-      - arm
       - arm64
-      - 386
     ldflags:
-      - -s -w
+      - -s -w -X sub2clash/config.Version={{ .Version }}
     no_unique_dist_dir: true
     binary: "{{ .ProjectName }}-{{ .Os }}-{{ .Arch }}"

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

@@ -35,6 +35,7 @@
 | REQUEST_MAX_FILE_SIZE | Get 请求订阅文件最大大小（byte）                                      | `1048576`             |
 | CACHE_EXPIRE          | 订阅缓存时间（秒）                                                 | `300`                 |
 | LOG_LEVEL             | 日志等级，可选值 `debug`,`info`,`warn`,`error`                    | `info`                |
+| SHORT_LINK_LENGTH     | 短链长度                                                      | `6`                   |
 
 ### API
 

api/controller/default.go

@@ -7,6 +7,7 @@ import (
 	"gopkg.in/yaml.v3"
 	"net/url"
 	"regexp"
+	"sort"
 	"strings"
 	"sub2clash/model"
 	"sub2clash/parser"
@@ -43,6 +44,7 @@ func BuildSub(clashType model.ClashType, query validator.SubValidator, template
 	if err != nil {
 		return nil, errors.New("解析模板失败: " + err.Error())
 	}
+	var proxyList []model.Proxy
 	// 加载订阅
 	for i := range query.Subs {
 		data, err := utils.LoadSubscription(query.Subs[i], query.Refresh)
@@ -50,31 +52,49 @@ func BuildSub(clashType model.ClashType, query validator.SubValidator, template
 			return nil, errors.New("加载订阅失败: " + err.Error())
 		}
 		// 解析订阅
-		var proxyList []model.Proxy
+
 		err = yaml.Unmarshal(data, &sub)
 		if err != nil {
 			reg, _ := regexp.Compile("(ssr|ss|vmess|trojan|http|https)://")
 			if reg.Match(data) {
-				proxyList = utils.ParseProxy(strings.Split(string(data), "\n")...)
+				p := utils.ParseProxy(strings.Split(string(data), "\n")...)
+				proxyList = append(proxyList, p...)
 			} else {
 				// 如果无法直接解析，尝试Base64解码
 				base64, err := parser.DecodeBase64(string(data))
 				if err != nil {
 					return nil, errors.New("加载订阅失败: " + err.Error())
 				}
-				proxyList = utils.ParseProxy(strings.Split(base64, "\n")...)
+				p := utils.ParseProxy(strings.Split(base64, "\n")...)
+				proxyList = append(proxyList, p...)
 			}
 		} else {
-			proxyList = sub.Proxies
+			proxyList = append(proxyList, sub.Proxies...)
 		}
-		utils.AddProxy(sub, query.AutoTest, query.Lazy, query.Sort, clashType, proxyList...)
 	}
+	// 将新增节点都添加到临时变量 t 中，防止策略组排序错乱
+	var t = &model.Subscription{}
+	utils.AddProxy(t, query.AutoTest, query.Lazy, clashType, proxyList...)
 	// 处理自定义代理
 	utils.AddProxy(
-		sub, query.AutoTest, query.Lazy, query.Sort, clashType,
+		t, query.AutoTest, query.Lazy, clashType,
 		utils.ParseProxy(query.Proxies...)...,
 	)
-	MergeSubAndTemplate(temp, sub)
+	// 排序策略组
+	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 {

api/controller/short_link.go

@@ -1,12 +1,14 @@
 package controller
 
 import (
-	"crypto/sha256"
+	"errors"
-	"encoding/hex"
 	"github.com/gin-gonic/gin"
+	"gorm.io/gorm"
 	"net/http"
+	"strings"
 	"sub2clash/config"
 	"sub2clash/model"
+	"sub2clash/utils"
 	"sub2clash/utils/database"
 	"sub2clash/validator"
 	"time"
@@ -18,12 +20,32 @@ func ShortLinkGenHandler(c *gin.Context) {
 	if err := c.ShouldBind(&params); err != nil {
 		c.String(400, "参数错误: "+err.Error())
 	}
-	// 生成短链接
+	if strings.TrimSpace(params.Url) == "" {
-	//hash := utils.RandomString(6)
+		c.String(400, "参数错误")
-	shortLink := sha256.Sum224([]byte(params.Url))
+		return
-	hash := hex.EncodeToString(shortLink[:])
+	}
+	// 生成hash
+	hash := utils.RandomString(config.Default.ShortLinkLength)
 	// 存入数据库
-	database.DB.FirstOrCreate(
+	var item model.ShortLink
+	result := database.FindShortLinkByUrl(params.Url, &item)
+	if result.Error == nil {
+		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,
@@ -37,17 +59,21 @@ func ShortLinkGenHandler(c *gin.Context) {
 func ShortLinkGetHandler(c *gin.Context) {
 	// 获取动态路由
 	hash := c.Param("hash")
+	if strings.TrimSpace(hash) == "" {
+		c.String(400, "参数错误")
+		return
+	}
 	// 查询数据库
 	var shortLink model.ShortLink
-	result := database.DB.Where("hash = ?", hash).First(&shortLink)
+	result := database.FindShortLinkByHash(hash, &shortLink)
-	// 更新最后访问时间
-	shortLink.LastRequestTime = time.Now().Unix()
-	database.DB.Save(&shortLink)
 	// 重定向
 	if result.Error != nil {
 		c.String(404, "未找到短链接")
 		return
 	}
+	// 更新最后访问时间
+	shortLink.LastRequestTime = time.Now().Unix()
+	database.SaveShortLink(&shortLink)
 	uri := config.Default.BasePath + shortLink.Url
 	c.Redirect(http.StatusTemporaryRedirect, uri)
 }

api/route.go

@@ -5,6 +5,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"html/template"
 	"sub2clash/api/controller"
+	"sub2clash/config"
 	"sub2clash/middleware"
 )
 
@@ -17,7 +18,11 @@ func SetRoute(r *gin.Engine) {
 	r.SetHTMLTemplate(template.Must(template.New("").ParseFS(templates, "templates/*")))
 	r.GET(
 		"/", func(c *gin.Context) {
-			c.HTML(200, "index.html", nil)
+			c.HTML(
+				200, "index.html", gin.H{
+					"Version": config.Version,
+				},
+			)
 		},
 	)
 	r.GET(

api/templates/index.html

@@ -1,19 +1,24 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="zh-CN">
-
   <head>
-    <meta charset="UTF-8">
+    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta content="width=device-width, initial-scale=1.0" name="viewport" />
     <title>sub2clash</title>
 
     <!-- Bootstrap CSS -->
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet"
+    <link
-          integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
+      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 src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"
+    <script
+      crossorigin="anonymous"
       integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL"
-            crossorigin="anonymous"></script>
+      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/dist/axios.min.js"></script>
@@ -35,16 +40,20 @@
   </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
+        <span class="text-muted fst-italic"
-                href="https://github.com/nitezs/sub2clash#clash-meta" target="_blank">使用文档</a></span>
+          >通用订阅链接转 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>
@@ -57,51 +66,96 @@
         <!-- Subscription Link -->
         <div class="form-group mb-3">
           <label for="sub">订阅链接:</label>
-            <textarea class="form-control" id="sub" name="sub" rows="5" placeholder="每行输入一个订阅链接"></textarea>
+          <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" rows="5"
+          <textarea
-                      placeholder="每行输入一个节点分享链接"></textarea>
+            class="form-control"
+            id="proxy"
+            name="proxy"
+            placeholder="每行输入一个节点分享链接"
+            rows="5"
+          ></textarea>
         </div>
 
         <!-- Refresh -->
         <div class="form-check mb-3">
-            <input type="checkbox" class="form-check-input" id="refresh" name="refresh">
+          <input
+            class="form-check-input"
+            id="refresh"
+            name="refresh"
+            type="checkbox"
+          />
           <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"
+          <input
-                   placeholder="输入外部模板链接或内部模板名称">
+            class="form-control"
+            id="template"
+            name="template"
+            placeholder="输入外部模板链接或内部模板名称"
+            type="text"
+          />
         </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>
+          <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 type="button" class="btn btn-primary mb-1 btn-xs" onclick="addRule()">+</button>
+          <button
+            class="btn btn-primary mb-1 btn-xs"
+            onclick="addRule()"
+            type="button"
+          >
+            +
+          </button>
         </div>
 
         <!-- Auto Test -->
         <div class="form-check mb-3">
-            <input type="checkbox" class="form-check-input" id="autoTest" name="autoTest">
+          <input
-            <label class="form-check-label" for="autoTest">指定国家策略组是否自动测速</label>
+            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 type="checkbox" class="form-check-input" id="lazy" name="lazy">
+          <input
-            <label class="form-check-label" for="lazy">自动测速是否启用 lazy</label>
+            class="form-check-input"
+            id="lazy"
+            name="lazy"
+            type="checkbox"
+          />
+          <label class="form-check-label" for="lazy">自动测速启用 lazy</label>
         </div>
 
         <!-- Sort -->
@@ -120,24 +174,47 @@
       <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>
+          <input class="form-control" id="apiLink" readonly type="text" />
-            <button class="btn btn-primary" type="button" onclick="generateURL()">生成链接</button>
+          <button class="btn btn-primary" onclick="generateURL()" type="button">
-            <button class="btn btn-primary" type="button" onclick="copyToClipboard('apiLink',this)">复制链接</button>
+            生成链接
+          </button>
+          <button
+            class="btn btn-primary"
+            onclick="copyToClipboard('apiLink',this)"
+            type="button"
+          >
+            复制链接
+          </button>
         </div>
         <div class="input-group">
-            <input type="text" class="form-control" id="apiShortLink" readonly>
+          <input class="form-control" id="apiShortLink" readonly type="text" />
-            <button class="btn btn-primary" type="button" onclick="generateShortLink()">生成短链</button>
+          <button
-            <button class="btn btn-primary" type="button" onclick="copyToClipboard('apiShortLink',this)">复制短链
+            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"
+        <p class="text-center">
-                                             href="https://github.com/nitezs/sub2clash">sub2clash</a></p>
+          Powered by
+          <a class="link-primary" href="https://github.com/nitezs/sub2clash"
+            >sub2clash</a
+          >
+        </p>
+        <p class="text-center">Version {{.Version}}</p>
       </footer>
-
     </div>
 
     <script>
@@ -151,13 +228,13 @@
           });
           e.textContent = "复制成功";
         } catch (err) {
-            console.error('复制到剪贴板失败:', err);
+          console.error("复制到剪贴板失败:", err);
         }
       }
 
       function createRuleProvider() {
-        const div = document.createElement('div');
+        const div = document.createElement("div");
-        div.classList.add('input-group', 'mb-2');
+        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">
@@ -170,8 +247,8 @@
       }
 
       function createRule() {
-        const div = document.createElement('div');
+        const div = document.createElement("div");
-        div.classList.add('input-group', 'mb-2');
+        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">
@@ -183,12 +260,12 @@
 
       function addRuleProvider() {
         const div = createRuleProvider();
-        document.getElementById('ruleProviderGroup').appendChild(div);
+        document.getElementById("ruleProviderGroup").appendChild(div);
       }
 
       function addRule() {
         const div = createRule();
-        document.getElementById('ruleGroup').appendChild(div);
+        document.getElementById("ruleGroup").appendChild(div);
       }
 
       function removeElement(button) {
@@ -202,8 +279,11 @@
         const endpoint = document.getElementById("endpoint").value;
 
         // 获取并组合订阅链接
-        let subLines = document.getElementById("sub").value.split('\n').filter(line => line.trim() !== "");
+        let subLines = document
-        let noSub = false
+          .getElementById("sub")
+          .value.split("\n")
+          .filter((line) => line.trim() !== "");
+        let noSub = false;
         // 去除 subLines 中空元素
         subLines = subLines.map((item) => {
           if (item !== "") {
@@ -211,14 +291,17 @@
           }
         });
         if (subLines.length > 0) {
-            queryParams.push(`sub=${encodeURIComponent(subLines.join(','))}`);
+          queryParams.push(`sub=${encodeURIComponent(subLines.join(","))}`);
         } else {
-            noSub = true
+          noSub = true;
         }
 
         // 获取并组合节点分享链接
-        let proxyLines = document.getElementById("proxy").value.split('\n').filter(line => line.trim() !== "");
+        let proxyLines = document
-        let noProxy = false
+          .getElementById("proxy")
+          .value.split("\n")
+          .filter((line) => line.trim() !== "");
+        let noProxy = false;
         // 去除 proxyLines 中空元素
         proxyLines = proxyLines.map((item) => {
           if (item !== "") {
@@ -226,21 +309,21 @@
           }
         });
         if (proxyLines.length > 0) {
-            queryParams.push(`proxy=${encodeURIComponent(proxyLines.join(','))}`);
+          queryParams.push(`proxy=${encodeURIComponent(proxyLines.join(","))}`);
         } else {
-            noProxy = true
+          noProxy = true;
         }
         if (noSub && noProxy) {
-            alert("订阅链接和节点分享链接不能同时为空！")
+          alert("订阅链接和节点分享链接不能同时为空！");
-            return
+          return "";
         }
         // 获取复选框的值
         const refresh = document.getElementById("refresh").checked;
-        queryParams.push(`refresh=${refresh ? 'true' : 'false'}`);
+        queryParams.push(`refresh=${refresh ? "true" : "false"}`);
         const autoTest = document.getElementById("autoTest").checked;
-        queryParams.push(`autoTest=${autoTest ? 'true' : 'false'}`);
+        queryParams.push(`autoTest=${autoTest ? "true" : "false"}`);
         const lazy = document.getElementById("lazy").checked;
-        queryParams.push(`lazy=${lazy ? 'true' : 'false'}`);
+        queryParams.push(`lazy=${lazy ? "true" : "false"}`);
 
         // 获取模板链接或名称（如果存在）
         const template = document.getElementById("template").value;
@@ -260,13 +343,21 @@
           let prepend = ruleProviders[baseIndex + 3].value;
           let name = ruleProviders[baseIndex + 4].value;
           // 是否存在空值
-            if (behavior.trim() === "" || url.trim() === "" || group.trim() === "" || prepend.trim() === "" || name.trim() === "") {
+          if (
+            behavior.trim() === "" ||
+            url.trim() === "" ||
+            group.trim() === "" ||
+            prepend.trim() === "" ||
+            name.trim() === ""
+          ) {
             alert("Rule Provider 中存在空值，请检查后重试！");
-                return;
+            return "";
           }
           providers.push(`[${behavior},${url},${group},${prepend},${name}]`);
         }
-        queryParams.push(`ruleProvider=${encodeURIComponent(providers.join(','))}`);
+        queryParams.push(
+          `ruleProvider=${encodeURIComponent(providers.join(","))}`,
+        );
 
         let ruleList = [];
         for (let i = 0; i < rules.length / 3; i++) {
@@ -275,43 +366,60 @@
             let prepend = rules[i * 3 + 1].value;
             let group = rules[i * 3 + 2].value;
             // 是否存在空值
-                if (rule.trim() === "" || prepend.trim() === "" || group.trim() === "") {
+            if (
+              rule.trim() === "" ||
+              prepend.trim() === "" ||
+              group.trim() === ""
+            ) {
               alert("Rule 中存在空值，请检查后重试！");
-                    return;
+              return "";
             }
             ruleList.push(`[${rule},${prepend},${group}]`);
           }
         }
-        queryParams.push(`rule=${encodeURIComponent(ruleList.join(','))}`);
+        queryParams.push(`rule=${encodeURIComponent(ruleList.join(","))}`);
 
         // 获取排序策略
         const sort = document.getElementById("sort").value;
         queryParams.push(`sort=${sort}`);
-        return `${endpoint}?${queryParams.join('&')}`;
+        return `${endpoint}?${queryParams.join("&")}`;
       }
 
       function generateURL() {
         const apiLink = document.getElementById("apiLink");
-        apiLink.value = `${window.location.origin}${window.location.pathname}${generateURI()}`;
+        let uri = generateURI();
+        if (uri === "") {
+          return;
+        }
+        apiLink.value = `${window.location.origin}${window.location.pathname}${uri}`;
       }
 
       function generateShortLink() {
         const apiShortLink = document.getElementById("apiShortLink");
-
+        let uri = generateURI();
-        axios.post("./short", {
+        if (uri === "") {
-            "url": generateURI()
+          return;
-        }, {
-            headers: {
-                "Content-Type": "application/json"
         }
-        }).then((response) => {
+        axios
+          .post(
+            "./short",
+            {
+              url: uri,
+            },
+            {
+              headers: {
+                "Content-Type": "application/json",
+              },
+            },
+          )
+          .then((response) => {
             apiShortLink.value = `${window.location.origin}${window.location.pathname}s/${response.data}`;
-        }).catch((error) => {
+          })
+          .catch((error) => {
             console.log(error);
             alert("生成短链失败，请重试！");
-        })
+          });
       }
     </script>
-
   </body>
 </html>

config/config.go

@@ -1,6 +1,7 @@
 package config
 
 import (
+	"errors"
 	"github.com/joho/godotenv"
 	"os"
 	"strconv"
@@ -15,11 +16,14 @@ type Config struct {
 	CacheExpire        int64
 	LogLevel           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",
@@ -29,12 +33,13 @@ func init() {
 		CacheExpire:        60 * 5,
 		LogLevel:           "info",
 		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,21 +52,21 @@ 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)
 	}
@@ -74,4 +79,12 @@ func init() {
 			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

@@ -9,7 +9,8 @@ services:
       - "8011:8011"
     volumes:
       - ./logs:/app/logs
-      # - ./templates:/app/templates
+      - ./templates:/app/templates
+      - ./data:/app/data
     # environment:
     #   - PORT=8011
     #   - META_TEMPLATE=template_meta.yaml

logger/logger.go

@@ -4,8 +4,6 @@ import (
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 	"path/filepath"
-	"sub2clash/config"
-	"sub2clash/utils"
 	"sync"
 	"time"
 )
@@ -13,9 +11,11 @@ import (
 var (
 	Logger   *zap.Logger
 	lock     sync.Mutex
+	logLevel string
 )
 
-func init() {
+func InitLogger(level string) {
+	logLevel = level
 	buildLogger()
 	go rotateLogs()
 }
@@ -24,7 +24,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 +36,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 +43,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

@@ -5,8 +5,6 @@ import (
 	"github.com/gin-gonic/gin"
 	"go.uber.org/zap"
 	"io"
-	"os"
-	"path/filepath"
 	"strconv"
 	"sub2clash/api"
 	"sub2clash/config"
@@ -21,43 +19,44 @@ 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)
+	err := config.LoadConfig()
-	}
+	// 初始化日志
-	if err := utils.MKDir("templates"); err != nil {
+	logger.InitLogger(config.Default.LogLevel)
-		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()
 	if err != nil {
-		panic(err)
+		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.MkEssentialDir()
+	if err != nil {
+		logger.Logger.Panic("create essential dir failed", zap.Error(err))
+	}
+	// 写入默认模板
+	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 +68,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
 	}
 }

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_group.go

@@ -39,7 +39,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
 }
 

parser/ss.go

@@ -12,12 +12,12 @@ import (
 func ParseSS(proxy string) (model.Proxy, error) {
 	// 判断是否以 ss:// 开头
 	if !strings.HasPrefix(proxy, "ss://") {
-		return model.Proxy{}, fmt.Errorf("无效的 ss Url")
+		return model.Proxy{}, fmt.Errorf("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{}, fmt.Errorf("invalid ss Url")
 	}
 	if !strings.Contains(parts[0], ":") {
 		// 解码
@@ -29,13 +29,13 @@ func ParseSS(proxy string) (model.Proxy, error) {
 	}
 	credentials := strings.SplitN(parts[0], ":", 2)
 	if len(credentials) != 2 {
-		return model.Proxy{}, fmt.Errorf("无效的 ss 凭证")
+		return model.Proxy{}, fmt.Errorf("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{}, fmt.Errorf("invalid ss Url")
 	}
 	// 转换端口字符串为数字
 	port, err := strconv.Atoi(strings.TrimSpace(serverAndPort[1]))

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

parser/vmess.go

@@ -12,7 +12,7 @@ import (
 func ParseVmess(proxy string) (model.Proxy, error) {
 	// 判断是否以 vmess:// 开头
 	if !strings.HasPrefix(proxy, "vmess://") {
-		return model.Proxy{}, fmt.Errorf("无效的 vmess Url")
+		return model.Proxy{}, fmt.Errorf("invalid vmess Url")
 	}
 	// 解码
 	base64, err := DecodeBase64(strings.TrimPrefix(proxy, "vmess://"))

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

@@ -2,17 +2,29 @@ package database
 
 import (
 	"github.com/glebarez/sqlite"
+	"go.uber.org/zap"
 	"gorm.io/gorm"
+	"path/filepath"
+	"sub2clash/logger"
 	"sub2clash/model"
+	"sub2clash/utils"
 )
 
 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 +36,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/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,7 +1,6 @@
 package utils
 
 import (
-	"sort"
 	"strings"
 	"sub2clash/model"
 	"sub2clash/parser"
@@ -30,12 +29,10 @@ func GetContryName(proxy model.Proxy) string {
 
 func AddProxy(
 	sub *model.Subscription, autotest bool,
-	lazy bool, sortStrategy string,
+	lazy bool, clashType model.ClashType, proxies ...model.Proxy,
-	clashType model.ClashType, proxies ...model.Proxy,
 ) {
 	newCountryGroupNames := make([]string, 0)
 	proxyTypes := model.GetSupportProxyTypes(clashType)
-
 	// 添加节点
 	for _, proxy := range proxies {
 		if !proxyTypes[proxy.Type] {
@@ -85,26 +82,6 @@ func AddProxy(
 			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 {

utils/write_default_template.go

@@ -0,0 +1,37 @@
+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) {
+			_ = 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
+}