完善错误提示

src/actions/base.ts

@@ -20,12 +20,12 @@ const _callPublic = cache(async <R = undefined>(
   data?: string,
 ): Promise<ApiResponse<R>> => {
   return call(`${API_BASE_URL}${endpoint}`, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: data,
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
     },
+    body: data,
+  },
   )
 })
 
@@ -113,24 +113,17 @@ const _callByUser = cache(async <R = undefined>(
 // ======================
 
 async function call<R = undefined>(url: string, request: RequestInit): Promise<ApiResponse<R>> {
-  const response = await fetch(url, request)
-  const type = response.headers.get('Content-Type') ?? 'text/plain'
-  if (type.indexOf('application/json') !== -1) {
-    const json = await response.json()
-    if (!response.ok) {
-      console.log('后端请求失败', url, `status=${response.status}`, json)
-      return {
-        success: false,
-        status: response.status,
-        message: json.message || '请求失败',
-      }
-    }
-    return {
-      success: true,
-      data: json,
-    }
+  let response: Response
+  try {
+    response = await fetch(url, request)
   }
-  else if (type.indexOf('text/plain') !== -1) {
+  catch (e) {
+    console.error('后端请求失败', url, (e as Error).message)
+    throw new Error(`请求失败，网络错误`)
+  }
+
+  const type = response.headers.get('Content-Type') ?? 'text/plain'
+  if (type.indexOf('text/plain') !== -1) {
     const text = await response.text()
     if (!response.ok) {
       console.log('后端请求失败', url, `status=${response.status}`, text)
@@ -141,12 +134,30 @@ async function call<R = undefined>(url: string, request: RequestInit): Promise<A
       }
     }
 
-    console.log('未处理的响应成功', `type=text`, `text=${text}`)
+    if (!!text?.trim()?.length) {
+      console.log('未处理的响应成功', `type=text`, `text=${text}`)
+    }
     return {
       success: true,
       data: undefined as R, // 强转类型，考虑优化
     }
   }
+  else if (type.indexOf('application/json') !== -1) {
+    const json = await response.json()
+    if (!response.ok) {
+      console.log('后端请求失败', url, `status=${response.status}`, json)
+
+      return {
+        success: false,
+        status: response.status,
+        message: json.message || json.error_description || '请求失败' // 业务错误（message）或者 oauth 错误（error_description）
+      }
+    }
+    return {
+      success: true,
+      data: json,
+    }
+  }
 
   throw new Error(`无法解析响应数据，未处理的 Content-Type: ${type}`)
 }
@@ -163,8 +174,7 @@ async function postCall<R = undefined>(rawResp: Promise<ApiResponse<R>>) {
   ].some(item => item.test(pathname))
 
   if (match && !resp.success && resp.status === 401) {
-    console.log('!!!!!!!!!redirect', '"', pathname, '"', resp.message)
-    redirect(pathname === '/' ? '/login' : `/login?redirect=${pathname}`)
+    redirect('/login?force=true')
   }
 
   return resp