oadmin/new-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🔧 fix(useApiRequest): improve playground SSE error handling and stream completion tracking

Browse Source
This commit is contained in:
RedwindA
2025-06-11 02:05:16 +08:00
parent 8ed68e4b12
commit bdb7c9cbd7
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
web/src/hooks/useApiRequest.js
View File

@@ -246,9 +246,11 @@ export const useApiRequest = (
let responseData = ''; let responseData = '';
let hasReceivedFirstResponse = false; let hasReceivedFirstResponse = false;
let isStreamComplete = false; // 添加标志位跟踪流是否正常完成
source.addEventListener('message', (e) => { source.addEventListener('message', (e) => {
if (e.data === '[DONE]') { if (e.data === '[DONE]') {
isStreamComplete = true; // 标记流正常完成
source.close(); source.close();
sseSourceRef.current = null; sseSourceRef.current = null;
setDebugData(prev => ({ ...prev, response: responseData })); setDebugData(prev => ({ ...prev, response: responseData }));
@@ -290,26 +292,30 @@ export const useApiRequest = (
}); });
source.addEventListener('error', (e) => { source.addEventListener('error', (e) => {
console.error('SSE Error:', e); // 只有在流没有正常完成且连接状态异常时才处理错误
const errorMessage = e.data || t('请求发生错误'); if (!isStreamComplete && source.readyState !== 2) {
console.error('SSE Error:', e);
const errorMessage = e.data || t('请求发生错误');
const errorInfo = handleApiError(new Error(errorMessage)); const errorInfo = handleApiError(new Error(errorMessage));
errorInfo.readyState = source.readyState; errorInfo.readyState = source.readyState;
setDebugData(prev => ({ setDebugData(prev => ({
...prev, ...prev,
response: responseData + '\n\nSSE Error:\n' + JSON.stringify(errorInfo, null, 2) response: responseData + '\n\nSSE Error:\n' + JSON.stringify(errorInfo, null, 2)
})); }));
setActiveDebugTab(DEBUG_TABS.RESPONSE); setActiveDebugTab(DEBUG_TABS.RESPONSE);
streamMessageUpdate(errorMessage, 'content'); streamMessageUpdate(errorMessage, 'content');
completeMessage(MESSAGE_STATUS.ERROR); completeMessage(MESSAGE_STATUS.ERROR);
sseSourceRef.current = null; sseSourceRef.current = null;
source.close(); source.close();
}
}); });
source.addEventListener('readystatechange', (e) => { source.addEventListener('readystatechange', (e) => {
if (e.readyState >= 2 && source.status !== undefined && source.status !== 200) { // 检查 HTTP 状态错误，但避免与正常关闭重复处理
if (e.readyState >= 2 && source.status !== undefined && source.status !== 200 && !isStreamComplete) {
const errorInfo = handleApiError(new Error('HTTP状态错误')); const errorInfo = handleApiError(new Error('HTTP状态错误'));
errorInfo.status = source.status; errorInfo.status = source.status;
errorInfo.readyState = source.readyState; errorInfo.readyState = source.readyState;
@@ -401,4 +407,4 @@ export const useApiRequest = (
streamMessageUpdate, streamMessageUpdate,
completeMessage, completeMessage,
}; };
}; };