fix(channel): 增加HTTP客户端超时时间并改进SOCKS5代理处理
- 将Telegram和微信企业号通道的HTTP客户端超时统一延长至30秒,避免因网络延迟导致请求失败 - 修复SOCKS5代理连接未正确处理上下文取消的问题,现在支持带认证的SOCKS5代理 - 当无法获取默认HTTP传输时,提供完整的传输配置而非空结构
This commit is contained in:
+40
-5
@@ -26,7 +26,17 @@ func newHTTPClient(proxyAddress string, timeout time.Duration) (*http.Client, er
|
|||||||
func newHTTPTransport(proxyAddress string) (*http.Transport, error) {
|
func newHTTPTransport(proxyAddress string) (*http.Transport, error) {
|
||||||
base, ok := http.DefaultTransport.(*http.Transport)
|
base, ok := http.DefaultTransport.(*http.Transport)
|
||||||
if !ok {
|
if !ok {
|
||||||
return &http.Transport{}, nil
|
return &http.Transport{
|
||||||
|
DialContext: (&net.Dialer{
|
||||||
|
Timeout: 10 * time.Second,
|
||||||
|
KeepAlive: 30 * time.Second,
|
||||||
|
}).DialContext,
|
||||||
|
ForceAttemptHTTP2: true,
|
||||||
|
MaxIdleConns: 100,
|
||||||
|
IdleConnTimeout: 90 * time.Second,
|
||||||
|
TLSHandshakeTimeout: 10 * time.Second,
|
||||||
|
ExpectContinueTimeout: 1 * time.Second,
|
||||||
|
}, nil
|
||||||
}
|
}
|
||||||
transport := base.Clone()
|
transport := base.Clone()
|
||||||
proxyAddress = strings.TrimSpace(proxyAddress)
|
proxyAddress = strings.TrimSpace(proxyAddress)
|
||||||
@@ -46,15 +56,40 @@ func newHTTPTransport(proxyAddress string) (*http.Transport, error) {
|
|||||||
transport.Proxy = http.ProxyURL(u)
|
transport.Proxy = http.ProxyURL(u)
|
||||||
return transport, nil
|
return transport, nil
|
||||||
case "socks5", "socks5h":
|
case "socks5", "socks5h":
|
||||||
normalized := *u
|
var auth *proxy.Auth
|
||||||
normalized.Scheme = "socks5"
|
if u.User != nil {
|
||||||
dialer, err := proxy.FromURL(&normalized, proxy.Direct)
|
auth = &proxy.Auth{
|
||||||
|
User: u.User.Username(),
|
||||||
|
Password: "",
|
||||||
|
}
|
||||||
|
if password, ok := u.User.Password(); ok {
|
||||||
|
auth.Password = password
|
||||||
|
}
|
||||||
|
}
|
||||||
|
dialer, err := proxy.SOCKS5("tcp", u.Host, auth, &net.Dialer{
|
||||||
|
Timeout: 10 * time.Second,
|
||||||
|
KeepAlive: 30 * time.Second,
|
||||||
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
transport.Proxy = nil
|
transport.Proxy = nil
|
||||||
transport.DialContext = func(ctx context.Context, network, addr string) (net.Conn, error) {
|
transport.DialContext = func(ctx context.Context, network, addr string) (net.Conn, error) {
|
||||||
return dialer.Dial(network, addr)
|
type dialResult struct {
|
||||||
|
conn net.Conn
|
||||||
|
err error
|
||||||
|
}
|
||||||
|
ch := make(chan dialResult, 1)
|
||||||
|
go func() {
|
||||||
|
conn, err := dialer.Dial(network, addr)
|
||||||
|
ch <- dialResult{conn: conn, err: err}
|
||||||
|
}()
|
||||||
|
select {
|
||||||
|
case <-ctx.Done():
|
||||||
|
return nil, ctx.Err()
|
||||||
|
case r := <-ch:
|
||||||
|
return r.conn, r.err
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return transport, nil
|
return transport, nil
|
||||||
default:
|
default:
|
||||||
|
|||||||
+1
-1
@@ -25,7 +25,7 @@ type telegramMessageResponse struct {
|
|||||||
|
|
||||||
func SendTelegramMessage(message *model.Message, user *model.User, channel_ *model.Channel) error {
|
func SendTelegramMessage(message *model.Message, user *model.User, channel_ *model.Channel) error {
|
||||||
// https://core.telegram.org/bots/api#sendmessage
|
// https://core.telegram.org/bots/api#sendmessage
|
||||||
client, err := newHTTPClient(channel_.URL, 10*time.Second)
|
client, err := newHTTPClient(channel_.URL, 30*time.Second)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ func (i *WeChatCorpAccountTokenStoreItem) Token() string {
|
|||||||
|
|
||||||
func (i *WeChatCorpAccountTokenStoreItem) Refresh() {
|
func (i *WeChatCorpAccountTokenStoreItem) Refresh() {
|
||||||
// https://work.weixin.qq.com/api/doc/90000/90135/91039
|
// https://work.weixin.qq.com/api/doc/90000/90135/91039
|
||||||
client, err := newHTTPClient(i.Proxy, 5*time.Second)
|
client, err := newHTTPClient(i.Proxy, 30*time.Second)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
common.SysError("failed to create http client: " + err.Error())
|
common.SysError("failed to create http client: " + err.Error())
|
||||||
return
|
return
|
||||||
@@ -159,7 +159,7 @@ func SendWeChatCorpMessage(message *model.Message, user *model.User, channel_ *m
|
|||||||
Proxy: proxyAddress,
|
Proxy: proxyAddress,
|
||||||
}
|
}
|
||||||
accessToken := TokenStoreGetToken(tokenItem.Key())
|
accessToken := TokenStoreGetToken(tokenItem.Key())
|
||||||
client, err := newHTTPClient(proxyAddress, 10*time.Second)
|
client, err := newHTTPClient(proxyAddress, 30*time.Second)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user