From 50d6f1f8314e53eebcfb1bd576074f8fc5466c84 Mon Sep 17 00:00:00 2001
From: Wang Jiyuan <59059173+EurFelux@users.noreply.github.com>
Date: Sun, 22 Jun 2025 17:03:43 +0800
Subject: [PATCH] refactor(middleware): Add error property to CompletionResult
 and handle errors when checking API (#7407)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* refactor(aiCore): 添加错误处理

* remove console.log
---
 .../src/aiCore/middleware/common/ErrorHandlerMiddleware.ts  | 3 ++-
 src/renderer/src/aiCore/middleware/schemas.ts               | 2 +-
 src/renderer/src/services/ApiService.ts                     | 6 ++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/renderer/src/aiCore/middleware/common/ErrorHandlerMiddleware.ts b/src/renderer/src/aiCore/middleware/common/ErrorHandlerMiddleware.ts
index 8875a0b627..ad023e4285 100644
--- a/src/renderer/src/aiCore/middleware/common/ErrorHandlerMiddleware.ts
+++ b/src/renderer/src/aiCore/middleware/common/ErrorHandlerMiddleware.ts
@@ -25,7 +25,7 @@ export const ErrorHandlerMiddleware =
       // 尝试执行下一个中间件
       return await next(ctx, params)
     } catch (error: any) {
-      console.log('ErrorHandlerMiddleware_error', error)
+      console.error('ErrorHandlerMiddleware_error', error)
       // 1. 使用通用的工具函数将错误解析为标准格式
       const errorChunk = createErrorChunk(error)
       // 2. 调用从外部传入的 onError 回调
@@ -50,6 +50,7 @@ export const ErrorHandlerMiddleware =
         rawOutput: undefined,
         stream: errorStream, // 将包含错误的流传递下去
         controller: undefined,
+        error: typeof error?.message === 'string' ? error.message : 'unknown error',
         getText: () => '' // 错误情况下没有文本结果
       }
     }
diff --git a/src/renderer/src/aiCore/middleware/schemas.ts b/src/renderer/src/aiCore/middleware/schemas.ts
index 33d9816b4f..02d7199454 100644
--- a/src/renderer/src/aiCore/middleware/schemas.ts
+++ b/src/renderer/src/aiCore/middleware/schemas.ts
@@ -62,7 +62,7 @@ export interface CompletionsResult {
   rawOutput?: SdkRawOutput
   stream?: ReadableStream<SdkRawChunk> | ReadableStream<Chunk> | AsyncIterable<Chunk>
   controller?: AbortController
-
+  error?: string
   getText: () => string
 }
 
diff --git a/src/renderer/src/services/ApiService.ts b/src/renderer/src/services/ApiService.ts
index 46c5fd849c..b962ec8917 100644
--- a/src/renderer/src/services/ApiService.ts
+++ b/src/renderer/src/services/ApiService.ts
@@ -595,6 +595,9 @@ export async function checkApi(provider: Provider, model: Model): Promise<void>
 
       // Try streaming check first
       const result = await ai.completions(params)
+      if (result.error) {
+        throw new Error(result.error)
+      }
       if (!result.getText()) {
         throw new Error('No response received')
       }
@@ -608,6 +611,9 @@ export async function checkApi(provider: Provider, model: Model): Promise<void>
         streamOutput: false
       }
       const result = await ai.completions(params)
+      if (result.error) {
+        throw new Error(result.error)
+      }
       if (!result.getText()) {
         throw new Error('No response received')
       }