Refactor Base64 validation in isLikelyBase64 function to remove unnecessary suffix check.

fix reg socks

.env.example

@@ -1,7 +0,0 @@
-PORT=8011
-META_TEMPLATE=meta_template.json
-CLASH_TEMPLATE=clash_template.json
-REQUEST_RETRY_TIMES=3
-REQUEST_MAX_FILE_SIZE=1048576
-CACHE_EXPIRE=300
-LOG_LEVEL=info

.github/workflows/docker.yml

@@ -18,7 +18,7 @@ jobs:
         with:
           images: |
             nite07/sub2clash
-            ghcr.io/nitezs/sub2clash
+            ghcr.io/bestnite/sub2clash
           tags: |
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}

.gitignore

@@ -1,9 +1,8 @@
 .idea
+.vscode
 dist
 subs
 logs
 data
 .env
 .vscode/settings.json
-test
-*test.go

.vscode/launch.json

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

Dockerfile

@@ -4,7 +4,7 @@ WORKDIR /app
 COPY . .
 RUN go mod download
 ARG version
-RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w -X sub2clash/constant.Version=${version}" -o sub2clash .
+RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w -X github.com/bestnite/sub2clash/constant.Version=${version}" -o sub2clash .
 
 FROM alpine:latest
 WORKDIR /app

README.md

@@ -1,7 +1,7 @@
 # sub2clash
 
 将订阅链接转换为 Clash、Clash.Meta 配置  
