Fix legacy rule-set download_detour blocked by empty direct check

common/dialer/detour.go

@@ -17,20 +17,20 @@ type DirectDialer interface {
 }
 
 type DetourDialer struct {
-	outboundManager adapter.OutboundManager
-	detour          string
-	defaultOutbound bool
-	legacyDNSDialer bool
-	dialer          N.Dialer
-	initOnce        sync.Once
-	initErr         error
+	outboundManager         adapter.OutboundManager
+	detour                  string
+	defaultOutbound         bool
+	disableEmptyDirectCheck bool
+	dialer                  N.Dialer
+	initOnce                sync.Once
+	initErr                 error
 }
 
-func NewDetour(outboundManager adapter.OutboundManager, detour string, legacyDNSDialer bool) N.Dialer {
+func NewDetour(outboundManager adapter.OutboundManager, detour string, disableEmptyDirectCheck bool) N.Dialer {
 	return &DetourDialer{
-		outboundManager: outboundManager,
-		detour:          detour,
-		legacyDNSDialer: legacyDNSDialer,
+		outboundManager:         outboundManager,
+		detour:                  detour,
+		disableEmptyDirectCheck: disableEmptyDirectCheck,
 	}
 }
 
@@ -66,7 +66,7 @@ func (d *DetourDialer) init() {
 	} else {
 		dialer = d.outboundManager.Default()
 	}
-	if !d.defaultOutbound && !d.legacyDNSDialer {
+	if !d.defaultOutbound && !d.disableEmptyDirectCheck {
 		if directDialer, isDirect := dialer.(DirectDialer); isDirect {
 			if directDialer.IsEmpty() {
 				d.initErr = E.New("detour to an empty direct outbound makes no sense")

common/dialer/dialer.go

@@ -17,15 +17,15 @@ import (
 )
 
 type Options struct {
-	Context          context.Context
-	Options          option.DialerOptions
-	RemoteIsDomain   bool
-	DirectResolver   bool
-	ResolverOnDetour bool
-	NewDialer        bool
-	LegacyDNSDialer  bool
-	DirectOutbound   bool
-	DefaultOutbound  bool
+	Context                 context.Context
+	Options                 option.DialerOptions
+	RemoteIsDomain          bool
+	DirectResolver          bool
+	ResolverOnDetour        bool
+	NewDialer               bool
+	DisableEmptyDirectCheck bool
+	DirectOutbound          bool
+	DefaultOutbound         bool
 }
 
 // TODO: merge with NewWithOptions
@@ -49,7 +49,7 @@ func NewWithOptions(options Options) (N.Dialer, error) {
 		if outboundManager == nil {
 			return nil, E.New("missing outbound manager")
 		}
-		dialer = NewDetour(outboundManager, dialOptions.Detour, options.LegacyDNSDialer)
+		dialer = NewDetour(outboundManager, dialOptions.Detour, options.DisableEmptyDirectCheck)
 	} else if options.DefaultOutbound {
 		outboundManager := service.FromContext[adapter.OutboundManager](options.Context)
 		if outboundManager == nil {

common/httpclient/client.go

@@ -16,13 +16,14 @@ import (
 
 func NewTransport(ctx context.Context, logger logger.ContextLogger, tag string, options option.HTTPClientOptions) (*ManagedTransport, error) {
 	rawDialer, err := dialer.NewWithOptions(dialer.Options{
-		Context:          ctx,
-		Options:          options.DialerOptions,
-		RemoteIsDomain:   true,
-		DirectResolver:   options.DirectResolver,
-		ResolverOnDetour: options.ResolveOnDetour,
-		NewDialer:        options.ResolveOnDetour,
-		DefaultOutbound:  options.DefaultOutbound,
+		Context:                 ctx,
+		Options:                 options.DialerOptions,
+		RemoteIsDomain:          true,
+		DirectResolver:          options.DirectResolver,
+		ResolverOnDetour:        options.ResolveOnDetour,
+		NewDialer:               options.ResolveOnDetour,
+		DisableEmptyDirectCheck: options.DisableEmptyDirectCheck,
+		DefaultOutbound:         options.DefaultOutbound,
 	})
 	if err != nil {
 		return nil, err