mirror of
https://github.com/router-for-me/CLIProxyAPIPlus.git
synced 2026-05-13 12:46:35 +08:00
## 中文说明 ### 连接池优化 - 为 AMP 代理、SOCKS5 代理和 HTTP 代理配置优化的连接池参数 - MaxIdleConnsPerHost 从默认的 2 增加到 20,支持更多并发用户 - MaxConnsPerHost 设为 0(无限制),避免连接瓶颈 - 添加 IdleConnTimeout (90s) 和其他超时配置 ### Kiro 执行器增强 - 添加 Event Stream 消息解析的边界保护,防止越界访问 - 实现实时使用量估算(每 5000 字符或 15 秒发送 ping 事件) - 正确从上游事件中提取并传递 stop_reason - 改进输入 token 计算,优先使用 Claude 格式解析 - 添加 max_tokens 截断警告日志 ### Token 计算改进 - 添加 tokenizer 缓存(sync.Map)避免重复创建 - 为 Claude/Kiro/AmazonQ 模型添加 1.1 调整因子 - 新增 countClaudeChatTokens 函数支持 Claude API 格式 - 支持图像 token 估算(基于尺寸计算) ### 认证刷新优化 - RefreshLead 从 30 分钟改为 5 分钟,与 Antigravity 保持一致 - 修复 NextRefreshAfter 设置,防止频繁刷新检查 - refreshFailureBackoff 从 5 分钟改为 1 分钟,加快失败恢复 --- ## English Description ### Connection Pool Optimization - Configure optimized connection pool parameters for AMP proxy, SOCKS5 proxy, and HTTP proxy - Increase MaxIdleConnsPerHost from default 2 to 20 to support more concurrent users - Set MaxConnsPerHost to 0 (unlimited) to avoid connection bottlenecks - Add IdleConnTimeout (90s) and other timeout configurations ### Kiro Executor Enhancements - Add boundary protection for Event Stream message parsing to prevent out-of-bounds access - Implement real-time usage estimation (send ping events every 5000 chars or 15 seconds) - Correctly extract and pass stop_reason from upstream events - Improve input token calculation, prioritize Claude format parsing - Add max_tokens truncation warning logs ### Token Calculation Improvements - Add tokenizer cache (sync.Map) to avoid repeated creation - Add 1.1 adjustment factor for Claude/Kiro/AmazonQ models - Add countClaudeChatTokens function to support Claude API format - Support image token estimation (calculated based on dimensions) ### Authentication Refresh Optimization - Change RefreshLead from 30 minutes to 5 minutes, consistent with Antigravity - Fix NextRefreshAfter setting to prevent frequent refresh checks - Change refreshFailureBackoff from 5 minutes to 1 minute for faster failure recovery
166 lines
5.1 KiB
Go
166 lines
5.1 KiB
Go
package executor
|
|
|
|
import (
|
|
"context"
|
|
"net"
|
|
"net/http"
|
|
"net/url"
|
|
"strings"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/router-for-me/CLIProxyAPI/v6/internal/config"
|
|
cliproxyauth "github.com/router-for-me/CLIProxyAPI/v6/sdk/cliproxy/auth"
|
|
log "github.com/sirupsen/logrus"
|
|
"golang.org/x/net/proxy"
|
|
)
|
|
|
|
// httpClientCache caches HTTP clients by proxy URL to enable connection reuse
|
|
var (
|
|
httpClientCache = make(map[string]*http.Client)
|
|
httpClientCacheMutex sync.RWMutex
|
|
)
|
|
|
|
// newProxyAwareHTTPClient creates an HTTP client with proper proxy configuration priority:
|
|
// 1. Use auth.ProxyURL if configured (highest priority)
|
|
// 2. Use cfg.ProxyURL if auth proxy is not configured
|
|
// 3. Use RoundTripper from context if neither are configured
|
|
//
|
|
// This function caches HTTP clients by proxy URL to enable TCP/TLS connection reuse.
|
|
//
|
|
// Parameters:
|
|
// - ctx: The context containing optional RoundTripper
|
|
// - cfg: The application configuration
|
|
// - auth: The authentication information
|
|
// - timeout: The client timeout (0 means no timeout)
|
|
//
|
|
// Returns:
|
|
// - *http.Client: An HTTP client with configured proxy or transport
|
|
func newProxyAwareHTTPClient(ctx context.Context, cfg *config.Config, auth *cliproxyauth.Auth, timeout time.Duration) *http.Client {
|
|
// Priority 1: Use auth.ProxyURL if configured
|
|
var proxyURL string
|
|
if auth != nil {
|
|
proxyURL = strings.TrimSpace(auth.ProxyURL)
|
|
}
|
|
|
|
// Priority 2: Use cfg.ProxyURL if auth proxy is not configured
|
|
if proxyURL == "" && cfg != nil {
|
|
proxyURL = strings.TrimSpace(cfg.ProxyURL)
|
|
}
|
|
|
|
// Build cache key from proxy URL (empty string for no proxy)
|
|
cacheKey := proxyURL
|
|
|
|
// Check cache first
|
|
httpClientCacheMutex.RLock()
|
|
if cachedClient, ok := httpClientCache[cacheKey]; ok {
|
|
httpClientCacheMutex.RUnlock()
|
|
// Return a wrapper with the requested timeout but shared transport
|
|
if timeout > 0 {
|
|
return &http.Client{
|
|
Transport: cachedClient.Transport,
|
|
Timeout: timeout,
|
|
}
|
|
}
|
|
return cachedClient
|
|
}
|
|
httpClientCacheMutex.RUnlock()
|
|
|
|
// Create new client
|
|
httpClient := &http.Client{}
|
|
if timeout > 0 {
|
|
httpClient.Timeout = timeout
|
|
}
|
|
|
|
// If we have a proxy URL configured, set up the transport
|
|
if proxyURL != "" {
|
|
transport := buildProxyTransport(proxyURL)
|
|
if transport != nil {
|
|
httpClient.Transport = transport
|
|
// Cache the client
|
|
httpClientCacheMutex.Lock()
|
|
httpClientCache[cacheKey] = httpClient
|
|
httpClientCacheMutex.Unlock()
|
|
return httpClient
|
|
}
|
|
// If proxy setup failed, log and fall through to context RoundTripper
|
|
log.Debugf("failed to setup proxy from URL: %s, falling back to context transport", proxyURL)
|
|
}
|
|
|
|
// Priority 3: Use RoundTripper from context (typically from RoundTripperFor)
|
|
if rt, ok := ctx.Value("cliproxy.roundtripper").(http.RoundTripper); ok && rt != nil {
|
|
httpClient.Transport = rt
|
|
}
|
|
|
|
// Cache the client for no-proxy case
|
|
if proxyURL == "" {
|
|
httpClientCacheMutex.Lock()
|
|
httpClientCache[cacheKey] = httpClient
|
|
httpClientCacheMutex.Unlock()
|
|
}
|
|
|
|
return httpClient
|
|
}
|
|
|
|
// buildProxyTransport creates an HTTP transport configured for the given proxy URL.
|
|
// It supports SOCKS5, HTTP, and HTTPS proxy protocols.
|
|
//
|
|
// Parameters:
|
|
// - proxyURL: The proxy URL string (e.g., "socks5://user:pass@host:port", "http://host:port")
|
|
//
|
|
// Returns:
|
|
// - *http.Transport: A configured transport, or nil if the proxy URL is invalid
|
|
func buildProxyTransport(proxyURL string) *http.Transport {
|
|
if proxyURL == "" {
|
|
return nil
|
|
}
|
|
|
|
parsedURL, errParse := url.Parse(proxyURL)
|
|
if errParse != nil {
|
|
log.Errorf("parse proxy URL failed: %v", errParse)
|
|
return nil
|
|
}
|
|
|
|
var transport *http.Transport
|
|
|
|
// Handle different proxy schemes
|
|
if parsedURL.Scheme == "socks5" {
|
|
// Configure SOCKS5 proxy with optional authentication
|
|
var proxyAuth *proxy.Auth
|
|
if parsedURL.User != nil {
|
|
username := parsedURL.User.Username()
|
|
password, _ := parsedURL.User.Password()
|
|
proxyAuth = &proxy.Auth{User: username, Password: password}
|
|
}
|
|
dialer, errSOCKS5 := proxy.SOCKS5("tcp", parsedURL.Host, proxyAuth, proxy.Direct)
|
|
if errSOCKS5 != nil {
|
|
log.Errorf("create SOCKS5 dialer failed: %v", errSOCKS5)
|
|
return nil
|
|
}
|
|
// Set up a custom transport using the SOCKS5 dialer with optimized connection pooling
|
|
transport = &http.Transport{
|
|
DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) {
|
|
return dialer.Dial(network, addr)
|
|
},
|
|
MaxIdleConns: 100,
|
|
MaxIdleConnsPerHost: 20, // Increased from default 2 to support more concurrent users
|
|
MaxConnsPerHost: 0, // No limit on max concurrent connections per host
|
|
IdleConnTimeout: 90 * time.Second,
|
|
}
|
|
} else if parsedURL.Scheme == "http" || parsedURL.Scheme == "https" {
|
|
// Configure HTTP or HTTPS proxy with optimized connection pooling
|
|
transport = &http.Transport{
|
|
Proxy: http.ProxyURL(parsedURL),
|
|
MaxIdleConns: 100,
|
|
MaxIdleConnsPerHost: 20, // Increased from default 2 to support more concurrent users
|
|
MaxConnsPerHost: 0, // No limit on max concurrent connections per host
|
|
IdleConnTimeout: 90 * time.Second,
|
|
}
|
|
} else {
|
|
log.Errorf("unsupported proxy scheme: %s", parsedURL.Scheme)
|
|
return nil
|
|
}
|
|
|
|
return transport
|
|
}
|