🐛 fix: better error handle

lobehub · Jan 15, 2024 · e3d0c26 · e3d0c26
1 parent 73cda65
commit e3d0c26
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/src/features/Settings.tsx b/src/features/Settings.tsx
@@ -8,8 +8,10 @@ import { Flexbox } from 'react-layout-kit';
 
 import { useStore } from '@/store';
 
-const getErrorContent = (errorType: string) => {
-  switch (errorType) {
+const getErrorContent = (errorType: string | { type: string }) => {
+  if (typeof errorType === 'string') return errorType;
+
+  switch (errorType.type) {
     case 'NO_BASE_URL': {
       return 'MIDJOURNEY API 代理地址为空，请填写后重试';
     }
@@ -36,7 +38,12 @@ const Settings = memo(() => {
       >
         <Flexbox gap={24}>
           {requestError && (
-            <Alert closable message={getErrorContent(requestError.type)} type={'error'} />
+            <Alert
+              closable
+              description={getErrorContent(requestError.body)}
+              message={`请求失败，错误码 ${requestError.status}`}
+              type={'error'}
+            />
           )}
           <Flexbox gap={12}>
             <div>MIDJOURNEY API 代理地址</div>

diff --git a/src/services/Midjourney.ts b/src/services/Midjourney.ts
@@ -70,15 +70,24 @@ class MidjourneyService {
       });
       if (!res.ok) {
         const body = await res.text();
-        throw new Error(body);
+        throw new Error(JSON.stringify({ body, message: res.statusText, status: res.status }));
       }
 
       return res.json();
     } catch (error) {
       // show Error
+      const requestError = JSON.parse((error as any).message);
+
+      let body = requestError.body;
+      try {
+        body = JSON.parse(requestError.body);
+      } catch {
+        /* empty */
+      }
+
       useStore.setState({
         isSettingsModalOpen: true,
-        requestError: JSON.parse((error as any).message),
+        requestError: { ...requestError, body },
       });
 
       return {};

diff --git a/src/store/initialState.ts b/src/store/initialState.ts
@@ -9,7 +9,7 @@ export interface AppState {
   inLobeChat?: boolean;
   isSettingsModalOpen: boolean;
   prompts: string;
-  requestError?: { type: string };
+  requestError?: { body: string | { type: string }; message: string; status: number };
   runningTaskIds: string[];
   settings: AppSettings;
   tasks: MidjourneyTask[];