Skip to content

Commit 800dabc

Browse files
committed
fix: 修复未等待salt初始化导致的tokenId为空的情况
1 parent d0b9086 commit 800dabc

5 files changed

Lines changed: 10 additions & 7 deletions

File tree

src/auth/token_manager.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1118,15 +1118,16 @@ class TokenManager {
11181118
/**
11191119
* 根据 token 对象获取 tokenId
11201120
* @param {Object} token - Token 对象
1121-
* @returns {string|null} tokenId,如果无法生成返回 null
1121+
* @returns {Promise<string|null>} tokenId,如果无法生成返回 null
11221122
*/
1123-
getTokenId(token) {
1123+
async getTokenId(token) {
11241124
if (!token?.refresh_token) return null;
11251125
try {
1126-
const salt = this.store._salt;
1126+
const salt = await this.store.getSalt();
11271127
if (!salt) return null;
11281128
return generateTokenId(token.refresh_token, salt);
11291129
} catch (error) {
1130+
log.error(`生成tokenId失败: ${error.message}`);
11301131
return null;
11311132
}
11321133
}

src/server/handlers/claude.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export const handleClaudeRequest = async (req, res, isStream) => {
6868
}
6969

7070
// 获取 tokenId 用于冷却状态管理
71-
const tokenId = tokenManager.getTokenId(token);
71+
const tokenId = await tokenManager.getTokenId(token);
7272

7373
// 创建刷新额度的回调函数
7474
const refreshQuota = async () => {

src/server/handlers/gemini.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ export const handleGeminiRequest = async (req, res, modelName, isStream) => {
115115
}
116116

117117
// 获取 tokenId 用于冷却状态管理
118-
const tokenId = tokenManager.getTokenId(token);
118+
const tokenId = await tokenManager.getTokenId(token);
119119

120120
// 创建刷新额度的回调函数
121121
const refreshQuota = async () => {

src/server/handlers/openai.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ export const handleOpenAIRequest = async (req, res) => {
4949
}
5050

5151
// 获取 tokenId 用于冷却状态管理
52-
const tokenId = tokenManager.getTokenId(token);
52+
const tokenId = await tokenManager.getTokenId(token);
53+
5354

5455
// 创建刷新额度的回调函数
5556
const refreshQuota = async () => {

src/utils/converters/openai.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ function handleAssistantMessage(message, antigravityMessages, enableThinking, ac
4848
const hasToolCalls = message.tool_calls && message.tool_calls.length > 0;
4949
const hasContent = message.content && message.content.trim() !== '';
5050
const { reasoningSignature, reasoningContent, toolSignature, toolContent } = getSignatureContext(sessionId, actualModelName, hasTools);
51-
51+
5252
const toolCalls = hasToolCalls
5353
? message.tool_calls.map(toolCall => {
5454
const safeName = processToolName(toolCall.function.name, sessionId, actualModelName);
@@ -89,6 +89,7 @@ function handleAssistantMessage(message, antigravityMessages, enableThinking, ac
8989
parts.push(part);
9090
}
9191
if (!enableThinking && parts[0]) delete parts[0].thoughtSignature;
92+
log.debug(`antigravityMessages:${antigravityMessages}`)
9293

9394
pushModelMessage({ parts, toolCalls, hasContent }, antigravityMessages);
9495
}

0 commit comments

Comments
 (0)