S-VPN/server
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(proxy): replace hardcoded group names with constants for better maintainability

Browse Source
This commit is contained in:
Chang lue Tsen 2025-07-16 14:22:40 -04:00 committed by Leif Draven
parent 97024dd1df
commit 8c4c7d0773
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/adapter/adapter.go
View File

@ -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")
}
}

14
pkg/adapter/uilts.go
View File

@ -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