etherreq 1.0.10 → 1.0.11

package/README.md

@@ -42,7 +42,6 @@ console.log(b1);
   };
 
 // 登录方法（自动保存 token）
-etherreq                                                                                                                                                                                                                                                             ;
   const login = async () => {
     const user={
     "id": 1,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "etherreq",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "description": "A lightweight custom HTTP request library.",
   "main": "src/index.js",
   "types": "src/types/etherreq.d.ts",

package/src/etherreq.js

@@ -10,62 +10,71 @@ export const create = (defaultConfig = {}) => {
     interceptors[type].push({ fulfilled, rejected });
   };
 
-  const dispatchRequest = async (config) => {
-    // 请求拦截器执行
-    for (const interceptor of interceptors.request) {
-      config = await interceptor.fulfilled(config);
-    }
+ const dispatchRequest = async (config) => {
+  // 请求拦截器执行
+  for (const interceptor of interceptors.request) {
+    config = await interceptor.fulfilled(config);
+  }
 
-    // 执行请求
-    let response;
-    try {
-      const { url, method = 'GET', headers = {}, body } = config;
+  let response;
+  try {
+    const { url, method = 'GET', headers = {}, body } = config;
 
-      const options = {
-        method,
-        headers,
-        body: method !== 'GET' ? JSON.stringify(body) : undefined,
-      };
+    const options = {
+      method,
+      headers,
+      body: method !== 'GET' ? JSON.stringify(body) : undefined,
+    };
 
-      const res = await fetch(url, options);
-      const data = await res.json();
-
-      // 手动处理 HTTP 错误状态
-if (!res.ok) {
-  const error = new Error(`HTTP 错误: ${res.status} - ${res.statusText}`);
-  error.response = {
-    data,
-    status: res.status,
-    statusText: res.statusText,
-    headers: res.headers,
-  };
-  throw error;
-}
+    const res = await fetch(url, options);
+
+    // 判断是否为 JSON 格式响应
+    const contentType = res.headers.get('content-type');
+    let data;
+
+    if (contentType && contentType.includes('application/json')) {
+      data = await res.json(); // 只有 JSON 内容才尝试解析
+    } else {
+      // 非 JSON 响应，可能是 HTML 页面（如登录重定向）
+      data = await res.text(); // 保存原始文本避免报错
+      throw new Error('非 JSON 响应，可能已跳转至登录页');
+    }
 
-      response = {
+    if (!res.ok) {
+      const error = new Error(`HTTP 错误: ${res.status} - ${res.statusText}`);
+      error.response = {
         data,
         status: res.status,
         statusText: res.statusText,
         headers: res.headers,
-        config,
       };
-    } catch (error) {
-      // 响应拦截器 - 错误处理
-      for (const interceptor of interceptors.response) {
-        if (interceptor.rejected) {
-          return interceptor.rejected(error);
-        }
-      }
       throw error;
     }
 
-    // 响应拦截器执行
+    response = {
+      data,
+      status: res.status,
+      statusText: res.statusText,
+      headers: res.headers,
+      config,
+    };
+  } catch (error) {
+    // 响应拦截器 - 错误处理
     for (const interceptor of interceptors.response) {
-      response = await interceptor.fulfilled(response);
+      if (interceptor.rejected) {
+        return interceptor.rejected(error);
+      }
     }
+    throw error;
+  }
 
-    return response;
-  };
+  // 响应拦截器执行
+  for (const interceptor of interceptors.response) {
+    response = await interceptor.fulfilled(response);
+  }
+
+  return response;
+};
 
   const instance = (config) => {
     return dispatchRequest({