Merge branch 'Alpha' into dev

config/config.go

@@ -157,6 +157,7 @@ type Config struct {
 
 type RawDNS struct {
 	Enable                bool              `yaml:"enable"`
+	PreferH3              bool              `yaml:"prefer-h3"`
 	IPv6                  bool              `yaml:"ipv6"`
 	UseHosts              bool              `yaml:"use-hosts"`
 	NameServer            []string          `yaml:"nameserver"`
@@ -240,6 +241,12 @@ type RawSniffer struct {
 	Ports       []string `yaml:"port-whitelist" json:"port-whitelist"`
 }
 
+var (
+	GroupsList             = list.New()
+	ProxiesList            = list.New()
+	ParsingProxiesCallback func(groupsList *list.List, proxiesList *list.List)
+)
+
 // Parse config
 func Parse(buf []byte) (*Config, error) {
 	rawCfg, err := UnmarshalRawConfig(buf)
@@ -527,7 +534,12 @@ func parseProxies(cfg *RawConfig) (proxies map[string]C.Proxy, providersMap map[
 		[]providerTypes.ProxyProvider{pd},
 	)
 	proxies["GLOBAL"] = adapter.NewProxy(global)
-
+	ProxiesList = proxiesList
+	GroupsList = groupsList
+	if ParsingProxiesCallback != nil {
+		// refresh tray menu
+		go ParsingProxiesCallback(GroupsList, ProxiesList)
+	}
 	return proxies, providersMap, nil
 }
 
@@ -767,6 +779,7 @@ func parseDNS(rawCfg *RawConfig, hosts *trie.DomainTrie[netip.Addr], rules []C.R
 	dnsCfg := &DNS{
 		Enable:       cfg.Enable,
 		Listen:       cfg.Listen,
+		PreferH3:     cfg.PreferH3,
 		IPv6:         cfg.IPv6,
 		EnhancedMode: cfg.EnhancedMode,
 		FallbackFilter: FallbackFilter{

dns/doh.go

@@ -11,6 +11,7 @@ import (
 	D "github.com/miekg/dns"
 	"go.uber.org/atomic"
 	"io"
+	"io/ioutil"
 	"net"
 	"net/http"
 	"strconv"
@@ -22,12 +23,8 @@ const (
 )
 
 type dohClient struct {
-	url          string
+	url       string
-	proxyAdapter string
+	transport http.RoundTripper
-	transport    *http.Transport
-	h3Transport  *http3.RoundTripper
-	supportH3    *atomic.Bool
-	firstTest    *atomic.Bool
 }
 
 func (dc *dohClient) Exchange(m *D.Msg) (msg *D.Msg, err error) {
@@ -70,35 +67,10 @@ func (dc *dohClient) newRequest(m *D.Msg) (*http.Request, error) {
 }
 
 func (dc *dohClient) doRequest(req *http.Request) (msg *D.Msg, err error) {
-	if dc.supportH3.Load() {
+	client := &http.Client{Transport: dc.transport}
-		msg, err = dc.doRequestWithTransport(req, dc.h3Transport)
-		if err != nil {
-			if dc.firstTest.CAS(true, false) {
-				dc.supportH3.Store(false)
-				_ = dc.h3Transport.Close()
-				dc.h3Transport = nil
-			}
-		} else {
-			if dc.firstTest.CAS(true, false) {
-				dc.supportH3.Store(true)
-				dc.transport.CloseIdleConnections()
-				dc.transport = nil
-			}
-		}
-	} else {
-		msg, err = dc.doRequestWithTransport(req, dc.transport)
-	}
-
-	return
-}
-
-func (dc *dohClient) doRequestWithTransport(req *http.Request, transport http.RoundTripper) (*D.Msg, error) {
-	client := &http.Client{Transport: transport}
 	resp, err := client.Do(req)
 	if err != nil {
-		if err != nil {
+		return nil, err
-			return nil, err
-		}
 	}
 
 	defer resp.Body.Close()
@@ -107,16 +79,28 @@ func (dc *dohClient) doRequestWithTransport(req *http.Request, transport http.Ro
 	if err != nil {
 		return nil, err
 	}
-	msg := &D.Msg{}
+	msg = &D.Msg{}
 	err = msg.Unpack(buf)
 	return msg, err
 }
 
 func newDoHClient(url string, r *Resolver, preferH3 bool, proxyAdapter string) *dohClient {
 	return &dohClient{
-		url:          url,
+		url:       url,
-		proxyAdapter: proxyAdapter,
+		transport: newDohTransport(r, preferH3, proxyAdapter),
-		transport: &http.Transport{
+	}
+}
+
+type dohTransport struct {
+	*http.Transport
+	h3       *http3.RoundTripper
+	preferH3 bool
+	canUseH3 atomic.Bool
+}
+
+func newDohTransport(r *Resolver, preferH3 bool, proxyAdapter string) *dohTransport {
+	dohT := &dohTransport{
+		Transport: &http.Transport{
 			ForceAttemptHTTP2: true,
 			DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) {
 				host, port, err := net.SplitHostPort(addr)
@@ -136,8 +120,12 @@ func newDoHClient(url string, r *Resolver, preferH3 bool, proxyAdapter string) *
 				}
 			},
 		},
+		preferH3: preferH3,
+	}
 
-		h3Transport: &http3.RoundTripper{
+	dohT.canUseH3.Store(preferH3)
+	if preferH3 {
+		dohT.h3 = &http3.RoundTripper{
 			Dial: func(ctx context.Context, network, addr string, tlsCfg *tls.Config, cfg *quic.Config) (quic.EarlyConnection, error) {
 				host, port, err := net.SplitHostPort(addr)
 				if err != nil {
@@ -168,8 +156,44 @@ func newDoHClient(url string, r *Resolver, preferH3 bool, proxyAdapter string) *
 					}
 				}
 			},
-		},
+		}
-		supportH3: atomic.NewBool(preferH3),
-		firstTest: atomic.NewBool(true),
 	}
+
+	return dohT
+}
+
+func (doh *dohTransport) RoundTrip(req *http.Request) (*http.Response, error) {
+	var resp *http.Response
+	var err error
+	var bodyBytes []byte
+	var h3Err bool
+	var fallbackErr bool
+	defer func() {
+		if doh.preferH3 && h3Err {
+			doh.canUseH3.Store(doh.preferH3 && fallbackErr)
+		}
+	}()
+
+	if req.Body != nil {
+		bodyBytes, err = ioutil.ReadAll(req.Body)
+	}
+
+	req.Body = ioutil.NopCloser(bytes.NewReader(bodyBytes))
+	if doh.preferH3 && doh.canUseH3.Load() {
+		resp, err = doh.h3.RoundTrip(req)
+		h3Err = err != nil
+		if !h3Err {
+			return resp, err
+		} else {
+			req.Body = ioutil.NopCloser(bytes.NewReader(bodyBytes))
+		}
+	}
+
+	resp, err = doh.Transport.RoundTrip(req)
+	fallbackErr = err != nil
+	if fallbackErr {
+		return resp, err
+	}
+
+	return resp, err
 }