-
+
+
+
sub2clash
-
通用订阅链接转 Clash(Meta) 配置工具 使用文档
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
+ });
+ }
+
+
diff --git a/config/config.go b/config/config.go
index d7f7978..2371992 100644
--- a/config/config.go
+++ b/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
}
diff --git a/docker-compose.yml b/docker-compose.yml
index 8a3b07a..9eadcb6 100644
--- a/docker-compose.yml
+++ b/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
diff --git a/logger/logger.go b/logger/logger.go
index e141cf9..55abcf3 100644
--- a/logger/logger.go
+++ b/logger/logger.go
@@ -4,18 +4,18 @@ import (
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
"path/filepath"
- "sub2clash/config"
- "sub2clash/utils"
"sync"
"time"
)
var (
- Logger *zap.Logger
- lock sync.Mutex
+ Logger *zap.Logger
+ lock sync.Mutex
+ logLevel string
)
-func init() {
+func InitLogger(level string) {
+ logLevel = level
buildLogger()
go rotateLogs()
}
@@ -24,7 +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())
}
}
diff --git a/main.go b/main.go
index 3bf78a3..72e5f58 100644
--- a/main.go
+++ b/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)
- }
- if err := utils.MKDir("templates"); err != nil {
- os.Exit(1)
- }
- if err := writeTemplate(config.Default.MetaTemplate, templateMeta); err != nil {
- os.Exit(1)
- }
- if err := writeTemplate(config.Default.ClashTemplate, templateClash); err != nil {
- os.Exit(1)
- }
- err := database.ConnectDB()
+ // 加载配置
+ err := config.LoadConfig()
+ // 初始化日志
+ logger.InitLogger(config.Default.LogLevel)
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
}
}
diff --git a/model/github.go b/model/github.go
new file mode 100644
index 0000000..eef70db
--- /dev/null
+++ b/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"`
+}
diff --git a/model/proxy_group.go b/model/proxy_group.go
index 26179c6..14ba7cf 100644
--- a/model/proxy_group.go
+++ b/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
}
diff --git a/parser/ss.go b/parser/ss.go
index eebeae5..a654fdf 100644
--- a/parser/ss.go
+++ b/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]))
diff --git a/parser/ssr.go b/parser/ssr.go
index 0c6f749..afc9b79 100644
--- a/parser/ssr.go
+++ b/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://")
diff --git a/parser/trojan.go b/parser/trojan.go
index c8c2d2c..d16398d 100644
--- a/parser/trojan.go
+++ b/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]))
diff --git a/parser/vless.go b/parser/vless.go
index 6740855..5e56467 100644
--- a/parser/vless.go
+++ b/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]))
diff --git a/parser/vmess.go b/parser/vmess.go
index 0dcd268..60b846c 100644
--- a/parser/vmess.go
+++ b/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://"))
diff --git a/utils/check_update.go b/utils/check_update.go
new file mode 100644
index 0000000..bd6cf53
--- /dev/null
+++ b/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
+ }
+}
diff --git a/utils/database/database.go b/utils/database/database.go
index 3740ca9..2c5c02c 100644
--- a/utils/database/database.go
+++ b/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)
+}
diff --git a/utils/mkdir.go b/utils/mkdir.go
new file mode 100644
index 0000000..45d276a
--- /dev/null
+++ b/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
+}
diff --git a/utils/os.go b/utils/os.go
deleted file mode 100644
index e318160..0000000
--- a/utils/os.go
+++ /dev/null
@@ -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
-}
diff --git a/utils/proxy.go b/utils/proxy.go
index 4623bde..c51b720 100644
--- a/utils/proxy.go
+++ b/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,
- clashType model.ClashType, proxies ...model.Proxy,
+ lazy bool, clashType model.ClashType, proxies ...model.Proxy,
) {
newCountryGroupNames := make([]string, 0)
proxyTypes := model.GetSupportProxyTypes(clashType)
-
// 添加节点
for _, proxy := range proxies {
if !proxyTypes[proxy.Type] {
@@ -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 {
diff --git a/utils/write_default_template.go b/utils/write_default_template.go
new file mode 100644
index 0000000..07a60ae
--- /dev/null
+++ b/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
+}