etherreq 1.0.37 → 1.0.39

package/package.json

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

package/src/etherreq.js

@@ -15,14 +15,17 @@ export const create = (defaultConfig = {}) => {
 const dispatchRequest = async (config) => {
   // 请求拦截器执行
   for (const interceptor of interceptors.request) {
-    config = await interceptor.fulfilled(config);
+    const nextConfig = await interceptor.fulfilled(config);
+    // ✅ 拦截器可以返回一个 response 对象，表示中断请求
+    if (nextConfig && nextConfig.isFromCache) {
+      return nextConfig; // ✅ 直接返回缓存结果，不再往下执行
+    }
+    config = nextConfig;
   }
 
   let response;
-
   const { url, method = 'GET', headers = {}, body } = config;
-  
-  let text = ''; // ✅ 提前定义 text 变量
+  let text = '';
 
   try {
     const options = {
@@ -33,21 +36,17 @@ const dispatchRequest = async (config) => {
 
     const res = await fetch(url, options);
 
-    // 先读取文本判断是否是 HTML
-    text = await res.text(); // ✅ 赋值给外部定义的 text
+    text = await res.text();
 
     if (!res.ok) {
       throw new Error(`HTTP 错误: ${res.status} - ${res.statusText}`);
     }
 
-    // 判断是否是 HTML 内容
     if (text.trim().startsWith('<')) {
-      console.log(text);
-      
       throw new Error('服务器返回了 HTML 页面，预期为 JSON 格式');
     }
 
-    const data = JSON.parse(text); // 安全解析
+    const data = JSON.parse(text);
 
     response = {
       data,
@@ -58,8 +57,6 @@ const dispatchRequest = async (config) => {
     };
   } catch (error) {
     error.message += `\n请求地址: ${url}`;
-    
-    // ✅ 安全地添加 text 信息（如果存在）
     if (text) {
       error.message += `\n响应内容: ${text.substring(0, 200)}...`;
     }

package/src/request.js

@@ -17,22 +17,22 @@ instance.interceptors.request.use((config) => {
     'Content-Type': 'application/json',
   };
 
-  // GET 请求启用缓存
   if (config.method === 'GET' && !config.disableCache) {
     const cacheKey = getCacheKey(config.url, config);
     const cached = requestCache.get(cacheKey);
-    console.log("缓存数据:",cached);
+    console.log("缓存数据:", cached);
 
-   if (cached) {
-  console.log("缓存命中");
-  const fakeResponse = {
-    data: cached, // 确保和 response.data 一致
-    status: 200,
-    statusText: 'OK',
-    config,
-  };
-  return Promise.resolve(fakeResponse);
-}
+    if (cached) {
+      console.log("缓存命中");
+      const fakeResponse = {
+        data: cached,
+        status: 200,
+        statusText: 'OK',
+        config,
+        isFromCache: true, // ✅ 添加标志位
+      };
+      return Promise.resolve(fakeResponse); // ✅ 返回响应对象，中断请求链
+    }
   }
 
   return {