etherreq 1.0.32 → 1.0.34

package/package.json

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

package/src/etherreq.js

@@ -11,70 +11,66 @@ export const create = (defaultConfig = {}) => {
   };
 
   // ✅ 使用 const 显式声明 dispatchRequest
-  const dispatchRequest = async (config) => {
-    // 请求拦截器执行
-    for (const interceptor of interceptors.request) {
-      config = await interceptor.fulfilled(config);
-    }
+// etherreq.js
+const dispatchRequest = async (config) => {
+  // 请求拦截器执行
+  for (const interceptor of interceptors.request) {
+    config = await interceptor.fulfilled(config);
+  }
 
-    let response;
-
-    const { url, method = 'GET', headers = {}, body } = config;
-    try {
-      const options = {
-        method,
-        headers,
-        body: method !== 'GET' ? JSON.stringify(body) : undefined,
-      };
-
-      const res = await fetch(url, options);
-      const data = await res.json();
-
-      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,
-        };
-        throw error;
-      }
+  let response;
 
-      response = {
-        data,
-        status: res.status,
-        statusText: res.statusText,
-        headers: res.headers,
-        config,
-      };
-    } catch (error) {
-      // 确保 error 对象始终有 config 字段
-      error.config = config;
-
-      // 响应拦截器 - 错误处理
-      for (const interceptor of interceptors.response) {
-        if (interceptor.rejected) {
-          return interceptor.rejected(error);
-        }
-      }
+  const { url, method = 'GET', headers = {}, body } = config;
+  try {
+    const options = {
+      method,
+      headers,
+      body: method !== 'GET' ? JSON.stringify(body) : undefined,
+    };
+
+    const res = await fetch(url, options);
+
+    // 先读取文本判断是否是 HTML
+    const text = await res.text();
+
+    if (!res.ok) {
+      throw new Error(`HTTP 错误: ${res.status} - ${res.statusText}`);
+    }
 
-      throw error;
+    // 判断是否是 HTML 内容
+    if (text.trim().startsWith('<')) {
+      throw new Error('服务器返回了 HTML 页面，预期为 JSON 格式');
     }
 
-    // 响应拦截器执行
+    const data = JSON.parse(text); // 安全解析
+
+    response = {
+      data,
+      status: res.status,
+      statusText: res.statusText,
+      headers: res.headers,
+      config,
+    };
+  } catch (error) {
+    error.config = config;
+    error.message += `\n请求地址: ${url}\n响应内容: ${text?.substring(0, 200)}...`;
+
     for (const interceptor of interceptors.response) {
-      try {
-        response = await interceptor.fulfilled(response);
-      } catch (err) {
-        // 捕获响应拦截器中的异常并抛出
-        throw err;
+      if (interceptor.rejected) {
+        return interceptor.rejected(error);
       }
     }
 
-    return response;
-  };
+    throw error;
+  }
+
+  // 响应拦截器执行
+  for (const interceptor of interceptors.response) {
+    response = await interceptor.fulfilled(response);
+  }
+
+  return response;
+};
 
   const instance = (config) => {
     return dispatchRequest({

package/src/request.js

@@ -23,25 +23,16 @@ instance.interceptors.request.use((config) => {
     const cached = requestCache.get(cacheKey);
     console.log("缓存数据:",cached);
 
-    if (cached) {
-      console.log("缓存命中");
-      // return Promise.resolve(cached); // 这里返回的就是 response.data
-      const a={
-  "data": {
-    "id": 123,
-    "name": "张三",
-    "email": "zhangsan@example.com"
-  },
-  "status": 200,
-  "statusText": "OK",
-  "headers": {
-    "content-type": "application/json"
-  }
+   if (cached) {
+  console.log("缓存命中");
+  const fakeResponse = {
+    data: cached, // 确保和 response.data 一致
+    status: 200,
+    statusText: 'OK',
+    config,
+  };
+  return Promise.resolve(fakeResponse);
 }
-console.log("返回数据:");
-console.log("返回数据:",a);
-      return a;
-    }
   }
 
   return {
@@ -52,16 +43,20 @@ console.log("返回数据:",a);
 
 // 响应拦截器：自动提取 response.data 并写入缓存
 instance.interceptors.response.use(
-  (response) => {
+    (response) => {
+    // 判断是否是缓存返回的数据（没有 .config）
+    if (!response.config && response.data !== undefined) {
+      // 已经是 data，直接返回
+      return response;
+    }
+
     const config = response.config;
 
     if (config && config.method === 'GET' && !config.disableCache) {
       const cacheKey = getCacheKey(config.url, config);
-      // ✅ 只缓存 response.data，避免缓存整个 response 对象
       requestCache.set(cacheKey, response.data);
     }
-
-    return response.data; // ✅ 正常请求也只返回 data 字段
+    return response.data;
   },
   (error) => {
     console.error('请求异常:', error);