feat: add global proxy config

common/utils/netutil/proxy.go

@@ -7,56 +7,24 @@ import (
 	"net/http"
 	"net/url"
 	"sync"
+	"time"
 
 	"github.com/charmbracelet/log"
 	"github.com/krau/SaveAny-Bot/config"
 	"golang.org/x/net/proxy"
 )
 
-func NewProxyDialer(proxyUrl string) (proxy.Dialer, error) {
-	url, err := url.Parse(proxyUrl)
-	if err != nil {
-		return nil, err
-	}
-	return proxy.FromURL(url, proxy.Direct)
-}
-
 func NewProxyHTTPClient(proxyUrl string) (*http.Client, error) {
 	if proxyUrl == "" {
-		return &http.Client{
-			Transport: &http.Transport{
-				Proxy: http.ProxyFromEnvironment,
-			},
-		}, nil
+		return http.DefaultClient, nil
 	}
-
-	u, err := url.Parse(proxyUrl)
+	transport, err := NewProxyTransport(proxyUrl)
 	if err != nil {
 		return nil, err
 	}
-
-	switch u.Scheme {
-	case "http", "https":
-		return &http.Client{
-			Transport: &http.Transport{
-				Proxy: http.ProxyURL(u),
-			},
-		}, nil
-	case "socks5":
-		dialer, err := proxy.FromURL(u, proxy.Direct)
-		if err != nil {
-			return nil, err
-		}
-		return &http.Client{
-			Transport: &http.Transport{
-				DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) {
-					return dialer.Dial(network, addr)
-				},
-			},
-		}, nil
-	default:
-		return nil, fmt.Errorf("unsupported proxy scheme: %s", u.Scheme)
-	}
+	return &http.Client{
+		Transport: transport,
+	}, nil
 }
 
 var (
@@ -76,3 +44,35 @@ func DefaultParserHTTPClient() *http.Client {
 	})
 	return defaultProxyHttpClient
 }
+
+func NewProxyTransport(proxyStr string) (*http.Transport, error) {
+	proxyURL, err := url.Parse(proxyStr)
+	if err != nil {
+		return nil, err
+	}
+	transport := &http.Transport{
+		ForceAttemptHTTP2:     true,
+		MaxIdleConns:          100,
+		IdleConnTimeout:       90 * time.Second,
+		TLSHandshakeTimeout:   10 * time.Second,
+		ExpectContinueTimeout: 1 * time.Second,
+	}
+	switch proxyURL.Scheme {
+	case "http", "https":
+		transport.Proxy = http.ProxyURL(proxyURL)
+
+	case "socks5", "socks5h":
+		dialer, err := proxy.FromURL(proxyURL, proxy.Direct)
+		if err != nil {
+			return nil, err
+		}
+		transport.DialContext = func(ctx context.Context, network, addr string) (net.Conn, error) {
+			return dialer.(proxy.ContextDialer).DialContext(ctx, network, addr)
+		}
+
+	default:
+		return nil, fmt.Errorf("unsupported proxy type: %s", proxyURL.Scheme)
+	}
+
+	return transport, nil
+}

common/utils/tgutil/net.go

@@ -0,0 +1,41 @@
+package tgutil
+
+import (
+	"net/url"
+
+	"github.com/gotd/td/telegram/dcs"
+	"github.com/krau/SaveAny-Bot/config"
+	"golang.org/x/net/proxy"
+)
+
+func newProxyDialer(proxyUrl string) (proxy.Dialer, error) {
+	url, err := url.Parse(proxyUrl)
+	if err != nil {
+		return nil, err
+	}
+	return proxy.FromURL(url, proxy.Direct)
+}
+
+func NewConfigProxyResolver() (dcs.Resolver, error) {
+	resolver := dcs.DefaultResolver()
+	if config.C().Proxy != "" {
+		// gloabl proxy, which has lower priority
+		dialer, err := newProxyDialer(config.C().Proxy)
+		if err != nil {
+			return nil, err
+		}
+		resolver = dcs.Plain(dcs.PlainOptions{
+			Dial: dialer.(proxy.ContextDialer).DialContext,
+		})
+	}
+	if config.C().Telegram.Proxy.Enable && config.C().Telegram.Proxy.URL != "" {
+		dialer, err := newProxyDialer(config.C().Telegram.Proxy.URL)
+		if err != nil {
+			return nil, err
+		}
+		resolver = dcs.Plain(dcs.PlainOptions{
+			Dial: dialer.(proxy.ContextDialer).DialContext,
+		})
+	}
+	return resolver, nil
+}