docs: update proxy configuration comments for clarity in README and example config files

README.md

@@ -43,7 +43,7 @@ lang = "en" # Language setting, "en" for English
 [telegram]
 token = "" # Your bot token, obtained from @BotFather
 [telegram.proxy]
-# Enable proxy for Telegram, currently only SOCKS5 is supported
+# Enable proxy for Telegram
 enable = false
 url = "socks5://127.0.0.1:7890"
 

README_zh.md

@@ -40,7 +40,7 @@
 [telegram]
 token = "" # 你的 Bot Token, 在 @BotFather 获取
 [telegram.proxy]
-# 启用代理连接 telegram, 当前只支持 socks5
+# 启用代理连接 telegram
 enable = false
 url = "socks5://127.0.0.1:7890"
 

common/utils/tgutil/net.go

@@ -1,6 +1,12 @@
 package tgutil
 
 import (
+	"bufio"
+	"context"
+	"encoding/base64"
+	"fmt"
+	"net"
+	"net/http"
 	"net/url"
 
 	"github.com/gotd/td/telegram/dcs"
@@ -8,24 +14,108 @@ import (
 	"golang.org/x/net/proxy"
 )
 
-func newProxyDialer(proxyUrl string) (proxy.Dialer, error) {
-	url, err := url.Parse(proxyUrl)
+// httpProxyDialer implements proxy.ContextDialer for HTTP CONNECT proxies
+type httpProxyDialer struct {
+	proxyURL *url.URL
+	forward  proxy.Dialer
+}
+
+func (d *httpProxyDialer) Dial(network, addr string) (net.Conn, error) {
+	return d.DialContext(context.Background(), network, addr)
+}
+
+func (d *httpProxyDialer) DialContext(ctx context.Context, network, addr string) (net.Conn, error) {
+	proxyAddr := d.proxyURL.Host
+	if d.proxyURL.Port() == "" {
+		if d.proxyURL.Scheme == "https" {
+			proxyAddr = net.JoinHostPort(d.proxyURL.Hostname(), "443")
+		} else {
+			proxyAddr = net.JoinHostPort(d.proxyURL.Hostname(), "80")
+		}
+	}
+
+	var conn net.Conn
+	var err error
+	if ctxDialer, ok := d.forward.(proxy.ContextDialer); ok {
+		conn, err = ctxDialer.DialContext(ctx, "tcp", proxyAddr)
+	} else {
+		conn, err = d.forward.Dial("tcp", proxyAddr)
+	}
+	if err != nil {
+		return nil, fmt.Errorf("failed to connect to proxy: %w", err)
+	}
+
+	// Send CONNECT request
+	connectReq := &http.Request{
+		Method: "CONNECT",
+		URL:    &url.URL{Opaque: addr},
+		Host:   addr,
+		Header: make(http.Header),
+	}
+
+	// Add proxy authentication if provided
+	if d.proxyURL.User != nil {
+		username := d.proxyURL.User.Username()
+		password, _ := d.proxyURL.User.Password()
+		auth := base64.StdEncoding.EncodeToString([]byte(username + ":" + password))
+		connectReq.Header.Set("Proxy-Authorization", "Basic "+auth)
+	}
+
+	if err := connectReq.Write(conn); err != nil {
+		conn.Close()
+		return nil, fmt.Errorf("failed to write CONNECT request: %w", err)
+	}
+
+	// Read response
+	br := bufio.NewReader(conn)
+	resp, err := http.ReadResponse(br, connectReq)
+	if err != nil {
+		conn.Close()
+		return nil, fmt.Errorf("failed to read CONNECT response: %w", err)
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		conn.Close()
+		return nil, fmt.Errorf("proxy CONNECT failed with status: %s", resp.Status)
+	}
+
+	return conn, nil
+}
+
+func newProxyDialer(proxyUrl string) (proxy.ContextDialer, error) {
+	parsedURL, err := url.Parse(proxyUrl)
 	if err != nil {
 		return nil, err
 	}
-	return proxy.FromURL(url, proxy.Direct)
+
+	switch parsedURL.Scheme {
+	case "http", "https":
+		return &httpProxyDialer{
+			proxyURL: parsedURL,
+			forward:  proxy.Direct,
+		}, nil
+	case "socks5", "socks5h":
+		dialer, err := proxy.FromURL(parsedURL, proxy.Direct)
+		if err != nil {
+			return nil, err
+		}
+		return dialer.(proxy.ContextDialer), nil
+	default:
+		return nil, fmt.Errorf("unsupported proxy scheme: %s", parsedURL.Scheme)
+	}
 }
 
 func NewConfigProxyResolver() (dcs.Resolver, error) {
 	resolver := dcs.DefaultResolver()
 	if config.C().Proxy != "" {
-		// gloabl proxy, which has lower priority
+		// global 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,
+			Dial: dialer.DialContext,
 		})
 	}
 	if config.C().Telegram.Proxy.Enable && config.C().Telegram.Proxy.URL != "" {
@@ -34,7 +124,7 @@ func NewConfigProxyResolver() (dcs.Resolver, error) {
 			return nil, err
 		}
 		resolver = dcs.Plain(dcs.PlainOptions{
-			Dial: dialer.(proxy.ContextDialer).DialContext,
+			Dial: dialer.DialContext,
 		})
 	}
 	return resolver, nil

config.example.toml

@@ -14,7 +14,7 @@ token = ""
 # app_id = 1025907
 # app_hash = "452b0359b988148995f22ff0f4229750"
 [telegram.proxy]
-# 启用代理连接 telegram, 只支持 socks5
+# 启用代理连接 telegram
 enable = false
 url = "socks5://127.0.0.1:7890"
 

docs/content/en/deployment/configuration/_index.md

@@ -64,7 +64,7 @@ proxy = "socks5://127.0.0.1:7890"
 - `rpc_retry`: Number of retries for RPC requests, default is 5.
 - `proxy`: Proxy configuration, optional.
   - `enable`: Whether to enable the proxy.
-  - `url`: Proxy address, only supports `socks5://`
+  - `url`: Proxy address
 - `userbot`: Userbot configuration, optional.
   - `enable`: Enable userbot integration. Requires logging in with a user account; you should use your own API ID & Hash when enabling this.
   - `session`: Path to the userbot session file, default is `data/usersession.db`.

docs/content/zh/deployment/configuration/_index.md

@@ -62,7 +62,7 @@ proxy = "socks5://127.0.0.1:7890"
 - `rpc_retry`: RPC 请求重试次数, 默认为 5.
 - `proxy`: 代理配置, 可选.
   - `enable`: 是否启用代理.
-  - `url`: 代理地址, 只支持 `socks5://`
+  - `url`: 代理地址
 - `userbot`: userbot 配置, 可选.
   - `enable`: 启用 userbot 集成, 需要登录用户账号, 此时请务必使用自己的 api id & hash.
   - `session`: userbot 会话文件路径, 默认为 `data/usersession.db`.