icybear/sing-box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Add costs field to URLTestOutboundOptions and update NewURLTestGroup signature

Browse Source
This commit is contained in:
n3t1zen
2026-02-24 12:58:37 +08:00
parent 4d3190480d
commit 38cce206c1
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
option/group.go
View File

@@ -10,6 +10,7 @@ type SelectorOutboundOptions struct {
type URLTestOutboundOptions struct { type URLTestOutboundOptions struct {
Outbounds []string `json:"outbounds"` Outbounds []string `json:"outbounds"`
Costs map[string]uint16 `json:"costs,omitempty"`
URL string `json:"url,omitempty"` URL string `json:"url,omitempty"`
Interval badoption.Duration `json:"interval,omitempty"` Interval badoption.Duration `json:"interval,omitempty"`
Tolerance uint16 `json:"tolerance,omitempty"` Tolerance uint16 `json:"tolerance,omitempty"`

17
protocol/group/urltest.go
View File

@@ -39,6 +39,7 @@ type URLTest struct {
connection adapter.ConnectionManager connection adapter.ConnectionManager
logger log.ContextLogger logger log.ContextLogger
tags []string tags []string
costs map[string]uint16
link string link string
interval time.Duration interval time.Duration
tolerance uint16 tolerance uint16
@@ -61,6 +62,7 @@ func NewURLTest(ctx context.Context, router adapter.Router, logger log.ContextLo
tolerance: options.Tolerance, tolerance: options.Tolerance,
idleTimeout: time.Duration(options.IdleTimeout), idleTimeout: time.Duration(options.IdleTimeout),
interruptExternalConnections: options.InterruptExistConnections, interruptExternalConnections: options.InterruptExistConnections,
costs: options.Costs,
} }
if len(outbound.tags) == 0 { if len(outbound.tags) == 0 {
return nil, E.New("missing tags") return nil, E.New("missing tags")
@@ -77,7 +79,7 @@ func (s *URLTest) Start() error {
} }
outbounds = append(outbounds, detour) outbounds = append(outbounds, detour)
} }
group, err := NewURLTestGroup(s.ctx, s.outbound, s.logger, outbounds, s.link, s.interval, s.tolerance, s.idleTimeout, s.interruptExternalConnections) group, err := NewURLTestGroup(s.ctx, s.outbound, s.logger, outbounds, s.costs, s.link, s.interval, s.tolerance, s.idleTimeout, s.interruptExternalConnections)
if err != nil { if err != nil {
return err return err
} }
@@ -194,6 +196,7 @@ type URLTestGroup struct {
pauseCallback *list.Element[pause.Callback] pauseCallback *list.Element[pause.Callback]
logger log.Logger logger log.Logger
outbounds []adapter.Outbound outbounds []adapter.Outbound
costs map[string]uint16
link string link string
interval time.Duration interval time.Duration
tolerance uint16 tolerance uint16
@@ -211,7 +214,7 @@ type URLTestGroup struct {
lastActive common.TypedValue[time.Time] lastActive common.TypedValue[time.Time]
} }
func NewURLTestGroup(ctx context.Context, outboundManager adapter.OutboundManager, logger log.Logger, outbounds []adapter.Outbound, link string, interval time.Duration, tolerance uint16, idleTimeout time.Duration, interruptExternalConnections bool) (*URLTestGroup, error) { func NewURLTestGroup(ctx context.Context, outboundManager adapter.OutboundManager, logger log.Logger, outbounds []adapter.Outbound, costs map[string]uint16, link string, interval time.Duration, tolerance uint16, idleTimeout time.Duration, interruptExternalConnections bool) (*URLTestGroup, error) {
if interval == 0 { if interval == 0 {
interval = C.DefaultURLTestInterval interval = C.DefaultURLTestInterval
} }
@@ -221,6 +224,9 @@ func NewURLTestGroup(ctx context.Context, outboundManager adapter.OutboundManage
if idleTimeout == 0 { if idleTimeout == 0 {
idleTimeout = C.DefaultURLTestIdleTimeout idleTimeout = C.DefaultURLTestIdleTimeout
} }
if costs == nil {
costs = map[string]uint16{}
}
if interval > idleTimeout { if interval > idleTimeout {
return nil, E.New("interval must be less or equal than idle_timeout") return nil, E.New("interval must be less or equal than idle_timeout")
} }
@@ -237,6 +243,7 @@ func NewURLTestGroup(ctx context.Context, outboundManager adapter.OutboundManage
outbound: outboundManager, outbound: outboundManager,
logger: logger, logger: logger,
outbounds: outbounds, outbounds: outbounds,
costs: costs,
link: link, link: link,
interval: interval, interval: interval,
tolerance: tolerance, tolerance: tolerance,
@@ -398,7 +405,11 @@ func (g *URLTestGroup) urlTest(ctx context.Context, force bool) (map[string]uint
Delay: t, Delay: t,
}) })
resultAccess.Lock() resultAccess.Lock()
result[tag] = t add_latency, exist := g.costs[tag]
if !exist {
add_latency = 0
}
result[tag] = t + add_latency
resultAccess.Unlock() resultAccess.Unlock()
} }
return nil, nil return nil, nil