nite/sub2sing-box
1
Fork 0
mirror of https://github.com/nitezs/sub2sing-box.git synced 2025-04-03 19:43:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix missing outbounds

Browse Source
This commit is contained in:
nite 2025-01-20 18:00:14 +08:00
parent 0a6fe9da0c
commit c0db1624d9
1 changed files with 51 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
common/convert.go
View File

@ -38,6 +38,10 @@ func Convert(
result := "" result := ""
var err error var err error
if groupType == "" {
groupType = C.TypeSelector
}
outbounds, err := ConvertSubscriptionsToSProxy(subscriptions) outbounds, err := ConvertSubscriptionsToSProxy(subscriptions)
if err != nil { if err != nil {
return "", err return "", err
@ -116,6 +120,15 @@ func Convert(
if template, err = J.UnmarshalExtendedContext[model.Options](globalCtx, []byte(templateData)); err != nil { if template, err = J.UnmarshalExtendedContext[model.Options](globalCtx, []byte(templateData)); err != nil {
return "", err return "", err
} }
for _, v := range template.Options.Outbounds {
template.Outbounds = append(template.Outbounds, (model.Outbound)(v))
}
for _, v := range template.Options.Inbounds {
template.Inbounds = append(template.Inbounds, (model.Inbound)(v))
}
for _, v := range template.Options.Endpoints {
template.Endpoints = append(template.Endpoints, (model.Endpoint)(v))
}
result, err = MergeTemplate(outbounds, &template) result, err = MergeTemplate(outbounds, &template)
if err != nil { if err != nil {
return "", err return "", err
@ -147,7 +160,7 @@ func AddCountryGroup(proxies []model.Outbound, groupType string, sortKey string,
AppendOutbound(&group, p.Tag) AppendOutbound(&group, p.Tag)
newGroup[country] = group newGroup[country] = group
} else { } else {
if groupType == C.TypeSelector || groupType == "" { if groupType == C.TypeSelector {
newGroup[country] = model.Outbound{ newGroup[country] = model.Outbound{
Tag: country, Tag: country,
Type: groupType, Type: groupType,
@ -173,23 +186,25 @@ func AddCountryGroup(proxies []model.Outbound, groupType string, sortKey string,
for _, p := range newGroup { for _, p := range newGroup {
groups = append(groups, p) groups = append(groups, p)
} }
if sortType == "asc" { if sortType != "" {
switch sortKey { if sortType == "asc" {
case "tag": switch sortKey {
sort.Sort(model.SortByTag(groups)) case "tag":
case "num": sort.Sort(model.SortByTag(groups))
sort.Sort(model.SortByNumber(groups)) case "num":
default: sort.Sort(model.SortByNumber(groups))
sort.Sort(model.SortByTag(groups)) default:
} sort.Sort(model.SortByTag(groups))
} else { }
switch sortKey { } else {
case "tag": switch sortKey {
sort.Sort(sort.Reverse(model.SortByTag(groups))) case "tag":
case "num": sort.Sort(sort.Reverse(model.SortByTag(groups)))
sort.Sort(sort.Reverse(model.SortByNumber(groups))) case "num":
default: sort.Sort(sort.Reverse(model.SortByNumber(groups)))
sort.Sort(sort.Reverse(model.SortByTag(groups))) default:
sort.Sort(sort.Reverse(model.SortByTag(groups)))
}
} }
} }
return append(proxies, groups...) return append(proxies, groups...)
@ -236,7 +251,8 @@ func MergeTemplate(outbounds []model.Outbound, template *model.Options) (string,
} }
} }
reg := regexp.MustCompile("<[A-Za-z]{2}>") reg := regexp.MustCompile("<[A-Za-z]{2}>")
for i, outbound := range template.Outbounds { for i, o := range template.Outbounds {
outbound := (model.Outbound)(o)
if outbound.Type == C.TypeSelector || outbound.Type == C.TypeURLTest { if outbound.Type == C.TypeSelector || outbound.Type == C.TypeURLTest {
var parsedOutbound []string = make([]string, 0) var parsedOutbound []string = make([]string, 0)
for _, o := range GetOutbounds(&outbound) { for _, o := range GetOutbounds(&outbound) {
@ -349,6 +365,12 @@ func SetOutbounds(outbound *model.Outbound, outbounds []string) {
case option.URLTestOutboundOptions: case option.URLTestOutboundOptions:
v.Outbounds = outbounds v.Outbounds = outbounds
outbound.Options = v outbound.Options = v
case *option.SelectorOutboundOptions:
v.Outbounds = outbounds
outbound.Options = v
case *option.URLTestOutboundOptions:
v.Outbounds = outbounds
outbound.Options = v
} }
} }
@ -360,6 +382,12 @@ func AppendOutbound(outbound *model.Outbound, outboundTag string) {
case option.URLTestOutboundOptions: case option.URLTestOutboundOptions:
v.Outbounds = append(v.Outbounds, outboundTag) v.Outbounds = append(v.Outbounds, outboundTag)
outbound.Options = v outbound.Options = v
case *option.SelectorOutboundOptions:
v.Outbounds = append(v.Outbounds, outboundTag)
outbound.Options = v
case *option.URLTestOutboundOptions:
v.Outbounds = append(v.Outbounds, outboundTag)
outbound.Options = v
} }
} }
@ -369,6 +397,10 @@ func GetOutbounds(outbound *model.Outbound) []string {
return v.Outbounds return v.Outbounds
case option.URLTestOutboundOptions: case option.URLTestOutboundOptions:
return v.Outbounds return v.Outbounds
case *option.SelectorOutboundOptions:
return v.Outbounds
case *option.URLTestOutboundOptions:
return v.Outbounds
} }
return nil return nil
} }