github/claude-relay-service
1
0
Fork 0
mirror of https://github.com/Wei-Shaw/claude-relay-service.git synced 2026-01-22 16:43:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复gemini转发未响应问题

Browse Source
This commit is contained in:
shaw
2025-11-20 21:02:43 +08:00
parent 61929874eb
commit 823be8acfc
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/services/geminiAccountService.js
View File

@@ -1098,7 +1098,7 @@ async function forwardToCodeAssist(client, apiMethod, requestBody, proxyConfig =
// 添加代理配置 // 添加代理配置
if (proxyAgent) { if (proxyAgent) {
axiosConfig.httpAgent = proxyAgent // 只设置 httpsAgent，因为目标 URL 是 HTTPS (cloudcode-pa.googleapis.com)
axiosConfig.httpsAgent = proxyAgent axiosConfig.httpsAgent = proxyAgent
axiosConfig.proxy = false axiosConfig.proxy = false
logger.info(`🌐 Using proxy for ${apiMethod}: ${ProxyHelper.getProxyDescription(proxyConfig)}`) logger.info(`🌐 Using proxy for ${apiMethod}: ${ProxyHelper.getProxyDescription(proxyConfig)}`)
@@ -1205,7 +1205,7 @@ async function loadCodeAssist(client, projectId = null, proxyConfig = null) {
// 添加代理配置 // 添加代理配置
if (proxyAgent) { if (proxyAgent) {
axiosConfig.httpAgent = proxyAgent // 只设置 httpsAgent，因为目标 URL 是 HTTPS (cloudcode-pa.googleapis.com)
axiosConfig.httpsAgent = proxyAgent axiosConfig.httpsAgent = proxyAgent
axiosConfig.proxy = false axiosConfig.proxy = false
logger.info( logger.info(
@@ -1414,7 +1414,7 @@ async function countTokens(client, contents, model = 'gemini-2.0-flash-exp', pro
// 添加代理配置 // 添加代理配置
const proxyAgent = ProxyHelper.createProxyAgent(proxyConfig) const proxyAgent = ProxyHelper.createProxyAgent(proxyConfig)
if (proxyAgent) { if (proxyAgent) {
axiosConfig.httpAgent = proxyAgent // 只设置 httpsAgent，因为目标 URL 是 HTTPS (cloudcode-pa.googleapis.com)
axiosConfig.httpsAgent = proxyAgent axiosConfig.httpsAgent = proxyAgent
axiosConfig.proxy = false axiosConfig.proxy = false
logger.info( logger.info(
@@ -1491,7 +1491,7 @@ async function generateContent(
// 添加代理配置 // 添加代理配置
const proxyAgent = ProxyHelper.createProxyAgent(proxyConfig) const proxyAgent = ProxyHelper.createProxyAgent(proxyConfig)
if (proxyAgent) { if (proxyAgent) {
axiosConfig.httpAgent = proxyAgent // 只设置 httpsAgent，因为目标 URL 是 HTTPS (cloudcode-pa.googleapis.com)
axiosConfig.httpsAgent = proxyAgent axiosConfig.httpsAgent = proxyAgent
axiosConfig.proxy = false axiosConfig.proxy = false
logger.info( logger.info(
@@ -1500,7 +1500,6 @@ async function generateContent(
} else { } else {
// 没有代理时，使用 keepAlive agent 防止长时间请求被中断 // 没有代理时，使用 keepAlive agent 防止长时间请求被中断
axiosConfig.httpsAgent = keepAliveAgent axiosConfig.httpsAgent = keepAliveAgent
axiosConfig.httpAgent = keepAliveAgent
logger.debug('🌐 Using keepAlive agent for Gemini generateContent') logger.debug('🌐 Using keepAlive agent for Gemini generateContent')
} }
@@ -1570,7 +1569,8 @@ async function generateContentStream(
// 添加代理配置 // 添加代理配置
const proxyAgent = ProxyHelper.createProxyAgent(proxyConfig) const proxyAgent = ProxyHelper.createProxyAgent(proxyConfig)
if (proxyAgent) { if (proxyAgent) {
axiosConfig.httpAgent = proxyAgent // 只设置 httpsAgent，因为目标 URL 是 HTTPS (cloudcode-pa.googleapis.com)
// 同时设置 httpAgent 和 httpsAgent 可能导致 axios/follow-redirects 选择错误的协议
axiosConfig.httpsAgent = proxyAgent axiosConfig.httpsAgent = proxyAgent
axiosConfig.proxy = false axiosConfig.proxy = false
logger.info( logger.info(
@@ -1579,7 +1579,6 @@ async function generateContentStream(
} else { } else {
// 没有代理时，使用 keepAlive agent 防止长时间流式请求被中断 // 没有代理时，使用 keepAlive agent 防止长时间流式请求被中断
axiosConfig.httpsAgent = keepAliveAgent axiosConfig.httpsAgent = keepAliveAgent
axiosConfig.httpAgent = keepAliveAgent
logger.debug('🌐 Using keepAlive agent for Gemini streamGenerateContent') logger.debug('🌐 Using keepAlive agent for Gemini streamGenerateContent')
} }

6
src/services/geminiRelayService.js
View File

@@ -279,7 +279,7 @@ async function sendGeminiRequest({
// 添加代理配置 // 添加代理配置
const proxyAgent = createProxyAgent(proxy) const proxyAgent = createProxyAgent(proxy)
if (proxyAgent) { if (proxyAgent) {
axiosConfig.httpAgent = proxyAgent // 只设置 httpsAgent，因为目标 URL 是 HTTPS (cloudcode.googleapis.com)
axiosConfig.httpsAgent = proxyAgent axiosConfig.httpsAgent = proxyAgent
axiosConfig.proxy = false axiosConfig.proxy = false
logger.info(`🌐 Using proxy for Gemini API request: ${ProxyHelper.getProxyDescription(proxy)}`) logger.info(`🌐 Using proxy for Gemini API request: ${ProxyHelper.getProxyDescription(proxy)}`)
@@ -389,7 +389,7 @@ async function getAvailableModels(accessToken, proxy, projectId, location = 'us-
const proxyAgent = createProxyAgent(proxy) const proxyAgent = createProxyAgent(proxy)
if (proxyAgent) { if (proxyAgent) {
axiosConfig.httpAgent = proxyAgent // 只设置 httpsAgent，因为目标 URL 是 HTTPS (cloudcode.googleapis.com)
axiosConfig.httpsAgent = proxyAgent axiosConfig.httpsAgent = proxyAgent
axiosConfig.proxy = false axiosConfig.proxy = false
logger.info( logger.info(
@@ -492,7 +492,7 @@ async function countTokens({
// 添加代理配置 // 添加代理配置
const proxyAgent = createProxyAgent(proxy) const proxyAgent = createProxyAgent(proxy)
if (proxyAgent) { if (proxyAgent) {
axiosConfig.httpAgent = proxyAgent // 只设置 httpsAgent，因为目标 URL 是 HTTPS (cloudcode.googleapis.com)
axiosConfig.httpsAgent = proxyAgent axiosConfig.httpsAgent = proxyAgent
axiosConfig.proxy = false axiosConfig.proxy = false
logger.info( logger.info(