mirror of
https://github.com/Wei-Shaw/sub2api.git
synced 2026-11-18 23:01:23 +00:00
Merge pull request #4207 from hongheshan-svg/upstream-pr/http2-keepalive
fix(openai): 为 Codex HTTP/2 上游启用 PING 健康探测,剔除死连接
This commit is contained in:
2 files changed
+96
No files matched your search
@@ -21,6 +21,7 @@ import (
|
||||
|
||||
"github.com/andybalholm/brotli"
|
||||
"github.com/klauspost/compress/zstd"
|
||||
"golang.org/x/net/http2"
|
||||
|
||||
"github.com/Wei-Shaw/sub2api/internal/config"
|
||||
"github.com/Wei-Shaw/sub2api/internal/pkg/proxyurl"
|
||||
@@ -60,6 +61,13 @@ const (
|
||||
defaultOpenAIHTTP2FallbackErrorThreshold = 2
|
||||
defaultOpenAIHTTP2FallbackWindow = 60 * time.Second
|
||||
defaultOpenAIHTTP2FallbackTTL = 10 * time.Minute
|
||||
// OpenAI HTTP/2 连接健康探测:Codex 上游改走 HTTP/2 后,池化连接被代理/NAT
|
||||
// 静默掐断会成为“死连接”(两端都以为存活),请求落上去会挂到 TCP 重传超时
|
||||
// (分钟级)。Go 的 http2.Transport 默认 ReadIdleTimeout=0(不发健康 PING),
|
||||
// 无法检测。启用主动 PING 探测:连接空闲 ReadIdleTimeout 后发 PING,PingTimeout
|
||||
// 内无响应即判定死连接并关闭,从源头避免请求挂在死连接上。
|
||||
openAIHTTP2ReadIdleTimeout = 15 * time.Second
|
||||
openAIHTTP2PingTimeout = 15 * time.Second
|
||||
|
||||
// The Grok CLI proxy rejects requests that do not identify a supported
|
||||
// client version. Keep a known-good stable version in the binary while
|
||||
@@ -1102,6 +1110,11 @@ func buildUpstreamTransport(settings poolSettings, proxyURL *url.URL, protocolMo
|
||||
switch protocolMode {
|
||||
case upstreamProtocolModeOpenAIH2:
|
||||
transport.ForceAttemptHTTP2 = true
|
||||
// 显式配置 http2 并启用 PING 健康探测,剔除代理/NAT 静默掐断的死连接,
|
||||
// 避免请求挂在死连接上直到 TCP 重传超时(分钟级)。
|
||||
if _, err := enableOpenAIHTTP2KeepAlive(transport); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
case upstreamProtocolModeOpenAIH1:
|
||||
transport.ForceAttemptHTTP2 = false
|
||||
transport.TLSNextProto = make(map[string]func(string, *tls.Conn) http.RoundTripper)
|
||||
@@ -1116,6 +1129,22 @@ func buildUpstreamTransport(settings poolSettings, proxyURL *url.URL, protocolMo
|
||||
return transport, nil
|
||||
}
|
||||
|
||||
// enableOpenAIHTTP2KeepAlive 在 http.Transport 上显式配置 HTTP/2 并启用连接健康探测。
|
||||
// Go 默认惰性配置 http2 且 ReadIdleTimeout=0(不发健康 PING),无法检测被代理/NAT
|
||||
// 静默掐断的死连接。此处主动设置 ReadIdleTimeout/PingTimeout,让死连接被提前 PING
|
||||
// 出并关闭,请求得以重建连接而非挂到 TCP 重传超时。返回底层 *http2.Transport 便于测试。
|
||||
func enableOpenAIHTTP2KeepAlive(transport *http.Transport) (*http2.Transport, error) {
|
||||
h2, err := http2.ConfigureTransports(transport)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if h2 != nil {
|
||||
h2.ReadIdleTimeout = openAIHTTP2ReadIdleTimeout
|
||||
h2.PingTimeout = openAIHTTP2PingTimeout
|
||||
}
|
||||
return h2, nil
|
||||
}
|
||||
|
||||
// buildUpstreamTransportWithTLSFingerprint 构建带 TLS 指纹伪装的 Transport
|
||||
// 使用 utls 库模拟 Claude CLI 的 TLS 指纹
|
||||
//
|
||||
|
||||
Reference in new issue
Block a user