hesoyam/sing-box-extended-mirror
1
0
Fork 0
mirror of https://github.com/shtorm-7/sing-box-extended.git synced 2026-10-19 15:54:24 +00:00
Code Issues Packages Projects Releases 2 Wiki Activity

fix: Report fork component references to reference manager

Browse Source
This commit is contained in:
Shtorm
2026-10-19 14:37:32 +03:00
parent 2283c95513
commit 6b5ee55ba2
14 changed files with 157 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adapter/provider/adapter.go
+4
View File
@@ -186,6 +186,10 @@ func (a *Adapter) UpdateGroups() {
for element := a.callbacks.Front(); element != nil; element = element.Next() {
element.Value(a.providerTag)
}
history := service.PtrFromContext[urltest.HistoryStorage](a.ctx)
if history != nil {
history.NotifyUpdated()
}
}
func (a *Adapter) Close() error {
protocol/bond/inbound.go
+11
View File
@@ -84,6 +84,17 @@ func (h *Inbound) Start(stage adapter.StartStage, scope *adapter.Scope) error {
return nil
}
func (h *Inbound) References() []string {
var references []string
for _, inbound := range h.inbounds {
referrer, isReferrer := inbound.(adapter.Referrer)
if isReferrer {
references = append(references, referrer.References()...)
}
}
return references
}
func (h *Inbound) connHandler(ctx context.Context, conn net.Conn, metadata adapter.InboundContext, onClose N.CloseHandlerFunc) error {
request, err := ReadRequest(conn)
if err != nil {
protocol/bond/outbound.go
+31
View File
@@ -89,6 +89,37 @@ func (h *Outbound) Start(stage adapter.StartStage, scope *adapter.Scope) error {
return nil
}
func (h *Outbound) References() []string {
var references []string
for _, outbound := range h.outbounds {
referrer, isReferrer := outbound.(adapter.Referrer)
if isReferrer {
references = append(references, referrer.References()...)
} else {
references = append(references, outbound.Dependencies()...)
}
}
return references
}
func (h *Outbound) SetKeepIdleConnections(keep bool) {
for _, outbound := range h.outbounds {
keeper, isKeeper := outbound.(adapter.IdleConnectionKeeper)
if isKeeper {
keeper.SetKeepIdleConnections(keep)
}
}
}
func (h *Outbound) CloseIdleConnections() {
for _, outbound := range h.outbounds {
keeper, isKeeper := outbound.(adapter.IdleConnectionKeeper)
if isKeeper {
keeper.CloseIdleConnections()
}
}
}
func (h *Outbound) DialContext(ctx context.Context, network string, destination M.Socksaddr) (net.Conn, error) {
if N.NetworkName(network) == N.NetworkUDP {
return h.uotClient.DialContext(ctx, network, destination)
protocol/failover/inbound.go
+11
View File
@@ -69,6 +69,17 @@ func (h *Inbound) Start(stage adapter.StartStage, scope *adapter.Scope) error {
return nil
}
func (h *Inbound) References() []string {
var references []string
for _, inbound := range h.inbounds {
referrer, isReferrer := inbound.(adapter.Referrer)
if isReferrer {
references = append(references, referrer.References()...)
}
}
return references
}
func (h *Inbound) connHandler(ctx context.Context, conn net.Conn, metadata adapter.InboundContext, onClose N.CloseHandlerFunc) error {
if metadata.Destination != Destination {
h.router.RouteConnectionEx(ctx, conn, metadata, onClose)
protocol/failover/outbound.go
+31
View File
@@ -79,6 +79,37 @@ func (f *Failover) Start(stage adapter.StartStage, scope *adapter.Scope) error {
return nil
}
func (f *Failover) References() []string {
var references []string
for _, outbound := range f.outbounds {
referrer, isReferrer := outbound.(adapter.Referrer)
if isReferrer {
references = append(references, referrer.References()...)
} else {
references = append(references, outbound.Dependencies()...)
}
}
return references
}
func (f *Failover) SetKeepIdleConnections(keep bool) {
for _, outbound := range f.outbounds {
keeper, isKeeper := outbound.(adapter.IdleConnectionKeeper)
if isKeeper {
keeper.SetKeepIdleConnections(keep)
}
}
}
func (f *Failover) CloseIdleConnections() {
for _, outbound := range f.outbounds {
keeper, isKeeper := outbound.(adapter.IdleConnectionKeeper)
if isKeeper {
keeper.CloseIdleConnections()
}
}
}
func (f *Failover) DialContext(ctx context.Context, network string, destination M.Socksaddr) (net.Conn, error) {
if N.NetworkName(network) == N.NetworkUDP {
return f.uotClient.DialContext(ctx, network, destination)
protocol/limiter/bandwidth/outbound.go
+4
View File
@@ -100,6 +100,10 @@ func (h *Outbound) Start(stage adapter.StartStage, scope *adapter.Scope) error {
return h.router.Start(stage, scope)
}
func (h *Outbound) References() []string {
return h.router.References()
}
func (h *Outbound) DialContext(ctx context.Context, network string, destination M.Socksaddr) (net.Conn, error) {
conn, err := h.detour.DialContext(ctx, network, destination)
if err != nil {
protocol/limiter/connection/outbound.go
+4
View File
@@ -100,6 +100,10 @@ func (h *Outbound) Start(stage adapter.StartStage, scope *adapter.Scope) error {
return h.router.Start(stage, scope)
}
func (h *Outbound) References() []string {
return h.router.References()
}
func (h *Outbound) DialContext(ctx context.Context, network string, destination M.Socksaddr) (net.Conn, error) {
onClose, lockCtx, err := h.strategy.request(ctx, adapter.ContextFrom(ctx))
if err != nil {
protocol/limiter/rate/outbound.go
+4
View File
@@ -96,6 +96,10 @@ func (h *Outbound) Start(stage adapter.StartStage, scope *adapter.Scope) error {
return h.router.Start(stage, scope)
}
func (h *Outbound) References() []string {
return h.router.References()
}
func (h *Outbound) DialContext(ctx context.Context, network string, destination M.Socksaddr) (net.Conn, error) {
if err := h.strategy.request(ctx, adapter.ContextFrom(ctx)); err != nil {
return nil, err
protocol/limiter/traffic/outbound.go
+4
View File
@@ -76,6 +76,10 @@ func (h *Outbound) Start(stage adapter.StartStage, scope *adapter.Scope) error {
return h.router.Start(stage, scope)
}
func (h *Outbound) References() []string {
return h.router.References()
}
func (h *Outbound) DialContext(ctx context.Context, network string, destination M.Socksaddr) (net.Conn, error) {
conn, err := h.detour.DialContext(ctx, network, destination)
if err != nil {
protocol/vpn/client.go
+8
View File
@@ -106,6 +106,14 @@ func (c *ClientEndpoint) Start(stage adapter.StartStage, scope *adapter.Scope) e
return nil
}
func (c *ClientEndpoint) References() []string {
referrer, isReferrer := c.outbound.(adapter.Referrer)
if isReferrer {
return referrer.References()
}
return c.outbound.Dependencies()
}
func (c *ClientEndpoint) DialContext(ctx context.Context, network string, destination M.Socksaddr) (net.Conn, error) {
if N.NetworkName(network) == N.NetworkUDP {
return c.uotClient.DialContext(ctx, network, destination)
protocol/vpn/server.go
+11
View File
@@ -107,6 +107,17 @@ func (s *ServerEndpoint) Start(stage adapter.StartStage, scope *adapter.Scope) e
return nil
}
func (s *ServerEndpoint) References() []string {
var references []string
for _, inbound := range s.inbounds {
referrer, isReferrer := inbound.(adapter.Referrer)
if isReferrer {
references = append(references, referrer.References()...)
}
}
return references
}
func (s *ServerEndpoint) DialContext(ctx context.Context, network string, destination M.Socksaddr) (net.Conn, error) {
if N.NetworkName(network) == N.NetworkUDP {
return s.uotClient.DialContext(ctx, network, destination)
provider/remote/provider.go
+11
View File
@@ -140,6 +140,17 @@ func (s *ProviderRemote) Start(stage adapter.StartStage, scope *adapter.Scope) e
return s.Adapter.Start()
}
func (s *ProviderRemote) References() []string {
if s.downloadDetour != "" {
return []string{s.downloadDetour}
}
defaultOutbound := s.outbound.Default()
if defaultOutbound == nil {
return nil
}
return []string{defaultOutbound.Tag()}
}
func (s *ProviderRemote) Update() error {
if s.ticker != nil {
s.ticker.Reset(s.updateInterval)
route/reference.go
+7
View File
@@ -121,6 +121,7 @@ func (m *ReferenceManager) update() {
transportManager := service.FromContext[adapter.DNSTransportManager](m.ctx)
networkManager := service.FromContext[adapter.NetworkManager](m.ctx)
httpClientManager := service.FromContext[adapter.HTTPClientManager](m.ctx)
providerManager := service.FromContext[adapter.ProviderManager](m.ctx)
transportQueue := slices.Clone(m.staticTransports)
outboundQueue := slices.Clone(m.staticOutbounds)
@@ -156,6 +157,12 @@ func (m *ReferenceManager) update() {
if isReferrer {
outboundQueue = append(outboundQueue, referrer.References()...)
}
for _, provider := range providerManager.Providers() {
referrer, isReferrer := provider.(adapter.Referrer)
if isReferrer {
outboundQueue = append(outboundQueue, referrer.References()...)
}
}
referencedTransports := make(map[string]bool)
for len(transportQueue) > 0 {
route/router.go
+16
View File
@@ -10,6 +10,7 @@ import (
"github.com/sagernet/sing-box/common/process"
"github.com/sagernet/sing-box/common/taskmonitor"
C "github.com/sagernet/sing-box/constant"
"github.com/sagernet/sing-box/experimental/clashmode"
"github.com/sagernet/sing-box/log"
"github.com/sagernet/sing-box/option"
R "github.com/sagernet/sing-box/route/rule"
@@ -36,6 +37,7 @@ type Router struct {
defaultOutbound adapter.Outbound
httpClientManager adapter.HTTPClientManager
rules []adapter.Rule
ruleOptions []option.Rule
final string
needFindProcess bool
needFindNeighbor bool
@@ -64,6 +66,7 @@ func NewRouter(ctx context.Context, logFactory log.Factory, name string, options
network: service.FromContext[adapter.NetworkManager](ctx),
httpClientManager: service.FromContext[adapter.HTTPClientManager](ctx),
rules: make([]adapter.Rule, 0, len(options.Rules)),
ruleOptions: options.Rules,
final: options.Final,
ruleSetMap: make(map[string]adapter.RuleSet),
needFindProcess: hasRule(options.Rules, isProcessRule) || hasDNSRule(dnsOptions.Rules, isProcessDNSRule) || options.FindProcess,
@@ -242,6 +245,19 @@ func (r *Router) Start(stage adapter.StartStage, scope *adapter.Scope) error {
return nil
}
func (r *Router) References() []string {
var mode string
clashMode := service.PtrFromContext[clashmode.Manager](r.ctx)
if clashMode != nil {
mode = clashMode.Mode()
}
var references, transports []string
if !collectRuleReferences(r.ruleOptions, mode, &references, &transports) {
references = append(references, r.final)
}
return references
}
func (r *Router) RuleSet(tag string) (adapter.RuleSet, bool) {
ruleSet, loaded := r.ruleSetMap[tag]
return ruleSet, loaded