From 8c4c7d07739a04d8c59089f0f9af1af5e7698d86 Mon Sep 17 00:00:00 2001 From: Chang lue Tsen Date: Wed, 16 Jul 2025 14:22:40 -0400 Subject: [PATCH] refactor(proxy): replace hardcoded group names with constants for better maintainability --- pkg/adapter/adapter.go | 7 ++++++- pkg/adapter/uilts.go | 14 +++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/pkg/adapter/adapter.go b/pkg/adapter/adapter.go index 10dfb44..cd4f1b8 100644 --- a/pkg/adapter/adapter.go +++ b/pkg/adapter/adapter.go @@ -13,6 +13,11 @@ import ( "github.com/perfect-panel/server/pkg/adapter/v2rayn" ) +var ( + AutoSelect = "Auto - UrlTest" + Selection = "Selection" +) + type Config struct { Nodes []*server.Server Rules []*server.RuleGroup @@ -39,7 +44,7 @@ func NewAdapter(cfg *Config) *Adapter { continue } if len(group.Proxies) == 0 { - p := append([]string{"Auto Select", "Selection"}, nodes...) + p := append([]string{AutoSelect, Selection}, nodes...) g[i].Proxies = append(p, "DIRECT") } } diff --git a/pkg/adapter/uilts.go b/pkg/adapter/uilts.go index cfe9f3e..475479c 100644 --- a/pkg/adapter/uilts.go +++ b/pkg/adapter/uilts.go @@ -141,7 +141,7 @@ func adapterTags(tags map[string][]*server.Server, group []proxy.Group) (proxyGr func generateProxyGroup(servers []proxy.Proxy) (proxyGroup []proxy.Group, nodes []string) { proxyGroup = append(proxyGroup, proxy.Group{ - Name: "Auto Select", + Name: AutoSelect, Type: proxy.GroupTypeURLTest, Proxies: make([]string, 0), URL: "https://www.gstatic.com/generate_204", @@ -150,14 +150,14 @@ func generateProxyGroup(servers []proxy.Proxy) (proxyGroup []proxy.Group, nodes // 设置手动选择分组 proxyGroup = append(proxyGroup, proxy.Group{ - Name: "Selection", + Name: Selection, Type: proxy.GroupTypeSelect, - Proxies: []string{"Auto Select"}, + Proxies: []string{AutoSelect}, }) for _, node := range servers { - proxyGroup = addProxyToGroup(node.Name, "Auto Select", proxyGroup) - proxyGroup = addProxyToGroup(node.Name, "Selection", proxyGroup) + proxyGroup = addProxyToGroup(node.Name, AutoSelect, proxyGroup) + proxyGroup = addProxyToGroup(node.Name, Selection, proxyGroup) nodes = append(nodes, node.Name) } return proxyGroup, tool.RemoveDuplicateElements(nodes...) @@ -258,11 +258,11 @@ func SortGroups(groups []proxy.Group, defaultName string) []proxy.Group { group.Proxies = tool.RemoveStringElement(group.Proxies, defaultName, "REJECT") sortedGroups = append([]proxy.Group{group}, sortedGroups...) continue - } else if group.Name == "Selection" { + } else if group.Name == Selection { group.Proxies = tool.RemoveStringElement(group.Proxies, defaultName) selectedGroup = group continue - } else if group.Name == "Auto Select" { + } else if group.Name == AutoSelect { group.Proxies = tool.RemoveStringElement(group.Proxies, defaultName, group.Name) sortedGroups = append([]proxy.Group{group}, sortedGroups...) continue