fix(subscribe): enhance server tag handling in subscription logic

This commit is contained in:
Chang lue Tsen
2025-04-30 15:38:01 +09:00
parent 9a1942f8cf
commit c5b0507187
3 changed files with 37 additions and 13 deletions
+14 -3
View File
@@ -12,25 +12,36 @@ import (
"github.com/perfect-panel/server/pkg/adapter/surfboard"
)
type Config struct {
Nodes []*server.Server
Rules []*server.RuleGroup
Tags map[string][]*server.Server
}
type Adapter struct {
proxy.Adapter
}
func NewAdapter(nodes []*server.Server, rules []*server.RuleGroup) *Adapter {
func NewAdapter(cfg *Config) *Adapter {
// 转换服务器列表
proxies := adapterProxies(nodes)
proxies := adapterProxies(cfg.Nodes)
// 生成代理组
proxyGroup, region := generateProxyGroup(proxies)
// 转换规则组
g, r := adapterRules(rules)
g, r := adapterRules(cfg.Rules)
// 加入兜底节点
for i, group := range g {
if len(group.Proxies) == 0 {
g[i].Proxies = append([]string{"DIRECT"}, region...)
}
}
// 合并代理组
proxyGroup = RemoveEmptyGroup(append(proxyGroup, g...))
// 处理标签
proxyGroup = adapterTags(cfg.Tags, proxyGroup)
return &Adapter{
Adapter: proxy.Adapter{
Proxies: proxies,
+12
View File
@@ -109,6 +109,18 @@ func adapterRules(groups []*server.RuleGroup) (proxyGroup []proxy.Group, rules [
return
}
func adapterTags(tags map[string][]*server.Server, group []proxy.Group) (proxyGroup []proxy.Group) {
for tag, servers := range tags {
proxies := adapterProxies(servers)
if len(proxies) != 0 {
for _, p := range proxies {
group = addProxyToGroup(p.Name, tag, group)
}
}
}
return group
}
func generateProxyGroup(servers []proxy.Proxy) (proxyGroup []proxy.Group, region []string) {
// 设置手动选择分组
proxyGroup = append(proxyGroup, []proxy.Group{