-[预览](https://www.nite07.com/sub)
+[预览](https://clash.nite07.com/)
 
 ## 特性
 
@@ -18,28 +18,44 @@
   - Hysteria （Clash.Meta）
   - Hysteria2 （Clash.Meta）
   - Socks5
+  - Anytls （Clash.Meta）
 
 ## 使用
 
 ### 部署
 
-- [docker compose](./docker-compose.yml)
-- 运行[二进制文件](https://github.com/nitezs/sub2clash/releases/latest)
+- [docker compose](./compose.yml)
+- 运行[二进制文件](https://github.com/bestnite/sub2clash/releases/latest)
 
 ### 配置
 
-可以通过编辑 .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`                   |
+1. **配置文件**：支持多种格式（YAML、JSON），按以下优先级搜索：
+   - `config.yaml` / `config.yml`
+   - `config.json`
+   - `sub2clash.yaml` / `sub2clash.yml`
+   - `sub2clash.json`
+2. **环境变量**：使用 `SUB2CLASH_` 前缀，例如 `SUB2CLASH_ADDRESS=0.0.0.0:8011`
+3. **默认值**：内置默认配置
+
+| 配置项                | 环境变量                        | 说明                                    | 默认值                                                                                               |
+| --------------------- | ------------------------------- | --------------------------------------- | ---------------------------------------------------------------------------------------------------- |
+| address               | SUB2CLASH_ADDRESS               | 服务监听地址                            | `0.0.0.0:8011`                                                                                       |
+| meta_template         | SUB2CLASH_META_TEMPLATE         | 默认 meta 模板 URL                      | `https://raw.githubusercontent.com/bestnite/sub2clash/refs/heads/main/templates/template_meta.yaml`  |
+| clash_template        | SUB2CLASH_CLASH_TEMPLATE        | 默认 clash 模板 URL                     | `https://raw.githubusercontent.com/bestnite/sub2clash/refs/heads/main/templates/template_clash.yaml` |
+| request_retry_times   | SUB2CLASH_REQUEST_RETRY_TIMES   | 请求重试次数                            | `3`                                                                                                  |
+| request_max_file_size | SUB2CLASH_REQUEST_MAX_FILE_SIZE | 请求文件最大大小（byte）                | `1048576`                                                                                            |
+| cache_expire          | SUB2CLASH_CACHE_EXPIRE          | 订阅缓存时间（秒）                      | `300`                                                                                                |
+| log_level             | SUB2CLASH_LOG_LEVEL             | 日志等级：`debug`,`info`,`warn`,`error` | `info`                                                                                               |
+| short_link_length     | SUB2CLASH_SHORT_LINK_LENGTH     | 短链长度                                | `6`                                                                                                  |
+
+#### 配置文件示例
+
+参考示例文件：
+
+- [config.example.yaml](./config.example.yaml) - YAML 格式
+- [config.example.json](./config.example.json) - JSON 格式
 
 ### API
 
@@ -58,3 +74,16 @@
 
 - [Clash](./templates/template_clash.yaml)
 - [Clash.Meta](./templates/template_meta.yaml)
+
+## 开发
+
+### 添加新协议支持
+
+添加新协议支持需要实现以下组件：
+
+1. 在 `parser` 目录下实现协议解析器，用于解析节点链接
+2. 在 `model/proxy` 目录下定义协议结构体
+
+## 贡献者
+
+[![](https://contrib.rocks/image?repo=bestnite/sub2clash)](https://github.com/bestnite/sub2clash/graphs/contributors)

api/handler/clash.go

@@ -1,44 +0,0 @@
-package handler
-
-import (
-	"net/http"
-
-	"github.com/nitezs/sub2clash/config"
-	"github.com/nitezs/sub2clash/model"
-	"github.com/nitezs/sub2clash/validator"
-
-	"github.com/gin-gonic/gin"
-	"gopkg.in/yaml.v3"
-)
-
-func SubmodHandler(c *gin.Context) {
-
-	query, err := validator.ParseQuery(c)
-	if err != nil {
-		c.String(http.StatusBadRequest, err.Error())
-		return
-	}
-	sub, err := BuildSub(model.Clash, query, config.Default.ClashTemplate)
-	if err != nil {
-		c.String(http.StatusInternalServerError, err.Error())
-		return
-	}
-
-	if query.NodeListMode {
-		nodelist := model.NodeList{}
-		nodelist.Proxies = sub.Proxies
-		marshal, err := yaml.Marshal(nodelist)
-		if err != nil {
-			c.String(http.StatusInternalServerError, "YAML序列化失败: "+err.Error())
-			return
-		}
-		c.String(http.StatusOK, string(marshal))
-		return
-	}
-	marshal, err := yaml.Marshal(sub)
-	if err != nil {
-		c.String(http.StatusInternalServerError, "YAML序列化失败: "+err.Error())
-		return
-	}
-	c.String(http.StatusOK, string(marshal))
-}

api/handler/default.go

@@ -1,293 +0,0 @@
-package handler
-
-import (
-	"crypto/sha256"
-	"encoding/hex"
-	"errors"
-	"net/url"
-	"regexp"
-	"sort"
-	"strconv"
-	"strings"
-
-	"github.com/nitezs/sub2clash/common"
-	"github.com/nitezs/sub2clash/logger"
-	"github.com/nitezs/sub2clash/model"
-	"github.com/nitezs/sub2clash/parser"
-	"github.com/nitezs/sub2clash/validator"
-
-	"go.uber.org/zap"
-	"gopkg.in/yaml.v3"
-)
-
-func BuildSub(clashType model.ClashType, query validator.SubValidator, template string) (
-	*model.Subscription, error,
-) {
-
-	var temp = &model.Subscription{}
-	var sub = &model.Subscription{}
-	var err error
-	var templateBytes []byte
-
-	if query.Template != "" {
-		template = query.Template
-	}
-	if strings.HasPrefix(template, "http") {
-		templateBytes, err = common.LoadSubscription(template, query.Refresh, query.UserAgent)
-		if err != nil {
-			logger.Logger.Debug(
-				"load template failed", zap.String("template", template), zap.Error(err),
-			)
-			return nil, errors.New("加载模板失败: " + err.Error())
-		}
-	} else {
-		unescape, err := url.QueryUnescape(template)
-		if err != nil {
-			return nil, errors.New("加载模板失败: " + err.Error())
-		}
-		templateBytes, err = common.LoadTemplate(unescape)
-		if err != nil {
-			logger.Logger.Debug(
-				"load template failed", zap.String("template", template), zap.Error(err),
-			)
-			return nil, errors.New("加载模板失败: " + err.Error())
-		}
-	}
-
-	err = yaml.Unmarshal(templateBytes, &temp)
-	if err != nil {
-		logger.Logger.Debug("parse template failed", zap.Error(err))
-		return nil, errors.New("解析模板失败: " + err.Error())
-	}
-	var proxyList []model.Proxy
-
-	for i := range query.Subs {
-		data, err := common.LoadSubscription(query.Subs[i], query.Refresh, query.UserAgent)
-		subName := ""
-		if strings.Contains(query.Subs[i], "#") {
-			subName = query.Subs[i][strings.LastIndex(query.Subs[i], "#")+1:]
-		}
-		if err != nil {
-			logger.Logger.Debug(
-				"load subscription failed", zap.String("url", query.Subs[i]), zap.Error(err),
-			)
-			return nil, errors.New("加载订阅失败: " + err.Error())
-		}
-
-		err = yaml.Unmarshal(data, &sub)
-		var newProxies []model.Proxy
-		if err != nil {
-			reg, _ := regexp.Compile("(ssr|ss|vmess|trojan|vless|hysteria|hy2|hysteria2)://")
-			if reg.Match(data) {
-				p := common.ParseProxy(strings.Split(string(data), "\n")...)
-				newProxies = p
-			} else {
-
-				base64, err := parser.DecodeBase64(string(data))
-				if err != nil {
-					logger.Logger.Debug(
-						"parse subscription failed", zap.String("url", query.Subs[i]),
-						zap.String("data", string(data)),
-						zap.Error(err),
-					)
-					return nil, errors.New("加载订阅失败: " + err.Error())
-				}
-				p := common.ParseProxy(strings.Split(base64, "\n")...)
-				newProxies = p
-			}
-		} else {
-			newProxies = sub.Proxies
-		}
-		if subName != "" {
-			for i := range newProxies {
-				newProxies[i].SubName = subName
-			}
-		}
-		proxyList = append(proxyList, newProxies...)
-	}
-
-	if len(query.Proxies) != 0 {
-		proxyList = append(proxyList, common.ParseProxy(query.Proxies...)...)
-	}
-
-	for i := range proxyList {
-		if proxyList[i].SubName != "" {
-			proxyList[i].Name = strings.TrimSpace(proxyList[i].SubName) + " " + strings.TrimSpace(proxyList[i].Name)
-		}
-	}
-
-	proxies := make(map[string]*model.Proxy)
-	newProxies := make([]model.Proxy, 0, len(proxyList))
-	for i := range proxyList {
-		key := proxyList[i].Server + strconv.Itoa(proxyList[i].Port) + proxyList[i].Type + proxyList[i].UUID + proxyList[i].Password
-		if proxyList[i].Network == "ws" {
-			key += proxyList[i].WSOpts.Path + proxyList[i].WSOpts.Headers["Host"]
-		}
-		if _, exist := proxies[key]; !exist {
-			proxies[key] = &proxyList[i]
-			newProxies = append(newProxies, proxyList[i])
-		}
-	}
-	proxyList = newProxies
-
-	if strings.TrimSpace(query.Remove) != "" {
-		newProxyList := make([]model.Proxy, 0, len(proxyList))
-		for i := range proxyList {
-			removeReg, err := regexp.Compile(query.Remove)
-			if err != nil {
-				logger.Logger.Debug("remove regexp compile failed", zap.Error(err))
-				return nil, errors.New("remove 参数非法: " + err.Error())
-			}
-
-			if removeReg.MatchString(proxyList[i].Name) {
-				continue
-			}
-			newProxyList = append(newProxyList, proxyList[i])
-		}
-		proxyList = newProxyList
-	}
-
-	if len(query.ReplaceKeys) != 0 {
-
-		replaceRegs := make([]*regexp.Regexp, 0, len(query.ReplaceKeys))
-		for _, v := range query.ReplaceKeys {
-			replaceReg, err := regexp.Compile(v)
-			if err != nil {
-				logger.Logger.Debug("replace regexp compile failed", zap.Error(err))
-				return nil, errors.New("replace 参数非法: " + err.Error())
-			}
-			replaceRegs = append(replaceRegs, replaceReg)
-		}
-		for i := range proxyList {
-
-			for j, v := range replaceRegs {
-				if v.MatchString(proxyList[i].Name) {
-					proxyList[i].Name = v.ReplaceAllString(
-						proxyList[i].Name, query.ReplaceTo[j],
-					)
-				}
-			}
-		}
-	}
-
-	names := make(map[string]int)
-	for i := range proxyList {
-		if _, exist := names[proxyList[i].Name]; exist {
-			names[proxyList[i].Name] = names[proxyList[i].Name] + 1
-			proxyList[i].Name = proxyList[i].Name + " " + strconv.Itoa(names[proxyList[i].Name])
-		} else {
-			names[proxyList[i].Name] = 0
-		}
-	}
-
-	for i := range proxyList {
-		proxyList[i].Name = strings.TrimSpace(proxyList[i].Name)
-	}
-
-	var t = &model.Subscription{}
-	common.AddProxy(t, query.AutoTest, query.Lazy, clashType, proxyList...)
-
-	switch query.Sort {
-	case "sizeasc":
-		sort.Sort(model.ProxyGroupsSortBySize(t.ProxyGroups))
-	case "sizedesc":
-		sort.Sort(sort.Reverse(model.ProxyGroupsSortBySize(t.ProxyGroups)))
-	case "nameasc":
-		sort.Sort(model.ProxyGroupsSortByName(t.ProxyGroups))
-	case "namedesc":
-		sort.Sort(sort.Reverse(model.ProxyGroupsSortByName(t.ProxyGroups)))
-	default:
-		sort.Sort(model.ProxyGroupsSortByName(t.ProxyGroups))
-	}
-
-	MergeSubAndTemplate(temp, t, query.IgnoreCountryGrooup)
-
-	for _, v := range query.Rules {
-		if v.Prepend {
-			common.PrependRules(temp, v.Rule)
-		} else {
-			common.AppendRules(temp, v.Rule)
-		}
-	}
-
-	for _, v := range query.RuleProviders {
-		hash := sha256.Sum224([]byte(v.Url))
-		name := hex.EncodeToString(hash[:])
-		provider := model.RuleProvider{
-			Type:     "http",
-			Behavior: v.Behavior,
-			Url:      v.Url,
-			Path:     "./" + name + ".yaml",
-			Interval: 3600,
-		}
-		if v.Prepend {
-			common.PrependRuleProvider(
-				temp, v.Name, v.Group, provider,
-			)
-		} else {
-			common.AppenddRuleProvider(
-				temp, v.Name, v.Group, provider,
-			)
-		}
-	}
-	return temp, nil
-}
-
-func MergeSubAndTemplate(temp *model.Subscription, sub *model.Subscription, igcg bool) {
-
-	var countryGroupNames []string
-	for _, proxyGroup := range sub.ProxyGroups {
-		if proxyGroup.IsCountryGrop {
-			countryGroupNames = append(
-				countryGroupNames, proxyGroup.Name,
-			)
-		}
-	}
-	var proxyNames []string
-	for _, proxy := range sub.Proxies {
-		proxyNames = append(proxyNames, proxy.Name)
-	}
-
-	temp.Proxies = append(temp.Proxies, sub.Proxies...)
-
-	for i := range temp.ProxyGroups {
-		if temp.ProxyGroups[i].IsCountryGrop {
-			continue
-		}
-		newProxies := make([]string, 0)
-		countryGroupMap := make(map[string]model.ProxyGroup)
-		for _, v := range sub.ProxyGroups {
-			if v.IsCountryGrop {
-				countryGroupMap[v.Name] = v
-			}
-		}
-		for j := range temp.ProxyGroups[i].Proxies {
-			reg := regexp.MustCompile("<(.*?)>")
-			if reg.Match([]byte(temp.ProxyGroups[i].Proxies[j])) {
-				key := reg.FindStringSubmatch(temp.ProxyGroups[i].Proxies[j])[1]
-				switch key {
-				case "all":
-					newProxies = append(newProxies, proxyNames...)
-				case "countries":
-					if !igcg {
-						newProxies = append(newProxies, countryGroupNames...)
-					}
-				default:
-					if !igcg {
-						if len(key) == 2 {
-							newProxies = append(
-								newProxies, countryGroupMap[common.GetContryName(key)].Proxies...,
-							)
-						}
-					}
-				}
-			} else {
-				newProxies = append(newProxies, temp.ProxyGroups[i].Proxies[j])
-			}
-		}
-		temp.ProxyGroups[i].Proxies = newProxies
-	}
-	if !igcg {
-		temp.ProxyGroups = append(temp.ProxyGroups, sub.ProxyGroups...)
-	}
-}

api/handler/meta.go

@@ -1,45 +0,0 @@
-package handler
-
-import (
-	_ "embed"
-	"net/http"
-
-	"github.com/nitezs/sub2clash/config"
-	"github.com/nitezs/sub2clash/model"
-	"github.com/nitezs/sub2clash/validator"
-
-	"github.com/gin-gonic/gin"
-	"gopkg.in/yaml.v3"
-)
-
-func SubHandler(c *gin.Context) {
-
-	query, err := validator.ParseQuery(c)
-	if err != nil {
-		c.String(http.StatusBadRequest, err.Error())
-		return
-	}
-	sub, err := BuildSub(model.ClashMeta, query, config.Default.MetaTemplate)
-	if err != nil {
-		c.String(http.StatusInternalServerError, err.Error())
-		return
-	}
-
-	if query.NodeListMode {
-		nodelist := model.NodeList{}
-		nodelist.Proxies = sub.Proxies
-		marshal, err := yaml.Marshal(nodelist)
-		if err != nil {
-			c.String(http.StatusInternalServerError, "YAML序列化失败: "+err.Error())
-			return
-		}
-		c.String(http.StatusOK, string(marshal))
-		return
-	}
-	marshal, err := yaml.Marshal(sub)
-	if err != nil {
-		c.String(http.StatusInternalServerError, "YAML序列化失败: "+err.Error())
-		return
-	}
-	c.String(http.StatusOK, string(marshal))
-}

api/route.go

@@ -1,49 +0,0 @@
-package api
-
-import (
-	"embed"
-	"html/template"
-	"log"
-	"net/http"
-
-	"github.com/nitezs/sub2clash/api/handler"
-	"github.com/nitezs/sub2clash/constant"
-	"github.com/nitezs/sub2clash/middleware"
-
-	"github.com/gin-gonic/gin"
-)
-
-//go:embed static
-var staticFiles embed.FS
-
-func SetRoute(r *gin.Engine) {
-	r.Use(middleware.ZapLogger())
-
-	tpl, err := template.ParseFS(staticFiles, "static/*")
-	if err != nil {
-		log.Fatalf("Error parsing templates: %v", err)
-	}
-	r.SetHTMLTemplate(tpl)
-
-	r.GET(
-		"/static/*filepath", func(c *gin.Context) {
-			c.FileFromFS("static/"+c.Param("filepath"), http.FS(staticFiles))
-		},
-	)
-	r.GET(
-		"/", func(c *gin.Context) {
-			version := constant.Version
-			c.HTML(
-				200, "index.html", gin.H{
-					"Version": version,
-				},
-			)
-		},
-	)
-	r.GET("/clash", handler.SubmodHandler)
-	r.GET("/meta", handler.SubHandler)
-	r.GET("/s/:hash", handler.GetRawConfHandler)
-	r.POST("/short", handler.GenerateLinkHandler)
-	r.PUT("/short", handler.UpdateLinkHandler)
-	r.GET("/short", handler.GetRawConfUriHandler)
-}

common/database/database.go

@@ -2,10 +2,10 @@ package database
 
 import (
 	"encoding/json"
-	"errors"
 	"path/filepath"
 
-	"github.com/nitezs/sub2clash/model"
+	"github.com/bestnite/sub2clash/common"
+	"github.com/bestnite/sub2clash/model"
 
 	"go.etcd.io/bbolt"
 )
@@ -17,13 +17,16 @@ func ConnectDB() error {
 
 	db, err := bbolt.Open(path, 0600, nil)
 	if err != nil {
-		return err
+		return common.NewDatabaseConnectError(err)
 	}
 	DB = db
 
 	return db.Update(func(tx *bbolt.Tx) error {
 		_, err := tx.CreateBucketIfNotExists([]byte("ShortLinks"))
-		return err
+		if err != nil {
+			return common.NewDatabaseConnectError(err)
+		}
+		return nil
 	})
 }
 
@@ -33,7 +36,7 @@ func FindShortLinkByHash(hash string) (*model.ShortLink, error) {
 		b := tx.Bucket([]byte("ShortLinks"))
 		v := b.Get([]byte(hash))
 		if v == nil {
-			return errors.New("ShortLink not found")
+			return common.NewRecordNotFoundError("ShortLink", hash)
 		}
 		return json.Unmarshal(v, &shortLink)
 	})

common/errors.go

@@ -0,0 +1,192 @@
+package common
+
+import (
+	"errors"
+	"fmt"
+)
+
+// CommonError represents a structured error type for the common package
+type CommonError struct {
+	Code    ErrorCode
+	Message string
+	Cause   error
+}
+
+// ErrorCode represents different types of errors
+type ErrorCode string
+
+const (
+	// Directory operation errors
+	ErrDirCreation ErrorCode = "DIRECTORY_CREATION_FAILED"
+	ErrDirAccess   ErrorCode = "DIRECTORY_ACCESS_FAILED"
+
+	// File operation errors
+	ErrFileNotFound ErrorCode = "FILE_NOT_FOUND"
+	ErrFileRead     ErrorCode = "FILE_READ_FAILED"
+	ErrFileWrite    ErrorCode = "FILE_WRITE_FAILED"
+	ErrFileCreate   ErrorCode = "FILE_CREATE_FAILED"
+
+	// Network operation errors
+	ErrNetworkRequest  ErrorCode = "NETWORK_REQUEST_FAILED"
+	ErrNetworkResponse ErrorCode = "NETWORK_RESPONSE_FAILED"
+
+	// Template and configuration errors
+	ErrTemplateLoad  ErrorCode = "TEMPLATE_LOAD_FAILED"
+	ErrTemplateParse ErrorCode = "TEMPLATE_PARSE_FAILED"
+	ErrConfigInvalid ErrorCode = "CONFIG_INVALID"
+
+	// Subscription errors
+	ErrSubscriptionLoad  ErrorCode = "SUBSCRIPTION_LOAD_FAILED"
+	ErrSubscriptionParse ErrorCode = "SUBSCRIPTION_PARSE_FAILED"
+
+	// Regex errors
+	ErrRegexCompile ErrorCode = "REGEX_COMPILE_FAILED"
+	ErrRegexInvalid ErrorCode = "REGEX_INVALID"
+
+	// Database errors
+	ErrDatabaseConnect ErrorCode = "DATABASE_CONNECTION_FAILED"
+	ErrDatabaseQuery   ErrorCode = "DATABASE_QUERY_FAILED"
+	ErrRecordNotFound  ErrorCode = "RECORD_NOT_FOUND"
+
+	// Validation errors
+	ErrValidation   ErrorCode = "VALIDATION_FAILED"
+	ErrInvalidInput ErrorCode = "INVALID_INPUT"
+)
+
+// Error returns the string representation of the error
+func (e *CommonError) Error() string {
+	if e.Cause != nil {
+		return fmt.Sprintf("[%s] %s: %v", e.Code, e.Message, e.Cause)
+	}
+	return fmt.Sprintf("[%s] %s", e.Code, e.Message)
+}
+
+// Unwrap returns the underlying error
+func (e *CommonError) Unwrap() error {
+	return e.Cause
+}
+
+// Is allows error comparison
+func (e *CommonError) Is(target error) bool {
+	if t, ok := target.(*CommonError); ok {
+		return e.Code == t.Code
+	}
+	return false
+}
+
+// NewError creates a new CommonError
+func NewError(code ErrorCode, message string, cause error) *CommonError {
+	return &CommonError{
+		Code:    code,
+		Message: message,
+		Cause:   cause,
+	}
+}
+
+// NewSimpleError creates a new CommonError without a cause
+func NewSimpleError(code ErrorCode, message string) *CommonError {
+	return &CommonError{
+		Code:    code,
+		Message: message,
+	}
+}
+
+// Convenience constructors for common error types
+
+// Directory errors
+func NewDirCreationError(dirPath string, cause error) *CommonError {
+	return NewError(ErrDirCreation, fmt.Sprintf("failed to create directory: %s", dirPath), cause)
+}
+
+func NewDirAccessError(dirPath string, cause error) *CommonError {
+	return NewError(ErrDirAccess, fmt.Sprintf("failed to access directory: %s", dirPath), cause)
+}
+
+// File errors
+func NewFileNotFoundError(filePath string) *CommonError {
+	return NewSimpleError(ErrFileNotFound, fmt.Sprintf("file not found: %s", filePath))
+}
+
+func NewFileReadError(filePath string, cause error) *CommonError {
+	return NewError(ErrFileRead, fmt.Sprintf("failed to read file: %s", filePath), cause)
+}
+
+func NewFileWriteError(filePath string, cause error) *CommonError {
+	return NewError(ErrFileWrite, fmt.Sprintf("failed to write file: %s", filePath), cause)
+}
+
+func NewFileCreateError(filePath string, cause error) *CommonError {
+	return NewError(ErrFileCreate, fmt.Sprintf("failed to create file: %s", filePath), cause)
+}
+
+// Network errors
+func NewNetworkRequestError(url string, cause error) *CommonError {
+	return NewError(ErrNetworkRequest, fmt.Sprintf("network request failed for URL: %s", url), cause)
+}
+
+func NewNetworkResponseError(message string, cause error) *CommonError {
+	return NewError(ErrNetworkResponse, message, cause)
+}
+
+// Template errors
+func NewTemplateLoadError(template string, cause error) *CommonError {
+	return NewError(ErrTemplateLoad, fmt.Sprintf("failed to load template: %s", template), cause)
+}
+
+func NewTemplateParseError(cause error) *CommonError {
+	return NewError(ErrTemplateParse, "failed to parse template", cause)
+}
+
+// Subscription errors
+func NewSubscriptionLoadError(url string, cause error) *CommonError {
+	return NewError(ErrSubscriptionLoad, fmt.Sprintf("failed to load subscription: %s", url), cause)
+}
+
+func NewSubscriptionParseError(cause error) *CommonError {
+	return NewError(ErrSubscriptionParse, "failed to parse subscription", cause)
+}
+
+// Regex errors
+func NewRegexCompileError(pattern string, cause error) *CommonError {
+	return NewError(ErrRegexCompile, fmt.Sprintf("failed to compile regex pattern: %s", pattern), cause)
+}
+
+func NewRegexInvalidError(paramName string, cause error) *CommonError {
+	return NewError(ErrRegexInvalid, fmt.Sprintf("invalid regex in parameter: %s", paramName), cause)
+}
+
+// Database errors
+func NewDatabaseConnectError(cause error) *CommonError {
+	return NewError(ErrDatabaseConnect, "failed to connect to database", cause)
+}
+
+func NewRecordNotFoundError(recordType string, id string) *CommonError {
+	return NewSimpleError(ErrRecordNotFound, fmt.Sprintf("%s not found: %s", recordType, id))
+}
+
+// Validation errors
+func NewValidationError(field string, message string) *CommonError {
+	return NewSimpleError(ErrValidation, fmt.Sprintf("validation failed for %s: %s", field, message))
+}
+
+func NewInvalidInputError(paramName string, value string) *CommonError {
+	return NewSimpleError(ErrInvalidInput, fmt.Sprintf("invalid input for parameter %s: %s", paramName, value))
+}
+
+// IsErrorCode checks if an error has a specific error code
+func IsErrorCode(err error, code ErrorCode) bool {
+	var commonErr *CommonError
+	if errors.As(err, &commonErr) {
+		return commonErr.Code == code
+	}
+	return false
+}
+
+// GetErrorCode extracts the error code from an error
+func GetErrorCode(err error) (ErrorCode, bool) {
+	var commonErr *CommonError
+	if errors.As(err, &commonErr) {
+		return commonErr.Code, true
+	}
+	return "", false
+}

common/get.go

@@ -1,58 +0,0 @@
-package common
-
-import (
-	"errors"
-	"net/http"
-	"time"
-
-	"github.com/nitezs/sub2clash/config"
-)
-
-type GetConfig struct {
-	userAgent string
-}
-
-type GetOption func(*GetConfig)
-
-func WithUserAgent(userAgent string) GetOption {
-	return func(config *GetConfig) {
-		config.userAgent = userAgent
-	}
-}
-
-func Get(url string, options ...GetOption) (resp *http.Response, err error) {
-	retryTimes := config.Default.RequestRetryTimes
-	haveTried := 0
-	retryDelay := time.Second
-	getConfig := GetConfig{}
-	for _, option := range options {
-		option(&getConfig)
-	}
-	for haveTried < retryTimes {
-		client := &http.Client{}
-		//client.Timeout = time.Second * 10
-		req, err := http.NewRequest("GET", url, nil)
-		if err != nil {
-			haveTried++
-			time.Sleep(retryDelay)
-			continue
-		}
-		if getConfig.userAgent != "" {
-			req.Header.Set("User-Agent", getConfig.userAgent)
-		}
-		get, err := client.Do(req)
-		if err != nil {
-			haveTried++
-			time.Sleep(retryDelay)
-			continue
-		} else {
-
-			if get != nil && get.ContentLength > config.Default.RequestMaxFileSize {
-				return nil, errors.New("文件过大")
-			}
-			return get, nil
-		}
-
-	}
-	return nil, err
-}

common/mkdir.go

@@ -1,7 +1,6 @@
 package common
 
 import (
-	"errors"
 	"os"
 )
 
@@ -18,16 +17,13 @@ func MKDir(dir string) error {
 
 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())
+		return NewDirCreationError("subs", err)
 	}
 	if err := MKDir("logs"); err != nil {
-		return errors.New("create logs dir failed" + err.Error())
+		return NewDirCreationError("logs", err)
 	}
 	if err := MKDir("data"); err != nil {
-		return errors.New("create data dir failed" + err.Error())
+		return NewDirCreationError("data", err)
 	}
 	return nil
 }

common/proxy.go

@@ -3,12 +3,8 @@ package common
 import (
 	"strings"
 
-	"github.com/nitezs/sub2clash/constant"
-	"github.com/nitezs/sub2clash/logger"
-	"github.com/nitezs/sub2clash/model"
-	"github.com/nitezs/sub2clash/parser"
-
-	"go.uber.org/zap"
+	"github.com/bestnite/sub2clash/model"
+	"github.com/bestnite/sub2clash/model/proxy"
 )
 
 func GetContryName(countryKey string) string {
@@ -52,7 +48,7 @@ func GetContryName(countryKey string) string {
 
 func AddProxy(
 	sub *model.Subscription, autotest bool,
-	lazy bool, clashType model.ClashType, proxies ...model.Proxy,
+	lazy bool, clashType model.ClashType, proxies ...proxy.Proxy,
 ) {
 	proxyTypes := model.GetSupportProxyTypes(clashType)
 
@@ -60,11 +56,11 @@ func AddProxy(
 		if !proxyTypes[proxy.Type] {
 			continue
 		}
-		sub.Proxies = append(sub.Proxies, proxy)
+		sub.Proxy = append(sub.Proxy, proxy)
 		haveProxyGroup := false
 		countryName := GetContryName(proxy.Name)
-		for i := range sub.ProxyGroups {
-			group := &sub.ProxyGroups[i]
+		for i := range sub.ProxyGroup {
+			group := &sub.ProxyGroup[i]
 			if group.Name == countryName {
 				group.Proxies = append(group.Proxies, proxy.Name)
 				group.Size++
@@ -94,50 +90,7 @@ func AddProxy(
 					Size:          1,
 				}
 			}
-			sub.ProxyGroups = append(sub.ProxyGroups, newGroup)
+			sub.ProxyGroup = append(sub.ProxyGroup, newGroup)
 		}
 	}
 }
-
-func ParseProxy(proxies ...string) []model.Proxy {
-	var result []model.Proxy
-	for _, proxy := range proxies {
-		if proxy != "" {
-			var proxyItem model.Proxy
-			var err error
-
-			if strings.HasPrefix(proxy, constant.ShadowsocksPrefix) {
-				proxyItem, err = parser.ParseShadowsocks(proxy)
-			}
-			if strings.HasPrefix(proxy, constant.TrojanPrefix) {
-				proxyItem, err = parser.ParseTrojan(proxy)
-			}
-			if strings.HasPrefix(proxy, constant.VMessPrefix) {
-				proxyItem, err = parser.ParseVmess(proxy)
-			}
-			if strings.HasPrefix(proxy, constant.VLESSPrefix) {
-				proxyItem, err = parser.ParseVless(proxy)
-			}
-			if strings.HasPrefix(proxy, constant.ShadowsocksRPrefix) {
-				proxyItem, err = parser.ParseShadowsocksR(proxy)
-			}
-			if strings.HasPrefix(proxy, constant.Hysteria2Prefix1) || strings.HasPrefix(proxy, constant.Hysteria2Prefix2) {
-				proxyItem, err = parser.ParseHysteria2(proxy)
-			}
-			if strings.HasPrefix(proxy, constant.HysteriaPrefix) {
-				proxyItem, err = parser.ParseHysteria(proxy)
-			}
-			if strings.HasPrefix(proxy, constant.SocksPrefix) {
-				proxyItem, err = parser.ParseSocks(proxy)
-			}
-			if err == nil {
-				result = append(result, proxyItem)
-			} else {
-				logger.Logger.Debug(
-					"parse proxy failed", zap.String("proxy", proxy), zap.Error(err),
-				)
-			}
-		}
-	}
-	return result
-}

common/request.go

@@ -0,0 +1,12 @@
+package common
+
+import (
+	"resty.dev/v3"
+)
+
+func Request(retryTimes int) *resty.Client {
+	client := resty.New()
+	client.
+		SetRetryCount(retryTimes)
+	return client
+}

common/rule.go

@@ -4,16 +4,16 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/nitezs/sub2clash/model"
+	"github.com/bestnite/sub2clash/model"
 )
 
 func PrependRuleProvider(
 	sub *model.Subscription, providerName string, group string, provider model.RuleProvider,
 ) {
-	if sub.RuleProviders == nil {
-		sub.RuleProviders = make(map[string]model.RuleProvider)
+	if sub.RuleProvider == nil {
+		sub.RuleProvider = make(map[string]model.RuleProvider)
 	}
-	sub.RuleProviders[providerName] = provider
+	sub.RuleProvider[providerName] = provider
 	PrependRules(
 		sub,
 		fmt.Sprintf("RULE-SET,%s,%s", providerName, group),
@@ -23,29 +23,29 @@ func PrependRuleProvider(
 func AppenddRuleProvider(
 	sub *model.Subscription, providerName string, group string, provider model.RuleProvider,
 ) {
-	if sub.RuleProviders == nil {
-		sub.RuleProviders = make(map[string]model.RuleProvider)
+	if sub.RuleProvider == nil {
+		sub.RuleProvider = make(map[string]model.RuleProvider)
 	}
-	sub.RuleProviders[providerName] = provider
+	sub.RuleProvider[providerName] = provider
 	AppendRules(sub, fmt.Sprintf("RULE-SET,%s,%s", providerName, group))
 }
 
 func PrependRules(sub *model.Subscription, rules ...string) {
-	if sub.Rules == nil {
-		sub.Rules = make([]string, 0)
+	if sub.Rule == nil {
+		sub.Rule = make([]string, 0)
 	}
-	sub.Rules = append(rules, sub.Rules...)
+	sub.Rule = append(rules, sub.Rule...)
 }
 
 func AppendRules(sub *model.Subscription, rules ...string) {
-	if sub.Rules == nil {
-		sub.Rules = make([]string, 0)
+	if sub.Rule == nil {
+		sub.Rule = make([]string, 0)
 	}
-	matchRule := sub.Rules[len(sub.Rules)-1]
+	matchRule := sub.Rule[len(sub.Rule)-1]
 	if strings.Contains(matchRule, "MATCH") {
-		sub.Rules = append(sub.Rules[:len(sub.Rules)-1], rules...)
-		sub.Rules = append(sub.Rules, matchRule)
+		sub.Rule = append(sub.Rule[:len(sub.Rule)-1], rules...)
+		sub.Rule = append(sub.Rule, matchRule)
 		return
 	}
-	sub.Rules = append(sub.Rules, rules...)
+	sub.Rule = append(sub.Rule, rules...)
 }

common/sub.go

@@ -5,21 +5,30 @@ import (
 	"encoding/hex"
 	"fmt"
 	"io"
-	"net/http"
+	"net/url"
 	"os"
 	"path/filepath"
+	"regexp"
+	"sort"
+	"strconv"
+	"strings"
 	"sync"
 	"time"
 
-	"github.com/nitezs/sub2clash/config"
+	"github.com/bestnite/sub2clash/logger"
+	"github.com/bestnite/sub2clash/model"
+	P "github.com/bestnite/sub2clash/model/proxy"
+	"github.com/bestnite/sub2clash/parser"
+	"go.uber.org/zap"
+	"gopkg.in/yaml.v3"
 )
 
 var subsDir = "subs"
 var fileLock sync.RWMutex
 
-func LoadSubscription(url string, refresh bool, userAgent string) ([]byte, error) {
+func LoadSubscription(url string, refresh bool, userAgent string, cacheExpire int64, retryTimes int) ([]byte, error) {
 	if refresh {
-		return FetchSubscriptionFromAPI(url, userAgent)
+		return FetchSubscriptionFromAPI(url, userAgent, retryTimes)
 	}
 	hash := sha256.Sum224([]byte(url))
 	fileName := filepath.Join(subsDir, hex.EncodeToString(hash[:]))
@@ -28,10 +37,10 @@ func LoadSubscription(url string, refresh bool, userAgent string) ([]byte, error
 		if !os.IsNotExist(err) {
 			return nil, err
 		}
-		return FetchSubscriptionFromAPI(url, userAgent)
+		return FetchSubscriptionFromAPI(url, userAgent, retryTimes)
 	}
 	lastGetTime := stat.ModTime().Unix()
-	if lastGetTime+config.Default.CacheExpire > time.Now().Unix() {
+	if lastGetTime+cacheExpire > time.Now().Unix() {
 		file, err := os.Open(fileName)
 		if err != nil {
 			return nil, err
@@ -49,21 +58,18 @@ func LoadSubscription(url string, refresh bool, userAgent string) ([]byte, error
 		}
 		return subContent, nil
 	}
-	return FetchSubscriptionFromAPI(url, userAgent)
+	return FetchSubscriptionFromAPI(url, userAgent, retryTimes)
 }
 
-func FetchSubscriptionFromAPI(url string, userAgent string) ([]byte, error) {
+func FetchSubscriptionFromAPI(url string, userAgent string, retryTimes int) ([]byte, error) {
 	hash := sha256.Sum224([]byte(url))
 	fileName := filepath.Join(subsDir, hex.EncodeToString(hash[:]))
-	resp, err := Get(url, WithUserAgent(userAgent))
+	client := Request(retryTimes)
+	defer client.Close()
+	resp, err := client.R().SetHeader("User-Agent", userAgent).Get(url)
 	if err != nil {
 		return nil, err
 	}
-	defer func(resp *http.Response) {
-		if resp != nil && resp.Body != nil {
-			_ = resp.Body.Close()
-		}
-	}(resp)
 	data, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return nil, fmt.Errorf("failed to read response body: %w", err)
@@ -85,3 +91,305 @@ func FetchSubscriptionFromAPI(url string, userAgent string) ([]byte, error) {
 	}
 	return data, nil
 }
+
+func BuildSub(clashType model.ClashType, query model.SubConfig, template string, cacheExpire int64, retryTimes int) (
+	*model.Subscription, error,
+) {
+	var temp = &model.Subscription{}
+	var sub = &model.Subscription{}
+	var err error
+	var templateBytes []byte
+
+	if query.Template != "" {
+		template = query.Template
+	}
+	if strings.HasPrefix(template, "http") {
+		templateBytes, err = LoadSubscription(template, query.Refresh, query.UserAgent, cacheExpire, retryTimes)
+		if err != nil {
+			logger.Logger.Debug(
+				"load template failed", zap.String("template", template), zap.Error(err),
+			)
+			return nil, NewTemplateLoadError(template, err)
+		}
+	} else {
+		unescape, err := url.QueryUnescape(template)
+		if err != nil {
+			return nil, NewTemplateLoadError(template, err)
+		}
+		templateBytes, err = LoadTemplate(unescape)
+		if err != nil {
+			logger.Logger.Debug(
+				"load template failed", zap.String("template", template), zap.Error(err),
+			)
+			return nil, NewTemplateLoadError(unescape, err)
+		}
+	}
+
+	err = yaml.Unmarshal(templateBytes, &temp)
+	if err != nil {
+		logger.Logger.Debug("parse template failed", zap.Error(err))
+		return nil, NewTemplateParseError(err)
+	}
+	var proxyList []P.Proxy
+
+	for i := range query.Subs {
+		data, err := LoadSubscription(query.Subs[i], query.Refresh, query.UserAgent, cacheExpire, retryTimes)
+		subName := ""
+		if strings.Contains(query.Subs[i], "#") {
+			subName = query.Subs[i][strings.LastIndex(query.Subs[i], "#")+1:]
+		}
+		if err != nil {
+			logger.Logger.Debug(
+				"load subscription failed", zap.String("url", query.Subs[i]), zap.Error(err),
+			)
+			return nil, NewSubscriptionLoadError(query.Subs[i], err)
+		}
+
+		err = yaml.Unmarshal(data, &sub)
+		var newProxies []P.Proxy
+		if err != nil {
+			reg, err := regexp.Compile("(" + strings.Join(parser.GetAllPrefixes(), "|") + ")://")
+			if err != nil {
+				logger.Logger.Debug("compile regex failed", zap.Error(err))
+				return nil, NewRegexInvalidError("prefix", err)
+			}
+			if reg.Match(data) {
+				p, err := parser.ParseProxies(strings.Split(string(data), "\n")...)
+				if err != nil {
+					return nil, err
+				}
+				newProxies = p
+			} else {
+				base64, err := parser.DecodeBase64(string(data))
+				if err != nil {
+					logger.Logger.Debug(
+						"parse subscription failed", zap.String("url", query.Subs[i]),
+						zap.String("data", string(data)),
+						zap.Error(err),
+					)
+					return nil, NewSubscriptionParseError(err)
+				}
+				p, err := parser.ParseProxies(strings.Split(base64, "\n")...)
+				if err != nil {
+					return nil, err
+				}
+				newProxies = p
+			}
+		} else {
+			newProxies = sub.Proxy
+		}
+		if subName != "" {
+			for i := range newProxies {
+				newProxies[i].SubName = subName
+			}
+		}
+		proxyList = append(proxyList, newProxies...)
+	}
+
+	if len(query.Proxy) != 0 {
+		p, err := parser.ParseProxies(query.Proxies...)
+		if err != nil {
+			return nil, err
+		}
+		proxyList = append(proxyList, p...)
+	}
+
+	for i := range proxyList {
+		if proxyList[i].SubName != "" {
+			proxyList[i].Name = strings.TrimSpace(proxyList[i].SubName) + " " + strings.TrimSpace(proxyList[i].Name)
+		}
+	}
+
+	proxies := make(map[string]*P.Proxy)
+	newProxies := make([]P.Proxy, 0, len(proxyList))
+	for i := range proxyList {
+		yamlBytes, err := yaml.Marshal(proxyList[i])
+		if err != nil {
+			logger.Logger.Debug("marshal proxy failed", zap.Error(err))
+			return nil, fmt.Errorf("marshal proxy failed: %w", err)
+		}
+		key := string(yamlBytes)
+		if _, exist := proxies[key]; !exist {
+			proxies[key] = &proxyList[i]
+			newProxies = append(newProxies, proxyList[i])
+		}
+	}
+	proxyList = newProxies
+
+	if strings.TrimSpace(query.Remove) != "" {
+		newProxyList := make([]P.Proxy, 0, len(proxyList))
+		for i := range proxyList {
+			removeReg, err := regexp.Compile(query.Remove)
+			if err != nil {
+				logger.Logger.Debug("remove regexp compile failed", zap.Error(err))
+				return nil, NewRegexInvalidError("remove", err)
+			}
+
+			if removeReg.MatchString(proxyList[i].Name) {
+				continue
+			}
+			newProxyList = append(newProxyList, proxyList[i])
+		}
+		proxyList = newProxyList
+	}
+
+	if len(query.ReplaceKeys) != 0 {
+
+		replaceRegs := make([]*regexp.Regexp, 0, len(query.ReplaceKeys))
+		for _, v := range query.ReplaceKeys {
+			replaceReg, err := regexp.Compile(v)
+			if err != nil {
+				logger.Logger.Debug("replace regexp compile failed", zap.Error(err))
+				return nil, NewRegexInvalidError("replace", err)
+			}
+			replaceRegs = append(replaceRegs, replaceReg)
+		}
+		for i := range proxyList {
+
+			for j, v := range replaceRegs {
+				if v.MatchString(proxyList[i].Name) {
+					proxyList[i].Name = v.ReplaceAllString(
+						proxyList[i].Name, query.ReplaceTo[j],
+					)
+				}
+			}
+		}
+	}
+
+	names := make(map[string]int)
+	for i := range proxyList {
+		if _, exist := names[proxyList[i].Name]; exist {
+			names[proxyList[i].Name] = names[proxyList[i].Name] + 1
+			proxyList[i].Name = proxyList[i].Name + " " + strconv.Itoa(names[proxyList[i].Name])
+		} else {
+			names[proxyList[i].Name] = 0
+		}
+	}
+
+	for i := range proxyList {
+		proxyList[i].Name = strings.TrimSpace(proxyList[i].Name)
+	}
+
+	var t = &model.Subscription{}
+	AddProxy(t, query.AutoTest, query.Lazy, clashType, proxyList...)
+
+	switch query.Sort {
+	case "sizeasc":
+		sort.Sort(model.ProxyGroupsSortBySize(t.ProxyGroup))
+	case "sizedesc":
+		sort.Sort(sort.Reverse(model.ProxyGroupsSortBySize(t.ProxyGroup)))
+	case "nameasc":
+		sort.Sort(model.ProxyGroupsSortByName(t.ProxyGroup))
+	case "namedesc":
+		sort.Sort(sort.Reverse(model.ProxyGroupsSortByName(t.ProxyGroup)))
+	default:
+		sort.Sort(model.ProxyGroupsSortByName(t.ProxyGroup))
+	}
+
+	MergeSubAndTemplate(temp, t, query.IgnoreCountryGrooup)
+
+	for _, v := range query.Rules {
+		if v.Prepend {
+			PrependRules(temp, v.Rule)
+		} else {
+			AppendRules(temp, v.Rule)
+		}
+	}
+
+	for _, v := range query.RuleProviders {
+		hash := sha256.Sum224([]byte(v.Url))
+		name := hex.EncodeToString(hash[:])
+		provider := model.RuleProvider{
+			Type:     "http",
+			Behavior: v.Behavior,
+			Url:      v.Url,
+			Path:     "./" + name + ".yaml",
+			Interval: 3600,
+		}
+		if v.Prepend {
+			PrependRuleProvider(
+				temp, v.Name, v.Group, provider,
+			)
+		} else {
+			AppenddRuleProvider(
+				temp, v.Name, v.Group, provider,
+			)
+		}
+	}
+	return temp, nil
+}
+
+func FetchSubscriptionUserInfo(url string, userAgent string, retryTimes int) (string, error) {
+	client := Request(retryTimes)
+	defer client.Close()
+	resp, err := client.R().SetHeader("User-Agent", userAgent).Head(url)
+	if err != nil {
+		logger.Logger.Debug("创建 HEAD 请求失败", zap.Error(err))
+		return "", NewNetworkRequestError(url, err)
+	}
+	defer resp.Body.Close()
+	if userInfo := resp.Header().Get("subscription-userinfo"); userInfo != "" {
+		return userInfo, nil
+	}
+
+	logger.Logger.Debug("subscription-userinfo header not found in response")
+	return "", NewNetworkResponseError("subscription-userinfo header not found", nil)
+}
+
+func MergeSubAndTemplate(temp *model.Subscription, sub *model.Subscription, igcg bool) {
+	var countryGroupNames []string
+	for _, proxyGroup := range sub.ProxyGroup {
+		if proxyGroup.IsCountryGrop {
+			countryGroupNames = append(
+				countryGroupNames, proxyGroup.Name,
+			)
+		}
+	}
+	var proxyNames []string
+	for _, proxy := range sub.Proxy {
+		proxyNames = append(proxyNames, proxy.Name)
+	}
+
+	temp.Proxy = append(temp.Proxy, sub.Proxy...)
+
+	for i := range temp.ProxyGroup {
+		if temp.ProxyGroup[i].IsCountryGrop {
+			continue
+		}
+		newProxies := make([]string, 0)
+		countryGroupMap := make(map[string]model.ProxyGroup)
+		for _, v := range sub.ProxyGroup {
+			if v.IsCountryGrop {
+				countryGroupMap[v.Name] = v
+			}
+		}
+		for j := range temp.ProxyGroup[i].Proxies {
+			reg := regexp.MustCompile("<(.*?)>")
+			if reg.Match([]byte(temp.ProxyGroup[i].Proxies[j])) {
+				key := reg.FindStringSubmatch(temp.ProxyGroup[i].Proxies[j])[1]
+				switch key {
+				case "all":
+					newProxies = append(newProxies, proxyNames...)
+				case "countries":
+					if !igcg {
+						newProxies = append(newProxies, countryGroupNames...)
+					}
+				default:
+					if !igcg {
+						if len(key) == 2 {
+							newProxies = append(
+								newProxies, countryGroupMap[GetContryName(key)].Proxies...,
+							)
+						}
+					}
+				}
+			} else {
+				newProxies = append(newProxies, temp.ProxyGroup[i].Proxies[j])
+			}
+		}
+		temp.ProxyGroup[i].Proxies = newProxies
+	}
+	if !igcg {
+		temp.ProxyGroup = append(temp.ProxyGroup, sub.ProxyGroup...)
+	}
+}

common/template.go

@@ -1,16 +1,13 @@
 package common
 
 import (
-	"errors"
 	"io"
 	"os"
-	"path/filepath"
 )
 
-func LoadTemplate(template string) ([]byte, error) {
-	tPath := filepath.Join("templates", template)
-	if _, err := os.Stat(tPath); err == nil {
-		file, err := os.Open(tPath)
+func LoadTemplate(templatePath string) ([]byte, error) {
+	if _, err := os.Stat(templatePath); err == nil {
+		file, err := os.Open(templatePath)
 		if err != nil {
 			return nil, err
 		}
@@ -25,5 +22,5 @@ func LoadTemplate(template string) ([]byte, error) {
 		}
 		return result, nil
 	}
-	return nil, errors.New("模板文件不存在")
+	return nil, NewFileNotFoundError(templatePath)
 }

common/write_default_template.go

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

compose.yml

@@ -0,0 +1,11 @@
+name: sub2clash
+services:
+    sub2clash:
+        restart: unless-stopped
+        image: nite07/sub2clash:latest
+        ports:
+            - "8011:8011"
+        volumes:
+            # - ./logs:/app/logs
+            # - ./templates:/app/templates
+            - ./data:/app/data

config.example.json

@@ -0,0 +1,10 @@
+{
+    "address": "0.0.0.0:8011",
+    "meta_template": "https://raw.githubusercontent.com/bestnite/sub2clash/refs/heads/main/templates/template_meta.yaml",
+    "clash_template": "https://raw.githubusercontent.com/bestnite/sub2clash/refs/heads/main/templates/template_clash.yaml",
+    "request_retry_times": 3,
+    "request_max_file_size": 1048576,
+    "cache_expire": 300,
+    "log_level": "info",
+    "short_link_length": 6
+}

config.example.yaml

@@ -0,0 +1,22 @@
+# Sub2Clash 配置文件示例
+# 复制此文件为 config.yaml 并根据需要修改配置
+
+# 服务端口
+address: "0.0.0.0:8011"
+
+# 模板配置
+meta_template: "https://raw.githubusercontent.com/bestnite/sub2clash/refs/heads/main/templates/template_meta.yaml"
+clash_template: "https://raw.githubusercontent.com/bestnite/sub2clash/refs/heads/main/templates/template_clash.yaml"
+
+# 请求配置
+request_retry_times: 3
+request_max_file_size: 1048576 # 1MB in bytes
+
+# 缓存配置 (秒)
+cache_expire: 300 # 5 minutes
+
+# 日志级别 (debug, info, warn, error)
+log_level: "info"
+
+# 短链接长度
+short_link_length: 6

config/config.go

@@ -1,90 +1,76 @@
 package config
 
 import (
-	"errors"
-	"os"
-	"strconv"
+	"strings"
 
-	"github.com/joho/godotenv"
+	"github.com/spf13/viper"
 )
 
 type Config struct {
-	Port               int
-	MetaTemplate       string
-	ClashTemplate      string
-	RequestRetryTimes  int
-	RequestMaxFileSize int64
-	CacheExpire        int64
-	LogLevel           string
-	//BasePath           string
-	ShortLinkLength int
+	Address            string `mapstructure:"address"`
+	MetaTemplate       string `mapstructure:"meta_template"`
+	ClashTemplate      string `mapstructure:"clash_template"`
+	RequestRetryTimes  int    `mapstructure:"request_retry_times"`
+	RequestMaxFileSize int64  `mapstructure:"request_max_file_size"`
+	CacheExpire        int64  `mapstructure:"cache_expire"`
+	LogLevel           string `mapstructure:"log_level"`
+	ShortLinkLength    int    `mapstructure:"short_link_length"`
 }
 
-var Default *Config
+var GlobalConfig *Config
 var Dev string
 
 func LoadConfig() error {
-	Default = &Config{
-		MetaTemplate:       "template_meta.yaml",
-		ClashTemplate:      "template_clash.yaml",
-		RequestRetryTimes:  3,
-		RequestMaxFileSize: 1024 * 1024 * 1,
-		Port:               8011,
-		CacheExpire:        60 * 5,
-		LogLevel:           "info",
-		//BasePath:           "/",
-		ShortLinkLength: 6,
+	v := viper.New()
+
+	// 添加配置文件搜索路径
+	v.AddConfigPath(".")
+	v.AddConfigPath("./config")
+	v.AddConfigPath("/etc/sub2clash/")
+
+	// 设置默认值
+	setDefaults(v)
+
+	// 设置环境变量前缀和自动绑定
+	v.SetEnvPrefix("SUB2CLASH")
+	v.AutomaticEnv()
+	v.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
+
+	// 尝试按优先级加载不同格式的配置文件
+	configLoaded := false
+	configNames := []string{"config", "sub2clash"}
+	configExts := []string{"yaml", "yml", "json"}
+
+	for _, name := range configNames {
+		for _, ext := range configExts {
+			v.SetConfigName(name)
+			v.SetConfigType(ext)
+			if err := v.ReadInConfig(); err == nil {
+				configLoaded = true
+				break
 			}
-	_ = godotenv.Load()
-	if os.Getenv("PORT") != "" {
-		atoi, err := strconv.Atoi(os.Getenv("PORT"))
-		if err != nil {
-			return errors.New("PORT invalid")
 		}
-		Default.Port = atoi
+		if configLoaded {
+			break
 		}
-	if os.Getenv("META_TEMPLATE") != "" {
-		Default.MetaTemplate = os.Getenv("META_TEMPLATE")
 	}
-	if os.Getenv("CLASH_TEMPLATE") != "" {
-		Default.ClashTemplate = os.Getenv("CLASH_TEMPLATE")
-	}
-	if os.Getenv("REQUEST_RETRY_TIMES") != "" {
-		atoi, err := strconv.Atoi(os.Getenv("REQUEST_RETRY_TIMES"))
-		if err != nil {
-			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 {
-			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 {
-			return errors.New("CACHE_EXPIRE invalid")
-		}
-		Default.CacheExpire = int64(atoi)
-	}
-	if os.Getenv("LOG_LEVEL") != "" {
-		Default.LogLevel = os.Getenv("LOG_LEVEL")
-	}
-	//if os.Getenv("BASE_PATH") != "" {
-	//	Default.BasePath = os.Getenv("BASE_PATH")
-	//	if Default.BasePath[len(Default.BasePath)-1] != '/' {
-	//		Default.BasePath += "/"
-	//	}
-	//}
-	if os.Getenv("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
+
+	// 将配置解析到结构体
+	GlobalConfig = &Config{}
+	if err := v.Unmarshal(GlobalConfig); err != nil {
+		return err
 	}
+
 	return nil
 }
+
+func setDefaults(v *viper.Viper) {
+	v.SetDefault("address", "0.0.0.0:8011")
+	v.SetDefault("meta_template", "https://raw.githubusercontent.com/bestnite/sub2clash/refs/heads/main/templates/template_meta.yaml")
+	v.SetDefault("clash_template", "https://raw.githubusercontent.com/bestnite/sub2clash/refs/heads/main/templates/template_clash.yaml")
+	v.SetDefault("request_retry_times", 3)
+	v.SetDefault("request_max_file_size", 1024*1024*1)
+	v.SetDefault("cache_expire", 60*5)
+	v.SetDefault("log_level", "info")
+	v.SetDefault("short_link_length", 6)
+}

constant/prefix.go

@@ -1,13 +0,0 @@
-package constant
-
-const (
-	HysteriaPrefix     string = "hysteria://"
-	Hysteria2Prefix1   string = "hysteria2://"
-	Hysteria2Prefix2   string = "hy2://"
-	ShadowsocksPrefix  string = "ss://"
-	ShadowsocksRPrefix string = "ssr://"
-	TrojanPrefix       string = "trojan://"
-	VLESSPrefix        string = "vless://"
-	VMessPrefix        string = "vmess://"
-	SocksPrefix        string = "socks"
-)

docker-compose.yml

@@ -1,21 +0,0 @@
-version: "3"
-
-services:
-    sub2clash:
-        container_name: sub2clash
-        restart: unless-stopped
-        image: nite07/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

go.mod

@@ -1,42 +1,145 @@
-module github.com/nitezs/sub2clash
+module github.com/bestnite/sub2clash
 
-go 1.21
+go 1.21.0
+
+toolchain go1.24.3
 
 require (
-	github.com/gin-gonic/gin v1.9.1
-	github.com/joho/godotenv v1.5.1
+	github.com/gin-gonic/gin v1.10.1
+	github.com/metacubex/mihomo v1.19.10
+	github.com/spf13/viper v1.20.1
 	go.etcd.io/bbolt v1.3.9
 	go.uber.org/zap v1.27.0
-	golang.org/x/text v0.14.0
+	golang.org/x/text v0.22.0
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
 	gopkg.in/yaml.v3 v3.0.1
+	resty.dev/v3 v3.0.0-beta.3
 )
 
 require (
-	github.com/bytedance/sonic v1.11.5 // indirect
+	github.com/3andne/restls-client-go v0.1.6 // indirect
+	github.com/RyuaNerin/go-krypto v1.3.0 // indirect
+	github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344 // indirect
+	github.com/andybalholm/brotli v1.0.6 // indirect
+	github.com/bahlo/generic-list-go v0.2.0 // indirect
+	github.com/buger/jsonparser v1.1.1 // indirect
+	github.com/bytedance/sonic v1.11.6 // indirect
 	github.com/bytedance/sonic/loader v0.1.1 // indirect
-	github.com/cloudwego/base64x v0.1.3 // indirect
+	github.com/cloudflare/circl v1.3.7 // indirect
+	github.com/cloudwego/base64x v0.1.4 // indirect
 	github.com/cloudwego/iasm v0.2.0 // indirect
+	github.com/coreos/go-iptables v0.8.0 // indirect
+	github.com/dlclark/regexp2 v1.11.5 // indirect
+	github.com/ebitengine/purego v0.8.3 // indirect
+	github.com/enfein/mieru/v3 v3.13.0 // indirect
+	github.com/ericlagergren/aegis v0.0.0-20250325060835-cd0defd64358 // indirect
+	github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391 // indirect
+	github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1 // indirect
+	github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010 // indirect
+	github.com/fsnotify/fsnotify v1.9.0 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
+	github.com/gaukas/godicttls v0.0.4 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
+	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.19.0 // indirect
+	github.com/go-playground/validator/v10 v10.20.0 // indirect
+	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
+	github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
+	github.com/gobwas/httphead v0.1.0 // indirect
+	github.com/gobwas/pool v0.2.1 // indirect
+	github.com/gobwas/ws v1.4.0 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
+	github.com/gofrs/uuid/v5 v5.3.2 // indirect
+	github.com/google/btree v1.1.3 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
+	github.com/hashicorp/yamux v0.1.2 // indirect
+	github.com/insomniacslk/dhcp v0.0.0-20250109001534-8abf58130905 // indirect
+	github.com/josharian/native v1.1.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.7 // indirect
+	github.com/klauspost/compress v1.17.9 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.9 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
+	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
+	github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mdlayher/netlink v1.7.2 // indirect
+	github.com/mdlayher/socket v0.4.1 // indirect
+	github.com/metacubex/amneziawg-go v0.0.0-20240922133038-fdf3a4d5a4ab // indirect
+	github.com/metacubex/bart v0.20.5 // indirect
+	github.com/metacubex/bbolt v0.0.0-20240822011022-aed6d4850399 // indirect
+	github.com/metacubex/chacha v0.1.2 // indirect
+	github.com/metacubex/fswatch v0.1.1 // indirect
+	github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 // indirect
+	github.com/metacubex/gvisor v0.0.0-20250324165734-5857f47bd43b // indirect
+	github.com/metacubex/nftables v0.0.0-20250503052935-30a69ab87793 // indirect
+	github.com/metacubex/quic-go v0.52.1-0.20250522021943-aef454b9e639 // indirect
+	github.com/metacubex/randv2 v0.2.0 // indirect
+	github.com/metacubex/sing v0.5.3 // indirect
+	github.com/metacubex/sing-mux v0.3.2 // indirect
+	github.com/metacubex/sing-quic v0.0.0-20250523120938-f1a248e5ec7f // indirect
+	github.com/metacubex/sing-shadowsocks v0.2.10 // indirect
+	github.com/metacubex/sing-shadowsocks2 v0.2.4 // indirect
+	github.com/metacubex/sing-shadowtls v0.0.0-20250503063515-5d9f966d17a2 // indirect
+	github.com/metacubex/sing-tun v0.4.6-0.20250524142129-9d110c0af70c // indirect
+	github.com/metacubex/sing-vmess v0.2.2 // indirect
+	github.com/metacubex/sing-wireguard v0.0.0-20250503063753-2dc62acc626f // indirect
+	github.com/metacubex/smux v0.0.0-20250503055512-501391591dee // indirect
+	github.com/metacubex/tfo-go v0.0.0-20250516165257-e29c16ae41d4 // indirect
+	github.com/metacubex/utls v1.7.3 // indirect
+	github.com/metacubex/wireguard-go v0.0.0-20240922131502-c182e7471181 // indirect
+	github.com/miekg/dns v1.1.63 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/pelletier/go-toml/v2 v2.2.1 // indirect
+	github.com/mroth/weightedrand/v2 v2.1.0 // indirect
+	github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7 // indirect
+	github.com/onsi/ginkgo/v2 v2.9.5 // indirect
+	github.com/openacid/low v0.1.21 // indirect
+	github.com/oschwald/maxminddb-golang v1.12.0 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
+	github.com/pierrec/lz4/v4 v4.1.14 // indirect
+	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
+	github.com/puzpuzpuz/xsync/v3 v3.5.1 // indirect
+	github.com/quic-go/qpack v0.4.0 // indirect
+	github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a // indirect
+	github.com/sagikazarmark/locafero v0.7.0 // indirect
+	github.com/samber/lo v1.50.0 // indirect
+	github.com/shirou/gopsutil/v4 v4.25.1 // indirect
+	github.com/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b // indirect
+	github.com/sina-ghaderi/rabaead v0.0.0-20220730151906-ab6e06b96e8c // indirect
+	github.com/sina-ghaderi/rabbitio v0.0.0-20220730151941-9ce26f4f872e // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
+	github.com/sourcegraph/conc v0.3.0 // indirect
+	github.com/spf13/afero v1.12.0 // indirect
+	github.com/spf13/cast v1.7.1 // indirect
+	github.com/spf13/pflag v1.0.6 // indirect
+	github.com/subosito/gotenv v1.6.0 // indirect
+	github.com/tklauser/go-sysconf v0.3.12 // indirect
+	github.com/tklauser/numcpus v0.6.1 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
+	github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923 // indirect
 	github.com/ugorji/go/codec v1.2.12 // indirect
+	github.com/vishvananda/netns v0.0.4 // indirect
+	github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
+	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
+	github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
+	github.com/yusufpapurcu/wmi v1.2.4 // indirect
+	gitlab.com/go-extension/aes-ccm v0.0.0-20230221065045-e58665ef23c7 // indirect
+	gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect
+	go.uber.org/mock v0.4.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/arch v0.7.0 // indirect
-	golang.org/x/crypto v0.22.0 // indirect
-	golang.org/x/net v0.24.0 // indirect
-	golang.org/x/sys v0.19.0 // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
+	go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
+	golang.org/x/arch v0.8.0 // indirect
+	golang.org/x/crypto v0.33.0 // indirect
+	golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e // indirect
+	golang.org/x/mod v0.20.0 // indirect
+	golang.org/x/net v0.35.0 // indirect
+	golang.org/x/sync v0.11.0 // indirect
+	golang.org/x/sys v0.30.0 // indirect
+	golang.org/x/time v0.8.0 // indirect
+	golang.org/x/tools v0.24.0 // indirect
+	google.golang.org/protobuf v1.36.1 // indirect
+	lukechampine.com/blake3 v1.3.0 // indirect
 )

go.sum

@@ -1,102 +1,376 @@
-github.com/bytedance/sonic v1.11.5 h1:G00FYjjqll5iQ1PYXynbg/hyzqBqavH8Mo9/oTopd9k=
-github.com/bytedance/sonic v1.11.5/go.mod h1:X2PC2giUdj/Cv2lliWFLk6c/DUQok5rViJSemeB0wDw=
-github.com/bytedance/sonic/loader v0.1.0/go.mod h1:UmRT+IRTGKz/DAkzcEGzyVqQFJ7H9BqwBO3pm9H/+HY=
+github.com/3andne/restls-client-go v0.1.6 h1:tRx/YilqW7iHpgmEL4E1D8dAsuB0tFF3uvncS+B6I08=
+github.com/3andne/restls-client-go v0.1.6/go.mod h1:iEdTZNt9kzPIxjIGSMScUFSBrUH6bFRNg0BWlP4orEY=
+github.com/RyuaNerin/go-krypto v1.3.0 h1:smavTzSMAx8iuVlGb4pEwl9MD2qicqMzuXR2QWp2/Pg=
+github.com/RyuaNerin/go-krypto v1.3.0/go.mod h1:9R9TU936laAIqAmjcHo/LsaXYOZlymudOAxjaBf62UM=
+github.com/RyuaNerin/testingutil v0.1.0 h1:IYT6JL57RV3U2ml3dLHZsVtPOP6yNK7WUVdzzlpNrss=
+github.com/RyuaNerin/testingutil v0.1.0/go.mod h1:yTqj6Ta/ycHMPJHRyO12Mz3VrvTloWOsy23WOZH19AA=
+github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344 h1:cDVUiFo+npB0ZASqnw4q90ylaVAbnYyx0JYqK4YcGok=
+github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344/go.mod h1:9pIqrY6SXNL8vjRQE5Hd/OL5GyK/9MrGUWs87z/eFfk=
+github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU=
+github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
+github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI=
+github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
+github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk=
+github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xWbdbCW3pNTGyYg=
+github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
+github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs=
+github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
+github.com/bytedance/sonic v1.11.6 h1:oUp34TzMlL+OY1OUWxHqsdkgC/Zfc85zGqw9siXjrc0=
+github.com/bytedance/sonic v1.11.6/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4=
 github.com/bytedance/sonic/loader v0.1.1 h1:c+e5Pt1k/cy5wMveRDyk2X4B9hF4g7an8N3zCYjJFNM=
 github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
-github.com/cloudwego/base64x v0.1.3 h1:b5J/l8xolB7dyDTTmhJP2oTs5LdrjyrUFuNxdfq5hAg=
-github.com/cloudwego/base64x v0.1.3/go.mod h1:1+1K5BUHIQzyapgpF7LwvOGAEDicKtt1umPV+aN8pi8=
+github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
+github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
+github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
+github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
+github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
+github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y=
+github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
 github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg=
 github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
+github.com/coreos/go-iptables v0.8.0 h1:MPc2P89IhuVpLI7ETL/2tx3XZ61VeICZjYqDEgNsPRc=
+github.com/coreos/go-iptables v0.8.0/go.mod h1:Qe8Bv2Xik5FyTXwgIbLAnv2sWSBmvWdFETJConOQ//Q=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dlclark/regexp2 v1.11.5 h1:Q/sSnsKerHeCkc/jSTNq1oCm7KiVgUMZRDUoRu0JQZQ=
+github.com/dlclark/regexp2 v1.11.5/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
+github.com/ebitengine/purego v0.8.3 h1:K+0AjQp63JEZTEMZiwsI9g0+hAMNohwUOtY0RPGexmc=
+github.com/ebitengine/purego v0.8.3/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
+github.com/enfein/mieru/v3 v3.13.0 h1:eGyxLGkb+lut9ebmx+BGwLJ5UMbEc/wGIYO0AXEKy98=
+github.com/enfein/mieru/v3 v3.13.0/go.mod h1:zJBUCsi5rxyvHM8fjFf+GLaEl4OEjjBXr1s5F6Qd3hM=
+github.com/ericlagergren/aegis v0.0.0-20250325060835-cd0defd64358 h1:kXYqH/sL8dS/FdoFjr12ePjnLPorPo2FsnrHNuXSDyo=
+github.com/ericlagergren/aegis v0.0.0-20250325060835-cd0defd64358/go.mod h1:hkIFzoiIPZYxdFOOLyDho59b7SrDfo+w3h+yWdlg45I=
+github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391 h1:8j2RH289RJplhA6WfdaPqzg1MjH2K8wX5e0uhAxrw2g=
+github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391/go.mod h1:K2R7GhgxrlJzHw2qiPWsCZXf/kXEJN9PLnQK73Ll0po=
+github.com/ericlagergren/saferand v0.0.0-20220206064634-960a4dd2bc5c h1:RUzBDdZ+e/HEe2Nh8lYsduiPAZygUfVXJn0Ncj5sHMg=
+github.com/ericlagergren/saferand v0.0.0-20220206064634-960a4dd2bc5c/go.mod h1:ETASDWf/FmEb6Ysrtd1QhjNedUU/ZQxBCRLh60bQ/UI=
+github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1 h1:tlDMEdcPRQKBEz5nGDMvswiajqh7k8ogWRlhRwKy5mY=
+github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1/go.mod h1:4RfsapbGx2j/vU5xC/5/9qB3kn9Awp1YDiEnN43QrJ4=
+github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010 h1:fuGucgPk5dN6wzfnxl3D0D3rVLw4v2SbBT9jb4VnxzA=
+github.com/ericlagergren/subtle v0.0.0-20220507045147-890d697da010/go.mod h1:JtBcj7sBuTTRupn7c2bFspMDIObMJsVK8TeUvpShPok=
+github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
+github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
+github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
+github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
 github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0=
 github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk=
+github.com/gaukas/godicttls v0.0.4 h1:NlRaXb3J6hAnTmWdsEKb9bcSBD6BvcIjdGdeb0zfXbk=
+github.com/gaukas/godicttls v0.0.4/go.mod h1:l6EenT4TLWgTdwslVb4sEMOCf7Bv0JAK67deKr9/NCI=
 github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
-github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
-github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
+github.com/gin-gonic/gin v1.10.1 h1:T0ujvqyCSqRopADpgPgiTT63DUQVSfojyME59Ei63pQ=
+github.com/gin-gonic/gin v1.10.1/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y=
+github.com/go-chi/chi/v5 v5.2.1 h1:KOIHODQj58PmL80G2Eak4WdvUzjSJSm0vG72crDCqb8=
+github.com/go-chi/chi/v5 v5.2.1/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops=
+github.com/go-chi/render v1.0.3 h1:AsXqd2a1/INaIfUSKq3G5uA8weYx20FOsM7uSoCyyt4=
+github.com/go-chi/render v1.0.3/go.mod h1:/gr3hVkmYR0YlEy3LxCuVRFzEu9Ruok+gFqbIofjao0=
+github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
+github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
+github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
+github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
 github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
 github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
-github.com/go-playground/validator/v10 v10.19.0 h1:ol+5Fu+cSq9JD7SoSqe04GMI92cbn0+wvQ3bZ8b/AU4=
-github.com/go-playground/validator/v10 v10.19.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
+github.com/go-playground/validator/v10 v10.20.0 h1:K9ISHbSaI0lyB2eWMPJo+kOS/FBExVwjEviJTixqxL8=
+github.com/go-playground/validator/v10 v10.20.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
+github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
+github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
+github.com/go-viper/mapstructure/v2 v2.2.1 h1:ZAaOCxANMuZx5RCeg0mBdEZk7DZasvvZIxtHqx8aGss=
+github.com/go-viper/mapstructure/v2 v2.2.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
+github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU=
+github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM=
+github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
+github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
+github.com/gobwas/ws v1.4.0 h1:CTaoG1tojrh4ucGPcoJFiAQUAsEWekEWvLy7GsVNqGs=
+github.com/gobwas/ws v1.4.0/go.mod h1:G3gNqMNtPppf5XUz7O4shetPpcZ1VJ7zt18dlUeakrc=
 github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
 github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/gofrs/uuid/v5 v5.3.2 h1:2jfO8j3XgSwlz/wHqemAEugfnTlikAYHhnqQ8Xh4fE0=
+github.com/gofrs/uuid/v5 v5.3.2/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
+github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
+github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
-github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
+github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE=
+github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/tink/go v1.6.1 h1:t7JHqO8Ath2w2ig5vjwQYJzhGEZymedQc90lQXUBa4I=
+github.com/google/tink/go v1.6.1/go.mod h1:IGW53kTgag+st5yPhKKwJ6u2l+SSp5/v9XF7spovjlY=
+github.com/hashicorp/yamux v0.1.2 h1:XtB8kyFOyHXYVFnwT5C3+Bdo8gArse7j2AQ0DA0Uey8=
+github.com/hashicorp/yamux v0.1.2/go.mod h1:C+zze2n6e/7wshOZep2A70/aQU6QBRWJO/G6FT1wIns=
+github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/insomniacslk/dhcp v0.0.0-20250109001534-8abf58130905 h1:q3OEI9RaN/wwcx+qgGo6ZaoJkCiDYe/gjDLfq7lQQF4=
+github.com/insomniacslk/dhcp v0.0.0-20250109001534-8abf58130905/go.mod h1:VvGYjkZoJyKqlmT1yzakUs4mfKMNB0XdODP0+rdml6k=
+github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
+github.com/josharian/native v1.0.1-0.20221213033349-c1e37c09b531/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
+github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtLA=
+github.com/josharian/native v1.1.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
+github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
+github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM=
-github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
+github.com/klauspost/cpuid/v2 v2.2.9 h1:66ze0taIn2H33fBvCkXuv9BmCwDfafmiIVpKV9kKGuY=
+github.com/klauspost/cpuid/v2 v2.2.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8=
 github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
 github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
+github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
+github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
+github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 h1:EnfXoSqDfSNJv0VBNqY/88RNnhSGYkrHaO0mmFGbVsc=
+github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40/go.mod h1:vy1vK6wD6j7xX6O6hXe621WabdtNkou2h7uRtTfRMyg=
+github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
+github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mdlayher/netlink v1.7.2 h1:/UtM3ofJap7Vl4QWCPDGXY8d3GIY2UGSDbK+QWmY8/g=
+github.com/mdlayher/netlink v1.7.2/go.mod h1:xraEF7uJbxLhc5fpHL4cPe221LI2bdttWlU+ZGLfQSw=
+github.com/mdlayher/socket v0.4.1 h1:eM9y2/jlbs1M615oshPQOHZzj6R6wMT7bX5NPiQvn2U=
+github.com/mdlayher/socket v0.4.1/go.mod h1:cAqeGjoufqdxWkD7DkpyS+wcefOtmu5OQ8KuoJGIReA=
+github.com/metacubex/amneziawg-go v0.0.0-20240922133038-fdf3a4d5a4ab h1:Chbw+/31UC14YFNr78pESt5Vowlc62zziw05JCUqoL4=
+github.com/metacubex/amneziawg-go v0.0.0-20240922133038-fdf3a4d5a4ab/go.mod h1:xVKK8jC5Sd3hfh7WjmCq+HorehIbrBijaUWmcuKjPcI=
+github.com/metacubex/bart v0.20.5 h1:XkgLZ17QxfxkqKdGsojoM2Zu01mmHyyQSFzt2/calTM=
+github.com/metacubex/bart v0.20.5/go.mod h1:DCcyfP4MC+Zy7sLK7XeGuMw+P5K9mIRsYOBgiE8icsI=
+github.com/metacubex/bbolt v0.0.0-20240822011022-aed6d4850399 h1:oBowHVKZycNtAFbZ6avaCSZJYeme2Nrj+4RpV2cNJig=
+github.com/metacubex/bbolt v0.0.0-20240822011022-aed6d4850399/go.mod h1:4xcieuIK+M4bGQmQYZVqEaIYqjS1ahO4kXG7EmDgEro=
+github.com/metacubex/chacha v0.1.2 h1:QulCq3eVm3TO6+4nVIWJtmSe7BT2GMrgVHuAoqRQnlc=
+github.com/metacubex/chacha v0.1.2/go.mod h1:Djn9bPZxLTXbJFSeyo0/qzEzQI+gUSSzttuzZM75GH8=
+github.com/metacubex/fswatch v0.1.1 h1:jqU7C/v+g0qc2RUFgmAOPoVvfl2BXXUXEumn6oQuxhU=
+github.com/metacubex/fswatch v0.1.1/go.mod h1:czrTT7Zlbz7vWft8RQu9Qqh+JoX+Nnb+UabuyN1YsgI=
+github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759 h1:cjd4biTvOzK9ubNCCkQ+ldc4YSH/rILn53l/xGBFHHI=
+github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759/go.mod h1:UHOv2xu+RIgLwpXca7TLrXleEd4oR3sPatW6IF8wU88=
+github.com/metacubex/gvisor v0.0.0-20250324165734-5857f47bd43b h1:RUh4OdVPz/jDrM9MQ2ySuqu2aeBqcA8rtfWUYLZ8RtI=
+github.com/metacubex/gvisor v0.0.0-20250324165734-5857f47bd43b/go.mod h1:8LpS0IJW1VmWzUm3ylb0e2SK5QDm5lO/2qwWLZgRpBU=
+github.com/metacubex/mihomo v1.19.10 h1:GXCOA1rJNfU5qYSvo+UBUFksh61M0tjPfvlZ1OsYtfs=
+github.com/metacubex/mihomo v1.19.10/go.mod h1:ih7BKy1pfqSvPRqaCcuFFK4oNRIFyBotoHX0PbhF7SQ=
+github.com/metacubex/nftables v0.0.0-20250503052935-30a69ab87793 h1:1Qpuy+sU3DmyX9HwI+CrBT/oLNJngvBorR2RbajJcqo=
+github.com/metacubex/nftables v0.0.0-20250503052935-30a69ab87793/go.mod h1:RjRNb4G52yAgfR+Oe/kp9G4PJJ97Fnj89eY1BFO3YyA=
+github.com/metacubex/quic-go v0.52.1-0.20250522021943-aef454b9e639 h1:L+1brQNzBhCCxWlicwfK1TlceemCRmrDE4HmcVHc29w=
+github.com/metacubex/quic-go v0.52.1-0.20250522021943-aef454b9e639/go.mod h1:Kc6h++Q/zf3AxcUCevJhJwgrskJumv+pZdR8g/E/10k=
+github.com/metacubex/randv2 v0.2.0 h1:uP38uBvV2SxYfLj53kuvAjbND4RUDfFJjwr4UigMiLs=
+github.com/metacubex/randv2 v0.2.0/go.mod h1:kFi2SzrQ5WuneuoLLCMkABtiBu6VRrMrWFqSPyj2cxY=
+github.com/metacubex/sing v0.5.2/go.mod h1:ypf0mjwlZm0sKdQSY+yQvmsbWa0hNPtkeqyRMGgoN+w=
+github.com/metacubex/sing v0.5.3 h1:QWdN16WFKMk06x4nzkc8SvZ7y2x+TLQrpkPoHs+WSVM=
+github.com/metacubex/sing v0.5.3/go.mod h1:ypf0mjwlZm0sKdQSY+yQvmsbWa0hNPtkeqyRMGgoN+w=
+github.com/metacubex/sing-mux v0.3.2 h1:nJv52pyRivHcaZJKk2JgxpaVvj1GAXG81scSa9N7ncw=
+github.com/metacubex/sing-mux v0.3.2/go.mod h1:3rt1soewn0O6j89GCLmwAQFsq257u0jf2zQSPhTL3Bw=
+github.com/metacubex/sing-quic v0.0.0-20250523120938-f1a248e5ec7f h1:mP3vIm+9hRFI0C0Vl3pE0NESF/L85FDbuB0tGgUii6I=
+github.com/metacubex/sing-quic v0.0.0-20250523120938-f1a248e5ec7f/go.mod h1:JPTpf7fpnojsSuwRJExhSZSy63pVbp3VM39+zj+sAJM=
+github.com/metacubex/sing-shadowsocks v0.2.10 h1:Pr7LDbjMANIQHl07zWgl1vDuhpsfDQUpZ8cX6DPabfg=
+github.com/metacubex/sing-shadowsocks v0.2.10/go.mod h1:MtRM0ZZjR0kaDOzy9zWSt6/4/UlrnsNBq+1FNAF4vBk=
+github.com/metacubex/sing-shadowsocks2 v0.2.4 h1:Ec0x3hHR7xkld5Z09IGh16wtUUpBb2HgqZ9DExd8Q7s=
+github.com/metacubex/sing-shadowsocks2 v0.2.4/go.mod h1:WP8+S0kqtnSbX1vlIpo5i8Irm/ijZITEPBcZ26B5unY=
+github.com/metacubex/sing-shadowtls v0.0.0-20250503063515-5d9f966d17a2 h1:gXU+MYPm7Wme3/OAY2FFzVq9d9GxPHOqu5AQfg/ddhI=
+github.com/metacubex/sing-shadowtls v0.0.0-20250503063515-5d9f966d17a2/go.mod h1:mbfboaXauKJNIHJYxQRa+NJs4JU9NZfkA+I33dS2+9E=
+github.com/metacubex/sing-tun v0.4.6-0.20250524142129-9d110c0af70c h1:Y6jk7AH5BEg9Dsvczrf/KokYsvxeKSZZlCLHg+hC4ro=
+github.com/metacubex/sing-tun v0.4.6-0.20250524142129-9d110c0af70c/go.mod h1:HDaHDL6onAX2ZGbAGUXKp++PohRdNb7Nzt6zxzhox+U=
+github.com/metacubex/sing-vmess v0.2.2 h1:nG6GIKF1UOGmlzs+BIetdGHkFZ20YqFVIYp5Htqzp+4=
+github.com/metacubex/sing-vmess v0.2.2/go.mod h1:CVDNcdSLVYFgTHQlubr88d8CdqupAUDqLjROos+H9xk=
+github.com/metacubex/sing-wireguard v0.0.0-20250503063753-2dc62acc626f h1:Sr/DYKYofKHKc4GF3qkRGNuj6XA6c0eqPgEDN+VAsYU=
+github.com/metacubex/sing-wireguard v0.0.0-20250503063753-2dc62acc626f/go.mod h1:jpAkVLPnCpGSfNyVmj6Cq4YbuZsFepm/Dc+9BAOcR80=
+github.com/metacubex/smux v0.0.0-20250503055512-501391591dee h1:lp6hJ+4wCLZu113awp7P6odM2okB5s60HUyF0FMqKmo=
+github.com/metacubex/smux v0.0.0-20250503055512-501391591dee/go.mod h1:4bPD8HWx9jPJ9aE4uadgyN7D1/Wz3KmPy+vale8sKLE=
+github.com/metacubex/tfo-go v0.0.0-20250516165257-e29c16ae41d4 h1:j1VRTiC9JLR4nUbSikx9OGdu/3AgFDqgcLj4GoqyQkc=
+github.com/metacubex/tfo-go v0.0.0-20250516165257-e29c16ae41d4/go.mod h1:l9oLnLoEXyGZ5RVLsh7QCC5XsouTUyKk4F2nLm2DHLw=
+github.com/metacubex/utls v1.7.3 h1:yDcMEWojFh+t8rU9X0HPcZDPAoFze/rIIyssqivzj8A=
+github.com/metacubex/utls v1.7.3/go.mod h1:oknYT0qTOwE4hjPmZOEpzVdefnW7bAdGLvZcqmk4TLU=
+github.com/metacubex/wireguard-go v0.0.0-20240922131502-c182e7471181 h1:hJLQviGySBuaynlCwf/oYgIxbVbGRUIKZCxdya9YrbQ=
+github.com/metacubex/wireguard-go v0.0.0-20240922131502-c182e7471181/go.mod h1:phewKljNYiTVT31Gcif8RiCKnTUOgVWFJjccqYM8s+Y=
+github.com/miekg/dns v1.1.63 h1:8M5aAw6OMZfFXTT7K5V0Eu5YiiL8l7nUAkyN6C9YwaY=
+github.com/miekg/dns v1.1.63/go.mod h1:6NGHfjhpmr5lt3XPLuyfDJi5AXbNIPM9PY6H6sF1Nfs=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/pelletier/go-toml/v2 v2.2.1 h1:9TA9+T8+8CUCO2+WYnDLCgrYi9+omqKXyjDtosvtEhg=
-github.com/pelletier/go-toml/v2 v2.2.1/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
+github.com/mroth/weightedrand/v2 v2.1.0 h1:o1ascnB1CIVzsqlfArQQjeMy1U0NcIbBO5rfd5E/OeU=
+github.com/mroth/weightedrand/v2 v2.1.0/go.mod h1:f2faGsfOGOwc1p94wzHKKZyTpcJUW7OJ/9U4yfiNAOU=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
+github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7 h1:1102pQc2SEPp5+xrS26wEaeb26sZy6k9/ZXlZN+eXE4=
+github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7/go.mod h1:UqoUn6cHESlliMhOnKLWr+CBH+e3bazUPvFj1XZwAjs=
+github.com/onsi/ginkgo/v2 v2.9.5 h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q=
+github.com/onsi/ginkgo/v2 v2.9.5/go.mod h1:tvAoo1QUJwNEU2ITftXTpR7R1RbCzoZUOs3RonqW57k=
+github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE=
+github.com/onsi/gomega v1.27.6/go.mod h1:PIQNjfQwkP3aQAH7lf7j87O/5FiNr+ZR8+ipb+qQlhg=
+github.com/openacid/errors v0.8.1/go.mod h1:GUQEJJOJE3W9skHm8E8Y4phdl2LLEN8iD7c5gcGgdx0=
+github.com/openacid/low v0.1.21 h1:Tr2GNu4N/+rGRYdOsEHOE89cxUIaDViZbVmKz29uKGo=
+github.com/openacid/low v0.1.21/go.mod h1:q+MsKI6Pz2xsCkzV4BLj7NR5M4EX0sGz5AqotpZDVh0=
+github.com/openacid/must v0.1.3/go.mod h1:luPiXCuJlEo3UUFQngVQokV0MPGryeYvtCbQPs3U1+I=
+github.com/openacid/testkeys v0.1.6/go.mod h1:MfA7cACzBpbiwekivj8StqX0WIRmqlMsci1c37CA3Do=
+github.com/oschwald/maxminddb-golang v1.12.0 h1:9FnTOD0YOhP7DGxGsq4glzpGy5+w7pq50AS6wALUMYs=
+github.com/oschwald/maxminddb-golang v1.12.0/go.mod h1:q0Nob5lTCqyQ8WT6FYgS1L7PXKVVbgiymefNwIjPzgY=
+github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M=
+github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc=
+github.com/pierrec/lz4/v4 v4.1.14 h1:+fL8AQEZtz/ijeNnpduH0bROTu0O3NZAlPjQxGn8LwE=
+github.com/pierrec/lz4/v4 v4.1.14/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
+github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
+github.com/puzpuzpuz/xsync/v3 v3.5.1 h1:GJYJZwO6IdxN/IKbneznS6yPkVC+c3zyY/j19c++5Fg=
+github.com/puzpuzpuz/xsync/v3 v3.5.1/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA=
+github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
+github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
+github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
+github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
+github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a h1:ObwtHN2VpqE0ZNjr6sGeT00J8uU7JF4cNUdb44/Duis=
+github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a/go.mod h1:xLnfdiJbSp8rNqYEdIW/6eDO4mVoogml14Bh2hSiFpM=
+github.com/sagikazarmark/locafero v0.7.0 h1:5MqpDsTGNDhY8sGp0Aowyf0qKsPrhewaLSsFaodPcyo=
+github.com/sagikazarmark/locafero v0.7.0/go.mod h1:2za3Cg5rMaTMoG/2Ulr9AwtFaIppKXTRYnozin4aB5k=
+github.com/samber/lo v1.50.0 h1:XrG0xOeHs+4FQ8gJR97zDz5uOFMW7OwFWiFVzqopKgY=
+github.com/samber/lo v1.50.0/go.mod h1:RjZyNk6WSnUFRKK6EyOhsRJMqft3G+pg7dCWHQCWvsc=
+github.com/shirou/gopsutil/v4 v4.25.1 h1:QSWkTc+fu9LTAWfkZwZ6j8MSUk4A2LV7rbH0ZqmLjXs=
+github.com/shirou/gopsutil/v4 v4.25.1/go.mod h1:RoUCUpndaJFtT+2zsZzzmhvbfGoDCJ7nFXKJf8GqJbI=
+github.com/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b h1:rXHg9GrUEtWZhEkrykicdND3VPjlVbYiLdX9J7gimS8=
+github.com/sina-ghaderi/poly1305 v0.0.0-20220724002748-c5926b03988b/go.mod h1:X7qrxNQViEaAN9LNZOPl9PfvQtp3V3c7LTo0dvGi0fM=
+github.com/sina-ghaderi/rabaead v0.0.0-20220730151906-ab6e06b96e8c h1:DjKMC30y6yjG3IxDaeAj3PCoRr+IsO+bzyT+Se2m2Hk=
+github.com/sina-ghaderi/rabaead v0.0.0-20220730151906-ab6e06b96e8c/go.mod h1:NV/a66PhhWYVmUMaotlXJ8fIEFB98u+c8l/CQIEFLrU=
+github.com/sina-ghaderi/rabbitio v0.0.0-20220730151941-9ce26f4f872e h1:ur8uMsPIFG3i4Gi093BQITvwH9znsz2VUZmnmwHvpIo=
+github.com/sina-ghaderi/rabbitio v0.0.0-20220730151941-9ce26f4f872e/go.mod h1:+e5fBW3bpPyo+3uLo513gIUblc03egGjMM0+5GKbzK8=
+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
+github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
+github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0=
+github.com/spf13/afero v1.12.0 h1:UcOPyRBYczmFn6yvphxkn9ZEOY65cpwGKb5mL36mrqs=
+github.com/spf13/afero v1.12.0/go.mod h1:ZTlWwG4/ahT8W7T0WQ5uYmjI9duaLQGy3Q2OAl4sk/4=
+github.com/spf13/cast v1.7.1 h1:cuNEagBQEHWN1FnbGEjCXL2szYEXqfJPbP2HNUaca9Y=
+github.com/spf13/cast v1.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
+github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
+github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/viper v1.20.1 h1:ZMi+z/lvLyPSCoNtFCpqjy0S4kPbirhpTMwl8BkW9X4=
+github.com/spf13/viper v1.20.1/go.mod h1:P9Mdzt1zoHIG8m2eZQinpiBjo6kCmZSKBClNNqjJvu4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
+github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
+github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
+github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
+github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk=
+github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY=
 github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
+github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923 h1:tHNk7XK9GkmKUR6Gh8gVBKXc2MVSZ4G/NnWLtzw4gNA=
+github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923/go.mod h1:eLL9Nub3yfAho7qB0MzZizFhTU2QkLeoVsWdHtDW264=
 github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
 github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
+github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
+github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU=
+github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
+github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1YX8=
+github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
+github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IUPn0Bjt8=
+github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok=
+github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
+github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
+github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc=
+github.com/wk8/go-ordered-map/v2 v2.1.8/go.mod h1:5nJHM5DyteebpVlHnWMV0rPz6Zp7+xBAnxjb1X5vnTw=
+github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
+github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
+gitlab.com/go-extension/aes-ccm v0.0.0-20230221065045-e58665ef23c7 h1:UNrDfkQqiEYzdMlNsVvBYOAJWZjdktqFE9tQh5BT2+4=
+gitlab.com/go-extension/aes-ccm v0.0.0-20230221065045-e58665ef23c7/go.mod h1:E+rxHvJG9H6PUdzq9NRG6csuLN3XUx98BfGOVWNYnXs=
+gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec h1:FpfFs4EhNehiVfzQttTuxanPIT43FtkkCFypIod8LHo=
+gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec/go.mod h1:BZ1RAoRPbCxum9Grlv5aeksu2H8BiKehBYooU2LFiOQ=
 go.etcd.io/bbolt v1.3.9 h1:8x7aARPEXiXbHmtUwAIv7eV2fQFHrLLavdiJ3uzJXoI=
 go.etcd.io/bbolt v1.3.9/go.mod h1:zaO32+Ti0PK1ivdPtgMESzuzL2VPoIG1PCQNvOdo/dE=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
+go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
+go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
 go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
+go4.org/netipx v0.0.0-20231129151722-fdeea329fbba h1:0b9z3AuHCjxk0x/opv64kcgZLBseWJUpBw5I82+2U4M=
+go4.org/netipx v0.0.0-20231129151722-fdeea329fbba/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y=
 golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
-golang.org/x/arch v0.7.0 h1:pskyeJh/3AmoQ8CPE95vxHLqp1G1GfGNXTmcl9NEKTc=
-golang.org/x/arch v0.7.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
-golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30=
-golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
-golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
-golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
-golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
-golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/arch v0.8.0 h1:3wRIsP3pM4yUptoR96otTUOXI367OS0+c9eeRi9doIc=
+golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
+golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
+golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e h1:I88y4caeGeuDQxgdoFPUq097j7kNfw6uvuiNxUBfcBk=
+golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ=
+golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0=
+golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
+golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
+golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200217220822-9197077df867/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
-golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
-google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
+golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
+golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
+golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
+golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg=
+golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
+golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24=
+golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=
+google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc=
 gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+lukechampine.com/blake3 v1.3.0 h1:sJ3XhFINmHSrYCgl958hscfIa3bw8x4DqMP3u1YvoYE=
+lukechampine.com/blake3 v1.3.0/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k=
 nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
+resty.dev/v3 v3.0.0-beta.3 h1:3kEwzEgCnnS6Ob4Emlk94t+I/gClyoah7SnNi67lt+E=
+resty.dev/v3 v3.0.0-beta.3/go.mod h1:OgkqiPvTDtOuV4MGZuUDhwOpkY8enjOsjjMzeOHefy4=
 rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=

main.go

@@ -3,24 +3,17 @@ package main
 import (
 	_ "embed"
 	"io"
-	"strconv"
 
-	"github.com/nitezs/sub2clash/api"
-	"github.com/nitezs/sub2clash/common"
-	"github.com/nitezs/sub2clash/common/database"
-	"github.com/nitezs/sub2clash/config"
-	"github.com/nitezs/sub2clash/logger"
+	"github.com/bestnite/sub2clash/common"
+	"github.com/bestnite/sub2clash/common/database"
+	"github.com/bestnite/sub2clash/config"
+	"github.com/bestnite/sub2clash/logger"
+	"github.com/bestnite/sub2clash/server"
 
 	"github.com/gin-gonic/gin"
 	"go.uber.org/zap"
 )
 
-//go:embed templates/template_meta.yaml
-var templateMeta string
-
-//go:embed templates/template_clash.yaml
-var templateClash string
-
 func init() {
 	var err error
 
@@ -31,16 +24,11 @@ func init() {
 
 	err = config.LoadConfig()
 
-	logger.InitLogger(config.Default.LogLevel)
+	logger.InitLogger(config.GlobalConfig.LogLevel)
 	if err != nil {
 		logger.Logger.Panic("load config failed", zap.Error(err))
 	}
 
-	err = common.WriteDefalutTemplate(templateMeta, templateClash)
-	if err != nil {
-		logger.Logger.Panic("write default template failed", zap.Error(err))
-	}
-
 	err = database.ConnectDB()
 	if err != nil {
 		logger.Logger.Panic("database connect failed", zap.Error(err))
@@ -49,16 +37,15 @@ func init() {
 }
 
 func main() {
-
 	gin.SetMode(gin.ReleaseMode)
 
 	gin.DefaultWriter = io.Discard
 
 	r := gin.Default()
 
-	api.SetRoute(r)
-	logger.Logger.Info("server is running at http://localhost:" + strconv.Itoa(config.Default.Port))
-	err := r.Run(":" + strconv.Itoa(config.Default.Port))
+	server.SetRoute(r)
+	logger.Logger.Info("server is running at " + config.GlobalConfig.Address)
+	err := r.Run(config.GlobalConfig.Address)
 	if err != nil {
 		logger.Logger.Error("server running failed", zap.Error(err))
 		return

model/clash.go

@@ -1,5 +1,7 @@
 package model
 
+import "github.com/bestnite/sub2clash/parser"
+
 type ClashType int
 
 const (
@@ -8,26 +10,19 @@ const (
 )
 
 func GetSupportProxyTypes(clashType ClashType) map[string]bool {
+	supportProxyTypes := make(map[string]bool)
+
+	for _, parser := range parser.GetAllParsers() {
 		if clashType == Clash {
-		return map[string]bool{
-			"ss":     true,
-			"ssr":    true,
-			"vmess":  true,
-			"trojan": true,
-			"socks5": true,
+			if parser.SupportClash() {
+				supportProxyTypes[parser.GetType()] = true
+			}
+		} else if clashType == ClashMeta {
+			if parser.SupportMeta() {
+				supportProxyTypes[parser.GetType()] = true
 			}
 		}
-	if clashType == ClashMeta {
-		return map[string]bool{
-			"ss":        true,
-			"ssr":       true,
-			"vmess":     true,
-			"trojan":    true,
-			"vless":     true,
-			"hysteria":  true,
-			"hysteria2": true,
-			"socks5":    true,
 	}
-	}
-	return nil
+
+	return supportProxyTypes
 }

model/github.go

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

model/proxy.go

@@ -1,104 +0,0 @@
-package model
-
-type SmuxStruct struct {
-	Enabled bool `yaml:"enable"`
-}
-
-type Proxy struct {
-	Name                string                `yaml:"name,omitempty"`
-	Server              string                `yaml:"server,omitempty"`
-	Port                int                   `yaml:"port,omitempty"`
-	Type                string                `yaml:"type,omitempty"`
-	Cipher              string                `yaml:"cipher,omitempty"`
-	Username            string                `yaml:"username,omitempty"`
-	Password            string                `yaml:"password,omitempty"`
-	UDP                 bool                  `yaml:"udp,omitempty"`
-	UUID                string                `yaml:"uuid,omitempty"`
-	Network             string                `yaml:"network,omitempty"`
-	Flow                string                `yaml:"flow,omitempty"`
-	TLS                 bool                  `yaml:"tls,omitempty"`
-	ClientFingerprint   string                `yaml:"client-fingerprint,omitempty"`
-	Plugin              string                `yaml:"plugin,omitempty"`
-	PluginOpts          map[string]any        `yaml:"plugin-opts,omitempty"`
-	Smux                SmuxStruct            `yaml:"smux,omitempty"`
-	Sni                 string                `yaml:"sni,omitempty"`
-	AllowInsecure       bool                  `yaml:"allow-insecure,omitempty"`
-	Fingerprint         string                `yaml:"fingerprint,omitempty"`
-	SkipCertVerify      bool                  `yaml:"skip-cert-verify,omitempty"`
-	Alpn                []string              `yaml:"alpn,omitempty"`
-	XUDP                bool                  `yaml:"xudp,omitempty"`
-	Servername          string                `yaml:"servername,omitempty"`
-	WSOpts              WSOptions             `yaml:"ws-opts,omitempty"`
-	AlterID             int                   `yaml:"alterId,omitempty"`
-	GrpcOpts            GrpcOptions           `yaml:"grpc-opts,omitempty"`
-	RealityOpts         RealityOptions        `yaml:"reality-opts,omitempty"`
-	Protocol            string                `yaml:"protocol,omitempty"`
-	Obfs                string                `yaml:"obfs,omitempty"`
-	ObfsParam           string                `yaml:"obfs-param,omitempty"`
-	ProtocolParam       string                `yaml:"protocol-param,omitempty"`
-	Remarks             []string              `yaml:"remarks,omitempty"`
-	HTTPOpts            HTTPOptions           `yaml:"http-opts,omitempty"`
-	HTTP2Opts           HTTP2Options          `yaml:"h2-opts,omitempty"`
-	PacketAddr          bool                  `yaml:"packet-addr,omitempty"`
-	PacketEncoding      string                `yaml:"packet-encoding,omitempty"`
-	GlobalPadding       bool                  `yaml:"global-padding,omitempty"`
-	AuthenticatedLength bool                  `yaml:"authenticated-length,omitempty"`
-	UDPOverTCP          bool                  `yaml:"udp-over-tcp,omitempty"`
-	UDPOverTCPVersion   int                   `yaml:"udp-over-tcp-version,omitempty"`
-	SubName             string                `yaml:"-"`
-	Up                  string                `yaml:"up,omitempty"`
-	Down                string                `yaml:"down,omitempty"`
-	CustomCA            string                `yaml:"ca,omitempty"`
-	CustomCAString      string                `yaml:"ca-str,omitempty"`
-	CWND                int                   `yaml:"cwnd,omitempty"`
-	Auth                string                `yaml:"auth,omitempty"`
-	ReceiveWindowConn   int                   `yaml:"recv-window-conn,omitempty"`
-	ReceiveWindow       int                   `yaml:"recv-window,omitempty"`
-	DisableMTUDiscovery bool                  `yaml:"disable-mtu-discovery,omitempty"`
-	FastOpen            bool                  `yaml:"fast-open,omitempty"`
-	HopInterval         int                   `yaml:"hop-interval,omitempty"`
-	Ports               string                `yaml:"ports,omitempty"`
-	AuthStringOLD       string                `yaml:"auth_str,omitempty"`
-	AuthString          string                `yaml:"auth-str,omitempty"`
-	Ip                  string                `yaml:"ip,omitempty"`
-	Ipv6                string                `yaml:"ipv6,omitempty"`
-	PrivateKey          string                `yaml:"private-key,omitempty"`
-	Workers             int                   `yaml:"workers,omitempty"`
-	MTU                 int                   `yaml:"mtu,omitempty"`
-	PersistentKeepalive int                   `yaml:"persistent-keepalive,omitempty"`
-	Peers               []WireGuardPeerOption `yaml:"peers,omitempty"`
-	RemoteDnsResolve    bool                  `yaml:"remote-dns-resolve,omitempty"`
-	Dns                 []string              `yaml:"dns,omitempty"`
-}
-
-type WireGuardPeerOption struct {
-	Server       string   `yaml:"server"`
-	Port         int      `yaml:"port"`
-	PublicKey    string   `yaml:"public-key,omitempty"`
-	PreSharedKey string   `yaml:"pre-shared-key,omitempty"`
-	Reserved     []uint8  `yaml:"reserved,omitempty"`
-	AllowedIPs   []string `yaml:"allowed-ips,omitempty"`
-}
-
-type _Proxy Proxy
-
-func (p Proxy) MarshalYAML() (interface{}, error) {
-	switch p.Type {
-	case "vmess":
-		return ProxyToVmess(p), nil
-	case "ss":
-		return ProxyToShadowSocks(p), nil
-	case "ssr":
-		return ProxyToShadowSocksR(p), nil
-	case "vless":
-		return ProxyToVless(p), nil
-	case "trojan":
-		return ProxyToTrojan(p), nil
-	case "hysteria":
-		return ProxyToHysteria(p), nil
-	case "hysteria2":
-		return ProxyToHysteria2(p), nil
-	default:
-		return _Proxy(p), nil
-	}
-}

model/proxy/anytls.go

@@ -0,0 +1,18 @@
+package proxy
+
+// https://github.com/MetaCubeX/mihomo/blob/Meta/adapter/outbound/anytls.go
+type Anytls struct {
+	Server                   string     `yaml:"server"`
+	Port                     int        `yaml:"port"`
+	Password                 string     `yaml:"password"`
+	ALPN                     []string   `yaml:"alpn,omitempty"`
+	SNI                      string     `yaml:"sni,omitempty"`
+	ECHOpts                  ECHOptions `yaml:"ech-opts,omitempty"`
+	ClientFingerprint        string     `yaml:"client-fingerprint,omitempty"`
+	SkipCertVerify           bool       `yaml:"skip-cert-verify,omitempty"`
+	Fingerprint              string     `yaml:"fingerprint,omitempty"`
+	UDP                      bool       `yaml:"udp,omitempty"`
+	IdleSessionCheckInterval int        `yaml:"idle-session-check-interval,omitempty"`
+	IdleSessionTimeout       int        `yaml:"idle-session-timeout,omitempty"`
+	MinIdleSession           int        `yaml:"min-idle-session,omitempty"`
+}

model/proxy/hysteria.go

@@ -0,0 +1,29 @@
+package proxy
+
+// https://github.com/MetaCubeX/mihomo/blob/Meta/adapter/outbound/hysteria.go
+type Hysteria struct {
+	Server              string     `yaml:"server"`
+	Port                int        `yaml:"port,omitempty"`
+	Ports               string     `yaml:"ports,omitempty"`
+	Protocol            string     `yaml:"protocol,omitempty"`
+	ObfsProtocol        string     `yaml:"obfs-protocol,omitempty"` // compatible with Stash
+	Up                  string     `yaml:"up"`
+	UpSpeed             int        `yaml:"up-speed,omitempty"` // compatible with Stash
+	Down                string     `yaml:"down"`
+	DownSpeed           int        `yaml:"down-speed,omitempty"` // compatible with Stash
+	Auth                string     `yaml:"auth,omitempty"`
+	AuthString          string     `yaml:"auth-str,omitempty"`
+	Obfs                string     `yaml:"obfs,omitempty"`
+	SNI                 string     `yaml:"sni,omitempty"`
+	ECHOpts             ECHOptions `yaml:"ech-opts,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"`
+	ReceiveWindowConn   int        `yaml:"recv-window-conn,omitempty"`
+	ReceiveWindow       int        `yaml:"recv-window,omitempty"`
+	DisableMTUDiscovery bool       `yaml:"disable-mtu-discovery,omitempty"`
+	FastOpen            bool       `yaml:"fast-open,omitempty"`
+	HopInterval         int        `yaml:"hop-interval,omitempty"`
+}

model/proxy/hysteria2.go

@@ -0,0 +1,29 @@
+package proxy
+
+// https://github.com/MetaCubeX/mihomo/blob/Meta/adapter/outbound/hysteria2.go
+type Hysteria2 struct {
+	Server         string     `yaml:"server"`
+	Port           int        `yaml:"port,omitempty"`
+	Ports          string     `yaml:"ports,omitempty"`
+	HopInterval    int        `yaml:"hop-interval,omitempty"`
+	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"`
+	ECHOpts        ECHOptions `yaml:"ech-opts,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"`
+	UdpMTU         int        `yaml:"udp-mtu,omitempty"`
+
+	// quic-go special config
+	InitialStreamReceiveWindow     uint64 `yaml:"initial-stream-receive-window,omitempty"`
+	MaxStreamReceiveWindow         uint64 `yaml:"max-stream-receive-window,omitempty"`
+	InitialConnectionReceiveWindow uint64 `yaml:"initial-connection-receive-window,omitempty"`
+	MaxConnectionReceiveWindow     uint64 `yaml:"max-connection-receive-window,omitempty"`
+}

model/proxy/proxy.go

@@ -0,0 +1,150 @@
+package proxy
+
+import "fmt"
+
+type HTTPOptions struct {
+	Method  string              `yaml:"method,omitempty"`
+	Path    []string            `yaml:"path,omitempty"`
+	Headers map[string][]string `yaml:"headers,omitempty"`
+}
+
+type HTTP2Options struct {
+	Host []string `yaml:"host,omitempty"`
+	Path string   `yaml:"path,omitempty"`
+}
+
+type GrpcOptions struct {
+	GrpcServiceName string `yaml:"grpc-service-name,omitempty"`
+}
+
+type RealityOptions struct {
+	PublicKey string `yaml:"public-key"`
+	ShortID   string `yaml:"short-id,omitempty"`
+}
+
+type WSOptions struct {
+	Path                string            `yaml:"path,omitempty"`
+	Headers             map[string]string `yaml:"headers,omitempty"`
+	MaxEarlyData        int               `yaml:"max-early-data,omitempty"`
+	EarlyDataHeaderName string            `yaml:"early-data-header-name,omitempty"`
+}
+
+type SmuxStruct struct {
+	Enabled bool `yaml:"enable"`
+}
+
+type WireGuardPeerOption struct {
+	Server       string   `yaml:"server"`
+	Port         int      `yaml:"port"`
+	PublicKey    string   `yaml:"public-key,omitempty"`
+	PreSharedKey string   `yaml:"pre-shared-key,omitempty"`
+	Reserved     []uint8  `yaml:"reserved,omitempty"`
+	AllowedIPs   []string `yaml:"allowed-ips,omitempty"`
+}
+
+type ECHOptions struct {
+	Enable bool   `yaml:"enable,omitempty" obfs:"enable,omitempty"`
+	Config string `yaml:"config,omitempty" obfs:"config,omitempty"`
+}
+
+type Proxy struct {
+	Type    string
+	Name    string
+	SubName string `yaml:"-"`
+	Anytls
+	Hysteria
+	Hysteria2
+	ShadowSocks
+	ShadowSocksR
+	Trojan
+	Vless
+	Vmess
+	Socks
+}
+
+func (p Proxy) MarshalYAML() (any, error) {
+	switch p.Type {
+	case "anytls":
+		return struct {
+			Type   string `yaml:"type"`
+			Name   string `yaml:"name"`
+			Anytls `yaml:",inline"`
+		}{
+			Type:   p.Type,
+			Name:   p.Name,
+			Anytls: p.Anytls,
+		}, nil
+	case "hysteria":
+		return struct {
+			Type     string `yaml:"type"`
+			Name     string `yaml:"name"`
+			Hysteria `yaml:",inline"`
+		}{
+			Type:     p.Type,
+			Name:     p.Name,
+			Hysteria: p.Hysteria,
+		}, nil
+	case "hysteria2":
+		return struct {
+			Type      string `yaml:"type"`
+			Name      string `yaml:"name"`
+			Hysteria2 `yaml:",inline"`
+		}{
+			Type:      p.Type,
+			Name:      p.Name,
+			Hysteria2: p.Hysteria2,
+		}, nil
+	case "ss":
+		return struct {
+			Type        string `yaml:"type"`
+			Name        string `yaml:"name"`
+			ShadowSocks `yaml:",inline"`
+		}{
+			Type:        p.Type,
+			Name:        p.Name,
+			ShadowSocks: p.ShadowSocks,
+		}, nil
+	case "ssr":
+		return struct {
+			Type         string `yaml:"type"`
+			Name         string `yaml:"name"`
+			ShadowSocksR `yaml:",inline"`
+		}{
+			Type:         p.Type,
+			Name:         p.Name,
+			ShadowSocksR: p.ShadowSocksR,
+		}, nil
+	case "trojan":
+		return struct {
+			Type   string `yaml:"type"`
+			Name   string `yaml:"name"`
+			Trojan `yaml:",inline"`
+		}{
+			Type:   p.Type,
+			Name:   p.Name,
+			Trojan: p.Trojan,
+		}, nil
+	case "vless":
+		return struct {
+			Type  string `yaml:"type"`
+			Name  string `yaml:"name"`
+			Vless `yaml:",inline"`
+		}{
+			Type:  p.Type,
+			Name:  p.Name,
+			Vless: p.Vless,
+		}, nil
+	case "vmess":
+		return struct {
+			Type  string `yaml:"type"`
+			Name  string `yaml:"name"`
+			Vmess `yaml:",inline"`
+		}{
+			Type:  p.Type,
+			Name:  p.Name,
+			Vmess: p.Vmess,
+		}, nil
+	default:
+		return nil, fmt.Errorf("unsupported proxy type: %s", p.Type)
+	}
+}

model/proxy/shadowsocks.go

@@ -1,8 +1,7 @@
-package model
+package proxy
 
+// https://github.com/MetaCubeX/mihomo/blob/Meta/adapter/outbound/shadowsocks.go
 type ShadowSocks struct {
-	Type              string         `yaml:"type"`
-	Name              string         `yaml:"name"`
 	Server            string         `yaml:"server"`
 	Port              int            `yaml:"port"`
 	Password          string         `yaml:"password"`
@@ -14,20 +13,3 @@ type ShadowSocks struct {
 	UDPOverTCPVersion int            `yaml:"udp-over-tcp-version,omitempty"`
 	ClientFingerprint string         `yaml:"client-fingerprint,omitempty"`
 }
-
-func ProxyToShadowSocks(p Proxy) ShadowSocks {
-	return ShadowSocks{
-		Type:              "ss",
-		Name:              p.Name,
-		Server:            p.Server,
-		Port:              p.Port,
-		Password:          p.Password,
-		Cipher:            p.Cipher,
-		UDP:               p.UDP,
-		Plugin:            p.Plugin,
-		PluginOpts:        p.PluginOpts,
-		UDPOverTCP:        p.UDPOverTCP,
-		UDPOverTCPVersion: p.UDPOverTCPVersion,
-		ClientFingerprint: p.ClientFingerprint,
-	}
-}

model/proxy/shadowsocksr.go

@@ -0,0 +1,14 @@
+package proxy
+
+// https://github.com/MetaCubeX/mihomo/blob/Meta/adapter/outbound/shadowsocksr.go
+type ShadowSocksR struct {
+	Server        string `yaml:"server"`
+	Port          int    `yaml:"port"`
+	Password      string `yaml:"password"`
+	Cipher        string `yaml:"cipher"`
+	Obfs          string `yaml:"obfs"`
+	ObfsParam     string `yaml:"obfs-param,omitempty"`
+	Protocol      string `yaml:"protocol"`
+	ProtocolParam string `yaml:"protocol-param,omitempty"`
+	UDP           bool   `yaml:"udp,omitempty"`
+}

model/proxy/socks.go

@@ -0,0 +1,13 @@
+package proxy
+
+// https://github.com/MetaCubeX/mihomo/blob/Meta/adapter/outbound/socks5.go
+type Socks struct {
+	Server         string `yaml:"server"`
+	Port           int    `yaml:"port"`
+	UserName       string `yaml:"username,omitempty"`
+	Password       string `yaml:"password,omitempty"`
+	TLS            bool   `yaml:"tls,omitempty"`
+	UDP            bool   `yaml:"udp,omitempty"`
+	SkipCertVerify bool   `yaml:"skip-cert-verify,omitempty"`
+	Fingerprint    string `yaml:"fingerprint,omitempty"`
+}

model/proxy/trojan.go

@@ -1,8 +1,7 @@
-package model
+package proxy
 
+// https://github.com/MetaCubeX/mihomo/blob/Meta/adapter/outbound/trojan.go
 type Trojan struct {
-	Type              string         `yaml:"type"`
-	Name              string         `yaml:"name"`
 	Server            string         `yaml:"server"`
 	Port              int            `yaml:"port"`
 	Password          string         `yaml:"password"`
@@ -12,28 +11,16 @@ type Trojan struct {
 	Fingerprint       string         `yaml:"fingerprint,omitempty"`
 	UDP               bool           `yaml:"udp,omitempty"`
 	Network           string         `yaml:"network,omitempty"`
+	ECHOpts           ECHOptions     `yaml:"ech-opts,omitempty"`
 	RealityOpts       RealityOptions `yaml:"reality-opts,omitempty"`
 	GrpcOpts          GrpcOptions    `yaml:"grpc-opts,omitempty"`
 	WSOpts            WSOptions      `yaml:"ws-opts,omitempty"`
+	SSOpts            TrojanSSOption `yaml:"ss-opts,omitempty"`
 	ClientFingerprint string         `yaml:"client-fingerprint,omitempty"`
 }
 
-func ProxyToTrojan(p Proxy) Trojan {
-	return Trojan{
-		Type:              "trojan",
-		Name:              p.Name,
-		Server:            p.Server,
-		Port:              p.Port,
-		Password:          p.Password,
-		ALPN:              p.Alpn,
-		SNI:               p.Sni,
-		SkipCertVerify:    p.SkipCertVerify,
-		Fingerprint:       p.Fingerprint,
-		UDP:               p.UDP,
-		Network:           p.Network,
-		RealityOpts:       p.RealityOpts,
-		GrpcOpts:          p.GrpcOpts,
-		WSOpts:            p.WSOpts,
-		ClientFingerprint: p.ClientFingerprint,
-	}
+type TrojanSSOption struct {
+	Enabled  bool   `yaml:"enabled,omitempty"`
+	Method   string `yaml:"method,omitempty"`
+	Password string `yaml:"password,omitempty"`
 }

model/proxy/vless.go

@@ -1,8 +1,7 @@
-package model
+package proxy
 
+// https://github.com/MetaCubeX/mihomo/blob/Meta/adapter/outbound/vless.go
 type Vless struct {
-	Type              string            `yaml:"type"`
-	Name              string            `yaml:"name"`
 	Server            string            `yaml:"server"`
 	Port              int               `yaml:"port"`
 	UUID              string            `yaml:"uuid"`
@@ -14,6 +13,7 @@ type Vless struct {
 	XUDP              bool              `yaml:"xudp,omitempty"`
 	PacketEncoding    string            `yaml:"packet-encoding,omitempty"`
 	Network           string            `yaml:"network,omitempty"`
+	ECHOpts           ECHOptions        `yaml:"ech-opts,omitempty"`
 	RealityOpts       RealityOptions    `yaml:"reality-opts,omitempty"`
 	HTTPOpts          HTTPOptions       `yaml:"http-opts,omitempty"`
 	HTTP2Opts         HTTP2Options      `yaml:"h2-opts,omitempty"`
@@ -26,32 +26,3 @@ type Vless struct {
 	ServerName        string            `yaml:"servername,omitempty"`
 	ClientFingerprint string            `yaml:"client-fingerprint,omitempty"`
 }
-
-func ProxyToVless(p Proxy) Vless {
-	return Vless{
-		Type:              "vless",
-		Name:              p.Name,
-		Server:            p.Server,
-		Port:              p.Port,
-		UUID:              p.UUID,
-		Flow:              p.Flow,
-		TLS:               p.TLS,
-		ALPN:              p.Alpn,
-		UDP:               p.UDP,
-		PacketAddr:        p.PacketAddr,
-		XUDP:              p.XUDP,
-		PacketEncoding:    p.PacketEncoding,
-		Network:           p.Network,
-		RealityOpts:       p.RealityOpts,
-		HTTPOpts:          p.HTTPOpts,
-		HTTP2Opts:         p.HTTP2Opts,
-		GrpcOpts:          p.GrpcOpts,
-		WSOpts:            p.WSOpts,
-		WSPath:            p.WSOpts.Path,
-		WSHeaders:         p.WSOpts.Headers,
-		SkipCertVerify:    p.SkipCertVerify,
-		Fingerprint:       p.Fingerprint,
-		ServerName:        p.Servername,
-		ClientFingerprint: p.ClientFingerprint,
-	}
-}

model/proxy/vmess.go

@@ -0,0 +1,29 @@
+package proxy
+
+// https://github.com/MetaCubeX/mihomo/blob/Meta/adapter/outbound/vmess.go
+type Vmess struct {
+	Server              string         `yaml:"server"`
+	Port                int            `yaml:"port"`
+	UUID                string         `yaml:"uuid"`
+	AlterID             int            `yaml:"alterId"`
+	Cipher              string         `yaml:"cipher"`
+	UDP                 bool           `yaml:"udp,omitempty"`
+	Network             string         `yaml:"network,omitempty"`
+	TLS                 bool           `yaml:"tls,omitempty"`
+	ALPN                []string       `yaml:"alpn,omitempty"`
+	SkipCertVerify      bool           `yaml:"skip-cert-verify,omitempty"`
+	Fingerprint         string         `yaml:"fingerprint,omitempty"`
+	ServerName          string         `yaml:"servername,omitempty"`
+	ECHOpts             ECHOptions     `yaml:"ech-opts,omitempty"`
+	RealityOpts         RealityOptions `yaml:"reality-opts,omitempty"`
+	HTTPOpts            HTTPOptions    `yaml:"http-opts,omitempty"`
+	HTTP2Opts           HTTP2Options   `yaml:"h2-opts,omitempty"`
+	GrpcOpts            GrpcOptions    `yaml:"grpc-opts,omitempty"`
+	WSOpts              WSOptions      `yaml:"ws-opts,omitempty"`
+	PacketAddr          bool           `yaml:"packet-addr,omitempty"`
+	XUDP                bool           `yaml:"xudp,omitempty"`
+	PacketEncoding      string         `yaml:"packet-encoding,omitempty"`
+	GlobalPadding       bool           `yaml:"global-padding,omitempty"`
+	AuthenticatedLength bool           `yaml:"authenticated-length,omitempty"`
+	ClientFingerprint   string         `yaml:"client-fingerprint,omitempty"`
+}

model/proxy_hysteria.go

@@ -1,58 +0,0 @@
-package model
-
-type Hysteria struct {
-	Type                string   `yaml:"type"`
-	Name                string   `yaml:"name"`
-	Server              string   `yaml:"server"`
-	Port                int      `yaml:"port,omitempty"`
-	Ports               string   `yaml:"ports,omitempty"`
-	Protocol            string   `yaml:"protocol,omitempty"`
-	ObfsProtocol        string   `yaml:"obfs-protocol,omitempty"`
-	Up                  string   `yaml:"up"`
-	UpSpeed             int      `yaml:"up-speed,omitempty"`
-	Down                string   `yaml:"down"`
-	DownSpeed           int      `yaml:"down-speed,omitempty"`
-	Auth                string   `yaml:"auth,omitempty"`
-	AuthStringOLD       string   `yaml:"auth_str,omitempty"`
-	AuthString          string   `yaml:"auth-str,omitempty"`
-	Obfs                string   `yaml:"obfs,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"`
-	ReceiveWindowConn   int      `yaml:"recv-window-conn,omitempty"`
-	ReceiveWindow       int      `yaml:"recv-window,omitempty"`
-	DisableMTUDiscovery bool     `yaml:"disable-mtu-discovery,omitempty"`
-	FastOpen            bool     `yaml:"fast-open,omitempty"`
-	HopInterval         int      `yaml:"hop-interval,omitempty"`
-}
-
-func ProxyToHysteria(p Proxy) Hysteria {
-	return Hysteria{
-		Type:                "hysteria",
-		Name:                p.Name,
-		Server:              p.Server,
-		Port:                p.Port,
-		Ports:               p.Ports,
-		Protocol:            p.Protocol,
-		Up:                  p.Up,
-		Down:                p.Down,
-		Auth:                p.Auth,
-		AuthStringOLD:       p.AuthStringOLD,
-		AuthString:          p.AuthString,
-		Obfs:                p.Obfs,
-		SNI:                 p.Sni,
-		SkipCertVerify:      p.SkipCertVerify,
-		Fingerprint:         p.Fingerprint,
-		ALPN:                p.Alpn,
-		CustomCA:            p.CustomCA,
-		CustomCAString:      p.CustomCAString,
-		ReceiveWindowConn:   p.ReceiveWindowConn,
-		ReceiveWindow:       p.ReceiveWindow,
-		DisableMTUDiscovery: p.DisableMTUDiscovery,
-		FastOpen:            p.FastOpen,
-		HopInterval:         p.HopInterval,
-	}
-}

model/proxy_hysteria2.go

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

model/proxy_shadowsocksr.go

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

model/proxy_vmess.go

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

model/rule_provider.go

@@ -6,6 +6,7 @@ type RuleProvider struct {
 	Url      string `yaml:"url,omitempty"`
 	Path     string `yaml:"path,omitempty"`
 	Interval int    `yaml:"interval,omitempty"`
+	Format string    `yaml:"format,omitempty"`
 }
 
 type Payload struct {

model/sub.go

@@ -1,210 +0,0 @@
-package model
-
-type NodeList struct {
-	Proxies []Proxy `yaml:"proxies,omitempty"`
-}
-
-type Subscription struct {
-	Port                  int      `yaml:"port,omitempty" json:"port"`
-	SocksPort             int      `yaml:"socks-port,omitempty" json:"socks-port"`
-	RedirPort             int      `yaml:"redir-port,omitempty" json:"redir-port"`
-	TProxyPort            int      `yaml:"tproxy-port,omitempty" json:"tproxy-port"`
-	MixedPort             int      `yaml:"mixed-port,omitempty" json:"mixed-port"`
-	ShadowSocksConfig     string   `yaml:"ss-config,omitempty"`
-	VmessConfig           string   `yaml:"vmess-config,omitempty"`
-	InboundTfo            bool     `yaml:"inbound-tfo,omitempty"`
-	InboundMPTCP          bool     `yaml:"inbound-mptcp,omitempty"`
-	Authentication        []string `yaml:"authentication,omitempty" json:"authentication"`
-	SkipAuthPrefixes      []string `yaml:"skip-auth-prefixes,omitempty"`
-	LanAllowedIPs         []string `yaml:"lan-allowed-ips,omitempty"`
-	LanDisAllowedIPs      []string `yaml:"lan-disallowed-ips,omitempty"`
-	AllowLan              bool     `yaml:"allow-lan,omitempty" json:"allow-lan"`
-	BindAddress           string   `yaml:"bind-address,omitempty" json:"bind-address"`
-	Mode                  string   `yaml:"mode,omitempty" json:"mode"`
-	UnifiedDelay          bool     `yaml:"unified-delay,omitempty" json:"unified-delay"`
-	LogLevel              string   `yaml:"log-level,omitempty" json:"log-level"`
-	IPv6                  bool     `yaml:"ipv6,omitempty" json:"ipv6"`
-	ExternalController    string   `yaml:"external-controller,omitempty"`
-	ExternalControllerTLS string   `yaml:"external-controller-tls,omitempty"`
-	ExternalUI            string   `yaml:"external-ui,omitempty"`
-	ExternalUIURL         string   `yaml:"external-ui-url,omitempty" json:"external-ui-url"`
-	ExternalUIName        string   `yaml:"external-ui-name,omitempty" json:"external-ui-name"`
-	Secret                string   `yaml:"secret,omitempty"`
-	Interface             string   `yaml:"interface-name,omitempty"`
-	RoutingMark           int      `yaml:"routing-mark,omitempty"`
-	//Tunnels                 []LC.Tunnel       `yaml:"tunnels,omitempty"`
-	GeoAutoUpdate           bool   `yaml:"geo-auto-update,omitempty" json:"geo-auto-update"`
-	GeoUpdateInterval       int    `yaml:"geo-update-interval,omitempty" json:"geo-update-interval"`
-	GeodataMode             bool   `yaml:"geodata-mode,omitempty" json:"geodata-mode"`
-	GeodataLoader           string `yaml:"geodata-loader,omitempty" json:"geodata-loader"`
-	GeositeMatcher          string `yaml:"geosite-matcher,omitempty" json:"geosite-matcher"`
-	TCPConcurrent           bool   `yaml:"tcp-concurrent,omitempty" json:"tcp-concurrent"`
-	FindProcessMode         string `yaml:"find-process-mode,omitempty" json:"find-process-mode"`
-	GlobalClientFingerprint string `yaml:"global-client-fingerprint,omitempty"`
-	GlobalUA                string `yaml:"global-ua,omitempty"`
-	KeepAliveInterval       int    `yaml:"keep-alive-interval,omitempty"`
-
-	Sniffer       RawSniffer                `yaml:"sniffer,omitempty" json:"sniffer"`
-	ProxyProvider map[string]map[string]any `yaml:"proxy-providers,omitempty"`
-	RuleProviders map[string]RuleProvider   `yaml:"rule-providers,omitempty"`
-	Hosts         map[string]any            `yaml:"hosts,omitempty" json:"hosts"`
-	NTP           RawNTP                    `yaml:"ntp,omitempty" json:"ntp"`
-	DNS           RawDNS                    `yaml:"dns,omitempty" json:"dns"`
-	Tun           RawTun                    `yaml:"tun,omitempty"`
-	TuicServer    RawTuicServer             `yaml:"tuic-server,omitempty"`
-	EBpf          EBpf                      `yaml:"ebpf,omitempty"`
-	IPTables      IPTables                  `yaml:"iptables,omitempty"`
-	Experimental  Experimental              `yaml:"experimental,omitempty"`
-	Profile       Profile                   `yaml:"profile,omitempty"`
-	GeoXUrl       GeoXUrl                   `yaml:"geox-url,omitempty"`
-	Proxies       []Proxy                   `yaml:"proxies,omitempty"`
-	ProxyGroups   []ProxyGroup              `yaml:"proxy-groups,omitempty"`
-	Rules         []string                  `yaml:"rules,omitempty"`
-	SubRules      map[string][]string       `yaml:"sub-rules,omitempty"`
-	RawTLS        TLS                       `yaml:"tls,omitempty"`
-	Listeners     []map[string]any          `yaml:"listeners,omitempty"`
-
-	ClashForAndroid RawClashForAndroid `yaml:"clash-for-android,omitempty" json:"clash-for-android"`
-}
-
-type RawClashForAndroid struct {
-	AppendSystemDNS   bool   `yaml:"append-system-dns,omitempty" json:"append-system-dns"`
-	UiSubtitlePattern string `yaml:"ui-subtitle-pattern,omitempty" json:"ui-subtitle-pattern"`
-}
-
-type TLS struct {
-	Certificate     string   `yaml:"certificate,omitempty"`
-	PrivateKey      string   `yaml:"private-key,omitempty"`
-	CustomTrustCert []string `yaml:"custom-certifactes,omitempty"`
-}
-
-type GeoXUrl struct {
-	GeoIp   string `yaml:"geoip,omitempty" json:"geoip"`
-	Mmdb    string `yaml:"mmdb,omitempty" json:"mmdb"`
-	GeoSite string `yaml:"geosite,omitempty" json:"geosite"`
-}
-
-type Experimental struct {
-	Fingerprints     []string `yaml:"fingerprints,omitempty"`
-	QUICGoDisableGSO bool     `yaml:"quic-go-disable-gso,omitempty"`
-	QUICGoDisableECN bool     `yaml:"quic-go-disable-ecn,omitempty"`
-	IP4PEnable       bool     `yaml:"dialer-ip4p-convert,omitempty"`
-}
-
-type Profile struct {
-	StoreSelected bool `yaml:"store-selected,omitempty"`
-	StoreFakeIP   bool `yaml:"store-fake-ip,omitempty"`
-}
-
-type IPTables struct {
-	Enable           bool     `yaml:"enable,omitempty" json:"enable"`
-	InboundInterface string   `yaml:"inbound-interface,omitempty" json:"inbound-interface"`
-	Bypass           []string `yaml:"bypass,omitempty" json:"bypass"`
-	DnsRedirect      bool     `yaml:"dns-redirect,omitempty" json:"dns-redirect"`
-}
-
-type EBpf struct {
-	RedirectToTun []string `yaml:"redirect-to-tun,omitempty" json:"redirect-to-tun"`
-	AutoRedir     []string `yaml:"auto-redir,omitempty" json:"auto-redir"`
-}
-
-type RawSniffer struct {
-	Enable          bool                         `yaml:"enable,omitempty" json:"enable"`
-	OverrideDest    bool                         `yaml:"override-destination,omitempty" json:"override-destination"`
-	Sniffing        []string                     `yaml:"sniffing,omitempty" json:"sniffing"`
-	ForceDomain     []string                     `yaml:"force-domain,omitempty" json:"force-domain"`
-	SkipDomain      []string                     `yaml:"skip-domain,omitempty" json:"skip-domain"`
-	Ports           []string                     `yaml:"port-whitelist,omitempty" json:"port-whitelist"`
-	ForceDnsMapping bool                         `yaml:"force-dns-mapping,omitempty" json:"force-dns-mapping"`
-	ParsePureIp     bool                         `yaml:"parse-pure-ip,omitempty" json:"parse-pure-ip"`
-	Sniff           map[string]RawSniffingConfig `yaml:"sniff,omitempty" json:"sniff"`
-}
-
-type RawSniffingConfig struct {
-	Ports        []string `yaml:"ports,omitempty" json:"ports"`
-	OverrideDest *bool    `yaml:"override-destination,omitempty" json:"override-destination"`
-}
-
-type RawNTP struct {
-	Enable        bool   `yaml:"enable,omitempty"`
-	Server        string `yaml:"server,omitempty"`
-	ServerPort    int    `yaml:"server-port,omitempty"`
-	Interval      int    `yaml:"interval,omitempty"`
-	DialerProxy   string `yaml:"dialer-proxy,omitempty"`
-	WriteToSystem bool   `yaml:"write-to-system,omitempty"`
-}
-
-type RawDNS struct {
-	Enable            bool              `yaml:"enable,omitempty" json:"enable"`
-	PreferH3          bool              `yaml:"prefer-h3,omitempty" json:"prefer-h3"`
-	IPv6              bool              `yaml:"ipv6,omitempty" json:"ipv6"`
-	IPv6Timeout       uint              `yaml:"ipv6-timeout,omitempty" json:"ipv6-timeout"`
-	UseHosts          bool              `yaml:"use-hosts,omitempty" json:"use-hosts"`
-	NameServer        []string          `yaml:"nameserver,omitempty" json:"nameserver"`
-	Fallback          []string          `yaml:"fallback,omitempty" json:"fallback"`
-	FallbackFilter    RawFallbackFilter `yaml:"fallback-filter,omitempty" json:"fallback-filter"`
-	Listen            string            `yaml:"listen,omitempty" json:"listen"`
-	EnhancedMode      string            `yaml:"enhanced-mode,omitempty" json:"enhanced-mode"`
-	FakeIPRange       string            `yaml:"fake-ip-range,omitempty" json:"fake-ip-range"`
-	FakeIPFilter      []string          `yaml:"fake-ip-filter,omitempty" json:"fake-ip-filter"`
-	DefaultNameserver []string          `yaml:"default-nameserver,omitempty" json:"default-nameserver"`
-	CacheAlgorithm    string            `yaml:"cache-algorithm,omitempty" json:"cache-algorithm"`
-	//NameServerPolicy      *orderedmap.OrderedMap[string, any] `yaml:"nameserver-policy,omitempty" json:"nameserver-policy"`
-	ProxyServerNameserver []string `yaml:"proxy-server-nameserver,omitempty" json:"proxy-server-nameserver"`
-}
-
-type RawFallbackFilter struct {
-	GeoIP     bool     `yaml:"geoip,omitempty" json:"geoip"`
-	GeoIPCode string   `yaml:"geoip-code,omitempty" json:"geoip-code"`
-	IPCIDR    []string `yaml:"ipcidr,omitempty" json:"ipcidr"`
-	Domain    []string `yaml:"domain,omitempty" json:"domain"`
-	GeoSite   []string `yaml:"geosite,omitempty" json:"geosite"`
-}
-
-type RawTun struct {
-	Enable              bool     `yaml:"enable,omitempty" json:"enable"`
-	Device              string   `yaml:"device,omitempty" json:"device"`
-	Stack               string   `yaml:"stack,omitempty" json:"stack"`
-	DNSHijack           []string `yaml:"dns-hijack,omitempty" json:"dns-hijack"`
-	AutoRoute           bool     `yaml:"auto-route,omitempty" json:"auto-route"`
-	AutoDetectInterface bool     `yaml:"auto-detect-interface,omitempty"`
-	RedirectToTun       []string `yaml:"-,omitempty" json:"-"`
-
-	MTU        uint32 `yaml:"mtu,omitempty" json:"mtu,omitempty"`
-	GSO        bool   `yaml:"gso,omitempty" json:"gso,omitempty"`
-	GSOMaxSize uint32 `yaml:"gso-max-size,omitempty" json:"gso-max-size,omitempty"`
-	//Inet4Address           []netip.Prefix `yaml:"inet4-address,omitempty" json:"inet4_address,omitempty"`
-	Inet6Address             []uint32 `yaml:"inet6-address,omitempty" json:"inet6_address,omitempty"`
-	StrictRoute              bool     `yaml:"strict-route,omitempty" json:"strict_route,omitempty"`
-	Inet4RouteAddress        []uint32 `yaml:"inet4-route-address,omitempty" json:"inet4_route_address,omitempty"`
-	Inet6RouteAddress        []uint32 `yaml:"inet6-route-address,omitempty" json:"inet6_route_address,omitempty"`
-	Inet4RouteExcludeAddress []uint32 `yaml:"inet4-route-exclude-address,omitempty" json:"inet4_route_exclude_address,omitempty"`
-	Inet6RouteExcludeAddress []uint32 `yaml:"inet6-route-exclude-address,omitempty" json:"inet6_route_exclude_address,omitempty"`
-	IncludeInterface         []string `yaml:"include-interface,omitempty" json:"include-interface,omitempty"`
-	ExcludeInterface         []string `yaml:"exclude-interface,omitempty" json:"exclude-interface,omitempty"`
-	IncludeUID               []uint32 `yaml:"include-uid,omitempty" json:"include_uid,omitempty"`
-	IncludeUIDRange          []string `yaml:"include-uid-range,omitempty" json:"include_uid_range,omitempty"`
-	ExcludeUID               []uint32 `yaml:"exclude-uid,omitempty" json:"exclude_uid,omitempty"`
-	ExcludeUIDRange          []string `yaml:"exclude-uid-range,omitempty" json:"exclude_uid_range,omitempty"`
-	IncludeAndroidUser       []int    `yaml:"include-android-user,omitempty" json:"include_android_user,omitempty"`
-	IncludePackage           []string `yaml:"include-package,omitempty" json:"include_package,omitempty"`
-	ExcludePackage           []string `yaml:"exclude-package,omitempty" json:"exclude_package,omitempty"`
-	EndpointIndependentNat   bool     `yaml:"endpoint-independent-nat,omitempty" json:"endpoint_independent_nat,omitempty"`
-	UDPTimeout               int64    `yaml:"udp-timeout,omitempty" json:"udp_timeout,omitempty"`
-	FileDescriptor           int      `yaml:"file-descriptor,omitempty" json:"file-descriptor"`
-}
-
-type RawTuicServer struct {
-	Enable                bool              `yaml:"enable,omitempty" json:"enable"`
-	Listen                string            `yaml:"listen,omitempty" json:"listen"`
-	Token                 []string          `yaml:"token,omitempty" json:"token"`
-	Users                 map[string]string `yaml:"users,omitempty" json:"users,omitempty"`
-	Certificate           string            `yaml:"certificate,omitempty" json:"certificate"`
-	PrivateKey            string            `yaml:"private-key,omitempty" json:"private-key"`
-	CongestionController  string            `yaml:"congestion-controller,omitempty" json:"congestion-controller,omitempty"`
-	MaxIdleTime           int               `yaml:"max-idle-time,omitempty" json:"max-idle-time,omitempty"`
-	AuthenticationTimeout int               `yaml:"authentication-timeout,omitempty" json:"authentication-timeout,omitempty"`
-	ALPN                  []string          `yaml:"alpn,omitempty" json:"alpn,omitempty"`
-	MaxUdpRelayPacketSize int               `yaml:"max-udp-relay-packet-size,omitempty" json:"max-udp-relay-packet-size,omitempty"`
-	CWND                  int               `yaml:"cwnd,omitempty" json:"cwnd,omitempty"`
-}

model/sub_config.go

@@ -1,4 +1,4 @@
-package validator
+package model
 
 import (
 	"crypto/sha256"
@@ -11,7 +11,7 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
-type SubValidator struct {
+type SubConfig struct {
 	Sub                 string               `form:"sub" binding:""`
 	Subs                []string             `form:"-" binding:""`
 	Proxy               string               `form:"proxy" binding:""`
@@ -47,22 +47,22 @@ type RuleStruct struct {
 	Prepend bool
 }
 
-func ParseQuery(c *gin.Context) (SubValidator, error) {
-	var query SubValidator
+func ParseSubQuery(c *gin.Context) (SubConfig, error) {
+	var query SubConfig
 	if err := c.ShouldBind(&query); err != nil {
-		return SubValidator{}, errors.New("参数错误: " + err.Error())
+		return SubConfig{}, errors.New("参数错误: " + err.Error())
 	}
 	if query.Sub == "" && query.Proxy == "" {
-		return SubValidator{}, errors.New("参数错误: sub 和 proxy 不能同时为空")
+		return SubConfig{}, errors.New("参数错误: sub 和 proxy 不能同时为空")
 	}
 	if query.Sub != "" {
 		query.Subs = strings.Split(query.Sub, ",")
 		for i := range query.Subs {
 			if !strings.HasPrefix(query.Subs[i], "http") {
-				return SubValidator{}, errors.New("参数错误: sub 格式错误")
+				return SubConfig{}, errors.New("参数错误: sub 格式错误")
 			}
 			if _, err := url.ParseRequestURI(query.Subs[i]); err != nil {
-				return SubValidator{}, errors.New("参数错误: " + err.Error())
+				return SubConfig{}, errors.New("参数错误: " + err.Error())
 			}
 		}
 	} else {
@@ -77,7 +77,7 @@ func ParseQuery(c *gin.Context) (SubValidator, error) {
 		if strings.HasPrefix(query.Template, "http") {
 			uri, err := url.ParseRequestURI(query.Template)
 			if err != nil {
-				return SubValidator{}, err
+				return SubConfig{}, err
 			}
 			query.Template = uri.String()
 		}
@@ -89,12 +89,12 @@ func ParseQuery(c *gin.Context) (SubValidator, error) {
 			length := len(ruleProviders)
 			parts := strings.Split(ruleProviders[length-i-1][1], ",")
 			if len(parts) < 4 {
-				return SubValidator{}, errors.New("参数错误: ruleProvider 格式错误")
+				return SubConfig{}, errors.New("参数错误: ruleProvider 格式错误")
 			}
 			u := parts[1]
 			uri, err := url.ParseRequestURI(u)
 			if err != nil {
-				return SubValidator{}, errors.New("参数错误: " + err.Error())
+				return SubConfig{}, errors.New("参数错误: " + err.Error())
 			}
 			u = uri.String()
 			if len(parts) == 4 {
@@ -115,7 +115,7 @@ func ParseQuery(c *gin.Context) (SubValidator, error) {
 		names := make(map[string]bool)
 		for _, ruleProvider := range query.RuleProviders {
 			if _, ok := names[ruleProvider.Name]; ok {
-				return SubValidator{}, errors.New("参数错误: Rule-Provider 名称重复")
+				return SubConfig{}, errors.New("参数错误: Rule-Provider 名称重复")
 			}
 			names[ruleProvider.Name] = true
 		}
@@ -148,7 +148,7 @@ func ParseQuery(c *gin.Context) (SubValidator, error) {
 		for i := range replaces {
 			length := len(replaces[i])
 			if length != 3 {
-				return SubValidator{}, errors.New("参数错误: replace 格式错误")
+				return SubConfig{}, errors.New("参数错误: replace 格式错误")
 			}
 			query.ReplaceKeys = append(query.ReplaceKeys, replaces[i][1])
 			query.ReplaceTo = append(query.ReplaceTo, replaces[i][2])

model/subscription.go

@@ -0,0 +1,83 @@
+package model
+
+import (
+	"net/netip"
+
+	"github.com/bestnite/sub2clash/model/proxy"
+	C "github.com/metacubex/mihomo/config"
+	LC "github.com/metacubex/mihomo/listener/config"
+)
+
+type NodeList struct {
+	Proxy []proxy.Proxy `yaml:"proxies,omitempty" json:"proxies"`
+}
+
+// https://github.com/MetaCubeX/mihomo/blob/Meta/config/config.go RawConfig
+type Subscription struct {
+	Port                    int            `yaml:"port,omitempty" json:"port"`
+	SocksPort               int            `yaml:"socks-port,omitempty" json:"socks-port"`
+	RedirPort               int            `yaml:"redir-port,omitempty" json:"redir-port"`
+	TProxyPort              int            `yaml:"tproxy-port,omitempty" json:"tproxy-port"`
+	MixedPort               int            `yaml:"mixed-port,omitempty" json:"mixed-port"`
+	ShadowSocksConfig       string         `yaml:"ss-config,omitempty" json:"ss-config"`
+	VmessConfig             string         `yaml:"vmess-config,omitempty" json:"vmess-config"`
+	InboundTfo              bool           `yaml:"inbound-tfo,omitempty" json:"inbound-tfo"`
+	InboundMPTCP            bool           `yaml:"inbound-mptcp,omitempty" json:"inbound-mptcp"`
+	Authentication          []string       `yaml:"authentication,omitempty" json:"authentication"`
+	SkipAuthPrefixes        []netip.Prefix `yaml:"skip-auth-prefixes,omitempty" json:"skip-auth-prefixes"`
+	LanAllowedIPs           []netip.Prefix `yaml:"lan-allowed-ips,omitempty" json:"lan-allowed-ips"`
+	LanDisAllowedIPs        []netip.Prefix `yaml:"lan-disallowed-ips,omitempty" json:"lan-disallowed-ips"`
+	AllowLan                bool           `yaml:"allow-lan,omitempty" json:"allow-lan"`
+	BindAddress             string         `yaml:"bind-address,omitempty" json:"bind-address"`
+	Mode                    string         `yaml:"mode,omitempty" json:"mode"`
+	UnifiedDelay            bool           `yaml:"unified-delay,omitempty" json:"unified-delay"`
+	LogLevel                string         `yaml:"log-level,omitempty" json:"log-level"`
+	IPv6                    bool           `yaml:"ipv6,omitempty" json:"ipv6"`
+	ExternalController      string         `yaml:"external-controller,omitempty" json:"external-controller"`
+	ExternalControllerPipe  string         `yaml:"external-controller-pipe,omitempty" json:"external-controller-pipe"`
+	ExternalControllerUnix  string         `yaml:"external-controller-unix,omitempty" json:"external-controller-unix"`
+	ExternalControllerTLS   string         `yaml:"external-controller-tls,omitempty" json:"external-controller-tls"`
+	ExternalControllerCors  C.RawCors      `yaml:"external-controller-cors,omitempty" json:"external-controller-cors"`
+	ExternalUI              string         `yaml:"external-ui,omitempty" json:"external-ui"`
+	ExternalUIURL           string         `yaml:"external-ui-url,omitempty" json:"external-ui-url"`
+	ExternalUIName          string         `yaml:"external-ui-name,omitempty" json:"external-ui-name"`
+	ExternalDohServer       string         `yaml:"external-doh-server,omitempty" json:"external-doh-server"`
+	Secret                  string         `yaml:"secret,omitempty" json:"secret"`
+	Interface               string         `yaml:"interface-name,omitempty" json:"interface-name"`
+	RoutingMark             int            `yaml:"routing-mark,omitempty" json:"routing-mark"`
+	Tunnels                 []LC.Tunnel    `yaml:"tunnels,omitempty" json:"tunnels"`
+	GeoAutoUpdate           bool           `yaml:"geo-auto-update,omitempty" json:"geo-auto-update"`
+	GeoUpdateInterval       int            `yaml:"geo-update-interval,omitempty" json:"geo-update-interval"`
+	GeodataMode             bool           `yaml:"geodata-mode,omitempty" json:"geodata-mode"`
+	GeodataLoader           string         `yaml:"geodata-loader,omitempty" json:"geodata-loader"`
+	GeositeMatcher          string         `yaml:"geosite-matcher,omitempty" json:"geosite-matcher"`
+	TCPConcurrent           bool           `yaml:"tcp-concurrent,omitempty" json:"tcp-concurrent"`
+	FindProcessMode         string         `yaml:"find-process-mode,omitempty" json:"find-process-mode"`
+	GlobalClientFingerprint string         `yaml:"global-client-fingerprint,omitempty" json:"global-client-fingerprint"`
+	GlobalUA                string         `yaml:"global-ua,omitempty" json:"global-ua"`
+	ETagSupport             bool           `yaml:"etag-support,omitempty" json:"etag-support"`
+	KeepAliveIdle           int            `yaml:"keep-alive-idle,omitempty" json:"keep-alive-idle"`
+	KeepAliveInterval       int            `yaml:"keep-alive-interval,omitempty" json:"keep-alive-interval"`
+	DisableKeepAlive        bool           `yaml:"disable-keep-alive,omitempty" json:"disable-keep-alive"`
+
+	ProxyProvider map[string]map[string]any `yaml:"proxy-providers,omitempty" json:"proxy-providers"`
+	RuleProvider  map[string]RuleProvider   `yaml:"rule-providers,omitempty" json:"rule-providers"`
+	Proxy         []proxy.Proxy             `yaml:"proxies,omitempty" json:"proxies"`
+	ProxyGroup    []ProxyGroup              `yaml:"proxy-groups,omitempty" json:"proxy-groups"`
+	Rule          []string                  `yaml:"rules,omitempty" json:"rule"`
+	SubRules      map[string][]string       `yaml:"sub-rules,omitempty" json:"sub-rules"`
+	Listeners     []map[string]any          `yaml:"listeners,omitempty" json:"listeners"`
+	Hosts         map[string]any            `yaml:"hosts,omitempty" json:"hosts"`
+	DNS           C.RawDNS                  `yaml:"dns,omitempty" json:"dns"`
+	NTP           C.RawNTP                  `yaml:"ntp,omitempty" json:"ntp"`
+	Tun           C.RawTun                  `yaml:"tun,omitempty" json:"tun"`
+	TuicServer    C.RawTuicServer           `yaml:"tuic-server,omitempty" json:"tuic-server"`
+	IPTables      C.RawIPTables             `yaml:"iptables,omitempty" json:"iptables"`
+	Experimental  C.RawExperimental         `yaml:"experimental,omitempty" json:"experimental"`
+	Profile       C.RawProfile              `yaml:"profile,omitempty" json:"profile"`
+	GeoXUrl       C.RawGeoXUrl              `yaml:"geox-url,omitempty" json:"geox-url"`
+	Sniffer       C.RawSniffer              `yaml:"sniffer,omitempty" json:"sniffer"`
+	TLS           C.RawTLS                  `yaml:"tls,omitempty" json:"tls"`
+
+	ClashForAndroid C.RawClashForAndroid `yaml:"clash-for-android,omitempty" json:"clash-for-android"`
+}

parser/anytls.go

@@ -0,0 +1,82 @@
+package parser
+
+import (
+	"fmt"
+	"net/url"
+	"strings"
+
+	P "github.com/bestnite/sub2clash/model/proxy"
+)
+
+type AnytlsParser struct{}
+
+func (p *AnytlsParser) SupportClash() bool {
+	return false
+}
+
+func (p *AnytlsParser) SupportMeta() bool {
+	return true
+}
+
+func (p *AnytlsParser) GetPrefixes() []string {
+	return []string{"anytls://"}
+}
+
+func (p *AnytlsParser) GetType() string {
+	return "anytls"
+}
+
+func (p *AnytlsParser) Parse(proxy string) (P.Proxy, error) {
+	if !hasPrefix(proxy, p.GetPrefixes()) {
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidPrefix, proxy)
+	}
+
+	link, err := url.Parse(proxy)
+	if err != nil {
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidStruct, err.Error())
+	}
+
+	username := link.User.Username()
+	password, exist := link.User.Password()
+	if !exist {
+		password = username
+	}
+
+	query := link.Query()
+	server := link.Hostname()
+	if server == "" {
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidStruct, "missing server host")
+	}
+	portStr := link.Port()
+	if portStr == "" {
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidStruct, "missing server port")
+	}
+	port, err := ParsePort(portStr)
+	if err != nil {
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidPort, err.Error())
+	}
+	insecure, sni := query.Get("insecure"), query.Get("sni")
+	insecureBool := insecure == "1"
+	remarks := link.Fragment
+	if remarks == "" {
+		remarks = fmt.Sprintf("%s:%s", server, portStr)
+	}
+	remarks = strings.TrimSpace(remarks)
+
+	result := P.Proxy{
+		Type: p.GetType(),
+		Name: remarks,
+		Anytls: P.Anytls{
+			Server:         server,
+			Port:           port,
+			Password:       password,
+			SNI:            sni,
+			SkipCertVerify: insecureBool,
+		},
+	}
+	return result, nil
+}
+
+func init() {
+	RegisterParser(&AnytlsParser{})
+}

parser/base64.go

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

parser/common.go

@@ -0,0 +1,81 @@
+package parser
+
+import (
+	"encoding/base64"
+	"errors"
+	"strconv"
+	"strings"
+
+	P "github.com/bestnite/sub2clash/model/proxy"
+)
+
+func hasPrefix(proxy string, prefixes []string) bool {
+	hasPrefix := false
+	for _, prefix := range prefixes {
+		if strings.HasPrefix(proxy, prefix) {
+			hasPrefix = true
+			break
+		}
+	}
+	return hasPrefix
+}
+
+func ParsePort(portStr string) (int, error) {
+	port, err := strconv.Atoi(portStr)
+
+	if err != nil {
+		return 0, err
+	}
+	if port < 1 || port > 65535 {
+		return 0, errors.New("invaild port range")
+	}
+	return port, nil
+}
+
+func isLikelyBase64(s string) bool {
+	if len(s)%4 == 0 && !strings.Contains(strings.TrimSuffix(s, "="), "=") {
+		s = strings.TrimSuffix(s, "=")
+		chars := "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
+		for _, c := range s {
+			if !strings.ContainsRune(chars, c) {
+				return false
+			}
+		}
+		return true
+	}
+	return false
+}
+
+func DecodeBase64(s string) (string, error) {
+	s = strings.TrimSpace(s)
+
+	if strings.Contains(s, "-") || strings.Contains(s, "_") {
+		s = strings.Replace(s, "-", "+", -1)
+		s = strings.Replace(s, "_", "/", -1)
+	}
+	if len(s)%4 != 0 {
+		s += strings.Repeat("=", 4-len(s)%4)
+	}
+	decodeStr, err := base64.StdEncoding.DecodeString(s)
+	if err != nil {
+		return "", err
+	}
+	return string(decodeStr), nil
+}
+
+func ParseProxies(proxies ...string) ([]P.Proxy, error) {
+	var result []P.Proxy
+	for _, proxy := range proxies {
+		if proxy != "" {
+			var proxyItem P.Proxy
+			var err error
+
+			proxyItem, err = ParseProxyWithRegistry(proxy)
+			if err != nil {
+				return nil, err
+			}
+			result = append(result, proxyItem)
+		}
+	}
+	return result, nil
+}

parser/errors.go

@@ -1,11 +1,5 @@
 package parser
 
-type ParseError struct {
-	Type    ParseErrorType
-	Message string
-	Raw     string
-}
-
 type ParseErrorType string
 
 const (
@@ -16,9 +10,6 @@ const (
 	ErrInvalidBase64     ParseErrorType = "invalid base64"
 )
 
-func (e *ParseError) Error() string {
-	if e.Message != "" {
-		return string(e.Type) + ": " + e.Message + " \"" + e.Raw + "\""
-	}
-	return string(e.Type)
+func (e ParseErrorType) Error() string {
+	return string(e)
 }

parser/hysteria.go

@@ -6,53 +6,54 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/nitezs/sub2clash/constant"
-	"github.com/nitezs/sub2clash/model"
+	P "github.com/bestnite/sub2clash/model/proxy"
 )
 
-func ParseHysteria(proxy string) (model.Proxy, error) {
-	if !strings.HasPrefix(proxy, constant.HysteriaPrefix) {
-		return model.Proxy{}, &ParseError{Type: ErrInvalidPrefix, Raw: proxy}
+type HysteriaParser struct{}
+
+func (p *HysteriaParser) SupportClash() bool {
+	return false
+}
+
+func (p *HysteriaParser) SupportMeta() bool {
+	return true
+}
+
+func (p *HysteriaParser) GetPrefixes() []string {
+	return []string{"hysteria://"}
+}
+
+func (p *HysteriaParser) GetType() string {
+	return "hysteria"
+}
+
+func (p *HysteriaParser) Parse(proxy string) (P.Proxy, error) {
+	if !hasPrefix(proxy, p.GetPrefixes()) {
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidPrefix, proxy)
 	}
 
 	link, err := url.Parse(proxy)
 	if err != nil {
-		return model.Proxy{}, &ParseError{
-			Type:    ErrInvalidStruct,
-			Message: "url parse error",
-			Raw:     proxy,
-		}
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidStruct, err.Error())
 	}
 	server := link.Hostname()
 	if server == "" {
-		return model.Proxy{}, &ParseError{
-			Type:    ErrInvalidStruct,
-			Message: "missing server host",
-			Raw:     proxy,
-		}
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidStruct, "missing server host")
 	}
 
 	portStr := link.Port()
 	if portStr == "" {
-		return model.Proxy{}, &ParseError{
-			Type:    ErrInvalidStruct,
-			Message: "missing server port",
-			Raw:     proxy,
-		}
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidStruct, "missing server port")
 	}
 
 	port, err := ParsePort(portStr)
 	if err != nil {
-		return model.Proxy{}, &ParseError{
-			Type:    ErrInvalidPort,
-			Message: err.Error(),
-			Raw:     proxy,
-		}
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidPort, err.Error())
 	}
 
 	query := link.Query()
 
-	protocol, auth, insecure, upmbps, downmbps, obfs, alpnStr := query.Get("protocol"), query.Get("auth"), query.Get("insecure"), query.Get("upmbps"), query.Get("downmbps"), query.Get("obfs"), query.Get("alpn")
+	protocol, auth, auth_str, insecure, upmbps, downmbps, obfs, alpnStr := query.Get("protocol"), query.Get("auth"), query.Get("auth-str"), query.Get("insecure"), query.Get("upmbps"), query.Get("downmbps"), query.Get("obfs"), query.Get("alpn")
 	insecureBool, err := strconv.ParseBool(insecure)
 	if err != nil {
 		insecureBool = false
@@ -70,19 +71,25 @@ func ParseHysteria(proxy string) (model.Proxy, error) {
 	}
 	remarks = strings.TrimSpace(remarks)
 
-	result := model.Proxy{
-		Type:           "hysteria",
+	result := P.Proxy{
+		Type: p.GetType(),
 		Name: remarks,
+		Hysteria: P.Hysteria{
 			Server:         server,
 			Port:           port,
 			Up:             upmbps,
 			Down:           downmbps,
 			Auth:           auth,
+			AuthString:     auth_str,
 			Obfs:           obfs,
 			SkipCertVerify: insecureBool,
-		Alpn:           alpn,
+			ALPN:           alpn,
 			Protocol:       protocol,
-		AllowInsecure:  insecureBool,
+		},
 	}
 	return result, nil
 }
+
+func init() {
+	RegisterParser(&HysteriaParser{})
+}

parser/hysteria2.go

@@ -5,23 +5,35 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/nitezs/sub2clash/constant"
-	"github.com/nitezs/sub2clash/model"
+	P "github.com/bestnite/sub2clash/model/proxy"
 )
 
-func ParseHysteria2(proxy string) (model.Proxy, error) {
-	if !strings.HasPrefix(proxy, constant.Hysteria2Prefix1) &&
-		!strings.HasPrefix(proxy, constant.Hysteria2Prefix2) {
-		return model.Proxy{}, &ParseError{Type: ErrInvalidPrefix, Raw: proxy}
+type Hysteria2Parser struct{}
+
+func (p *Hysteria2Parser) SupportClash() bool {
+	return false
+}
+
+func (p *Hysteria2Parser) SupportMeta() bool {
+	return true
+}
+
+func (p *Hysteria2Parser) GetPrefixes() []string {
+	return []string{"hysteria2://", "hy2://"}
+}
+
+func (p *Hysteria2Parser) GetType() string {
+	return "hysteria2"
+}
+
+func (p *Hysteria2Parser) Parse(proxy string) (P.Proxy, error) {
+	if !hasPrefix(proxy, p.GetPrefixes()) {
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidPrefix, proxy)
 	}
 
 	link, err := url.Parse(proxy)
 	if err != nil {
-		return model.Proxy{}, &ParseError{
-			Type:    ErrInvalidStruct,
-			Message: "url parse error",
-			Raw:     proxy,
-		}
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidStruct, err.Error())
 	}
 
 	username := link.User.Username()
@@ -33,29 +45,17 @@ func ParseHysteria2(proxy string) (model.Proxy, error) {
 	query := link.Query()
 	server := link.Hostname()
 	if server == "" {
-		return model.Proxy{}, &ParseError{
-			Type:    ErrInvalidStruct,
-			Message: "missing server host",
-			Raw:     proxy,
-		}
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidStruct, "missing server host")
 	}
 	portStr := link.Port()
 	if portStr == "" {
-		return model.Proxy{}, &ParseError{
-			Type:    ErrInvalidStruct,
-			Message: "missing server port",
-			Raw:     proxy,
-		}
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidStruct, "missing server port")
 	}
 	port, err := ParsePort(portStr)
 	if err != nil {
-		return model.Proxy{}, &ParseError{
-			Type: ErrInvalidPort,
-			Raw:  portStr,
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidPort, err.Error())
 	}
-	}
-	network, obfs, obfsPassword, pinSHA256, insecure, sni := query.Get("network"), query.Get("obfs"), query.Get("obfs-password"), query.Get("pinSHA256"), query.Get("insecure"), query.Get("sni")
-	enableTLS := pinSHA256 != "" || sni != ""
+	obfs, obfsPassword, insecure, sni := query.Get("obfs"), query.Get("obfs-password"), query.Get("insecure"), query.Get("sni")
 	insecureBool := insecure == "1"
 	remarks := link.Fragment
 	if remarks == "" {
@@ -63,18 +63,22 @@ func ParseHysteria2(proxy string) (model.Proxy, error) {
 	}
 	remarks = strings.TrimSpace(remarks)
 
-	result := model.Proxy{
-		Type:           "hysteria2",
+	result := P.Proxy{
+		Type: p.GetType(),
 		Name: remarks,
+		Hysteria2: P.Hysteria2{
 			Server:         server,
 			Port:           port,
 			Password:       password,
 			Obfs:           obfs,
-		ObfsParam:      obfsPassword,
-		Sni:            sni,
+			ObfsPassword:   obfsPassword,
+			SNI:            sni,
 			SkipCertVerify: insecureBool,
-		TLS:            enableTLS,
-		Network:        network,
+		},
 	}
 	return result, nil
 }
+
+func init() {
+	RegisterParser(&Hysteria2Parser{})
+}

parser/port.go

@@ -1,18 +0,0 @@
-package parser
-
-import (
-	"errors"
-	"strconv"
-)
-
-func ParsePort(portStr string) (int, error) {
-	port, err := strconv.Atoi(portStr)
-
-	if err != nil {
-		return 0, err
-	}
-	if port < 1 || port > 65535 {
-		return 0, errors.New("invaild port range")
-	}
-	return port, nil
-}

parser/registry.go

@@ -0,0 +1,80 @@
+package parser
+
+import (
+	"fmt"
+	"strings"
+	"sync"
+
+	P "github.com/bestnite/sub2clash/model/proxy"
+)
+
+type ProxyParser interface {
+	Parse(proxy string) (P.Proxy, error)
+	GetPrefixes() []string
+	GetType() string
+	SupportClash() bool
+	SupportMeta() bool
+}
+
+type parserRegistry struct {
+	mu      sync.RWMutex
+	parsers map[string]ProxyParser
+}
+
+var registry = &parserRegistry{
+	parsers: make(map[string]ProxyParser),
+}
+
+func RegisterParser(parser ProxyParser) {
+	registry.mu.Lock()
+	defer registry.mu.Unlock()
+
+	for _, prefix := range parser.GetPrefixes() {
+		registry.parsers[prefix] = parser
+	}
+}
+
+func GetParser(prefix string) (ProxyParser, bool) {
+	registry.mu.RLock()
+	defer registry.mu.RUnlock()
+
+	parser, exists := registry.parsers[prefix]
+	return parser, exists
+}
+
+func GetAllParsers() map[string]ProxyParser {
+	registry.mu.RLock()
+	defer registry.mu.RUnlock()
+
+	result := make(map[string]ProxyParser)
+	for k, v := range registry.parsers {
+		result[k] = v
+	}
+	return result
+}
+
+func GetAllPrefixes() []string {
+	registry.mu.RLock()
+	defer registry.mu.RUnlock()
+
+	prefixes := make([]string, 0, len(registry.parsers))
+	for prefix := range registry.parsers {
+		prefixes = append(prefixes, prefix)
+	}
+	return prefixes
+}
+
+func ParseProxyWithRegistry(proxy string) (P.Proxy, error) {
+	proxy = strings.TrimSpace(proxy)
+	if proxy == "" {
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidStruct, "empty proxy string")
+	}
+
+	for prefix, parser := range registry.parsers {
+		if strings.HasPrefix(proxy, prefix) {
+			return parser.Parse(proxy)
+		}
+	}
+
+	return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidPrefix, "unsupported protocol")
+}

parser/shadowsocks.go

@@ -5,24 +5,48 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/nitezs/sub2clash/constant"
-	"github.com/nitezs/sub2clash/model"
+	P "github.com/bestnite/sub2clash/model/proxy"
 )
 
-func ParseShadowsocks(proxy string) (model.Proxy, error) {
-	if !strings.HasPrefix(proxy, constant.ShadowsocksPrefix) {
-		return model.Proxy{}, &ParseError{Type: ErrInvalidPrefix, Raw: proxy}
+// ShadowsocksParser Shadowsocks协议解析器
+type ShadowsocksParser struct{}
+
+func (p *ShadowsocksParser) SupportClash() bool {
+	return true
+}
+
+func (p *ShadowsocksParser) SupportMeta() bool {
+	return true
+}
+
+// GetPrefixes 返回支持的协议前缀
+func (p *ShadowsocksParser) GetPrefixes() []string {
+	return []string{"ss://"}
+}
+
+// GetType 返回协议类型
+func (p *ShadowsocksParser) GetType() string {
+	return "ss"
+}
+
+// Parse 解析Shadowsocks代理
+func (p *ShadowsocksParser) Parse(proxy string) (P.Proxy, error) {
+	if !hasPrefix(proxy, p.GetPrefixes()) {
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidPrefix, proxy)
 	}
+
 	if !strings.Contains(proxy, "@") {
 		s := strings.SplitN(proxy, "#", 2)
-		d, err := DecodeBase64(strings.TrimPrefix(s[0], "ss://"))
-		if err != nil {
-			return model.Proxy{}, &ParseError{
-				Type:    ErrInvalidStruct,
-				Message: "url parse error",
-				Raw:     proxy,
+		for _, prefix := range p.GetPrefixes() {
+			if strings.HasPrefix(s[0], prefix) {
+				s[0] = strings.TrimPrefix(s[0], prefix)
+				break
 			}
 		}
+		d, err := DecodeBase64(s[0])
+		if err != nil {
+			return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidStruct, err.Error())
+		}
 		if len(s) == 2 {
 			proxy = "ss://" + d + "#" + s[1]
 		} else {
@@ -31,59 +55,42 @@ func ParseShadowsocks(proxy string) (model.Proxy, error) {
 	}
 	link, err := url.Parse(proxy)
 	if err != nil {
-		return model.Proxy{}, &ParseError{
-			Type:    ErrInvalidStruct,
-			Message: "url parse error",
-			Raw:     proxy,
-		}
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidStruct, err.Error())
 	}
 
 	server := link.Hostname()
 	if server == "" {
-		return model.Proxy{}, &ParseError{
-			Type:    ErrInvalidStruct,
-			Message: "missing server host",
-			Raw:     proxy,
-		}
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidStruct, "missing server host")
 	}
 
 	portStr := link.Port()
 	if portStr == "" {
-		return model.Proxy{}, &ParseError{
-			Type:    ErrInvalidStruct,
-			Message: "missing server port",
-			Raw:     proxy,
-		}
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidStruct, "missing server port")
 	}
 	port, err := ParsePort(portStr)
 	if err != nil {
-		return model.Proxy{}, &ParseError{
-			Type: ErrInvalidStruct,
-			Raw:  proxy,
-		}
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidStruct, err.Error())
 	}
 
 	method := link.User.Username()
-	password, _ := link.User.Password()
+	password, hasPassword := link.User.Password()
 
-	if password == "" {
-		user, err := DecodeBase64(method)
+	if !hasPassword && isLikelyBase64(method) {
+		decodedStr, err := DecodeBase64(method)
 		if err == nil {
-			methodAndPass := strings.SplitN(user, ":", 2)
+			methodAndPass := strings.SplitN(decodedStr, ":", 2)
 			if len(methodAndPass) == 2 {
 				method = methodAndPass[0]
 				password = methodAndPass[1]
+			} else {
+				method = decodedStr
 			}
 		}
 	}
-	if isLikelyBase64(password) {
+	if password != "" && isLikelyBase64(password) {
 		password, err = DecodeBase64(password)
 		if err != nil {
-			return model.Proxy{}, &ParseError{
-				Type:    ErrInvalidStruct,
-				Message: "password decode error",
-				Raw:     proxy,
-			}
+			return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidStruct, err.Error())
 		}
 	}
 
@@ -93,28 +100,21 @@ func ParseShadowsocks(proxy string) (model.Proxy, error) {
 	}
 	remarks = strings.TrimSpace(remarks)
 
-	result := model.Proxy{
-		Type:     "ss",
+	result := P.Proxy{
+		Type: p.GetType(),
+		Name: remarks,
+		ShadowSocks: P.ShadowSocks{
 			Cipher:   method,
 			Password: password,
 			Server:   server,
 			Port:     port,
-		Name:     remarks,
+		},
 	}
 
 	return result, nil
 }
 
-func isLikelyBase64(s string) bool {
-	if len(s)%4 == 0 && strings.HasSuffix(s, "=") && !strings.Contains(strings.TrimSuffix(s, "="), "=") {
-		s = strings.TrimSuffix(s, "=")
-		chars := "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
-		for _, c := range s {
-			if !strings.ContainsRune(chars, c) {
-				return false
-			}
-		}
-		return true
-	}
-	return false
+// 注册解析器
+func init() {
+	RegisterParser(&ShadowsocksParser{})
 }

parser/shadowsocksr.go

@@ -1,48 +1,67 @@
 package parser
 
 import (
+	"fmt"
 	"net/url"
 	"strconv"
 	"strings"
 
-	"github.com/nitezs/sub2clash/constant"
-	"github.com/nitezs/sub2clash/model"
+	P "github.com/bestnite/sub2clash/model/proxy"
 )
 
-func ParseShadowsocksR(proxy string) (model.Proxy, error) {
-	if !strings.HasPrefix(proxy, constant.ShadowsocksRPrefix) {
-		return model.Proxy{}, &ParseError{Type: ErrInvalidPrefix, Raw: proxy}
+type ShadowsocksRParser struct{}
+
+func (p *ShadowsocksRParser) SupportClash() bool {
+	return true
+}
+
+func (p *ShadowsocksRParser) SupportMeta() bool {
+	return true
+}
+
+func (p *ShadowsocksRParser) GetPrefixes() []string {
+	return []string{"ssr://"}
+}
+
+func (p *ShadowsocksRParser) GetType() string {
+	return "ssr"
+}
+
+func (p *ShadowsocksRParser) Parse(proxy string) (P.Proxy, error) {
+	if !hasPrefix(proxy, p.GetPrefixes()) {
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidPrefix, proxy)
+	}
+
+	for _, prefix := range p.GetPrefixes() {
+		if strings.HasPrefix(proxy, prefix) {
+			proxy = strings.TrimPrefix(proxy, prefix)
+			break
+		}
 	}
 
-	proxy = strings.TrimPrefix(proxy, constant.ShadowsocksRPrefix)
 	proxy, err := DecodeBase64(proxy)
 	if err != nil {
-		return model.Proxy{}, &ParseError{
-			Type: ErrInvalidBase64,
-			Raw:  proxy,
-		}
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidBase64, err.Error())
 	}
 	serverInfoAndParams := strings.SplitN(proxy, "/?", 2)
-	parts := strings.Split(serverInfoAndParams[0], ":")
+	if len(serverInfoAndParams) != 2 {
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidStruct, proxy)
+	}
+	parts := SplitNRight(serverInfoAndParams[0], ":", 6)
+	if len(parts) < 6 {
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidStruct, proxy)
+	}
 	server := parts[0]
 	protocol := parts[2]
 	method := parts[3]
 	obfs := parts[4]
 	password, err := DecodeBase64(parts[5])
 	if err != nil {
-		return model.Proxy{}, &ParseError{
-			Type:    ErrInvalidStruct,
-			Raw:     proxy,
-			Message: err.Error(),
-		}
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidStruct, err.Error())
 	}
 	port, err := ParsePort(parts[1])
 	if err != nil {
-		return model.Proxy{}, &ParseError{
-			Type:    ErrInvalidPort,
-			Message: err.Error(),
-			Raw:     proxy,
-		}
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidPort, err.Error())
 	}
 
 	var obfsParam string
@@ -51,11 +70,7 @@ func ParseShadowsocksR(proxy string) (model.Proxy, error) {
 	if len(serverInfoAndParams) == 2 {
 		params, err := url.ParseQuery(serverInfoAndParams[1])
 		if err != nil {
-			return model.Proxy{}, &ParseError{
-				Type:    ErrCannotParseParams,
-				Raw:     proxy,
-				Message: err.Error(),
-			}
+			return P.Proxy{}, fmt.Errorf("%w: %s", ErrCannotParseParams, err.Error())
 		}
 		if params.Get("obfsparam") != "" {
 			obfsParam, err = DecodeBase64(params.Get("obfsparam"))
@@ -69,17 +84,14 @@ func ParseShadowsocksR(proxy string) (model.Proxy, error) {
 			remarks = server + ":" + strconv.Itoa(port)
 		}
 		if err != nil {
-			return model.Proxy{}, &ParseError{
-				Type:    ErrInvalidStruct,
-				Raw:     proxy,
-				Message: err.Error(),
-			}
+			return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidStruct, err.Error())
 		}
 	}
 
-	result := model.Proxy{
+	result := P.Proxy{
+		Type: p.GetType(),
 		Name: remarks,
-		Type:          "ssr",
+		ShadowSocksR: P.ShadowSocksR{
 			Server:        server,
 			Port:          port,
 			Protocol:      protocol,
@@ -88,7 +100,35 @@ func ParseShadowsocksR(proxy string) (model.Proxy, error) {
 			Password:      password,
 			ObfsParam:     obfsParam,
 			ProtocolParam: protoParam,
+		},
 	}
 
 	return result, nil
 }
+
+func init() {
+	RegisterParser(&ShadowsocksRParser{})
+}
+
+func SplitNRight(s, sep string, n int) []string {
+	if n <= 0 {
+		return nil
+	}
+	if n == 1 {
+		return []string{s}
+	}
+	parts := strings.Split(s, sep)
+	if len(parts) <= n {
+		return parts
+	}
+	result := make([]string, n)
+	for i, j := len(parts)-1, 0; i >= 0; i, j = i-1, j+1 {
+		if j < n-1 {
+			result[n-j-1] = parts[len(parts)-j-1]
+		} else {
+			result[0] = strings.Join(parts[:i+1], sep)
+			break
+		}
+	}
+	return result
+}

parser/socks.go

@@ -2,46 +2,49 @@ package parser
 
 import (
 	"fmt"
-	"github.com/nitezs/sub2clash/constant"
-	"github.com/nitezs/sub2clash/model"
 	"net/url"
 	"strings"
+
+	P "github.com/bestnite/sub2clash/model/proxy"
 )
 
-func ParseSocks(proxy string) (model.Proxy, error) {
-	if !strings.HasPrefix(proxy, constant.SocksPrefix) {
-		return model.Proxy{}, &ParseError{Type: ErrInvalidPrefix, Raw: proxy}
+type SocksParser struct{}
+
+func (p *SocksParser) SupportClash() bool {
+	return true
+}
+func (p *SocksParser) SupportMeta() bool {
+	return true
+}
+
+func (p *SocksParser) GetPrefixes() []string {
+	return []string{"socks://"}
+}
+
+func (p *SocksParser) GetType() string {
+	return "socks5"
+}
+
+func (p *SocksParser) Parse(proxy string) (P.Proxy, error) {
+	if !hasPrefix(proxy, p.GetPrefixes()) {
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidPrefix, proxy)
 	}
+
 	link, err := url.Parse(proxy)
 	if err != nil {
-		return model.Proxy{}, &ParseError{
-			Type:    ErrInvalidStruct,
-			Message: "url parse error",
-			Raw:     proxy,
-		}
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidStruct, err.Error())
 	}
 	server := link.Hostname()
 	if server == "" {
-		return model.Proxy{}, &ParseError{
-			Type:    ErrInvalidStruct,
-			Message: "missing server host",
-			Raw:     proxy,
-		}
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidStruct, "missing server host")
 	}
 	portStr := link.Port()
 	if portStr == "" {
-		return model.Proxy{}, &ParseError{
-			Type:    ErrInvalidStruct,
-			Message: "missing server port",
-			Raw:     proxy,
-		}
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidStruct, "missing server port")
 	}
 	port, err := ParsePort(portStr)
 	if err != nil {
-		return model.Proxy{}, &ParseError{
-			Type: ErrInvalidPort,
-			Raw:  portStr,
-		}
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidPort, err.Error())
 	}
 
 	remarks := link.Fragment
@@ -50,30 +53,40 @@ func ParseSocks(proxy string) (model.Proxy, error) {
 	}
 	remarks = strings.TrimSpace(remarks)
 
-	encodeStr := link.User.Username()
 	var username, password string
-	if encodeStr != "" {
-		decodeStr, err := DecodeBase64(encodeStr)
-		splitStr := strings.Split(decodeStr, ":")
-		if err != nil {
-			return model.Proxy{}, &ParseError{
-				Type:    ErrInvalidStruct,
-				Message: "url parse error",
-				Raw:     proxy,
+
+	username = link.User.Username()
+	password, hasPassword := link.User.Password()
+
+	if !hasPassword && isLikelyBase64(username) {
+		decodedStr, err := DecodeBase64(username)
+		if err == nil {
+			usernameAndPassword := strings.SplitN(decodedStr, ":", 2)
+			if len(usernameAndPassword) == 2 {
+				username = usernameAndPassword[0]
+				password = usernameAndPassword[1]
+			} else {
+				username = decodedStr
 			}
 		}
-		username = splitStr[0]
-		if len(splitStr) == 2 {
-			password = splitStr[1]
 	}
-	}
-	return model.Proxy{
-		Type:     "socks5",
+
+	tls, udp := link.Query().Get("tls"), link.Query().Get("udp")
+
+	return P.Proxy{
+		Type: p.GetType(),
 		Name: remarks,
+		Socks: P.Socks{
 			Server:   server,
 			Port:     port,
-		Username: username,
+			UserName: username,
 			Password: password,
+			TLS:      tls == "true",
+			UDP:      udp == "true",
+		},
 	}, nil
-
+}
+
+func init() {
+	RegisterParser(&SocksParser{})
 }

parser/trojan.go

@@ -5,49 +5,50 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/nitezs/sub2clash/constant"
-	"github.com/nitezs/sub2clash/model"
+	P "github.com/bestnite/sub2clash/model/proxy"
 )
 
-func ParseTrojan(proxy string) (model.Proxy, error) {
-	if !strings.HasPrefix(proxy, constant.TrojanPrefix) {
-		return model.Proxy{}, &ParseError{Type: ErrInvalidPrefix, Raw: proxy}
+type TrojanParser struct{}
+
+func (p *TrojanParser) SupportClash() bool {
+	return true
+}
+
+func (p *TrojanParser) SupportMeta() bool {
+	return true
+}
+
+func (p *TrojanParser) GetPrefixes() []string {
+	return []string{"trojan://"}
+}
+
+func (p *TrojanParser) GetType() string {
+	return "trojan"
+}
+
+func (p *TrojanParser) Parse(proxy string) (P.Proxy, error) {
+	if !hasPrefix(proxy, p.GetPrefixes()) {
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidPrefix, proxy)
 	}
 
 	link, err := url.Parse(proxy)
 	if err != nil {
-		return model.Proxy{}, &ParseError{
-			Type:    ErrInvalidStruct,
-			Message: "url parse error",
-			Raw:     proxy,
-		}
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidStruct, err.Error())
 	}
 
 	password := link.User.Username()
 	server := link.Hostname()
 	if server == "" {
-		return model.Proxy{}, &ParseError{
-			Type:    ErrInvalidStruct,
-			Message: "missing server host",
-			Raw:     proxy,
-		}
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidStruct, "missing server host")
 	}
 	portStr := link.Port()
 	if portStr == "" {
-		return model.Proxy{}, &ParseError{
-			Type:    ErrInvalidStruct,
-			Message: "missing server port",
-			Raw:     proxy,
-		}
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidStruct, "missing server port")
 	}
 
 	port, err := ParsePort(portStr)
 	if err != nil {
-		return model.Proxy{}, &ParseError{
-			Type:    ErrInvalidPort,
-			Message: err.Error(),
-			Raw:     proxy,
-		}
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidPort, err.Error())
 	}
 
 	remarks := link.Fragment
@@ -57,7 +58,7 @@ func ParseTrojan(proxy string) (model.Proxy, error) {
 	remarks = strings.TrimSpace(remarks)
 
 	query := link.Query()
-	network, security, alpnStr, sni, pbk, sid, fp, path, host, serviceName := query.Get("type"), query.Get("security"), query.Get("alpn"), query.Get("sni"), query.Get("pbk"), query.Get("sid"), query.Get("fp"), query.Get("path"), query.Get("host"), query.Get("serviceName")
+	network, security, alpnStr, sni, pbk, sid, fp, path, host, serviceName, udp := query.Get("type"), query.Get("security"), query.Get("alpn"), query.Get("sni"), query.Get("pbk"), query.Get("sid"), query.Get("fp"), query.Get("path"), query.Get("host"), query.Get("serviceName"), query.Get("udp")
 
 	var alpn []string
 	if strings.Contains(alpnStr, ",") {
@@ -66,25 +67,22 @@ func ParseTrojan(proxy string) (model.Proxy, error) {
 		alpn = nil
 	}
 
-	result := model.Proxy{
-		Type:     "trojan",
+	result := P.Trojan{
 		Server:   server,
 		Port:     port,
 		Password: password,
-		Name:     remarks,
 		Network:  network,
+		UDP:      udp == "true",
 	}
 
 	if security == "xtls" || security == "tls" {
-		result.Alpn = alpn
-		result.Sni = sni
-		result.TLS = true
+		result.ALPN = alpn
+		result.SNI = sni
 	}
 
 	if security == "reality" {
-		result.TLS = true
-		result.Sni = sni
-		result.RealityOpts = model.RealityOptions{
+		result.SNI = sni
+		result.RealityOpts = P.RealityOptions{
 			PublicKey: pbk,
 			ShortID:   sid,
 		}
@@ -93,7 +91,7 @@ func ParseTrojan(proxy string) (model.Proxy, error) {
 
 	if network == "ws" {
 		result.Network = "ws"
-		result.WSOpts = model.WSOptions{
+		result.WSOpts = P.WSOptions{
 			Path: path,
 			Headers: map[string]string{
 				"Host": host,
@@ -102,10 +100,18 @@ func ParseTrojan(proxy string) (model.Proxy, error) {
 	}
 
 	if network == "grpc" {
-		result.GrpcOpts = model.GrpcOptions{
+		result.GrpcOpts = P.GrpcOptions{
 			GrpcServiceName: serviceName,
 		}
 	}
 
-	return result, nil
+	return P.Proxy{
+		Type:   p.GetType(),
+		Name:   remarks,
+		Trojan: result,
+	}, nil
+}
+
+func init() {
+	RegisterParser(&TrojanParser{})
 }

parser/vless.go

@@ -5,45 +5,50 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/nitezs/sub2clash/constant"
-	"github.com/nitezs/sub2clash/model"
+	P "github.com/bestnite/sub2clash/model/proxy"
 )
 
-func ParseVless(proxy string) (model.Proxy, error) {
-	if !strings.HasPrefix(proxy, constant.VLESSPrefix) {
-		return model.Proxy{}, &ParseError{Type: ErrInvalidPrefix, Raw: proxy}
+type VlessParser struct{}
+
+func (p *VlessParser) SupportClash() bool {
+	return false
+}
+
+func (p *VlessParser) SupportMeta() bool {
+	return true
+}
+
+func (p *VlessParser) GetPrefixes() []string {
+	return []string{"vless://"}
+}
+
+func (p *VlessParser) GetType() string {
+	return "vless"
+}
+
+func (p *VlessParser) Parse(proxy string) (P.Proxy, error) {
+	if !hasPrefix(proxy, p.GetPrefixes()) {
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidPrefix, proxy)
 	}
 
 	link, err := url.Parse(proxy)
 	if err != nil {
-		return model.Proxy{}, &ParseError{
-			Type:    ErrInvalidStruct,
-			Message: "url parse error",
-			Raw:     proxy,
-		}
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidStruct, err.Error())
 	}
 
 	server := link.Hostname()
 	if server == "" {
-		return model.Proxy{}, &ParseError{
-			Type:    ErrInvalidStruct,
-			Message: "missing server host",
-			Raw:     proxy,
-		}
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidStruct, "missing server host")
 	}
 	portStr := link.Port()
 	port, err := ParsePort(portStr)
 	if err != nil {
-		return model.Proxy{}, &ParseError{
-			Type:    ErrInvalidPort,
-			Message: err.Error(),
-			Raw:     proxy,
-		}
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidPort, err.Error())
 	}
 
 	query := link.Query()
 	uuid := link.User.Username()
-	flow, security, alpnStr, sni, insecure, fp, pbk, sid, path, host, serviceName, _type := query.Get("flow"), query.Get("security"), query.Get("alpn"), query.Get("sni"), query.Get("allowInsecure"), query.Get("fp"), query.Get("pbk"), query.Get("sid"), query.Get("path"), query.Get("host"), query.Get("serviceName"), query.Get("type")
+	flow, security, alpnStr, sni, insecure, fp, pbk, sid, path, host, serviceName, _type, udp := query.Get("flow"), query.Get("security"), query.Get("alpn"), query.Get("sni"), query.Get("allowInsecure"), query.Get("fp"), query.Get("pbk"), query.Get("sid"), query.Get("path"), query.Get("host"), query.Get("serviceName"), query.Get("type"), query.Get("udp")
 
 	insecureBool := insecure == "1"
 	var alpn []string
@@ -58,36 +63,35 @@ func ParseVless(proxy string) (model.Proxy, error) {
 	}
 	remarks = strings.TrimSpace(remarks)
 
-	result := model.Proxy{
-		Type:   "vless",
+	result := P.Vless{
 		Server: server,
-		Name:   remarks,
 		Port:   port,
 		UUID:   uuid,
 		Flow:   flow,
+		UDP:    udp == "true",
 	}
 
 	if security == "tls" {
 		result.TLS = true
-		result.Alpn = alpn
-		result.Sni = sni
-		result.AllowInsecure = insecureBool
-		result.ClientFingerprint = fp
+		result.ALPN = alpn
+		result.SkipCertVerify = insecureBool
+		result.Fingerprint = fp
+		result.ServerName = sni
 	}
 
 	if security == "reality" {
 		result.TLS = true
-		result.Servername = sni
-		result.RealityOpts = model.RealityOptions{
+		result.ServerName = sni
+		result.RealityOpts = P.RealityOptions{
 			PublicKey: pbk,
 			ShortID:   sid,
 		}
-		result.ClientFingerprint = fp
+		result.Fingerprint = fp
 	}
 
 	if _type == "ws" {
 		result.Network = "ws"
-		result.WSOpts = model.WSOptions{
+		result.WSOpts = P.WSOptions{
 			Path: path,
 		}
 		if host != "" {
@@ -98,24 +102,20 @@ func ParseVless(proxy string) (model.Proxy, error) {
 
 	if _type == "grpc" {
 		result.Network = "grpc"
-		result.GrpcOpts = model.GrpcOptions{
+		result.GrpcOpts = P.GrpcOptions{
 			GrpcServiceName: serviceName,
 		}
 	}
 
 	if _type == "http" {
-		result.HTTPOpts = model.HTTPOptions{}
+		result.HTTPOpts = P.HTTPOptions{}
 		result.HTTPOpts.Headers = map[string][]string{}
 
 		result.HTTPOpts.Path = strings.Split(path, ",")
 
 		hosts, err := url.QueryUnescape(host)
 		if err != nil {
-			return model.Proxy{}, &ParseError{
-				Type:    ErrCannotParseParams,
-				Raw:     proxy,
-				Message: err.Error(),
-			}
+			return P.Proxy{}, fmt.Errorf("%w: %s", ErrCannotParseParams, err.Error())
 		}
 		result.Network = "http"
 		if hosts != "" {
@@ -123,5 +123,13 @@ func ParseVless(proxy string) (model.Proxy, error) {
 		}
 	}
 
-	return result, nil
+	return P.Proxy{
+		Type:  p.GetType(),
+		Name:  remarks,
+		Vless: result,
+	}, nil
+}
+
+func init() {
+	RegisterParser(&VlessParser{})
 }

parser/vmess.go

@@ -2,29 +2,70 @@ package parser
 
 import (
 	"encoding/json"
+	"fmt"
 	"net/url"
 	"strconv"
 	"strings"
 
-	"github.com/nitezs/sub2clash/constant"
-	"github.com/nitezs/sub2clash/model"
+	P "github.com/bestnite/sub2clash/model/proxy"
 )
 
-func ParseVmess(proxy string) (model.Proxy, error) {
-	if !strings.HasPrefix(proxy, constant.VMessPrefix) {
-		return model.Proxy{}, &ParseError{Type: ErrInvalidPrefix, Raw: proxy}
+type VmessJson struct {
+	V    any    `json:"v"`
+	Ps   string `json:"ps"`
+	Add  string `json:"add"`
+	Port any    `json:"port"`
+	Id   string `json:"id"`
+	Aid  any    `json:"aid"`
+	Scy  string `json:"scy"`
+	Net  string `json:"net"`
+	Type string `json:"type"`
+	Host string `json:"host"`
+	Path string `json:"path"`
+	Tls  string `json:"tls"`
+	Sni  string `json:"sni"`
+	Alpn string `json:"alpn"`
+	Fp   string `json:"fp"`
+}
+
+type VmessParser struct{}
+
+func (p *VmessParser) SupportClash() bool {
+	return true
+}
+
+func (p *VmessParser) SupportMeta() bool {
+	return true
+}
+
+func (p *VmessParser) GetPrefixes() []string {
+	return []string{"vmess://"}
+}
+
+func (p *VmessParser) GetType() string {
+	return "vmess"
+}
+
+func (p *VmessParser) Parse(proxy string) (P.Proxy, error) {
+	if !hasPrefix(proxy, p.GetPrefixes()) {
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidPrefix, proxy)
 	}
 
-	proxy = strings.TrimPrefix(proxy, constant.VMessPrefix)
+	for _, prefix := range p.GetPrefixes() {
+		if strings.HasPrefix(proxy, prefix) {
+			proxy = strings.TrimPrefix(proxy, prefix)
+			break
+		}
+	}
 	base64, err := DecodeBase64(proxy)
 	if err != nil {
-		return model.Proxy{}, &ParseError{Type: ErrInvalidBase64, Raw: proxy, Message: err.Error()}
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidBase64, err.Error())
 	}
 
-	var vmess model.VmessJson
+	var vmess VmessJson
 	err = json.Unmarshal([]byte(base64), &vmess)
 	if err != nil {
-		return model.Proxy{}, &ParseError{Type: ErrInvalidStruct, Raw: proxy, Message: err.Error()}
+		return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidStruct, err.Error())
 	}
 
 	var port int
@@ -32,11 +73,7 @@ func ParseVmess(proxy string) (model.Proxy, error) {
 	case string:
 		port, err = ParsePort(vmess.Port.(string))
 		if err != nil {
-			return model.Proxy{}, &ParseError{
-				Type:    ErrInvalidPort,
-				Message: err.Error(),
-				Raw:     proxy,
-			}
+			return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidPort, err.Error())
 		}
 	case float64:
 		port = int(vmess.Port.(float64))
@@ -47,7 +84,7 @@ func ParseVmess(proxy string) (model.Proxy, error) {
 	case string:
 		aid, err = strconv.Atoi(vmess.Aid.(string))
 		if err != nil {
-			return model.Proxy{}, &ParseError{Type: ErrInvalidStruct, Raw: proxy, Message: err.Error()}
+			return P.Proxy{}, fmt.Errorf("%w: %s", ErrInvalidStruct, err.Error())
 		}
 	case float64:
 		aid = int(vmess.Aid.(float64))
@@ -62,9 +99,7 @@ func ParseVmess(proxy string) (model.Proxy, error) {
 		name = vmess.Ps
 	}
 
-	result := model.Proxy{
-		Name:    name,
-		Type:    "vmess",
+	result := P.Vmess{
 		Server:  vmess.Add,
 		Port:    port,
 		UUID:    vmess.Id,
@@ -81,8 +116,8 @@ func ParseVmess(proxy string) (model.Proxy, error) {
 		}
 		result.TLS = true
 		result.Fingerprint = vmess.Fp
-		result.Alpn = alpn
-		result.Servername = vmess.Sni
+		result.ALPN = alpn
+		result.ServerName = vmess.Sni
 	}
 
 	if vmess.Net == "ws" {
@@ -93,7 +128,7 @@ func ParseVmess(proxy string) (model.Proxy, error) {
 			vmess.Host = vmess.Add
 		}
 		result.Network = "ws"
-		result.WSOpts = model.WSOptions{
+		result.WSOpts = P.WSOptions{
 			Path: vmess.Path,
 			Headers: map[string]string{
 				"Host": vmess.Host,
@@ -102,19 +137,27 @@ func ParseVmess(proxy string) (model.Proxy, error) {
 	}
 
 	if vmess.Net == "grpc" {
-		result.GrpcOpts = model.GrpcOptions{
+		result.GrpcOpts = P.GrpcOptions{
 			GrpcServiceName: vmess.Path,
 		}
 		result.Network = "grpc"
 	}
 
 	if vmess.Net == "h2" {
-		result.HTTP2Opts = model.HTTP2Options{
+		result.HTTP2Opts = P.HTTP2Options{
 			Host: strings.Split(vmess.Host, ","),
 			Path: vmess.Path,
 		}
 		result.Network = "h2"
 	}
 
-	return result, nil
+	return P.Proxy{
+		Type:  p.GetType(),
+		Name:  name,
+		Vmess: result,
+	}, nil
+}
+
+func init() {
+	RegisterParser(&VmessParser{})
 }

server/handler/short_link.go

@@ -3,26 +3,36 @@ package handler
 import (
 	"io"
 	"net/http"
-	"strconv"
 	"strings"
 	"time"
 
-	"github.com/nitezs/sub2clash/common"
-	"github.com/nitezs/sub2clash/common/database"
-	"github.com/nitezs/sub2clash/config"
-	"github.com/nitezs/sub2clash/model"
-	"github.com/nitezs/sub2clash/validator"
+	"github.com/bestnite/sub2clash/common"
+	"github.com/bestnite/sub2clash/common/database"
+	"github.com/bestnite/sub2clash/config"
+	"github.com/bestnite/sub2clash/model"
 
 	"github.com/gin-gonic/gin"
 )
 
+type shortLinkGenRequset struct {
+	Url      string `form:"url" binding:"required"`
+	Password string `form:"password"`
+	CustomID string `form:"customId"`
+}
+
+type shortLinkUpdateRequest struct {
+	Hash     string `form:"hash" binding:"required"`
+	Url      string `form:"url" binding:"required"`
+	Password string `form:"password" binding:"required"`
+}
+
 func respondWithError(c *gin.Context, code int, message string) {
 	c.String(code, message)
 	c.Abort()
 }
 
 func GenerateLinkHandler(c *gin.Context) {
-	var params validator.ShortLinkGenValidator
+	var params shortLinkGenRequset
 	if err := c.ShouldBind(&params); err != nil {
 		respondWithError(c, http.StatusBadRequest, "参数错误: "+err.Error())
 		return
@@ -32,16 +42,41 @@ func GenerateLinkHandler(c *gin.Context) {
 		return
 	}
 
-	hash, err := generateUniqueHash()
+	var hash string
+	var password string
+	var err error
+
+	if params.CustomID != "" {
+		// 检查自定义ID是否已存在
+		exists, err := database.CheckShortLinkHashExists(params.CustomID)
+		if err != nil {
+			respondWithError(c, http.StatusInternalServerError, "数据库错误")
+			return
+		}
+		if exists {
+			respondWithError(c, http.StatusBadRequest, "短链已存在")
+			return
+		}
+		hash = params.CustomID
+		password = params.Password
+	} else {
+		// 自动生成短链ID和密码
+		hash, err = generateUniqueHash(config.GlobalConfig.ShortLinkLength)
 		if err != nil {
 			respondWithError(c, http.StatusInternalServerError, "生成短链接失败")
 			return
 		}
+		if params.Password == "" {
+			password = common.RandomString(8) // 生成8位随机密码
+		} else {
+			password = params.Password
+		}
+	}
 
 	shortLink := model.ShortLink{
 		Hash:     hash,
 		Url:      params.Url,
-		Password: params.Password,
+		Password: password,
 	}
 
 	if err := database.SaveShortLink(&shortLink); err != nil {
@@ -49,15 +84,17 @@ func GenerateLinkHandler(c *gin.Context) {
 		return
 	}
 
-	if params.Password != "" {
-		hash += "?password=" + params.Password
+	// 返回生成的短链ID和密码
+	response := map[string]string{
+		"hash":     hash,
+		"password": password,
 	}
-	c.String(http.StatusOK, hash)
+	c.JSON(http.StatusOK, response)
 }
 
-func generateUniqueHash() (string, error) {
+func generateUniqueHash(length int) (string, error) {
 	for {
-		hash := common.RandomString(config.Default.ShortLinkLength)
+		hash := common.RandomString(length)
 		exists, err := database.CheckShortLinkHashExists(hash)
 		if err != nil {
 			return "", err
@@ -69,16 +106,32 @@ func generateUniqueHash() (string, error) {
 }
 
 func UpdateLinkHandler(c *gin.Context) {
-	var params validator.ShortLinkUpdateValidator
+	var params shortLinkUpdateRequest
 	if err := c.ShouldBindJSON(&params); err != nil {
 		respondWithError(c, http.StatusBadRequest, "参数错误: "+err.Error())
 		return
 	}
+
+	// 先获取原有的短链接
+	existingLink, err := database.FindShortLinkByHash(params.Hash)
+	if err != nil {
+		respondWithError(c, http.StatusNotFound, "未找到短链接")
+		return
+	}
+
+	// 验证密码
+	if existingLink.Password != params.Password {
+		respondWithError(c, http.StatusUnauthorized, "密码错误")
+		return
+	}
+
+	// 更新URL，但保持原密码不变
 	shortLink := model.ShortLink{
 		Hash:     params.Hash,
 		Url:      params.Url,
-		Password: params.Password,
+		Password: existingLink.Password, // 保持原密码不变
 	}
+
 	if err := database.SaveShortLink(&shortLink); err != nil {
 		respondWithError(c, http.StatusInternalServerError, "数据库错误")
 		return
@@ -115,7 +168,7 @@ func GetRawConfHandler(c *gin.Context) {
 		return
 	}
 
-	response, err := http.Get("http://localhost:" + strconv.Itoa(config.Default.Port) + "/" + shortLink.Url)
+	response, err := http.Get(strings.TrimSuffix(config.GlobalConfig.Address, "/") + "/" + shortLink.Url)
 	if err != nil {
 		respondWithError(c, http.StatusInternalServerError, "请求错误: "+err.Error())
 		return

server/handler/sub.go

@@ -0,0 +1,53 @@
+package handler
+
+import (
+	_ "embed"
+	"net/http"
+
+	"github.com/bestnite/sub2clash/common"
+	"github.com/bestnite/sub2clash/config"
+	M "github.com/bestnite/sub2clash/model"
+
+	"github.com/gin-gonic/gin"
+	"gopkg.in/yaml.v3"
+)
+
+func SubHandler(model M.ClashType, template string) func(c *gin.Context) {
+	return func(c *gin.Context) {
+		query, err := M.ParseSubQuery(c)
+		if err != nil {
+			c.String(http.StatusBadRequest, err.Error())
+			return
+		}
+		sub, err := common.BuildSub(model, query, template, config.GlobalConfig.CacheExpire, config.GlobalConfig.RequestRetryTimes)
+		if err != nil {
+			c.String(http.StatusInternalServerError, err.Error())
+			return
+		}
+
+		if len(query.Subs) == 1 {
+			userInfoHeader, err := common.FetchSubscriptionUserInfo(query.Subs[0], "clash", config.GlobalConfig.RequestRetryTimes)
+			if err == nil {
+				c.Header("subscription-userinfo", userInfoHeader)
+			}
+		}
+
+		if query.NodeListMode {
+			nodelist := M.NodeList{}
+			nodelist.Proxy = sub.Proxy
+			marshal, err := yaml.Marshal(nodelist)
+			if err != nil {
+				c.String(http.StatusInternalServerError, "YAML序列化失败: "+err.Error())
+				return
+			}
+			c.String(http.StatusOK, string(marshal))
+			return
+		}
+		marshal, err := yaml.Marshal(sub)
+		if err != nil {
+			c.String(http.StatusInternalServerError, "YAML序列化失败: "+err.Error())
+			return
+		}
+		c.String(http.StatusOK, string(marshal))
+	}
+}

server/middleware/logger.go

@@ -4,7 +4,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/nitezs/sub2clash/logger"
+	"github.com/bestnite/sub2clash/logger"
 
 	"github.com/gin-gonic/gin"
 	"go.uber.org/zap"

server/route.go

@@ -0,0 +1,49 @@
+package server
+
+import (
+	"embed"
+	"html/template"
+	"log"
+	"net/http"
+
+	"github.com/bestnite/sub2clash/config"
+	"github.com/bestnite/sub2clash/constant"
+	"github.com/bestnite/sub2clash/model"
+	"github.com/bestnite/sub2clash/server/handler"
+	"github.com/bestnite/sub2clash/server/middleware"
+
+	"github.com/gin-gonic/gin"
+)
+
+//go:embed static
+var staticFiles embed.FS
+
+func SetRoute(r *gin.Engine) {
+	tpl, err := template.ParseFS(staticFiles, "static/*")
+	if err != nil {
+		log.Fatalf("Error parsing templates: %v", err)
+	}
+	r.SetHTMLTemplate(tpl)
+
+	r.GET(
+		"/static/*filepath", func(c *gin.Context) {
+			c.FileFromFS("static/"+c.Param("filepath"), http.FS(staticFiles))
+		},
+	)
+	r.GET(
+		"/", func(c *gin.Context) {
+			version := constant.Version
+			c.HTML(
+				200, "index.html", gin.H{
+					"Version": version,
+				},
+			)
+		},
+	)
+	r.GET("/clash", middleware.ZapLogger(), handler.SubHandler(model.Clash, config.GlobalConfig.ClashTemplate))
+	r.GET("/meta", middleware.ZapLogger(), handler.SubHandler(model.ClashMeta, config.GlobalConfig.MetaTemplate))
+	r.GET("/s/:hash", middleware.ZapLogger(), handler.GetRawConfHandler)
+	r.POST("/short", middleware.ZapLogger(), handler.GenerateLinkHandler)
+	r.PUT("/short", middleware.ZapLogger(), handler.UpdateLinkHandler)
+	r.GET("/short", middleware.ZapLogger(), handler.GetRawConfUriHandler)
+}

server/static/index.html

@@ -6,13 +6,11 @@
     <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" />
+    <link href="./static/bootstrap.min.css" rel="stylesheet" />
     <!-- Bootstrap JS -->
-    <script crossorigin="anonymous" integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL"
-        src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
+    <script src="./static/bootstrap.bundle.min.js"></script>
     <!-- Axios -->
-    <script src="https://cdn.jsdelivr.net/npm/axios@latest/dist/axios.min.js"></script>
+    <script src="./static/axios.min.js"></script>
     <style>
         .container {
             max-width: 800px;
@@ -38,7 +36,7 @@
         <div class="mb-4">
             <h2>sub2clash</h2>
             <span class="text-muted fst-italic">通用订阅链接转 Clash(Meta) 配置工具
-                <a href="https://github.com/nitezs/sub2clash#clash-meta" target="_blank">使用文档</a></span><br /><span
+                <a href="https://github.com/bestnite/sub2clash#clash-meta" target="_blank">使用文档</a></span><br /><span
                 class="text-muted fst-italic">注意：本程序非纯前端程序，输入的订阅将被后端缓存，请确保您信任当前站点</span>
         </div>
 
@@ -57,7 +55,7 @@
             <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="meta" selected>Clash.Meta</option>
             </select>
         </div>
         <!-- Template -->
@@ -77,9 +75,9 @@
         </div>
         <!-- User Agent -->
         <div class="form-group mb-3">
-            <label for="user-agent">ua标识:</label>
+            <label for="user-agent">UA 标识:</label>
             <textarea class="form-control" id="user-agent" name="user-agent"
-                placeholder="用于获取订阅的http请求中的user-agent标识(可选)" rows="1"></textarea>
+                placeholder="用于获取订阅的 http 请求中的 User-Agent 标识（可选）" rows="3"></textarea>
         </div>
         <!-- Refresh -->
         <div class="form-check mb-3">
@@ -147,31 +145,36 @@
         <div class="form-group mb-5">
             <label for="apiLink">配置链接:</label>
             <div class="input-group mb-2">
-                <input class="form-control" id="apiLink" type="text" placeholder="链接" />
+                <input class="form-control bg-light" id="apiLink" type="text" placeholder="链接" readonly
+                    style="cursor: not-allowed;" />
                 <button class="btn btn-primary" onclick="copyToClipboard('apiLink',this)" type="button">
                     复制链接
                 </button>
             </div>
-            <div class="input-group">
-                <input class="form-control" id="apiShortLink" type="text" placeholder="链接" />
-                <input class="form-control" id="password" type="text" placeholder="密码" />
+            <div class="input-group mb-2">
+                <input class="form-control" id="customId" type="text" placeholder="短链ID（可选）" />
+                <input class="form-control" id="password" type="text" placeholder="密码（可选）" />
                 <button class="btn btn-primary" onclick="generateShortLink()" type="button">
                     生成短链
                 </button>
-                <button class="btn btn-primary" onclick="updateShortLink()" type="button">
-                    更新短链
-                </button>
                 <button class="btn btn-primary" onclick="copyToClipboard('apiShortLink',this)" type="button">
                     复制短链
                 </button>
             </div>
+            <div class="input-group">
+                <input class="form-control bg-light" id="apiShortLink" type="text" placeholder="短链接" readonly
+                    style="cursor: not-allowed;" />
+                <button class="btn btn-primary" onclick="updateShortLink()" type="button">
+                    更新短链
+                </button>
+            </div>
         </div>
 
         <!-- footer-->
         <footer>
             <p class="text-center">
                 Powered by
-                <a class="link-primary" href="https://github.com/nitezs/sub2clash">sub2clash</a>
+                <a class="link-primary" href="https://github.com/bestnite/sub2clash">sub2clash</a>
             </p>
             <p class="text-center">Version {{.Version}}</p>
         </footer>

server/static/index.js

@@ -1,3 +1,15 @@
+function setInputReadOnly(input, readonly) {
+  if (readonly) {
+    input.readOnly = true;
+    input.classList.add('bg-light');
+    input.style.cursor = 'not-allowed';
+  } else {
+    input.readOnly = false;
+    input.classList.remove('bg-light');
+    input.style.cursor = 'auto';
+  }
+}
+
 function clearExistingValues() {
   // 清除简单输入框和复选框的值
   document.getElementById("endpoint").value = "clash";
@@ -12,7 +24,23 @@ function clearExistingValues() {
   document.getElementById("remove").value = "";
   document.getElementById("apiLink").value = "";
   document.getElementById("apiShortLink").value = "";
-  document.getElementById("password").value = "";
+  
+  // 恢复短链ID和密码输入框状态
+  const customIdInput = document.getElementById("customId");
+  const passwordInput = document.getElementById("password");
+  const generateButton = document.querySelector('button[onclick="generateShortLink()"]');
+  
+  customIdInput.value = "";
+  setInputReadOnly(customIdInput, false);
+  
+  passwordInput.value = "";
+  setInputReadOnly(passwordInput, false);
+  
+  // 恢复生成短链按钮状态
+  generateButton.disabled = false;
+  generateButton.classList.remove('btn-secondary');
+  generateButton.classList.add('btn-primary');
+  
   document.getElementById("nodeList").checked = false;
 
   // 清除由 createRuleProvider, createReplace, 和 createRule 创建的所有额外输入组
@@ -188,8 +216,32 @@ async function parseInputURL() {
     try {
       const response = await axios.get("./short?" + q.toString());
       url = new URL(window.location.href + response.data);
-      document.querySelector("#apiShortLink").value = inputURL;
-      document.querySelector("#password").value = password;
+      
+      // 回显配置链接
+      const apiLinkInput = document.querySelector("#apiLink");
+      apiLinkInput.value = `${window.location.origin}${window.location.pathname}${response.data}`;
+      setInputReadOnly(apiLinkInput, true);
+      
+      // 回显短链相关信息
+      const apiShortLinkInput = document.querySelector("#apiShortLink");
+      apiShortLinkInput.value = inputURL;
+      setInputReadOnly(apiShortLinkInput, true);
+      
+      // 设置短链ID和密码，并设置为只读
+      const customIdInput = document.querySelector("#customId");
+      const passwordInput = document.querySelector("#password");
+      const generateButton = document.querySelector('button[onclick="generateShortLink()"]');
+      
+      customIdInput.value = hash;
+      setInputReadOnly(customIdInput, true);
+      
+      passwordInput.value = password;
+      setInputReadOnly(passwordInput, true);
+      
+      // 禁用生成短链按钮
+      generateButton.disabled = true;
+      generateButton.classList.add('btn-secondary');
+      generateButton.classList.remove('btn-primary');
     } catch (error) {
       console.log(error);
       alert("获取短链失败，请检查密码！");
@@ -255,6 +307,17 @@ async function parseInputURL() {
     );
   }
 
+  if (params.has("userAgent")) {
+    document.getElementById("user-agent").value = decodeURIComponent(
+      params.get("userAgent")
+    );
+  }
+
+  if (params.has("ignoreCountryGroup")) {
+    document.getElementById("igcg").checked = 
+      params.get("ignoreCountryGroup") === "true";
+  }
+
   if (params.has("replace")) {
     parseAndFillReplaceParams(decodeURIComponent(params.get("replace")));
   }
@@ -428,21 +491,25 @@ function generateURL() {
     return;
   }
   apiLink.value = `${window.location.origin}${window.location.pathname}${uri}`;
+  setInputReadOnly(apiLink, true);
 }
 
 function generateShortLink() {
   const apiShortLink = document.getElementById("apiShortLink");
   const password = document.getElementById("password");
+  const customId = document.getElementById("customId");
   let uri = generateURI();
   if (uri === "") {
     return;
   }
+
   axios
     .post(
       "./short",
       {
         url: uri,
         password: password.value.trim(),
+        customId: customId.value.trim()
       },
       {
         headers: {
@@ -451,11 +518,20 @@ function generateShortLink() {
       }
     )
     .then((response) => {
-      apiShortLink.value = `${window.location.origin}${window.location.pathname}s/${response.data}`;
+      // 设置返回的短链ID和密码
+      customId.value = response.data.hash;
+      password.value = response.data.password;
+      // 生成完整的短链接
+      const shortLink = `${window.location.origin}${window.location.pathname}s/${response.data.hash}?password=${response.data.password}`;
+      apiShortLink.value = shortLink;
     })
     .catch((error) => {
       console.log(error);
+      if (error.response && error.response.data) {
+        alert(error.response.data);
+      } else {
         alert("生成短链失败，请重试！");
+      }
     });
 }
 
@@ -468,7 +544,7 @@ function updateShortLink() {
     hash = u.pathname.substring(u.pathname.lastIndexOf("/s/") + 3);
   }
   if (password.value.trim() === "") {
-    alert("请输入密码！");
+    alert("请输入原密码进行验证！");
     return;
   }
   let uri = generateURI();
@@ -490,11 +566,17 @@ function updateShortLink() {
       }
     )
     .then((response) => {
-      alert("更新短链成功！");
+      alert(`短链 ${hash} 更新成功！`);
     })
     .catch((error) => {
       console.log(error);
+      if (error.response && error.response.status === 401) {
+        alert("密码错误，请输入正确的原密码！");
+      } else if (error.response && error.response.data) {
         alert(error.response.data);
+      } else {
+        alert("更新短链失败，请重试！");
+      }
     });
 }
 

test/parser/anytls_test.go

@@ -0,0 +1,219 @@
+package test
+
+import (
+	"testing"
+
+	"github.com/bestnite/sub2clash/model/proxy"
+	"github.com/bestnite/sub2clash/parser"
+)
+
+func TestAnytls_Basic_SimpleLink(t *testing.T) {
+	p := &parser.AnytlsParser{}
+	input := "anytls://password123@127.0.0.1:8080#Anytls%20Proxy"
+
+	expected := proxy.Proxy{
+		Type: "anytls",
+		Name: "Anytls Proxy",
+		Anytls: proxy.Anytls{
+			Server:         "127.0.0.1",
+			Port:           8080,
+			Password:       "password123",
+			SkipCertVerify: false,
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestAnytls_Basic_WithSNI(t *testing.T) {
+	p := &parser.AnytlsParser{}
+	input := "anytls://password123@proxy.example.com:443?sni=proxy.example.com#Anytls%20SNI"
+
+	expected := proxy.Proxy{
+		Type: "anytls",
+		Name: "Anytls SNI",
+		Anytls: proxy.Anytls{
+			Server:         "proxy.example.com",
+			Port:           443,
+			Password:       "password123",
+			SNI:            "proxy.example.com",
+			SkipCertVerify: false,
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestAnytls_Basic_WithInsecure(t *testing.T) {
+	p := &parser.AnytlsParser{}
+	input := "anytls://password123@proxy.example.com:443?insecure=1&sni=proxy.example.com#Anytls%20Insecure"
+
+	expected := proxy.Proxy{
+		Type: "anytls",
+		Name: "Anytls Insecure",
+		Anytls: proxy.Anytls{
+			Server:         "proxy.example.com",
+			Port:           443,
+			Password:       "password123",
+			SNI:            "proxy.example.com",
+			SkipCertVerify: true,
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestAnytls_Basic_IPv6Address(t *testing.T) {
+	p := &parser.AnytlsParser{}
+	input := "anytls://password123@[2001:db8::1]:8080#Anytls%20IPv6"
+
+	expected := proxy.Proxy{
+		Type: "anytls",
+		Name: "Anytls IPv6",
+		Anytls: proxy.Anytls{
+			Server:         "2001:db8::1",
+			Port:           8080,
+			Password:       "password123",
+			SkipCertVerify: false,
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestAnytls_Basic_ComplexPassword(t *testing.T) {
+	p := &parser.AnytlsParser{}
+	input := "anytls://ComplexPassword!%40%23%24@proxy.example.com:8443?sni=example.com&insecure=1#Anytls%20Full"
+
+	expected := proxy.Proxy{
+		Type: "anytls",
+		Name: "Anytls Full",
+		Anytls: proxy.Anytls{
+			Server:         "proxy.example.com",
+			Port:           8443,
+			Password:       "ComplexPassword!@#$",
+			SNI:            "example.com",
+			SkipCertVerify: true,
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestAnytls_Basic_NoPassword(t *testing.T) {
+	p := &parser.AnytlsParser{}
+	input := "anytls://@127.0.0.1:8080#No%20Password"
+
+	expected := proxy.Proxy{
+		Type: "anytls",
+		Name: "No Password",
+		Anytls: proxy.Anytls{
+			Server:         "127.0.0.1",
+			Port:           8080,
+			Password:       "",
+			SkipCertVerify: false,
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestAnytls_Basic_UsernameOnly(t *testing.T) {
+	p := &parser.AnytlsParser{}
+	input := "anytls://username@127.0.0.1:8080#Username%20Only"
+
+	expected := proxy.Proxy{
+		Type: "anytls",
+		Name: "Username Only",
+		Anytls: proxy.Anytls{
+			Server:         "127.0.0.1",
+			Port:           8080,
+			Password:       "username",
+			SkipCertVerify: false,
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestAnytls_Error_MissingServer(t *testing.T) {
+	p := &parser.AnytlsParser{}
+	input := "anytls://password123@:8080"
+
+	_, err := p.Parse(input)
+	if err == nil {
+		t.Errorf("Expected error but got none")
+	}
+}
+
+func TestAnytls_Error_MissingPort(t *testing.T) {
+	p := &parser.AnytlsParser{}
+	input := "anytls://password123@127.0.0.1"
+
+	_, err := p.Parse(input)
+	if err == nil {
+		t.Errorf("Expected error but got none")
+	}
+}
+
+func TestAnytls_Error_InvalidPort(t *testing.T) {
+	p := &parser.AnytlsParser{}
+	input := "anytls://password123@127.0.0.1:99999"
+
+	_, err := p.Parse(input)
+	if err == nil {
+		t.Errorf("Expected error but got none")
+	}
+}
+
+func TestAnytls_Error_InvalidProtocol(t *testing.T) {
+	p := &parser.AnytlsParser{}
+	input := "anyssl://example.com:8080"
+
+	_, err := p.Parse(input)
+	if err == nil {
+		t.Errorf("Expected error but got none")
+	}
+}

test/parser/hysteria2_test.go

@@ -0,0 +1,198 @@
+package test
+
+import (
+	"testing"
+
+	"github.com/bestnite/sub2clash/model/proxy"
+	"github.com/bestnite/sub2clash/parser"
+)
+
+func TestHysteria2_Basic_SimpleLink(t *testing.T) {
+	p := &parser.Hysteria2Parser{}
+	input := "hysteria2://password123@127.0.0.1:8080#Hysteria2%20Proxy"
+
+	expected := proxy.Proxy{
+		Type: "hysteria2",
+		Name: "Hysteria2 Proxy",
+		Hysteria2: proxy.Hysteria2{
+			Server:         "127.0.0.1",
+			Port:           8080,
+			Password:       "password123",
+			SkipCertVerify: false,
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestHysteria2_Basic_AltPrefix(t *testing.T) {
+	p := &parser.Hysteria2Parser{}
+	input := "hy2://password123@proxy.example.com:443?insecure=1&sni=proxy.example.com#Hysteria2%20Alt"
+
+	expected := proxy.Proxy{
+		Type: "hysteria2",
+		Name: "Hysteria2 Alt",
+		Hysteria2: proxy.Hysteria2{
+			Server:         "proxy.example.com",
+			Port:           443,
+			Password:       "password123",
+			SNI:            "proxy.example.com",
+			SkipCertVerify: true,
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestHysteria2_Basic_WithObfs(t *testing.T) {
+	p := &parser.Hysteria2Parser{}
+	input := "hysteria2://password123@127.0.0.1:8080?obfs=salamander&obfs-password=obfs123#Hysteria2%20Obfs"
+
+	expected := proxy.Proxy{
+		Type: "hysteria2",
+		Name: "Hysteria2 Obfs",
+		Hysteria2: proxy.Hysteria2{
+			Server:         "127.0.0.1",
+			Port:           8080,
+			Password:       "password123",
+			Obfs:           "salamander",
+			ObfsPassword:   "obfs123",
+			SkipCertVerify: false,
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestHysteria2_Basic_IPv6Address(t *testing.T) {
+	p := &parser.Hysteria2Parser{}
+	input := "hysteria2://password123@[2001:db8::1]:8080#Hysteria2%20IPv6"
+
+	expected := proxy.Proxy{
+		Type: "hysteria2",
+		Name: "Hysteria2 IPv6",
+		Hysteria2: proxy.Hysteria2{
+			Server:         "2001:db8::1",
+			Port:           8080,
+			Password:       "password123",
+			SkipCertVerify: false,
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestHysteria2_Basic_FullConfig(t *testing.T) {
+	p := &parser.Hysteria2Parser{}
+	input := "hysteria2://password123@proxy.example.com:443?insecure=1&sni=proxy.example.com&obfs=salamander&obfs-password=obfs123#Hysteria2%20Full"
+
+	expected := proxy.Proxy{
+		Type: "hysteria2",
+		Name: "Hysteria2 Full",
+		Hysteria2: proxy.Hysteria2{
+			Server:         "proxy.example.com",
+			Port:           443,
+			Password:       "password123",
+			SNI:            "proxy.example.com",
+			Obfs:           "salamander",
+			ObfsPassword:   "obfs123",
+			SkipCertVerify: true,
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestHysteria2_Basic_NoPassword(t *testing.T) {
+	p := &parser.Hysteria2Parser{}
+	input := "hysteria2://@127.0.0.1:8080#No%20Password"
+
+	expected := proxy.Proxy{
+		Type: "hysteria2",
+		Name: "No Password",
+		Hysteria2: proxy.Hysteria2{
+			Server:         "127.0.0.1",
+			Port:           8080,
+			Password:       "",
+			SkipCertVerify: false,
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestHysteria2_Error_MissingServer(t *testing.T) {
+	p := &parser.Hysteria2Parser{}
+	input := "hysteria2://password123@:8080"
+
+	_, err := p.Parse(input)
+	if err == nil {
+		t.Errorf("Expected error but got none")
+	}
+}
+
+func TestHysteria2_Error_MissingPort(t *testing.T) {
+	p := &parser.Hysteria2Parser{}
+	input := "hysteria2://password123@127.0.0.1"
+
+	_, err := p.Parse(input)
+	if err == nil {
+		t.Errorf("Expected error but got none")
+	}
+}
+
+func TestHysteria2_Error_InvalidPort(t *testing.T) {
+	p := &parser.Hysteria2Parser{}
+	input := "hysteria2://password123@127.0.0.1:99999"
+
+	_, err := p.Parse(input)
+	if err == nil {
+		t.Errorf("Expected error but got none")
+	}
+}
+
+func TestHysteria2_Error_InvalidProtocol(t *testing.T) {
+	p := &parser.Hysteria2Parser{}
+	input := "hysteria://example.com:8080"
+
+	_, err := p.Parse(input)
+	if err == nil {
+		t.Errorf("Expected error but got none")
+	}
+}

test/parser/hysteria_test.go

@@ -0,0 +1,183 @@
+package test
+
+import (
+	"testing"
+
+	"github.com/bestnite/sub2clash/model/proxy"
+	"github.com/bestnite/sub2clash/parser"
+)
+
+func TestHysteria_Basic_SimpleLink(t *testing.T) {
+	p := &parser.HysteriaParser{}
+	input := "hysteria://127.0.0.1:8080?protocol=udp&auth=password123&upmbps=100&downmbps=100#Hysteria%20Proxy"
+
+	expected := proxy.Proxy{
+		Type: "hysteria",
+		Name: "Hysteria Proxy",
+		Hysteria: proxy.Hysteria{
+			Server:         "127.0.0.1",
+			Port:           8080,
+			Protocol:       "udp",
+			Auth:           "password123",
+			Up:             "100",
+			Down:           "100",
+			SkipCertVerify: false,
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestHysteria_Basic_WithAuthString(t *testing.T) {
+	p := &parser.HysteriaParser{}
+	input := "hysteria://proxy.example.com:443?protocol=wechat-video&auth-str=myauth&upmbps=50&downmbps=200&insecure=true#Hysteria%20Auth"
+
+	expected := proxy.Proxy{
+		Type: "hysteria",
+		Name: "Hysteria Auth",
+		Hysteria: proxy.Hysteria{
+			Server:         "proxy.example.com",
+			Port:           443,
+			Protocol:       "wechat-video",
+			AuthString:     "myauth",
+			Up:             "50",
+			Down:           "200",
+			SkipCertVerify: true,
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestHysteria_Basic_WithObfs(t *testing.T) {
+	p := &parser.HysteriaParser{}
+	input := "hysteria://127.0.0.1:8080?auth=password123&upmbps=100&downmbps=100&obfs=xplus&alpn=h3#Hysteria%20Obfs"
+
+	expected := proxy.Proxy{
+		Type: "hysteria",
+		Name: "Hysteria Obfs",
+		Hysteria: proxy.Hysteria{
+			Server:         "127.0.0.1",
+			Port:           8080,
+			Auth:           "password123",
+			Up:             "100",
+			Down:           "100",
+			Obfs:           "xplus",
+			ALPN:           []string{"h3"},
+			SkipCertVerify: false,
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestHysteria_Basic_IPv6Address(t *testing.T) {
+	p := &parser.HysteriaParser{}
+	input := "hysteria://[2001:db8::1]:8080?auth=password123&upmbps=100&downmbps=100#Hysteria%20IPv6"
+
+	expected := proxy.Proxy{
+		Type: "hysteria",
+		Name: "Hysteria IPv6",
+		Hysteria: proxy.Hysteria{
+			Server:         "2001:db8::1",
+			Port:           8080,
+			Auth:           "password123",
+			Up:             "100",
+			Down:           "100",
+			SkipCertVerify: false,
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestHysteria_Basic_MultiALPN(t *testing.T) {
+	p := &parser.HysteriaParser{}
+	input := "hysteria://proxy.example.com:443?auth=password123&upmbps=100&downmbps=100&alpn=h3,h2,http/1.1#Hysteria%20Multi%20ALPN"
+
+	expected := proxy.Proxy{
+		Type: "hysteria",
+		Name: "Hysteria Multi ALPN",
+		Hysteria: proxy.Hysteria{
+			Server:         "proxy.example.com",
+			Port:           443,
+			Auth:           "password123",
+			Up:             "100",
+			Down:           "100",
+			ALPN:           []string{"h3", "h2", "http/1.1"},
+			SkipCertVerify: false,
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestHysteria_Error_MissingServer(t *testing.T) {
+	p := &parser.HysteriaParser{}
+	input := "hysteria://:8080?auth=password123"
+
+	_, err := p.Parse(input)
+	if err == nil {
+		t.Errorf("Expected error but got none")
+	}
+}
+
+func TestHysteria_Error_MissingPort(t *testing.T) {
+	p := &parser.HysteriaParser{}
+	input := "hysteria://127.0.0.1?auth=password123"
+
+	_, err := p.Parse(input)
+	if err == nil {
+		t.Errorf("Expected error but got none")
+	}
+}
+
+func TestHysteria_Error_InvalidPort(t *testing.T) {
+	p := &parser.HysteriaParser{}
+	input := "hysteria://127.0.0.1:99999?auth=password123"
+
+	_, err := p.Parse(input)
+	if err == nil {
+		t.Errorf("Expected error but got none")
+	}
+}
+
+func TestHysteria_Error_InvalidProtocol(t *testing.T) {
+	p := &parser.HysteriaParser{}
+	input := "hysteria2://example.com:8080"
+
+	_, err := p.Parse(input)
+	if err == nil {
+		t.Errorf("Expected error but got none")
+	}
+}

test/parser/shadowsocks_test.go

@@ -0,0 +1,184 @@
+package test
+
+import (
+	"errors"
+	"testing"
+
+	"github.com/bestnite/sub2clash/model/proxy"
+	"github.com/bestnite/sub2clash/parser"
+)
+
+func TestShadowsocks_Basic_SimpleLink(t *testing.T) {
+	p := &parser.ShadowsocksParser{}
+	input := "ss://YWVzLTI1Ni1nY206cGFzc3dvcmQ=@127.0.0.1:8080"
+
+	expected := proxy.Proxy{
+		Type: "ss",
+		Name: "127.0.0.1:8080",
+		ShadowSocks: proxy.ShadowSocks{
+			Server:   "127.0.0.1",
+			Port:     8080,
+			Cipher:   "aes-256-gcm",
+			Password: "password",
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestShadowsocks_Basic_IPv6Address(t *testing.T) {
+	p := &parser.ShadowsocksParser{}
+	input := "ss://YWVzLTI1Ni1nY206cGFzc3dvcmQ=@[2001:db8::1]:8080"
+
+	expected := proxy.Proxy{
+		Type: "ss",
+		Name: "2001:db8::1:8080",
+		ShadowSocks: proxy.ShadowSocks{
+			Server:   "2001:db8::1",
+			Port:     8080,
+			Cipher:   "aes-256-gcm",
+			Password: "password",
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestShadowsocks_Basic_WithRemark(t *testing.T) {
+	p := &parser.ShadowsocksParser{}
+	input := "ss://YWVzLTI1Ni1nY206cGFzc3dvcmQ=@proxy.example.com:8080#My%20SS%20Proxy"
+
+	expected := proxy.Proxy{
+		Type: "ss",
+		Name: "My SS Proxy",
+		ShadowSocks: proxy.ShadowSocks{
+			Server:   "proxy.example.com",
+			Port:     8080,
+			Cipher:   "aes-256-gcm",
+			Password: "password",
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestShadowsocks_Advanced_Base64FullEncoded(t *testing.T) {
+	p := &parser.ShadowsocksParser{}
+	input := "ss://YWVzLTI1Ni1nY206cGFzc3dvcmRAbG9jYWxob3N0OjgwODA=#Local%20SS"
+
+	expected := proxy.Proxy{
+		Type: "ss",
+		Name: "Local SS",
+		ShadowSocks: proxy.ShadowSocks{
+			Server:   "localhost",
+			Port:     8080,
+			Cipher:   "aes-256-gcm",
+			Password: "password",
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestShadowsocks_Advanced_PlainUserPassword(t *testing.T) {
+	p := &parser.ShadowsocksParser{}
+	input := "ss://aes-256-gcm:password@192.168.1.1:8080"
+
+	expected := proxy.Proxy{
+		Type: "ss",
+		Name: "192.168.1.1:8080",
+		ShadowSocks: proxy.ShadowSocks{
+			Server:   "192.168.1.1",
+			Port:     8080,
+			Cipher:   "aes-256-gcm",
+			Password: "password",
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestShadowsocks_Advanced_ChaCha20Cipher(t *testing.T) {
+	p := &parser.ShadowsocksParser{}
+	input := "ss://chacha20-poly1305:mypassword@server.com:443#ChaCha20"
+
+	expected := proxy.Proxy{
+		Type: "ss",
+		Name: "ChaCha20",
+		ShadowSocks: proxy.ShadowSocks{
+			Server:   "server.com",
+			Port:     443,
+			Cipher:   "chacha20-poly1305",
+			Password: "mypassword",
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+// 错误处理测试
+func TestShadowsocks_Error_MissingServer(t *testing.T) {
+	p := &parser.ShadowsocksParser{}
+	input := "ss://YWVzLTI1Ni1nY206cGFzc3dvcmQ=@:8080"
+
+	_, err := p.Parse(input)
+	if !errors.Is(err, parser.ErrInvalidStruct) {
+		t.Errorf("Error is not expected: %v", err)
+	}
+}
+
+func TestShadowsocks_Error_MissingPort(t *testing.T) {
+	p := &parser.ShadowsocksParser{}
+	input := "ss://YWVzLTI1Ni1nY206cGFzc3dvcmQ=@127.0.0.1"
+
+	_, err := p.Parse(input)
+	if !errors.Is(err, parser.ErrInvalidStruct) {
+		t.Errorf("Error is not expected: %v", err)
+	}
+}
+
+func TestShadowsocks_Error_InvalidProtocol(t *testing.T) {
+	p := &parser.ShadowsocksParser{}
+	input := "http://example.com:8080"
+
+	_, err := p.Parse(input)
+	if !errors.Is(err, parser.ErrInvalidPrefix) {
+		t.Errorf("Error is not expected: %v", err)
+	}
+}

test/parser/shadowsocksr_test.go

@@ -0,0 +1,112 @@
+package test
+
+import (
+	"testing"
+
+	"github.com/bestnite/sub2clash/model/proxy"
+	"github.com/bestnite/sub2clash/parser"
+)
+
+func TestShadowsocksR_Basic_SimpleLink(t *testing.T) {
+	p := &parser.ShadowsocksRParser{}
+	input := "ssr://MTI3LjAuMC4xOjQ0MzpvcmlnaW46YWVzLTE5Mi1jZmI6cGxhaW46TVRJek1USXovP2dyb3VwPVpHVm1ZWFZzZEEmcmVtYXJrcz1TRUZJUVE"
+
+	expected := proxy.Proxy{
+		Type: "ssr",
+		Name: "HAHA",
+		ShadowSocksR: proxy.ShadowSocksR{
+			Server:        "127.0.0.1",
+			Port:          443,
+			Cipher:        "aes-192-cfb",
+			Password:      "123123",
+			ObfsParam:     "",
+			Obfs:          "plain",
+			Protocol:      "origin",
+			ProtocolParam: "",
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestShadowsocksR_Basic_WithParams(t *testing.T) {
+	p := &parser.ShadowsocksRParser{}
+	input := "ssr://MTI3LjAuMC4xOjQ0MzpvcmlnaW46YWVzLTE5Mi1jZmI6dGxzMS4wX3Nlc3Npb25fYXV0aDpNVEl6TVRJei8/b2Jmc3BhcmFtPWIySm1jeTF3WVhKaGJXVjBaWEkmcHJvdG9wYXJhbT1jSEp2ZEc5allXd3RjR0Z5WVcxbGRHVnkmZ3JvdXA9WkdWbVlYVnNkQSZyZW1hcmtzPVNFRklRUQ"
+
+	expected := proxy.Proxy{
+		Type: "ssr",
+		Name: "HAHA",
+		ShadowSocksR: proxy.ShadowSocksR{
+			Server:        "127.0.0.1",
+			Port:          443,
+			Cipher:        "aes-192-cfb",
+			Password:      "123123",
+			ObfsParam:     "obfs-parameter",
+			Obfs:          "tls1.0_session_auth",
+			Protocol:      "origin",
+			ProtocolParam: "protocal-parameter",
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestShadowsocksR_Basic_IPv6Address(t *testing.T) {
+	p := &parser.ShadowsocksRParser{}
+	input := "ssr://WzIwMDE6MGRiODo4NWEzOjAwMDA6MDAwMDo4YTJlOjAzNzA6NzMzNF06NDQzOm9yaWdpbjphZXMtMTkyLWNmYjpwbGFpbjpNVEl6TVRJei8/Z3JvdXA9WkdWbVlYVnNkQSZyZW1hcmtzPVNFRklRUQ"
+
+	expected := proxy.Proxy{
+		Type: "ssr",
+		Name: "HAHA",
+		ShadowSocksR: proxy.ShadowSocksR{
+			Server:        "[2001:0db8:85a3:0000:0000:8a2e:0370:7334]",
+			Port:          443,
+			Cipher:        "aes-192-cfb",
+			Password:      "123123",
+			ObfsParam:     "",
+			Obfs:          "plain",
+			Protocol:      "origin",
+			ProtocolParam: "",
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestShadowsocksR_Error_InvalidBase64(t *testing.T) {
+	p := &parser.ShadowsocksRParser{}
+	input := "ssr://invalid_base64"
+
+	_, err := p.Parse(input)
+	if err == nil {
+		t.Errorf("Expected error but got none")
+	}
+}
+
+func TestShadowsocksR_Error_InvalidProtocol(t *testing.T) {
+	p := &parser.ShadowsocksRParser{}
+	input := "ss://example.com:8080"
+
+	_, err := p.Parse(input)
+	if err == nil {
+		t.Errorf("Expected error but got none")
+	}
+}

test/parser/socks_test.go

@@ -0,0 +1,168 @@
+package test
+
+import (
+	"testing"
+
+	"github.com/bestnite/sub2clash/model/proxy"
+	"github.com/bestnite/sub2clash/parser"
+)
+
+func TestSocks_Basic_SimpleLink(t *testing.T) {
+	p := &parser.SocksParser{}
+	input := "socks://user:pass@127.0.0.1:1080#SOCKS%20Proxy"
+
+	expected := proxy.Proxy{
+		Type: "socks5",
+		Name: "SOCKS Proxy",
+		Socks: proxy.Socks{
+			Server:   "127.0.0.1",
+			Port:     1080,
+			UserName: "user",
+			Password: "pass",
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestSocks_Basic_NoAuth(t *testing.T) {
+	p := &parser.SocksParser{}
+	input := "socks://127.0.0.1:1080#SOCKS%20No%20Auth"
+
+	expected := proxy.Proxy{
+		Type: "socks5",
+		Name: "SOCKS No Auth",
+		Socks: proxy.Socks{
+			Server: "127.0.0.1",
+			Port:   1080,
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestSocks_Basic_IPv6Address(t *testing.T) {
+	p := &parser.SocksParser{}
+	input := "socks://user:pass@[2001:db8::1]:1080#SOCKS%20IPv6"
+
+	expected := proxy.Proxy{
+		Type: "socks5",
+		Name: "SOCKS IPv6",
+		Socks: proxy.Socks{
+			Server:   "2001:db8::1",
+			Port:     1080,
+			UserName: "user",
+			Password: "pass",
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestSocks_Basic_WithTLS(t *testing.T) {
+	p := &parser.SocksParser{}
+	input := "socks://user:pass@127.0.0.1:1080?tls=true&sni=example.com#SOCKS%20TLS"
+
+	expected := proxy.Proxy{
+		Type: "socks5",
+		Name: "SOCKS TLS",
+		Socks: proxy.Socks{
+			Server:   "127.0.0.1",
+			Port:     1080,
+			UserName: "user",
+			Password: "pass",
+			TLS:      true,
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestSocks_Basic_WithUDP(t *testing.T) {
+	p := &parser.SocksParser{}
+	input := "socks://user:pass@127.0.0.1:1080?udp=true#SOCKS%20UDP"
+
+	expected := proxy.Proxy{
+		Type: "socks5",
+		Name: "SOCKS UDP",
+		Socks: proxy.Socks{
+			Server:   "127.0.0.1",
+			Port:     1080,
+			UserName: "user",
+			Password: "pass",
+			UDP:      true,
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestSocks_Error_MissingServer(t *testing.T) {
+	p := &parser.SocksParser{}
+	input := "socks://user:pass@:1080"
+
+	_, err := p.Parse(input)
+	if err == nil {
+		t.Errorf("Expected error but got none")
+	}
+}
+
+func TestSocks_Error_MissingPort(t *testing.T) {
+	p := &parser.SocksParser{}
+	input := "socks://user:pass@127.0.0.1"
+
+	_, err := p.Parse(input)
+	if err == nil {
+		t.Errorf("Expected error but got none")
+	}
+}
+
+func TestSocks_Error_InvalidPort(t *testing.T) {
+	p := &parser.SocksParser{}
+	input := "socks://user:pass@127.0.0.1:99999"
+
+	_, err := p.Parse(input)
+	if err == nil {
+		t.Errorf("Expected error but got none")
+	}
+}
+
+func TestSocks_Error_InvalidProtocol(t *testing.T) {
+	p := &parser.SocksParser{}
+	input := "ss://example.com:8080"
+
+	_, err := p.Parse(input)
+	if err == nil {
+		t.Errorf("Expected error but got none")
+	}
+}

test/parser/trojan_test.go

@@ -0,0 +1,182 @@
+package test
+
+import (
+	"testing"
+
+	"github.com/bestnite/sub2clash/model/proxy"
+	"github.com/bestnite/sub2clash/parser"
+)
+
+func TestTrojan_Basic_SimpleLink(t *testing.T) {
+	p := &parser.TrojanParser{}
+	input := "trojan://password@127.0.0.1:443#Trojan%20Proxy"
+
+	expected := proxy.Proxy{
+		Type: "trojan",
+		Name: "Trojan Proxy",
+		Trojan: proxy.Trojan{
+			Server:   "127.0.0.1",
+			Port:     443,
+			Password: "password",
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestTrojan_Basic_WithTLS(t *testing.T) {
+	p := &parser.TrojanParser{}
+	input := "trojan://password@127.0.0.1:443?security=tls&sni=example.com&alpn=h2,http/1.1#Trojan%20TLS"
+
+	expected := proxy.Proxy{
+		Type: "trojan",
+		Name: "Trojan TLS",
+		Trojan: proxy.Trojan{
+			Server:   "127.0.0.1",
+			Port:     443,
+			Password: "password",
+			ALPN:     []string{"h2", "http/1.1"},
+			SNI:      "example.com",
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestTrojan_Basic_WithReality(t *testing.T) {
+	p := &parser.TrojanParser{}
+	input := "trojan://password@127.0.0.1:443?security=reality&sni=example.com&pbk=publickey123&sid=shortid123&fp=chrome#Trojan%20Reality"
+
+	expected := proxy.Proxy{
+		Type: "trojan",
+		Name: "Trojan Reality",
+		Trojan: proxy.Trojan{
+			Server:   "127.0.0.1",
+			Port:     443,
+			Password: "password",
+			SNI:      "example.com",
+			RealityOpts: proxy.RealityOptions{
+				PublicKey: "publickey123",
+				ShortID:   "shortid123",
+			},
+			Fingerprint: "chrome",
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestTrojan_Basic_WithWebSocket(t *testing.T) {
+	p := &parser.TrojanParser{}
+	input := "trojan://password@127.0.0.1:443?type=ws&path=/ws&host=example.com#Trojan%20WS"
+
+	expected := proxy.Proxy{
+		Type: "trojan",
+		Name: "Trojan WS",
+		Trojan: proxy.Trojan{
+			Server:   "127.0.0.1",
+			Port:     443,
+			Password: "password",
+			Network:  "ws",
+			WSOpts: proxy.WSOptions{
+				Path: "/ws",
+				Headers: map[string]string{
+					"Host": "example.com",
+				},
+			},
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestTrojan_Basic_WithGrpc(t *testing.T) {
+	p := &parser.TrojanParser{}
+	input := "trojan://password@127.0.0.1:443?type=grpc&serviceName=grpc_service#Trojan%20gRPC"
+
+	expected := proxy.Proxy{
+		Type: "trojan",
+		Name: "Trojan gRPC",
+		Trojan: proxy.Trojan{
+			Server:   "127.0.0.1",
+			Port:     443,
+			Password: "password",
+			Network:  "grpc",
+			GrpcOpts: proxy.GrpcOptions{
+				GrpcServiceName: "grpc_service",
+			},
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestTrojan_Error_MissingServer(t *testing.T) {
+	p := &parser.TrojanParser{}
+	input := "trojan://password@:443"
+
+	_, err := p.Parse(input)
+	if err == nil {
+		t.Errorf("Expected error but got none")
+	}
+}
+
+func TestTrojan_Error_MissingPort(t *testing.T) {
+	p := &parser.TrojanParser{}
+	input := "trojan://password@127.0.0.1"
+
+	_, err := p.Parse(input)
+	if err == nil {
+		t.Errorf("Expected error but got none")
+	}
+}
+
+func TestTrojan_Error_InvalidPort(t *testing.T) {
+	p := &parser.TrojanParser{}
+	input := "trojan://password@127.0.0.1:99999"
+
+	_, err := p.Parse(input)
+	if err == nil {
+		t.Errorf("Expected error but got none")
+	}
+}
+
+func TestTrojan_Error_InvalidProtocol(t *testing.T) {
+	p := &parser.TrojanParser{}
+	input := "ss://example.com:8080"
+
+	_, err := p.Parse(input)
+	if err == nil {
+		t.Errorf("Expected error but got none")
+	}
+}

test/parser/utils.go

@@ -0,0 +1,24 @@
+package test
+
+import (
+	"reflect"
+	"testing"
+
+	"github.com/bestnite/sub2clash/model/proxy"
+	"gopkg.in/yaml.v3"
+)
+
+func validateResult(t *testing.T, expected proxy.Proxy, result proxy.Proxy) {
+	t.Helper()
+
+	if result.Type != expected.Type {
+		t.Errorf("Type mismatch: expected %s, got %s", expected.Type, result.Type)
+	}
+
+	if !reflect.DeepEqual(expected, result) {
+		expectedYaml, _ := yaml.Marshal(expected)
+		resultYaml, _ := yaml.Marshal(result)
+
+		t.Errorf("Structure mismatch: \nexpected:\n %s\ngot:\n %s", string(expectedYaml), string(resultYaml))
+	}
+}

test/parser/vless_test.go

@@ -0,0 +1,214 @@
+package test
+
+import (
+	"testing"
+
+	"github.com/bestnite/sub2clash/model/proxy"
+	"github.com/bestnite/sub2clash/parser"
+)
+
+func TestVless_Basic_SimpleLink(t *testing.T) {
+	p := &parser.VlessParser{}
+	input := "vless://b831b0c4-33b7-4873-9834-28d66d87d4ce@127.0.0.1:8080#VLESS%20Proxy"
+
+	expected := proxy.Proxy{
+		Type: "vless",
+		Name: "VLESS Proxy",
+		Vless: proxy.Vless{
+			Server: "127.0.0.1",
+			Port:   8080,
+			UUID:   "b831b0c4-33b7-4873-9834-28d66d87d4ce",
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestVless_Basic_WithTLS(t *testing.T) {
+	p := &parser.VlessParser{}
+	input := "vless://b831b0c4-33b7-4873-9834-28d66d87d4ce@127.0.0.1:443?security=tls&sni=example.com&alpn=h2,http/1.1#VLESS%20TLS"
+
+	expected := proxy.Proxy{
+		Type: "vless",
+		Name: "VLESS TLS",
+		Vless: proxy.Vless{
+			Server:     "127.0.0.1",
+			Port:       443,
+			UUID:       "b831b0c4-33b7-4873-9834-28d66d87d4ce",
+			TLS:        true,
+			ALPN:       []string{"h2", "http/1.1"},
+			ServerName: "example.com",
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestVless_Basic_WithReality(t *testing.T) {
+	p := &parser.VlessParser{}
+	input := "vless://b831b0c4-33b7-4873-9834-28d66d87d4ce@127.0.0.1:443?security=reality&sni=example.com&pbk=publickey123&sid=shortid123&fp=chrome#VLESS%20Reality"
+
+	expected := proxy.Proxy{
+		Type: "vless",
+		Name: "VLESS Reality",
+		Vless: proxy.Vless{
+			Server:     "127.0.0.1",
+			Port:       443,
+			UUID:       "b831b0c4-33b7-4873-9834-28d66d87d4ce",
+			TLS:        true,
+			ServerName: "example.com",
+			RealityOpts: proxy.RealityOptions{
+				PublicKey: "publickey123",
+				ShortID:   "shortid123",
+			},
+			Fingerprint: "chrome",
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestVless_Basic_WithWebSocket(t *testing.T) {
+	p := &parser.VlessParser{}
+	input := "vless://b831b0c4-33b7-4873-9834-28d66d87d4ce@127.0.0.1:443?type=ws&path=/ws&host=example.com#VLESS%20WS"
+
+	expected := proxy.Proxy{
+		Type: "vless",
+		Name: "VLESS WS",
+		Vless: proxy.Vless{
+			Server:  "127.0.0.1",
+			Port:    443,
+			UUID:    "b831b0c4-33b7-4873-9834-28d66d87d4ce",
+			Network: "ws",
+			WSOpts: proxy.WSOptions{
+				Path: "/ws",
+				Headers: map[string]string{
+					"Host": "example.com",
+				},
+			},
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestVless_Basic_WithGrpc(t *testing.T) {
+	p := &parser.VlessParser{}
+	input := "vless://b831b0c4-33b7-4873-9834-28d66d87d4ce@127.0.0.1:443?type=grpc&serviceName=grpc_service#VLESS%20gRPC"
+
+	expected := proxy.Proxy{
+		Type: "vless",
+		Name: "VLESS gRPC",
+		Vless: proxy.Vless{
+			Server:  "127.0.0.1",
+			Port:    443,
+			UUID:    "b831b0c4-33b7-4873-9834-28d66d87d4ce",
+			Network: "grpc",
+			GrpcOpts: proxy.GrpcOptions{
+				GrpcServiceName: "grpc_service",
+			},
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestVless_Basic_WithHTTP(t *testing.T) {
+	p := &parser.VlessParser{}
+	input := "vless://b831b0c4-33b7-4873-9834-28d66d87d4ce@127.0.0.1:443?type=http&path=/path1,/path2&host=host1.com,host2.com#VLESS%20HTTP"
+
+	expected := proxy.Proxy{
+		Type: "vless",
+		Name: "VLESS HTTP",
+		Vless: proxy.Vless{
+			Server:  "127.0.0.1",
+			Port:    443,
+			UUID:    "b831b0c4-33b7-4873-9834-28d66d87d4ce",
+			Network: "http",
+			HTTPOpts: proxy.HTTPOptions{
+				Path: []string{"/path1", "/path2"},
+				Headers: map[string][]string{
+					"host": {"host1.com", "host2.com"},
+				},
+			},
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestVless_Error_MissingServer(t *testing.T) {
+	p := &parser.VlessParser{}
+	input := "vless://b831b0c4-33b7-4873-9834-28d66d87d4ce@:8080"
+
+	_, err := p.Parse(input)
+	if err == nil {
+		t.Errorf("Expected error but got none")
+	}
+}
+
+func TestVless_Error_MissingPort(t *testing.T) {
+	p := &parser.VlessParser{}
+	input := "vless://b831b0c4-33b7-4873-9834-28d66d87d4ce@127.0.0.1"
+
+	_, err := p.Parse(input)
+	if err == nil {
+		t.Errorf("Expected error but got none")
+	}
+}
+
+func TestVless_Error_InvalidPort(t *testing.T) {
+	p := &parser.VlessParser{}
+	input := "vless://b831b0c4-33b7-4873-9834-28d66d87d4ce@127.0.0.1:99999"
+
+	_, err := p.Parse(input)
+	if err == nil {
+		t.Errorf("Expected error but got none")
+	}
+}
+
+func TestVless_Error_InvalidProtocol(t *testing.T) {
+	p := &parser.VlessParser{}
+	input := "ss://example.com:8080"
+
+	_, err := p.Parse(input)
+	if err == nil {
+		t.Errorf("Expected error but got none")
+	}
+}

test/parser/vmess_test.go

@@ -0,0 +1,232 @@
+package test
+
+import (
+	"testing"
+
+	"github.com/bestnite/sub2clash/model/proxy"
+	"github.com/bestnite/sub2clash/parser"
+)
+
+func TestVmess_Basic_SimpleLink(t *testing.T) {
+	p := &parser.VmessParser{}
+	input := "vmess://eyJhZGQiOiIxMjcuMC4wLjEiLCJhaWQiOiIwIiwiaWQiOiIxMjM0NTY3OC05MDEyLTM0NTYtNzg5MC0xMjM0NTY3ODkwMTIiLCJuZXQiOiJ3cyIsInBvcnQiOiI0NDMiLCJwcyI6IkhBSEEiLCJ0bHMiOiJ0bHMiLCJ0eXBlIjoibm9uZSIsInYiOiIyIn0="
+
+	expected := proxy.Proxy{
+		Type: "vmess",
+		Name: "HAHA",
+		Vmess: proxy.Vmess{
+			UUID:    "12345678-9012-3456-7890-123456789012",
+			AlterID: 0,
+			Cipher:  "auto",
+			Server:  "127.0.0.1",
+			Port:    443,
+			TLS:     true,
+			Network: "ws",
+			WSOpts: proxy.WSOptions{
+				Path: "/",
+				Headers: map[string]string{
+					"Host": "127.0.0.1",
+				},
+			},
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestVmess_Basic_WithPath(t *testing.T) {
+	p := &parser.VmessParser{}
+	input := "vmess://eyJhZGQiOiIxMjcuMC4wLjEiLCJhaWQiOiIwIiwiaWQiOiIxMjM0NTY3OC05MDEyLTM0NTYtNzg5MC0xMjM0NTY3ODkwMTIiLCJuZXQiOiJ3cyIsInBhdGgiOiIvd3MiLCJwb3J0IjoiNDQzIiwicHMiOiJIQUNLIiwidGxzIjoidGxzIiwidHlwZSI6Im5vbmUiLCJ2IjoiMiJ9"
+
+	expected := proxy.Proxy{
+		Type: "vmess",
+		Name: "HACK",
+		Vmess: proxy.Vmess{
+			UUID:    "12345678-9012-3456-7890-123456789012",
+			AlterID: 0,
+			Cipher:  "auto",
+			Server:  "127.0.0.1",
+			Port:    443,
+			TLS:     true,
+			Network: "ws",
+			WSOpts: proxy.WSOptions{
+				Path: "/ws",
+				Headers: map[string]string{
+					"Host": "127.0.0.1",
+				},
+			},
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestVmess_Basic_WithHost(t *testing.T) {
+	p := &parser.VmessParser{}
+	input := "vmess://eyJhZGQiOiIxMjcuMC4wLjEiLCJhaWQiOiIwIiwiaG9zdCI6ImV4YW1wbGUuY29tIiwiaWQiOiIxMjM0NTY3OC05MDEyLTM0NTYtNzg5MC0xMjM0NTY3ODkwMTIiLCJuZXQiOiJ3cyIsInBvcnQiOiI0NDMiLCJwcyI6IkhBSEEiLCJ0bHMiOiJ0bHMiLCJ0eXBlIjoibm9uZSIsInYiOiIyIn0="
+
+	expected := proxy.Proxy{
+		Type: "vmess",
+		Name: "HAHA",
+		Vmess: proxy.Vmess{
+			UUID:    "12345678-9012-3456-7890-123456789012",
+			AlterID: 0,
+			Cipher:  "auto",
+			Server:  "127.0.0.1",
+			Port:    443,
+			TLS:     true,
+			Network: "ws",
+			WSOpts: proxy.WSOptions{
+				Path: "/",
+				Headers: map[string]string{
+					"Host": "example.com",
+				},
+			},
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestVmess_Basic_WithSNI(t *testing.T) {
+	p := &parser.VmessParser{}
+	input := "vmess://eyJhZGQiOiIxMjcuMC4wLjEiLCJhaWQiOiIwIiwiaWQiOiIxMjM0NTY3OC05MDEyLTM0NTYtNzg5MC0xMjM0NTY3ODkwMTIiLCJuZXQiOiJ3cyIsInBvcnQiOiI0NDMiLCJwcyI6IkhBSEEiLCJzbmkiOiJleGFtcGxlLmNvbSIsInRscyI6InRscyIsInR5cGUiOiJub25lIiwidiI6IjIifQ=="
+
+	expected := proxy.Proxy{
+		Type: "vmess",
+		Name: "HAHA",
+		Vmess: proxy.Vmess{
+			UUID:       "12345678-9012-3456-7890-123456789012",
+			AlterID:    0,
+			Cipher:     "auto",
+			Server:     "127.0.0.1",
+			Port:       443,
+			TLS:        true,
+			Network:    "ws",
+			ServerName: "example.com",
+			WSOpts: proxy.WSOptions{
+				Path: "/",
+				Headers: map[string]string{
+					"Host": "127.0.0.1",
+				},
+			},
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestVmess_Basic_WithAlterID(t *testing.T) {
+	p := &parser.VmessParser{}
+	input := "vmess://eyJhZGQiOiIxMjcuMC4wLjEiLCJhaWQiOiIxIiwiaWQiOiIxMjM0NTY3OC05MDEyLTM0NTYtNzg5MC0xMjM0NTY3ODkwMTIiLCJuZXQiOiJ3cyIsInBvcnQiOiI0NDMiLCJwcyI6IkhBSEEiLCJ0bHMiOiJ0bHMiLCJ0eXBlIjoibm9uZSIsInYiOiIyIn0="
+
+	expected := proxy.Proxy{
+		Type: "vmess",
+		Name: "HAHA",
+		Vmess: proxy.Vmess{
+			UUID:    "12345678-9012-3456-7890-123456789012",
+			AlterID: 1,
+			Cipher:  "auto",
+			Server:  "127.0.0.1",
+			Port:    443,
+			TLS:     true,
+			Network: "ws",
+			WSOpts: proxy.WSOptions{
+				Path: "/",
+				Headers: map[string]string{
+					"Host": "127.0.0.1",
+				},
+			},
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestVmess_Basic_GRPC(t *testing.T) {
+	p := &parser.VmessParser{}
+	input := "vmess://eyJhZGQiOiIxMjcuMC4wLjEiLCJhaWQiOiIwIiwiaWQiOiIxMjM0NTY3OC05MDEyLTM0NTYtNzg5MC0xMjM0NTY3ODkwMTIiLCJuZXQiOiJncnBjIiwicG9ydCI6IjQ0MyIsInBzIjoiSEFIQSIsInRscyI6InRscyIsInR5cGUiOiJub25lIiwidiI6IjIifQ=="
+
+	expected := proxy.Proxy{
+		Type: "vmess",
+		Name: "HAHA",
+		Vmess: proxy.Vmess{
+			UUID:     "12345678-9012-3456-7890-123456789012",
+			AlterID:  0,
+			Cipher:   "auto",
+			Server:   "127.0.0.1",
+			Port:     443,
+			TLS:      true,
+			Network:  "grpc",
+			GrpcOpts: proxy.GrpcOptions{},
+		},
+	}
+
+	result, err := p.Parse(input)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	validateResult(t, expected, result)
+}
+
+func TestVmess_Error_InvalidBase64(t *testing.T) {
+	p := &parser.VmessParser{}
+	input := "vmess://invalid_base64"
+
+	_, err := p.Parse(input)
+	if err == nil {
+		t.Errorf("Expected error but got none")
+	}
+}
+
+func TestVmess_Error_InvalidJSON(t *testing.T) {
+	p := &parser.VmessParser{}
+	input := "vmess://eyJpbnZhbGlkIjoianNvbn0="
+
+	_, err := p.Parse(input)
+	if err == nil {
+		t.Errorf("Expected error but got none")
+	}
+}
+
+func TestVmess_Error_InvalidProtocol(t *testing.T) {
+	p := &parser.VmessParser{}
+	input := "ss://example.com:8080"
+
+	_, err := p.Parse(input)
+	if err == nil {
+		t.Errorf("Expected error but got none")
+	}
+}

validator/short_link.go

@@ -1,17 +0,0 @@
-package validator
-
-type ShortLinkGenValidator struct {
-	Url      string `form:"url" binding:"required"`
-	Password string `form:"password"`
-}
-
-type GetUrlValidator struct {
-	Hash     string `form:"hash" binding:"required"`
-	Password string `form:"password"`
-}
-
-type ShortLinkUpdateValidator struct {
-	Hash     string `form:"hash" binding:"required"`
-	Url      string `form:"url" binding:"required"`
-	Password string `form:"password" binding:"required"`
-}