@yh-ui/request 1.0.52 → 1.0.53

package/dist/http-cache.cjs

@@ -49,6 +49,9 @@ class HttpCache {
     if (!entry) return void 0;
     const now = Date.now();
     if (entry.expireTime && now > entry.expireTime) {
+      if (this.options.staleWhileRevalidate && now <= entry.expireTime + this.options.staleTime) {
+        return entry;
+      }
       this.cache.delete(key);
       return void 0;
     }
@@ -193,6 +196,7 @@ function createHttpCacheInterceptor(options = {}) {
         const key = `${response.config.method}:${response.config.fullPath || response.config.url}`;
         const entry = cache.get(key);
         if (entry) {
+          cache.set(key, entry.data, response.response);
           return {
             ...response,
             data: entry.data

package/dist/http-cache.mjs

@@ -35,6 +35,9 @@ export class HttpCache {
     if (!entry) return void 0;
     const now = Date.now();
     if (entry.expireTime && now > entry.expireTime) {
+      if (this.options.staleWhileRevalidate && now <= entry.expireTime + this.options.staleTime) {
+        return entry;
+      }
       this.cache.delete(key);
       return void 0;
     }
@@ -175,6 +178,7 @@ export function createHttpCacheInterceptor(options = {}) {
         const key = `${response.config.method}:${response.config.fullPath || response.config.url}`;
         const entry = cache.get(key);
         if (entry) {
+          cache.set(key, entry.data, response.response);
           return {
             ...response,
             data: entry.data

package/dist/request.cjs

@@ -71,8 +71,14 @@ function createRequestError(error, config, response) {
     requestError.isNetworkError = true;
     requestError.code = "NETWORK_ERROR";
   } else if (config?.signal?.aborted) {
-    requestError.isCanceled = true;
-    requestError.code = "CANCELED";
+    const isTimeout = err.message.toLowerCase().includes("timeout") || err.name === "TimeoutError" || (config.signal.reason instanceof Error ? config.signal.reason.message.toLowerCase().includes("timeout") : String(config.signal.reason).toLowerCase().includes("timeout"));
+    if (isTimeout) {
+      requestError.isTimeout = true;
+      requestError.code = "TIMEOUT";
+    } else {
+      requestError.isCanceled = true;
+      requestError.code = "CANCELED";
+    }
   } else if (response) {
     requestError.code = `HTTP_${response.status}`;
   }

package/dist/request.mjs

@@ -49,8 +49,14 @@ export function createRequestError(error, config, response) {
     requestError.isNetworkError = true;
     requestError.code = "NETWORK_ERROR";
   } else if (config?.signal?.aborted) {
-    requestError.isCanceled = true;
-    requestError.code = "CANCELED";
+    const isTimeout = err.message.toLowerCase().includes("timeout") || err.name === "TimeoutError" || (config.signal.reason instanceof Error ? config.signal.reason.message.toLowerCase().includes("timeout") : String(config.signal.reason).toLowerCase().includes("timeout"));
+    if (isTimeout) {
+      requestError.isTimeout = true;
+      requestError.code = "TIMEOUT";
+    } else {
+      requestError.isCanceled = true;
+      requestError.code = "CANCELED";
+    }
   } else if (response) {
     requestError.code = `HTTP_${response.status}`;
   }

package/dist/useLoadMore.cjs

@@ -40,6 +40,7 @@ function useLoadMore(service, options = {}) {
   const loadService = loadMoreService || service;
   const loadData = async (isRefresh = false) => {
     if (loading.value || loadingMore.value) return;
+    const requestedPage = current.value;
     const isLoadMoreOp = !isRefresh;
     loading.value = isLoadMoreOp ? false : true;
     if (isRefresh) refreshing.value = true;
@@ -55,7 +56,7 @@ function useLoadMore(service, options = {}) {
       }
       if (isRefresh) {
         data.value = pageData;
-        current.value = initialPage + 1;
+        current.value = requestedPage + 1;
       } else {
         const oldData = data.value;
         if (Array.isArray(oldData) && Array.isArray(pageData)) {
@@ -63,7 +64,7 @@ function useLoadMore(service, options = {}) {
         } else {
           data.value = pageData;
         }
-        current.value++;
+        current.value = requestedPage + 1;
       }
       onSuccess?.(pageData, params.value);
     } catch (err) {

package/dist/useLoadMore.mjs

@@ -34,6 +34,7 @@ export function useLoadMore(service, options = {}) {
   const loadService = loadMoreService || service;
   const loadData = async (isRefresh = false) => {
     if (loading.value || loadingMore.value) return;
+    const requestedPage = current.value;
     const isLoadMoreOp = !isRefresh;
     loading.value = isLoadMoreOp ? false : true;
     if (isRefresh) refreshing.value = true;
@@ -53,7 +54,7 @@ export function useLoadMore(service, options = {}) {
       }
       if (isRefresh) {
         data.value = pageData;
-        current.value = initialPage + 1;
+        current.value = requestedPage + 1;
       } else {
         const oldData = data.value;
         if (Array.isArray(oldData) && Array.isArray(pageData)) {
@@ -61,7 +62,7 @@ export function useLoadMore(service, options = {}) {
         } else {
           data.value = pageData;
         }
-        current.value++;
+        current.value = requestedPage + 1;
       }
       onSuccess?.(pageData, params.value);
     } catch (err) {

package/dist/usePagination.cjs

@@ -69,8 +69,16 @@ function usePagination(service, options = {}) {
   };
   const loadPage = async page => {
     if (page < 1 || totalPages.value > 0 && page > totalPages.value) return;
+    if (current.value === page) {
+      if (manual) {
+        await loadData();
+      }
+      return;
+    }
     current.value = page;
-    await loadData();
+    if (manual) {
+      await loadData();
+    }
   };
   const nextPage = async () => {
     if (noMore.value) return;
@@ -86,14 +94,31 @@ function usePagination(service, options = {}) {
     await loadPage(totalPages.value);
   };
   const refresh = async () => {
-    current.value = 1;
     refreshing.value = true;
-    await loadData();
+    if (current.value === 1) {
+      await loadData();
+    } else {
+      current.value = 1;
+      if (manual) {
+        await loadData();
+      }
+    }
   };
   const setPageSize = size => {
+    if (pageSize.value === size) {
+      if (manual) {
+        loadData();
+      }
+      return;
+    }
     pageSize.value = size;
-    if (!manual) {
-      refresh();
+    if (manual) {
+      if (current.value === 1) {
+        loadData();
+      } else {
+        current.value = 1;
+        loadData();
+      }
     }
   };
   const setTotal = newTotal => {
@@ -101,8 +126,11 @@ function usePagination(service, options = {}) {
   };
   (0, _vue.watch)(pageSize, () => {
     if (!manual) {
-      current.value = 1;
-      loadData();
+      if (current.value === 1) {
+        loadData();
+      } else {
+        current.value = 1;
+      }
     }
   });
   (0, _vue.watch)(current, () => {

package/dist/usePagination.mjs

@@ -60,8 +60,16 @@ export function usePagination(service, options = {}) {
   };
   const loadPage = async (page) => {
     if (page < 1 || totalPages.value > 0 && page > totalPages.value) return;
+    if (current.value === page) {
+      if (manual) {
+        await loadData();
+      }
+      return;
+    }
     current.value = page;
-    await loadData();
+    if (manual) {
+      await loadData();
+    }
   };
   const nextPage = async () => {
     if (noMore.value) return;
@@ -77,14 +85,31 @@ export function usePagination(service, options = {}) {
     await loadPage(totalPages.value);
   };
   const refresh = async () => {
-    current.value = 1;
     refreshing.value = true;
-    await loadData();
+    if (current.value === 1) {
+      await loadData();
+    } else {
+      current.value = 1;
+      if (manual) {
+        await loadData();
+      }
+    }
   };
   const setPageSize = (size) => {
+    if (pageSize.value === size) {
+      if (manual) {
+        loadData();
+      }
+      return;
+    }
     pageSize.value = size;
-    if (!manual) {
-      refresh();
+    if (manual) {
+      if (current.value === 1) {
+        loadData();
+      } else {
+        current.value = 1;
+        loadData();
+      }
     }
   };
   const setTotal = (newTotal) => {
@@ -92,8 +117,11 @@ export function usePagination(service, options = {}) {
   };
   watch(pageSize, () => {
     if (!manual) {
-      current.value = 1;
-      loadData();
+      if (current.value === 1) {
+        loadData();
+      } else {
+        current.value = 1;
+      }
     }
   });
   watch(current, () => {

package/dist/useQueue.cjs

@@ -20,6 +20,7 @@ function useQueue(options = {}) {
   } = options;
   const taskList = (0, _vue.reactive)([]);
   const taskMap = /* @__PURE__ */new Map();
+  const abortControllers = /* @__PURE__ */new Map();
   const isRunning = (0, _vue.ref)(false);
   const isPaused = (0, _vue.ref)(false);
   const currentTaskIds = /* @__PURE__ */new Set();
@@ -44,23 +45,34 @@ function useQueue(options = {}) {
   const totalCount = (0, _vue.computed)(() => tasks.value.length);
   const executeTask = async task => {
     if (task.status === "canceled" || task.status === "running") return;
+    const controller = new AbortController();
+    abortControllers.set(task.id, controller);
     task.status = "running";
     task.startTime = Date.now();
     currentTaskIds.add(task.id);
     triggerUpdate();
     try {
       if (task.delay && task.delay > 0) {
-        await new Promise(resolve => setTimeout(resolve, task.delay));
+        await new Promise((resolve, reject) => {
+          const timeoutId = setTimeout(resolve, task.delay);
+          controller.signal.addEventListener("abort", () => {
+            clearTimeout(timeoutId);
+            reject(new Error("Canceled"));
+          });
+        });
       }
-      if (task.status === "canceled") return;
-      const result = await task.task();
-      if (task.status === "canceled") return;
+      if (task.status === "canceled" || controller.signal.aborted) return;
+      const result = await task.task({
+        signal: controller.signal
+      });
+      if (task.status === "canceled" || controller.signal.aborted) return;
       task.status = "fulfilled";
       task.result = result;
       task.endTime = Date.now();
       triggerUpdate();
       onTaskComplete?.(task);
     } catch (error) {
+      if (task.status === "canceled" || controller.signal.aborted) return;
       task.status = "rejected";
       task.error = error instanceof Error ? error : new Error(String(error));
       task.endTime = Date.now();
@@ -71,6 +83,7 @@ function useQueue(options = {}) {
       }
     } finally {
       currentTaskIds.delete(task.id);
+      abortControllers.delete(task.id);
     }
   };
   const processQueue = () => {
@@ -131,6 +144,10 @@ function useQueue(options = {}) {
     taskMap.forEach(task => {
       if (task.status === "pending" || task.status === "running") {
         task.status = "canceled";
+        const controller = abortControllers.get(task.id);
+        if (controller) {
+          controller.abort();
+        }
       }
     });
     taskMap.clear();
@@ -159,22 +176,28 @@ function useQueue(options = {}) {
   const cancel = taskId => {
     const task = taskMap.get(taskId);
     if (task) {
-      if (task.status === "pending") {
-        task.status = "canceled";
+      const prevStatus = task.status;
+      task.status = "canceled";
+      const controller = abortControllers.get(taskId);
+      if (controller) {
+        controller.abort();
+      }
+      if (prevStatus === "pending") {
         taskMap.delete(taskId);
         const index = taskList.findIndex(t => t.id === taskId);
         if (index > -1) taskList.splice(index, 1);
-        triggerUpdate();
-      } else if (task.status === "running") {
-        task.status = "canceled";
-        triggerUpdate();
       }
+      triggerUpdate();
     }
   };
   const cancelAll = () => {
     taskMap.forEach(task => {
       if (task.status === "pending" || task.status === "running") {
         task.status = "canceled";
+        const controller = abortControllers.get(task.id);
+        if (controller) {
+          controller.abort();
+        }
       }
     });
     currentTaskIds.clear();

package/dist/useQueue.d.ts

@@ -8,7 +8,9 @@ export interface QueueTask<T = unknown> {
     /** 任务 key（用于去重） */
     key?: string;
     /** 任务函数 */
-    task: () => Promise<T>;
+    task: (options: {
+        signal: AbortSignal;
+    }) => Promise<T>;
     /** 任务优先级（数字越大优先级越高） */
     priority?: number;
     /** 任务状态 */
@@ -73,7 +75,9 @@ export interface UseQueueReturn<T = unknown> {
     /** 总数量 */
     totalCount: ComputedRef<number>;
     /** 添加任务 */
-    add: <R = unknown>(task: () => Promise<R>, options?: AddTaskOptions) => string;
+    add: <R = unknown>(task: (options: {
+        signal: AbortSignal;
+    }) => Promise<R>, options?: AddTaskOptions) => string;
     /** 移除任务 */
     remove: (taskId: string) => void;
     /** 清空队列 */

package/dist/useQueue.mjs

@@ -14,6 +14,7 @@ export function useQueue(options = {}) {
   } = options;
   const taskList = reactive([]);
   const taskMap = /* @__PURE__ */ new Map();
+  const abortControllers = /* @__PURE__ */ new Map();
   const isRunning = ref(false);
   const isPaused = ref(false);
   const currentTaskIds = /* @__PURE__ */ new Set();
@@ -40,23 +41,32 @@ export function useQueue(options = {}) {
   const totalCount = computed(() => tasks.value.length);
   const executeTask = async (task) => {
     if (task.status === "canceled" || task.status === "running") return;
+    const controller = new AbortController();
+    abortControllers.set(task.id, controller);
     task.status = "running";
     task.startTime = Date.now();
     currentTaskIds.add(task.id);
     triggerUpdate();
     try {
       if (task.delay && task.delay > 0) {
-        await new Promise((resolve) => setTimeout(resolve, task.delay));
+        await new Promise((resolve, reject) => {
+          const timeoutId = setTimeout(resolve, task.delay);
+          controller.signal.addEventListener("abort", () => {
+            clearTimeout(timeoutId);
+            reject(new Error("Canceled"));
+          });
+        });
       }
-      if (task.status === "canceled") return;
-      const result = await task.task();
-      if (task.status === "canceled") return;
+      if (task.status === "canceled" || controller.signal.aborted) return;
+      const result = await task.task({ signal: controller.signal });
+      if (task.status === "canceled" || controller.signal.aborted) return;
       task.status = "fulfilled";
       task.result = result;
       task.endTime = Date.now();
       triggerUpdate();
       onTaskComplete?.(task);
     } catch (error) {
+      if (task.status === "canceled" || controller.signal.aborted) return;
       task.status = "rejected";
       task.error = error instanceof Error ? error : new Error(String(error));
       task.endTime = Date.now();
@@ -67,6 +77,7 @@ export function useQueue(options = {}) {
       }
     } finally {
       currentTaskIds.delete(task.id);
+      abortControllers.delete(task.id);
     }
   };
   const processQueue = () => {
@@ -127,6 +138,10 @@ export function useQueue(options = {}) {
     taskMap.forEach((task) => {
       if (task.status === "pending" || task.status === "running") {
         task.status = "canceled";
+        const controller = abortControllers.get(task.id);
+        if (controller) {
+          controller.abort();
+        }
       }
     });
     taskMap.clear();
@@ -155,22 +170,28 @@ export function useQueue(options = {}) {
   const cancel = (taskId) => {
     const task = taskMap.get(taskId);
     if (task) {
-      if (task.status === "pending") {
-        task.status = "canceled";
+      const prevStatus = task.status;
+      task.status = "canceled";
+      const controller = abortControllers.get(taskId);
+      if (controller) {
+        controller.abort();
+      }
+      if (prevStatus === "pending") {
         taskMap.delete(taskId);
         const index = taskList.findIndex((t) => t.id === taskId);
         if (index > -1) taskList.splice(index, 1);
-        triggerUpdate();
-      } else if (task.status === "running") {
-        task.status = "canceled";
-        triggerUpdate();
       }
+      triggerUpdate();
     }
   };
   const cancelAll = () => {
     taskMap.forEach((task) => {
       if (task.status === "pending" || task.status === "running") {
         task.status = "canceled";
+        const controller = abortControllers.get(task.id);
+        if (controller) {
+          controller.abort();
+        }
       }
     });
     currentTaskIds.clear();

package/dist/useRequest.cjs

@@ -16,6 +16,16 @@ function setCache(key, value, cacheTime) {
     expireTime
   });
 }
+function getCache(key) {
+  const cached = globalCache.get(key);
+  if (cached) {
+    if (Date.now() < cached.expireTime) {
+      return cached.data;
+    }
+    globalCache.delete(key);
+  }
+  return void 0;
+}
 function useRequest(service, options = {}) {
   const {
     manual = false,
@@ -55,7 +65,9 @@ function useRequest(service, options = {}) {
     loading.value = true;
     error.value = void 0;
     try {
-      const response = await service(...runParams);
+      const response = await service(...runParams, {
+        signal: abortController.signal
+      });
       if (currentRunCount !== runCount.value) {
         const cancelError = new Error("Request canceled");
         cancelError.isCanceled = true;
@@ -95,10 +107,12 @@ function useRequest(service, options = {}) {
     }
   };
   const cancel = () => {
+    runCount.value++;
     if (abortController) {
       abortController.abort();
       abortController = null;
     }
+    cancelFn?.();
     loading.value = false;
   };
   const refresh = async () => {
@@ -166,6 +180,7 @@ function useRequestSWR(cacheKey, service, options = {}) {
   const {
     cacheTime = 10 * 60 * 1e3,
     setCache: customSetCache,
+    getCache: customGetCache,
     refreshOnWindowFocus = false,
     refreshDepsWait = 1e3,
     refreshDeps = [],
@@ -173,6 +188,7 @@ function useRequestSWR(cacheKey, service, options = {}) {
     ...requestOptions
   } = options;
   const setCacheFn = customSetCache || ((key, value) => setCache(key, value, cacheTime));
+  const getCacheFn = customGetCache || getCache;
   const getKey = () => {
     const key = typeof cacheKey === "function" ? cacheKey() : cacheKey;
     return key;
@@ -182,16 +198,35 @@ function useRequestSWR(cacheKey, service, options = {}) {
     data,
     error,
     params,
-    run,
+    run: originalRun,
     mutate,
     cancel,
-    refresh,
     disabled
-  } = useRequest(key => service(key), {
+  } = useRequest((key, options2) => service(key, options2), {
     manual,
     defaultParams: manual ? [] : [getKey()],
     ...requestOptions
   });
+  const initialKey = getKey();
+  if (initialKey) {
+    const cachedVal = getCacheFn(initialKey);
+    if (cachedVal !== void 0) {
+      data.value = cachedVal;
+    }
+  }
+  const swrRun = async key => {
+    const cachedVal = getCacheFn(key);
+    if (cachedVal !== void 0) {
+      data.value = cachedVal;
+    }
+    return originalRun(key);
+  };
+  const swrRefresh = async () => {
+    const key = params.value[0] || getKey();
+    if (key) {
+      await swrRun(key).catch(() => {});
+    }
+  };
   const updateCache = newData => {
     const key = getKey();
     if (key) {
@@ -205,27 +240,31 @@ function useRequestSWR(cacheKey, service, options = {}) {
   }, {
     immediate: true
   });
-  if (refreshOnWindowFocus && !manual) {
+  if (refreshOnWindowFocus && !manual && (0, _vue.getCurrentInstance)()) {
+    const handleFocus = () => {
+      const key = getKey();
+      if (key && !loading.value) {
+        swrRefresh();
+      }
+    };
     (0, _vue.onMounted)(() => {
-      const handleFocus = () => {
-        const key = getKey();
-        if (key && !loading.value) {
-          refresh();
-        }
-      };
       window.addEventListener("visibilitychange", handleFocus);
       window.addEventListener("focus", handleFocus);
-      (0, _vue.onUnmounted)(() => {
-        window.removeEventListener("visibilitychange", handleFocus);
-        window.removeEventListener("focus", handleFocus);
-      });
+    });
+    (0, _vue.onUnmounted)(() => {
+      window.removeEventListener("visibilitychange", handleFocus);
+      window.removeEventListener("focus", handleFocus);
     });
   }
   if (refreshDeps && refreshDeps.length > 0 && !manual) {
     (0, _vue.watch)(() => refreshDeps.map(dep => dep.value), () => {
       const key = getKey();
       if (key) {
-        setTimeout(() => run(key).catch(() => {}), refreshDepsWait);
+        const cachedVal = getCacheFn(key);
+        if (cachedVal !== void 0) {
+          data.value = cachedVal;
+        }
+        setTimeout(() => swrRun(key).catch(() => {}), refreshDepsWait);
       }
     }, {
       deep: true
@@ -238,10 +277,10 @@ function useRequestSWR(cacheKey, service, options = {}) {
     params,
     loadingMore: (0, _vue.ref)(false),
     noMore: (0, _vue.ref)(false),
-    run,
+    run: swrRun,
     mutate,
     cancel,
-    refresh,
+    refresh: swrRefresh,
     loadMore: async () => {
       return Promise.resolve();
     },

package/dist/useRequest.d.ts

@@ -14,7 +14,9 @@ export interface UseRequestOptions<TData, TParams extends unknown[] = unknown[]>
     /** 请求实例 */
     request?: Request;
     /** 请求函数 */
-    service?: (...args: TParams) => Promise<RequestResponse<TData>>;
+    service?: (...args: [...TParams, {
+        signal?: AbortSignal;
+    }?] | unknown[]) => Promise<RequestResponse<TData>>;
     /** 格式化返回数据 */
     formatResult?: (response: RequestResponse<TData>) => TData;
     /** 成功回调 */
@@ -108,7 +110,9 @@ export declare function useRequest<TData = unknown, TParams extends unknown[] =
  *   { cacheKey: 'user' }
  * )
  */
-export declare function useRequestSWR<TData = unknown>(cacheKey: string | (() => string), service: (key: string) => Promise<RequestResponse<TData>>, options?: UseRequestSWROptions<TData, [string]>): UseRequestReturn<TData, [string]>;
+export declare function useRequestSWR<TData = unknown>(cacheKey: string | (() => string), service: (key: string, options?: {
+    signal?: AbortSignal;
+}) => Promise<RequestResponse<TData>>, options?: UseRequestSWROptions<TData, [string]>): UseRequestReturn<TData, [string]>;
 /**
  * useRequestPolling - 带轮询的请求 Hook
  *

package/dist/useRequest.mjs

@@ -4,7 +4,8 @@ import {
   computed,
   watch,
   onMounted,
-  onUnmounted
+  onUnmounted,
+  getCurrentInstance
 } from "vue";
 import { debounce, throttle } from "@yh-ui/utils";
 const globalCache = /* @__PURE__ */ new Map();
@@ -12,6 +13,16 @@ function setCache(key, value, cacheTime) {
   const expireTime = Date.now() + (cacheTime || 5 * 60 * 1e3);
   globalCache.set(key, { data: value, expireTime });
 }
+function getCache(key) {
+  const cached = globalCache.get(key);
+  if (cached) {
+    if (Date.now() < cached.expireTime) {
+      return cached.data;
+    }
+    globalCache.delete(key);
+  }
+  return void 0;
+}
 export function useRequest(service, options = {}) {
   const {
     manual = false,
@@ -51,7 +62,7 @@ export function useRequest(service, options = {}) {
     loading.value = true;
     error.value = void 0;
     try {
-      const response = await service(...runParams);
+      const response = await service(...runParams, { signal: abortController.signal });
       if (currentRunCount !== runCount.value) {
         const cancelError = new Error("Request canceled");
         cancelError.isCanceled = true;
@@ -91,10 +102,12 @@ export function useRequest(service, options = {}) {
     }
   };
   const cancel = () => {
+    runCount.value++;
     if (abortController) {
       abortController.abort();
       abortController = null;
     }
+    cancelFn?.();
     loading.value = false;
   };
   const refresh = async () => {
@@ -173,6 +186,7 @@ export function useRequestSWR(cacheKey, service, options = {}) {
   const {
     cacheTime = 10 * 60 * 1e3,
     setCache: customSetCache,
+    getCache: customGetCache,
     refreshOnWindowFocus = false,
     refreshDepsWait = 1e3,
     refreshDeps = [],
@@ -180,15 +194,49 @@ export function useRequestSWR(cacheKey, service, options = {}) {
     ...requestOptions
   } = options;
   const setCacheFn = customSetCache || ((key, value) => setCache(key, value, cacheTime));
+  const getCacheFn = customGetCache || getCache;
   const getKey = () => {
     const key = typeof cacheKey === "function" ? cacheKey() : cacheKey;
     return key;
   };
-  const { loading, data, error, params, run, mutate, cancel, refresh, disabled } = useRequest((key) => service(key), {
-    manual,
-    defaultParams: manual ? [] : [getKey()],
-    ...requestOptions
-  });
+  const {
+    loading,
+    data,
+    error,
+    params,
+    run: originalRun,
+    mutate,
+    cancel,
+    disabled
+  } = useRequest(
+    (key, options2) => service(key, options2),
+    {
+      manual,
+      defaultParams: manual ? [] : [getKey()],
+      ...requestOptions
+    }
+  );
+  const initialKey = getKey();
+  if (initialKey) {
+    const cachedVal = getCacheFn(initialKey);
+    if (cachedVal !== void 0) {
+      data.value = cachedVal;
+    }
+  }
+  const swrRun = async (key) => {
+    const cachedVal = getCacheFn(key);
+    if (cachedVal !== void 0) {
+      data.value = cachedVal;
+    }
+    return originalRun(key);
+  };
+  const swrRefresh = async () => {
+    const key = params.value[0] || getKey();
+    if (key) {
+      await swrRun(key).catch(() => {
+      });
+    }
+  };
   const updateCache = (newData) => {
     const key = getKey();
     if (key) {
@@ -204,20 +252,20 @@ export function useRequestSWR(cacheKey, service, options = {}) {
     },
     { immediate: true }
   );
-  if (refreshOnWindowFocus && !manual) {
+  if (refreshOnWindowFocus && !manual && getCurrentInstance()) {
+    const handleFocus = () => {
+      const key = getKey();
+      if (key && !loading.value) {
+        swrRefresh();
+      }
+    };
     onMounted(() => {
-      const handleFocus = () => {
-        const key = getKey();
-        if (key && !loading.value) {
-          refresh();
-        }
-      };
       window.addEventListener("visibilitychange", handleFocus);
       window.addEventListener("focus", handleFocus);
-      onUnmounted(() => {
-        window.removeEventListener("visibilitychange", handleFocus);
-        window.removeEventListener("focus", handleFocus);
-      });
+    });
+    onUnmounted(() => {
+      window.removeEventListener("visibilitychange", handleFocus);
+      window.removeEventListener("focus", handleFocus);
     });
   }
   if (refreshDeps && refreshDeps.length > 0 && !manual) {
@@ -226,7 +274,11 @@ export function useRequestSWR(cacheKey, service, options = {}) {
       () => {
         const key = getKey();
         if (key) {
-          setTimeout(() => run(key).catch(() => {
+          const cachedVal = getCacheFn(key);
+          if (cachedVal !== void 0) {
+            data.value = cachedVal;
+          }
+          setTimeout(() => swrRun(key).catch(() => {
           }), refreshDepsWait);
         }
       },
@@ -240,10 +292,10 @@ export function useRequestSWR(cacheKey, service, options = {}) {
     params,
     loadingMore: ref(false),
     noMore: ref(false),
-    run,
+    run: swrRun,
     mutate,
     cancel,
-    refresh,
+    refresh: swrRefresh,
     loadMore: async () => {
       return Promise.resolve();
     },

package/dist/websocket.cjs

@@ -20,6 +20,9 @@ class WebSocketClient {
   heartbeatTimer = null;
   heartbeatTimeoutTimer = null;
   messageQueue = [];
+  isActivelyClosed = false;
+  messageIdCounter = 0;
+  pendingRequests = /* @__PURE__ */new Map();
   // 回调
   onOpenCallback = null;
   onCloseCallback = null;
@@ -84,6 +87,7 @@ class WebSocketClient {
    * 连接
    */
   connect() {
+    this.isActivelyClosed = false;
     return new Promise((resolve, reject) => {
       if (!isWebSocketSupported()) {
         const error = new Error("WebSocket is not supported in this environment");
@@ -118,6 +122,7 @@ class WebSocketClient {
    * 断开连接
    */
   disconnect(code = 1e3, reason = "Client disconnect") {
+    this.isActivelyClosed = true;
     this.clearTimers();
     this.setState("disconnecting");
     if (this.ws) {
@@ -125,6 +130,7 @@ class WebSocketClient {
       this.ws = null;
     }
     this.setState("disconnected");
+    this.rejectAllPendingRequests("WebSocket disconnected: " + reason);
   }
   /**
    * 发送消息
@@ -143,25 +149,24 @@ class WebSocketClient {
    */
   sendAndWait(data, timeout = 3e4) {
     return new Promise((resolve, reject) => {
-      const messageId = Date.now().toString();
+      const messageId = `msg_${Date.now()}_${++this.messageIdCounter}`;
       const timer = setTimeout(() => {
+        this.pendingRequests.delete(messageId);
         reject(new Error("WebSocket message timeout"));
       }, timeout);
-      const originalCallback = this.onMessageCallback;
-      this.onMessageCallback = message => {
-        const decoded = message.data;
-        if (decoded && decoded.id === messageId) {
-          clearTimeout(timer);
-          this.onMessageCallback = originalCallback;
-          resolve(decoded.result);
-        } else {
-          originalCallback?.(message);
-        }
-      };
-      this.send({
+      this.pendingRequests.set(messageId, {
+        resolve,
+        reject,
+        timer
+      });
+      const payload = typeof data === "object" && data !== null ? {
         id: messageId,
         ...data
-      });
+      } : {
+        id: messageId,
+        data
+      };
+      this.send(payload);
     });
   }
   /**
@@ -206,9 +211,10 @@ class WebSocketClient {
     this.ws = null;
     this.clearTimers();
     this.setState("disconnected");
-    if (this.options.reconnect && this.reconnectAttempts < this.options.reconnectMaxAttempts) {
+    if (!this.isActivelyClosed && this.options.reconnect && this.reconnectAttempts < this.options.reconnectMaxAttempts) {
       this.reconnect();
     }
+    this.rejectAllPendingRequests(`WebSocket disconnected: ${event.reason || "Closed"}`);
     this.onCloseCallback?.(event.code, event.reason);
   }
   handleError(event) {
@@ -234,6 +240,18 @@ class WebSocketClient {
       timestamp: Date.now()
     };
     this.lastMessage.value = message;
+    if (data && typeof data === "object") {
+      const decoded = data;
+      if (decoded.id && this.pendingRequests.has(decoded.id)) {
+        const pending = this.pendingRequests.get(decoded.id);
+        if (pending) {
+          clearTimeout(pending.timer);
+          this.pendingRequests.delete(decoded.id);
+          pending.resolve(decoded.result);
+          return;
+        }
+      }
+    }
     this.onMessageCallback?.(message);
   }
   reconnect() {
@@ -271,6 +289,13 @@ class WebSocketClient {
     }
     this.clearHeartbeatTimeout();
   }
+  rejectAllPendingRequests(reason = "WebSocket disconnected") {
+    for (const [, pending] of this.pendingRequests.entries()) {
+      clearTimeout(pending.timer);
+      pending.reject(new Error(reason));
+    }
+    this.pendingRequests.clear();
+  }
   /**
    * 清理资源
    */

package/dist/websocket.d.ts

@@ -62,6 +62,9 @@ export declare class WebSocketClient {
     private heartbeatTimer;
     private heartbeatTimeoutTimer;
     private messageQueue;
+    private isActivelyClosed;
+    private messageIdCounter;
+    private pendingRequests;
     private onOpenCallback;
     private onCloseCallback;
     private onErrorCallback;
@@ -111,6 +114,7 @@ export declare class WebSocketClient {
     private startHeartbeat;
     private clearHeartbeatTimeout;
     private clearTimers;
+    private rejectAllPendingRequests;
     /**
      * 清理资源
      */

package/dist/websocket.mjs

@@ -11,6 +11,9 @@ export class WebSocketClient {
   heartbeatTimer = null;
   heartbeatTimeoutTimer = null;
   messageQueue = [];
+  isActivelyClosed = false;
+  messageIdCounter = 0;
+  pendingRequests = /* @__PURE__ */ new Map();
   // 回调
   onOpenCallback = null;
   onCloseCallback = null;
@@ -75,6 +78,7 @@ export class WebSocketClient {
    * 连接
    */
   connect() {
+    this.isActivelyClosed = false;
     return new Promise((resolve, reject) => {
       if (!isWebSocketSupported()) {
         const error = new Error("WebSocket is not supported in this environment");
@@ -109,6 +113,7 @@ export class WebSocketClient {
    * 断开连接
    */
   disconnect(code = 1e3, reason = "Client disconnect") {
+    this.isActivelyClosed = true;
     this.clearTimers();
     this.setState("disconnecting");
     if (this.ws) {
@@ -116,6 +121,7 @@ export class WebSocketClient {
       this.ws = null;
     }
     this.setState("disconnected");
+    this.rejectAllPendingRequests("WebSocket disconnected: " + reason);
   }
   /**
    * 发送消息
@@ -134,22 +140,14 @@ export class WebSocketClient {
    */
   sendAndWait(data, timeout = 3e4) {
     return new Promise((resolve, reject) => {
-      const messageId = Date.now().toString();
+      const messageId = `msg_${Date.now()}_${++this.messageIdCounter}`;
       const timer = setTimeout(() => {
+        this.pendingRequests.delete(messageId);
         reject(new Error("WebSocket message timeout"));
       }, timeout);
-      const originalCallback = this.onMessageCallback;
-      this.onMessageCallback = (message) => {
-        const decoded = message.data;
-        if (decoded && decoded.id === messageId) {
-          clearTimeout(timer);
-          this.onMessageCallback = originalCallback;
-          resolve(decoded.result);
-        } else {
-          originalCallback?.(message);
-        }
-      };
-      this.send({ id: messageId, ...data });
+      this.pendingRequests.set(messageId, { resolve, reject, timer });
+      const payload = typeof data === "object" && data !== null ? { id: messageId, ...data } : { id: messageId, data };
+      this.send(payload);
     });
   }
   /**
@@ -194,9 +192,10 @@ export class WebSocketClient {
     this.ws = null;
     this.clearTimers();
     this.setState("disconnected");
-    if (this.options.reconnect && this.reconnectAttempts < this.options.reconnectMaxAttempts) {
+    if (!this.isActivelyClosed && this.options.reconnect && this.reconnectAttempts < this.options.reconnectMaxAttempts) {
       this.reconnect();
     }
+    this.rejectAllPendingRequests(`WebSocket disconnected: ${event.reason || "Closed"}`);
     this.onCloseCallback?.(event.code, event.reason);
   }
   handleError(event) {
@@ -222,6 +221,18 @@ export class WebSocketClient {
       timestamp: Date.now()
     };
     this.lastMessage.value = message;
+    if (data && typeof data === "object") {
+      const decoded = data;
+      if (decoded.id && this.pendingRequests.has(decoded.id)) {
+        const pending = this.pendingRequests.get(decoded.id);
+        if (pending) {
+          clearTimeout(pending.timer);
+          this.pendingRequests.delete(decoded.id);
+          pending.resolve(decoded.result);
+          return;
+        }
+      }
+    }
     this.onMessageCallback?.(message);
   }
   reconnect() {
@@ -263,6 +274,13 @@ export class WebSocketClient {
     }
     this.clearHeartbeatTimeout();
   }
+  rejectAllPendingRequests(reason = "WebSocket disconnected") {
+    for (const [, pending] of this.pendingRequests.entries()) {
+      clearTimeout(pending.timer);
+      pending.reject(new Error(reason));
+    }
+    this.pendingRequests.clear();
+  }
   /**
    * 清理资源
    */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yh-ui/request",
-  "version": "1.0.52",
+  "version": "1.0.53",
   "description": "YH-UI HTTP request hooks - Enterprise-grade request management",
   "type": "module",
   "sideEffects": false,
@@ -32,7 +32,7 @@
     "postpack": "node ../../scripts/prepare-package-manifest.mjs restore"
   },
   "dependencies": {
-    "@yh-ui/utils": "^1.0.52"
+    "@yh-ui/utils": "^1.0.53"
   },
   "devDependencies": {
     "vue": "^3.5.35",