vue3-request 1.0.24 → 1.0.26

package/README.md

@@ -1,36 +1,33 @@
-更多内容请查看文档 -> [**文档**](https://fslflame.github.io/vue3-request/)
+更多内容请查看<a href="https://Flame-00.github.io/vue3-request/" target="_blank">文档</a>
 
-## 核心解决方案
+[演练场](https://codesandbox.io/p/devbox/yrxqp8)
+
+## 核心优势
 
 Vue3-Request 是一个专为 Vue 3 设计的异步请求处理库，它通过统一的 useRequest Hook 和强大的插件生态，彻底简化了异步操作和 API 调用的复杂性：
 
 ✨ 统一状态管理
 
 - 🚀 所有数据都具有响应式
-- 📊 自动管理 loading、data、error、signal、params 等状态
+- 📊 自动管理 loading、data、res、error、signal、params 等状态
 - 🔄 提供 run、runAsync、refresh、cancel、abort 等便捷方法
 - 🎛️ 支持手动和自动执行模式，满足不同业务场景
 
 🧩 强大的插件生态 内置 9 大核心插件，开箱即用：
 
-- <img src="https://fslflame.github.io/vue3-request/cancel.svg" alt="取消请求" width="20" height="20" /> 请求中止 - 自动生成 AbortSignal 中止过期请求，避免状态污染和竞态条件问题
-- 🔄 错误重试 - 智能重试机制，提升请求成功率
-- ⚡ 防抖节流 - 优化用户交互，减少无效请求
-- 💾 智能缓存 - 提升用户体验，减少服务器压力
-- 🔁 轮询请求 - 实时数据同步，支持动态控制
-- 👁️ 窗口聚焦刷新 - 用户回到页面时自动刷新数据
-- 📦 依赖刷新 - 响应式依赖变化，自动触发请求
-- ⏳ 准备状态控制 - 条件请求执行，精确控制时机
-- 💻 完整 TypeScript 支持 - 类型安全，智能提示
-- 🔌 框架无关 - 兼容 Axios、Fetch 等任意请求库
-- 📝 丰富的生命周期 - onBefore、onSuccess、onError、onFinally
-- 🎨 可扩展架构 - 支持自定义插件，满足特殊需求
-- 📚 完善文档 - 详尽示例，快速上手
-
-## 为什么选择 Vue3-Request？
-
-在一个充满挑战的异步世界中，Vue3-Request 不仅仅是一个工具库，更是你的开发伙伴。它让复杂的异步逻辑变得简单优雅，让重复的样板代码成为历史，让你可以专注于真正重要的业务逻辑。
-从简单的数据获取到复杂的业务场景，从性能优化到用户体验，Vue3-Request 都为你提供了最佳实践的解决方案。让我们一起拥抱更高效、更优雅的异步编程方式！
+- <img src="https://Flame-00.github.io/vue3-request/cancel.svg" alt="取消请求" width="20" height="20" /> 请求中止
+- 🔄 错误重试
+- ⚡ 防抖节流
+- 💾 智能缓存
+- 🔁 轮询请求
+- 👁️ 窗口聚焦刷新
+- 📦 依赖刷新
+- ⏳ 准备状态控制
+- 💻 完整 TypeScript 支持
+- 🔌 框架无关
+- 📝 丰富的生命周期
+- 🎨 可扩展架构
+- 📚 完善文档
 
 ## ⚡ 快速安装
 

package/dist/vue3-request.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=require("vue"),b=e=>e,C=e=>e==null,S=typeof window>"u";function M(e){return C(e)?e:typeof e=="number"&&!isNaN(e)}function p(e,t){return M(e)===void 0?{is:!1,value:0}:M(e)?t&&e===-1?{is:!0,value:-1}:{is:!0,value:e===0||e&&e<0?0:e}:{is:!1,value:0}}const q=(e,t)=>{let n=t;for(let s=e.length;s-- >0;){const r=e[s];n=r(n)}return n?.()},F=()=>new Promise(()=>{}),j=e=>e instanceof Function,y=new Map,N=(e,t,{data:n,params:s,time:r})=>{let u;const a=L(e),{is:o,value:l}=p(t,!0);o&&(a?.timer&&clearTimeout(a.timer),l!==-1&&(u=setTimeout(()=>{E(e)},l)),y.set(e,{data:n,params:s,time:r,timer:u}))},L=e=>y.get(e),E=e=>{e&&typeof e=="string"?y.delete(e):y.clear()};class U{constructor(t,n){this.service=t,this.options=n,this.state=i.reactive({data:void 0,error:void 0,params:n?.defaultParams||[],loading:!1,isFinished:!1,isAborted:!1,signal:new AbortController().signal})}currentRequestId=0;pluginImpls=[];state;abort=()=>{};setState=t=>{Object.assign(this.state,t)};executePlugin=(t,...n)=>{if(t==="onRequest")return{servicePromise:q(this.pluginImpls.map(r=>r.onRequest).filter(Boolean),n[0])};{const s=this.pluginImpls.map(r=>r[t]?.(...n)).filter(Boolean);return Object.assign({},...s)}};loading=t=>{this.setState({loading:t,isFinished:!t})};onFinished=()=>{this.executePlugin("onFinally",this.state.params,this.state.data,this.state.error),this.loading(!1),this.options.onFinally?.(this.state.params,this.state.data,this.state.error)};runAsync=async(...t)=>{const n=++this.currentRequestId,{isReturn:s,isReady:r,...u}=this.executePlugin("onBefore",t);if(!r)return F();if(this.setState({params:t,...u}),this.loading(!0),s)return this.loading(!1),u.data;this.options.onBefore?.(t);try{const a=()=>this.service(...t);let{servicePromise:o}=this.executePlugin("onRequest",a);o||(o=a());const l=await o;return n!==this.currentRequestId?F():(this.setState({data:l,error:void 0}),this.executePlugin("onSuccess",l,t),this.options.onSuccess?.(l,t),this.onFinished(),l)}catch(a){if(n!==this.currentRequestId)return F();const o=a;throw this.setState({data:void 0,error:o}),this.executePlugin("onError",o,t),this.options.onError?.(o,t),this.onFinished(),o}};run=(...t)=>{this.runAsync(...t).catch(n=>{this.options.onError})};refresh=()=>{this.run(...this.state.params)};refreshAsync=async()=>await this.runAsync(...this.state.params);mutate=t=>{j(t)?t(this.state.data):this.setState({data:t}),this.executePlugin("onMutate",this.state.data)};cancel=()=>{this.executePlugin("onCancel"),this.currentRequestId++,this.loading(!1)}}function D(e,t,n){const s={manual:!1,...t},r=new U(e,s);r.pluginImpls=n.map(m=>m(r,s)),i.onMounted(()=>{if(!s.manual){const m=r.state.params;r.run(...m)}}),i.onUnmounted(r.cancel);const{run:u,cancel:a,refresh:o,runAsync:l,refreshAsync:v,abort:f,mutate:g}=r;return{...i.toRefs(r.state),run:u,cancel:a,refresh:o,runAsync:l,mutate:g,abort:f,refreshAsync:v,clearCache:E}}const W=b((e,{abortPrevious:t=!0})=>{let n=null;const s=()=>{n=new AbortController,e.setState({signal:n.signal,isAborted:n.signal.aborted})};return e.abort=()=>{n&&!n.signal.aborted&&!e.state.isFinished&&(n.abort(),e.setState({isAborted:n.signal.aborted}))},{onBefore:()=>{typeof t=="boolean"&&t&&e.abort(),s()},onRequest:r=>()=>r(),onCancel:()=>{e.abort(),n=null}}}),R=new Map,_=(e,{data:t,params:n,time:s})=>{R.has(e)&&R.get(e)?.forEach(u=>u({data:t,params:n,time:s}))},V=(e,t)=>(R.has(e)?R.get(e)?.add(t):R.set(e,new Set),()=>{const n=R.get(e);n?.delete(t),n?.size===0&&R.delete(e)}),P=new Map,H=(e,t)=>{P.set(e,t),t.then(()=>{}).catch(()=>{}).finally(()=>{z(e)})},$=e=>P.get(e),z=e=>{e&&typeof e=="string"?P.delete(e):P.clear()},J=b((e,{cacheKey:t,cacheTime:n=3e5,staleTime:s=0,setCache:r,getCache:u})=>{const a=i.ref(null);let o=null;const{is:l,value:v}=p(s,!0);if(!l)return{};const f=typeof t=="function"?t:()=>t,g=(d,c)=>{r?r(d,c):N(d,n,c),_(d,c)},m=d=>u?u(d):L(d);function w(){const d=f();if(!d)return;const c=m(d);c&&Reflect.has(c,"data")&&e.setState({data:c.data,params:c.params}),a.value=V(d,h=>{e.setState({data:h.data})})}return w(),i.onUnmounted(()=>{a.value?.()}),{onBefore:d=>{const c=f(d);if(!c)return null;const h=m(c);return!h||!Reflect.has(h,"data")?{}:v===-1||Date.now()-h.time<v?{data:h.data,error:void 0,isReturn:!0}:{data:h.data,error:void 0}},onRequest:d=>{const c=f(e.state.params);if(!c)return d;let h=$(c);return h&&h!==o?()=>h:(h=d(),o=h,H(c,h),()=>h)},onSuccess:(d,c)=>{const h=f(c);h&&(a.value?.(),g(h,{data:d,params:c,time:Date.now()}),a.value=V(h,O=>{e.setState({data:O.data})}))},onMutate(d){const c=f(e.state.params);c&&(a.value?.(),g(c,{data:d,params:e.state.params,time:Date.now()}),a.value=V(c,h=>{e.setState({data:h.data})}))}}}),Q=b((e,{errorRetryCount:t=0,errorRetryInterval:n})=>{const s=i.ref(),r=i.ref(0),u=i.ref(!1),a=i.computed(()=>1e3*Math.pow(2,r.value)),o=()=>{let f=null;r.value++;const{value:g}=p(i.toValue(t),!0),m=g===-1,w=r.value<=g;if(m||w){let{is:d,value:c}=p(i.toValue(n));d||(c=i.toValue(Math.min(a.value,3e4))),f=setTimeout(()=>{u.value=!0,e.refresh()},c)}return()=>{f&&clearTimeout(f)}},l=()=>{s.value?.()},{is:v}=p(i.toValue(t),!0);return v?{onBefore:()=>{u.value||(r.value=0),u.value=!1,l()},onSuccess:()=>{r.value=0},onError:()=>{s.value=o()},onCancel:()=>{r.value=0,l()}}:{}}),x=()=>S||C(window.document?.visibilityState)?!0:document.visibilityState==="visible",T=new Set,X=e=>(T.add(e),()=>{T.delete(e)}),Y=()=>{x()&&T.forEach(e=>{e()})};!S&&window?.addEventListener&&window.addEventListener("visibilitychange",Y,!1);const Z=b((e,{pollingInterval:t,pollingWhenHidden:n=!0,errorRetryCount:s})=>{const r=i.ref(null),u=i.ref(),a=()=>{let o;const{value:l}=p(i.toValue(s),!0);if(e.state.error&&l!==0)return;const{is:v,value:f}=p(i.toValue(t));return v?(o=setTimeout(()=>{!i.toValue(n)&&!x()?r.value=X(e.refresh):e.refresh()},f),()=>{o&&clearTimeout(o),r.value?.()}):void 0};return i.watch([()=>i.toValue(t),()=>i.toValue(n)],()=>{u.value?.(),u.value=a()}),i.onUnmounted(()=>{r.value?.()}),{onBefore:()=>{u.value?.()},onCancel:()=>{u.value?.()},onFinally:()=>{u.value=a()}}}),G=b((e,{manual:t,refreshDeps:n,refreshDepsAction:s})=>{if(C(n)||typeof n!="object"&&typeof n!="function")return{};const r=i.watch(n,()=>{t||(s?s():e.refresh())},{deep:!0});return{onCancel:()=>{r()}}}),k=()=>(!S&&window.navigator?.onLine)??!0,A=new Set,I=e=>(A.add(e),()=>{A.delete(e)}),B=()=>{!x()||!k()||A.forEach(e=>{e()})};!S&&window?.addEventListener&&(window.addEventListener("visibilitychange",B,!1),window.addEventListener("focus",B,!1));const K=b((e,{refocusTimespan:t=5e3,refreshOnWindowFocus:n=!1})=>{const s=i.ref(),{is:r}=p(i.toValue(t));if(!r||C(i.toValue(n))||typeof i.toValue(n)!="boolean")return{};const u=(a,o)=>{let l=!1;return()=>{l||(l=!0,a(),setTimeout(()=>{l=!1},o))}};return i.watchEffect(()=>{s.value?.(),i.toValue(n)&&(s.value=I(u(e.refresh,i.toValue(t))))}),i.onUnmounted(()=>{s.value?.()}),{}}),ee=b((e,{manual:t,ready:n=!0,defaultParams:s=[]})=>{const r=i.watch(()=>i.toValue(n),u=>{!t&&u&&e.run(...s)},{flush:"sync"});return{onBefore:()=>({isReady:i.toValue(n)}),onCancel:()=>{r()}}});function te(e,t,n){var s=null,r=null,u=typeof n=="boolean"?{leading:n,trailing:!n}:Object.assign({leading:!1,trailing:!0},n),a=!1,o=null,l=u.leading,v=u.trailing,f=function(){s=null,r=null},g=function(){a=!0,e.apply(r,s),f()},m=function(){if(l===!0&&(o=null),a){f();return}if(v===!0){g();return}f()},w=function(){var c=o!==null;return c&&clearTimeout(o),f(),o=null,a=!1,c},d=function(){a=!1,s=arguments,r=this,o===null?l===!0&&g():clearTimeout(o),o=setTimeout(m,t)};return d.cancel=w,d}const ne=b((e,{debounceWait:t,debounceOptions:n,manual:s})=>{const r=i.ref(!1);let u=null;const a=e.runAsync;return s||(r.value=!0),i.watchEffect(()=>{const{is:o,value:l}=p(i.toValue(t));if(!o)return;const v=i.toValue(n);u=te(f=>f(),l,v),e.runAsync=(...f)=>new Promise((g,m)=>{r.value?(r.value=!1,a(...f).then(g).catch(m)):u(()=>{a(...f).then(g).catch(m)})}),i.onWatcherCleanup(()=>{u?.cancel(),e.runAsync=a})}),{onCancel:()=>{u?.cancel()}}});function re(e,t,n){var s=null,r=null,u=!1,a=null,o=Object.assign({leading:!0,trailing:!0},n),l=o.leading,v=o.trailing,f=function(){s=null,r=null},g=function(){u=!0,e.apply(r,s),a=setTimeout(m,t),f()},m=function(){if(a=null,u){f();return}if(v===!0){g();return}f()},w=function(){var c=a!==null;return c&&clearTimeout(a),f(),a=null,u=!1,c},d=function(){if(s=arguments,r=this,u=!1,a===null&&l===!0){g();return}v===!0&&(a=setTimeout(m,t))};return d.cancel=w,d}const se=b((e,{throttleWait:t,throttleOptions:n})=>{let s=null;const r=e.runAsync;return i.watchEffect(()=>{const{is:u,value:a}=p(i.toValue(t));if(!u)return;const o=i.toValue(n);s=re(l=>l(),a,o),e.runAsync=(...l)=>new Promise((v,f)=>{s(()=>{r(...l).then(v).catch(f)})}),i.onWatcherCleanup(()=>{s?.cancel(),e.runAsync=r})}),{onCancel:()=>{s?.cancel()}}}),ie=[Q,Z,G,K,W,ee,ne,se,J];function ae(e,t,n){return D(e,t||{},[...n||[],...ie])}exports.clearCache=E;exports.definePlugin=b;exports.useRequest=ae;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("vue"),p=e=>e,y=e=>e==null,S=typeof window>"u";function x(e){return y(e)?e:typeof e=="number"&&!isNaN(e)}function b(e,t){return x(e)===void 0?{is:!1,value:0}:x(e)?t&&e===-1?{is:!0,value:-1}:{is:!0,value:e===0||e&&e<0?0:e}:{is:!1,value:0}}const M=(e,t)=>{let n=t;for(let i=e.length;i-- >0;){const r=e[i];n=r(n)}return n?.()},V=()=>new Promise(()=>{}),P=new Map,O=(e,t,{data:n,params:i,time:r})=>{let a;const u=L(e),{is:o,value:f}=b(t,!0);o&&(u?.timer&&clearTimeout(u.timer),f!==-1&&(a=setTimeout(()=>{A(e)},f)),P.set(e,{data:n,params:i,time:r,timer:a}))},L=e=>P.get(e),A=e=>{e&&typeof e=="string"?P.delete(e):P.clear()};class j{constructor(t,n){this.service=t,this.options=n,this.state=s.reactive({data:void 0,res:void 0,error:void 0,params:n?.defaultParams||[],loading:!1,isFinished:!1,isAborted:!1,signal:new AbortController().signal})}currentRequestId=0;pluginImpls=[];state;abort=()=>{};setState=t=>{if(Object.assign(this.state,t),t.data&&typeof t.data=="object"&&!y(t.data)){const n=this.options.resKey||"data";Reflect.has(t.data,n)&&(this.state.res=t.data[n])}};executePlugin=(t,...n)=>{if(t==="onRequest")return{servicePromise:M(this.pluginImpls.map(r=>r.onRequest).filter(Boolean),n[0])};{const i=this.pluginImpls.map(r=>r[t]?.(...n)).filter(Boolean);return Object.assign({},...i)}};loading=t=>{this.setState({loading:t,isFinished:!t})};onFinished=()=>{this.executePlugin("onFinally",this.state.params),this.loading(!1),this.options.onFinally?.(this.state.params)};runAsync=async(...t)=>{const n=++this.currentRequestId,{isReturn:i,isReady:r,...a}=this.executePlugin("onBefore",t);if(!r)return V();if(this.setState({params:t,...a}),this.loading(!0),i)return this.loading(!1),a.data;this.options.onBefore?.(t);try{const u=()=>this.service(...t);let{servicePromise:o}=this.executePlugin("onRequest",u);return o||(o=u()),n!==this.currentRequestId?V():(this.setState({data:await o,error:void 0}),this.executePlugin("onSuccess",t),this.options.onSuccess?.(t),this.onFinished(),this.state.data)}catch(u){if(n!==this.currentRequestId)return V();throw this.setState({data:void 0,res:void 0,error:u}),this.executePlugin("onError",t),this.options.onError?.(t),this.onFinished(),this.state.error}};run=(...t)=>{this.runAsync(...t).catch(n=>{this.options.onError})};refresh=()=>{this.run(...this.state.params)};refreshAsync=async()=>await this.runAsync(...this.state.params);cancel=()=>{this.executePlugin("onCancel"),this.currentRequestId++,this.loading(!1)}}function N(e,t,n){const i={manual:!1,...t},r=new j(e,i);r.pluginImpls=n.map(h=>h(r,i)),s.onMounted(()=>{if(!i.manual){const h=r.state.params;r.run(...h)}}),s.onUnmounted(r.cancel);const{run:a,cancel:u,refresh:o,runAsync:f,refreshAsync:v,abort:l}=r;return{...s.toRefs(r.state),run:a,cancel:u,refresh:o,runAsync:f,abort:l,refreshAsync:v,clearCache:A}}const U=p((e,{abortPrevious:t=!0})=>{let n=null;const i=()=>{n=new AbortController,e.setState({signal:n.signal,isAborted:n.signal.aborted})};return e.abort=()=>{n&&!n.signal.aborted&&!e.state.isFinished&&(n.abort(),e.setState({isAborted:n.signal.aborted}))},{onBefore:()=>{typeof t=="boolean"&&t&&e.abort(),i()},onRequest:r=>()=>r(),onCancel:()=>{e.abort(),n=null}}}),R=new Map,W=(e,{data:t,params:n,time:i})=>{R.has(e)&&R.get(e)?.forEach(a=>a({data:t,params:n,time:i}))},B=(e,t)=>(R.has(e)?R.get(e)?.add(t):R.set(e,new Set),()=>{const n=R.get(e);n?.delete(t),n?.size===0&&R.delete(e)}),C=new Map,_=(e,t)=>{C.set(e,t),t.then(()=>{}).catch(()=>{}).finally(()=>{H(e)})},D=e=>C.get(e),H=e=>{e&&typeof e=="string"?C.delete(e):C.clear()},$=p((e,{cacheKey:t,cacheTime:n=3e5,staleTime:i=0,setCache:r,getCache:a})=>{const u=s.ref(null);let o=null;const{is:f,value:v}=b(i,!0);if(!f)return{};const l=typeof t=="function"?t:()=>t,h=(d,c)=>{r?r(d,c):O(d,n,c),W(d,c)},m=d=>a?a(d):L(d);function w(){const d=l();if(!d)return;const c=m(d);c&&Reflect.has(c,"data")&&e.setState({data:c.data,params:c.params}),u.value=B(d,g=>{e.setState({data:g.data})})}return w(),s.onUnmounted(()=>{u.value?.()}),{onBefore:d=>{const c=l(d);if(!c)return null;const g=m(c);return!g||!Reflect.has(g,"data")?{}:v===-1||Date.now()-g.time<v?{data:g.data,error:void 0,isReturn:!0}:{data:g.data,error:void 0}},onRequest:d=>{const c=l(e.state.params);if(!c)return d;let g=D(c);return g&&g!==o?()=>g:(g=d(),o=g,_(c,g),()=>g)},onSuccess:d=>{const c=l(d);c&&(u.value?.(),h(c,{data:e.state.data,params:d,time:Date.now()}),u.value=B(c,g=>{e.setState({data:g.data})}))}}}),z=p((e,{errorRetryCount:t=0,errorRetryInterval:n})=>{const i=s.ref(),r=s.ref(0),a=s.ref(!1),u=s.computed(()=>1e3*Math.pow(2,r.value)),o=()=>{let l=null;r.value++;const{value:h}=b(s.toValue(t),!0),m=h===-1,w=r.value<=h;if(m||w){let{is:d,value:c}=b(s.toValue(n));d||(c=s.toValue(Math.min(u.value,3e4))),l=setTimeout(()=>{a.value=!0,e.refresh()},c)}return()=>{l&&clearTimeout(l)}},f=()=>{i.value?.()},{is:v}=b(s.toValue(t),!0);return v?{onBefore:()=>{a.value||(r.value=0),a.value=!1,f()},onSuccess:()=>{r.value=0},onError:()=>{i.value=o()},onCancel:()=>{r.value=0,f()}}:{}}),E=()=>S||y(window.document?.visibilityState)?!0:document.visibilityState==="visible",T=new Set,J=e=>(T.add(e),()=>{T.delete(e)}),Q=()=>{E()&&T.forEach(e=>{e()})};!S&&window?.addEventListener&&window.addEventListener("visibilitychange",Q,!1);const X=p((e,{pollingInterval:t,pollingWhenHidden:n=!0,errorRetryCount:i})=>{const r=s.ref(null),a=s.ref(),u=()=>{let o;const{value:f}=b(s.toValue(i),!0);if(e.state.error&&f!==0)return;const{is:v,value:l}=b(s.toValue(t));return v?(o=setTimeout(()=>{!s.toValue(n)&&!E()?r.value=J(e.refresh):e.refresh()},l),()=>{o&&clearTimeout(o),r.value?.()}):void 0};return s.watch([()=>s.toValue(t),()=>s.toValue(n)],()=>{a.value?.(),a.value=u()}),s.onUnmounted(()=>{r.value?.()}),{onBefore:()=>{a.value?.()},onCancel:()=>{a.value?.()},onFinally:()=>{a.value=u()}}}),Y=p((e,{manual:t,refreshDeps:n,refreshDepsAction:i})=>{if(y(n)||typeof n!="object"&&typeof n!="function")return{};const r=s.watch(n,()=>{t||(i?i():e.refresh())},{deep:!0});return{onCancel:()=>{r()}}}),Z=()=>(!S&&window.navigator?.onLine)??!0,F=new Set,G=e=>(F.add(e),()=>{F.delete(e)}),q=()=>{!E()||!Z()||F.forEach(e=>{e()})};!S&&window?.addEventListener&&(window.addEventListener("visibilitychange",q,!1),window.addEventListener("focus",q,!1));const I=p((e,{refocusTimespan:t=5e3,refreshOnWindowFocus:n=!1})=>{const i=s.ref(),{is:r}=b(s.toValue(t));if(!r||y(s.toValue(n))||typeof s.toValue(n)!="boolean")return{};const a=(u,o)=>{let f=!1;return()=>{f||(f=!0,u(),setTimeout(()=>{f=!1},o))}};return s.watchEffect(()=>{i.value?.(),s.toValue(n)&&(i.value=G(a(e.refresh,s.toValue(t))))}),s.onUnmounted(()=>{i.value?.()}),{}}),k=p((e,{manual:t,ready:n=!0,defaultParams:i=[]})=>{const r=s.watch(()=>s.toValue(n),a=>{!t&&a&&e.run(...i)},{flush:"sync"});return{onBefore:()=>({isReady:s.toValue(n)}),onCancel:()=>{r()}}});function K(e,t,n){var i=null,r=null,a=typeof n=="boolean"?{leading:n,trailing:!n}:Object.assign({leading:!1,trailing:!0},n),u=!1,o=null,f=a.leading,v=a.trailing,l=function(){i=null,r=null},h=function(){u=!0,e.apply(r,i),l()},m=function(){if(f===!0&&(o=null),u){l();return}if(v===!0){h();return}l()},w=function(){var c=o!==null;return c&&clearTimeout(o),l(),o=null,u=!1,c},d=function(){u=!1,i=arguments,r=this,o===null?f===!0&&h():clearTimeout(o),o=setTimeout(m,t)};return d.cancel=w,d}const ee=p((e,{debounceWait:t,debounceOptions:n,manual:i})=>{const r=s.ref(!1);let a=null;const u=e.runAsync;return i||(r.value=!0),s.watchEffect(()=>{const{is:o,value:f}=b(s.toValue(t));if(!o)return;const v=s.toValue(n);a=K(l=>l(),f,v),e.runAsync=(...l)=>new Promise((h,m)=>{r.value?(r.value=!1,u(...l).then(h).catch(m)):a(()=>{u(...l).then(h).catch(m)})}),s.onWatcherCleanup(()=>{a?.cancel(),e.runAsync=u})}),{onCancel:()=>{a?.cancel()}}});function te(e,t,n){var i=null,r=null,a=!1,u=null,o=Object.assign({leading:!0,trailing:!0},n),f=o.leading,v=o.trailing,l=function(){i=null,r=null},h=function(){a=!0,e.apply(r,i),u=setTimeout(m,t),l()},m=function(){if(u=null,a){l();return}if(v===!0){h();return}l()},w=function(){var c=u!==null;return c&&clearTimeout(u),l(),u=null,a=!1,c},d=function(){if(i=arguments,r=this,a=!1,u===null&&f===!0){h();return}v===!0&&(u=setTimeout(m,t))};return d.cancel=w,d}const ne=p((e,{throttleWait:t,throttleOptions:n})=>{let i=null;const r=e.runAsync;return s.watchEffect(()=>{const{is:a,value:u}=b(s.toValue(t));if(!a)return;const o=s.toValue(n);i=te(f=>f(),u,o),e.runAsync=(...f)=>new Promise((v,l)=>{i(()=>{r(...f).then(v).catch(l)})}),s.onWatcherCleanup(()=>{i?.cancel(),e.runAsync=r})}),{onCancel:()=>{i?.cancel()}}}),re=[z,X,Y,I,U,k,ee,ne,$];function ie(e,t,n){return N(e,t||{},[...n||[],...re])}exports.clearCache=A;exports.definePlugin=p;exports.useRequest=ie;

package/dist/vue3-request.es.d.ts

@@ -3,11 +3,11 @@ import { Ref } from 'vue';
 import { ToRefs } from 'vue';
 import { WatchSource } from 'vue';
 
-declare type BaseOptions<D, P extends any[]> = Partial<{
+declare type BaseOptions<D, P extends any[], K = "data"> = Partial<{
     onBefore: (params: P) => void;
-    onSuccess: (data: D, params: P) => void;
-    onFinally: (params: P, data?: D, error?: Error) => void;
-    onError: (error: Error, params: P) => void;
+    onSuccess: (params: P) => void;
+    onFinally: (params: P) => void;
+    onError: (params: P) => void;
     manual: boolean;
     defaultParams: P;
     refreshDeps: WatchSource | WatchSource[] | object;
@@ -29,10 +29,12 @@ declare type BaseOptions<D, P extends any[]> = Partial<{
     throttleWait: Ref<number> | number;
     throttleOptions: Reactive<ThrottleOptionsType> | ThrottleOptionsType;
     abortPrevious: boolean;
-}>;
+}> & (D extends object ? {
+    resKey?: K;
+} : {});
 
 declare type CacheParamsType<D = any, P = any> = {
-    data?: D;
+    data: D;
     params: P;
     time: number;
 } & {
@@ -48,12 +50,15 @@ declare type DebounceOptionsType = {
 
 export declare const definePlugin: <D = any, P extends any[] = any, O = {}>(plugin: Plugin_2<D, P, O>) => Plugin_2<D, P, O>;
 
-declare interface IState<D, P extends any[]> {
-    data?: D;
+declare type ExtractFieldType<D, K> = D extends object ? K extends keyof D ? D[K] : "data" extends keyof D ? D["data"] : never : never;
+
+declare interface IState<D, P extends any[], K = "data"> {
+    data: D;
+    res: ExtractFieldType<D, K>;
     loading: boolean;
     isFinished: boolean;
     isAborted: boolean;
-    error?: Error;
+    error: Error;
     params: P;
     signal: AbortSignal;
 }
@@ -66,27 +71,30 @@ declare type PluginMethodsReturn<D, P extends any[]> = Partial<{
     signal: AbortSignal;
     isReturn: boolean;
     isReady: boolean;
-    data?: D;
+    data: D;
 }>;
 
 declare type PluginReturn<D, P extends any[]> = Partial<{
     onBefore: (params: P) => void;
-    onSuccess: (data: D, params: P) => void;
-    onFinally: (params: P, data: D, error: Error) => void;
-    onError: (error: Error, params: P) => void;
+    onSuccess: (params: P) => void;
+    onError: (params: P) => void;
+    onFinally: (params: P) => void;
     onCancel: () => void;
-    onMutate: (data: D) => void;
     onRequest: (service: ServiceType<D, P>) => ServiceType<D, P>;
 }>;
 
 declare class Request_2<D, P extends any[]> {
     service: ServiceType<D, P>;
-    options: BaseOptions<D, P>;
+    options: BaseOptions<D, P> & {
+        resKey: keyof D;
+    };
     currentRequestId: number;
     pluginImpls: PluginReturn<D, P>[];
     state: IState<D, P>;
     abort: () => void;
-    constructor(service: ServiceType<D, P>, options: BaseOptions<D, P>);
+    constructor(service: ServiceType<D, P>, options: BaseOptions<D, P> & {
+        resKey: keyof D;
+    });
     setState: (s: Partial<IState<D, P>>) => void;
     executePlugin: (event: keyof PluginReturn<D, P>, ...rest: any[]) => PluginMethodsReturn<D, P>;
     loading: (loading: boolean) => void;
@@ -95,7 +103,6 @@ declare class Request_2<D, P extends any[]> {
     run: (...params: P) => void;
     refresh: () => void;
     refreshAsync: () => Promise<D>;
-    mutate: (data: D | ((data: D) => D)) => void;
     cancel: () => void;
 }
 
@@ -108,11 +115,17 @@ declare type ThrottleOptionsType = {
 
 declare type Timeout = ReturnType<typeof setTimeout>;
 
-export declare function useRequest<D, P extends any[] = any[]>(service: ServiceType<D, P>, options?: BaseOptions<D, P>): UseRequestReturnType<D, P>;
+export declare function useRequest<D extends object, K extends keyof D, P extends any[] = any[]>(service: ServiceType<D, P>, options: BaseOptions<D, P, K> & {
+    resKey: K;
+}): UseRequestReturnType<D, P, K>;
+
+export declare function useRequest<D extends object, P extends any[] = any[]>(service: ServiceType<D, P>, options?: BaseOptions<D, P, "data">): UseRequestReturnType<D, P, "data">;
+
+export declare function useRequest<D, P extends any[] = any[]>(service: ServiceType<D, P>, options?: BaseOptions<D, P, never>): UseRequestReturnType<D, P, never>;
 
 export declare function useRequest<D, P extends any[] = any[], O = {}>(service: ServiceType<D, P>, options: BaseOptions<D, P> & O, plugins: Plugin_2<D, P, O>[]): UseRequestReturnType<D, P>;
 
-declare interface UseRequestReturnType<D, P extends any[]> extends ToRefs<IState<D, P>> {
+declare interface UseRequestReturnType<D, P extends any[], K = "data"> extends ToRefs<IState<D, P, K>> {
     run: (...args: P) => void;
     cancel: () => void;
     refresh: () => void;
@@ -120,7 +133,6 @@ declare interface UseRequestReturnType<D, P extends any[]> extends ToRefs<IState
     abort: () => void;
     refreshAsync: () => Promise<D>;
     clearCache: (key?: string) => void;
-    mutate: (data: D | ((data: D) => D)) => void;
 }
 
 export { }

package/dist/vue3-request.es.js

@@ -1,13 +1,13 @@
-import { reactive as H, onMounted as W, onUnmounted as S, toRefs as $, ref as w, computed as z, toValue as h, watch as M, watchEffect as L, onWatcherCleanup as N } from "vue";
-const b = (e) => e, F = (e) => e == null, T = typeof window > "u";
-function j(e) {
-  return F(e) ? e : typeof e == "number" && !isNaN(e);
+import { reactive as D, onMounted as H, onUnmounted as F, toRefs as W, ref as R, computed as $, toValue as d, watch as B, watchEffect as L, onWatcherCleanup as N } from "vue";
+const b = (e) => e, P = (e) => e == null, T = typeof window > "u";
+function O(e) {
+  return P(e) ? e : typeof e == "number" && !isNaN(e);
 }
 function p(e, t) {
-  return j(e) === void 0 ? {
+  return O(e) === void 0 ? {
     is: !1,
     value: 0
-  } : j(e) ? t && e === -1 ? {
+  } : O(e) ? t && e === -1 ? {
     is: !0,
     value: -1
   } : {
@@ -18,27 +18,28 @@ function p(e, t) {
     value: 0
   };
 }
-const U = (e, t) => {
+const z = (e, t) => {
   let n = t;
-  for (let s = e.length; s-- > 0; ) {
-    const r = e[s];
+  for (let i = e.length; i-- > 0; ) {
+    const r = e[i];
     n = r(n);
   }
   return n?.();
 }, A = () => new Promise(() => {
-}), J = (e) => e instanceof Function, P = /* @__PURE__ */ new Map(), Q = (e, t, { data: n, params: s, time: r }) => {
-  let a;
-  const i = V(e), { is: u, value: o } = p(t, !0);
-  u && (i?.timer && clearTimeout(i.timer), o !== -1 && (a = setTimeout(() => {
-    D(e);
-  }, o)), P.set(e, { data: n, params: s, time: r, timer: a }));
-}, V = (e) => P.get(e), D = (e) => {
-  e && typeof e == "string" ? P.delete(e) : P.clear();
+}), C = /* @__PURE__ */ new Map(), U = (e, t, { data: n, params: i, time: r }) => {
+  let s;
+  const a = V(e), { is: u, value: c } = p(t, !0);
+  u && (a?.timer && clearTimeout(a.timer), c !== -1 && (s = setTimeout(() => {
+    _(e);
+  }, c)), C.set(e, { data: n, params: i, time: r, timer: s }));
+}, V = (e) => C.get(e), _ = (e) => {
+  e && typeof e == "string" ? C.delete(e) : C.clear();
 };
-class X {
+class J {
   constructor(t, n) {
-    this.service = t, this.options = n, this.state = H({
+    this.service = t, this.options = n, this.state = D({
       data: void 0,
+      res: void 0,
       error: void 0,
       params: n?.defaultParams || [],
       loading: !1,
@@ -53,59 +54,57 @@ class X {
   abort = () => {
   };
   setState = (t) => {
-    Object.assign(this.state, t);
+    if (Object.assign(this.state, t), t.data && typeof t.data == "object" && !P(t.data)) {
+      const n = this.options.resKey || "data";
+      Reflect.has(t.data, n) && (this.state.res = t.data[n]);
+    }
   };
   executePlugin = (t, ...n) => {
     if (t === "onRequest")
       return {
-        servicePromise: U(
+        servicePromise: z(
           this.pluginImpls.map((r) => r.onRequest).filter(Boolean),
           n[0]
         )
       };
     {
-      const s = this.pluginImpls.map((r) => r[t]?.(...n)).filter(Boolean);
-      return Object.assign({}, ...s);
+      const i = this.pluginImpls.map((r) => r[t]?.(...n)).filter(Boolean);
+      return Object.assign({}, ...i);
     }
   };
-  // 设置加载状态
   loading = (t) => {
     this.setState({ loading: t, isFinished: !t });
   };
-  // 请求完成
   onFinished = () => {
     this.executePlugin(
       "onFinally",
-      this.state.params,
-      this.state.data,
-      this.state.error
+      this.state.params
+      // this.state.data,
+      // this.state.error
     ), this.loading(!1), this.options.onFinally?.(
-      this.state.params,
-      this.state.data,
-      this.state.error
+      this.state.params
+      // this.state.data,
+      // this.state.error
     );
   };
   runAsync = async (...t) => {
-    const n = ++this.currentRequestId, { isReturn: s, isReady: r, ...a } = this.executePlugin(
+    const n = ++this.currentRequestId, { isReturn: i, isReady: r, ...s } = this.executePlugin(
       "onBefore",
       t
     );
     if (!r)
       return A();
-    if (this.setState({ params: t, ...a }), this.loading(!0), s)
-      return this.loading(!1), a.data;
+    if (this.setState({ params: t, ...s }), this.loading(!0), i)
+      return this.loading(!1), s.data;
     this.options.onBefore?.(t);
     try {
-      const i = () => this.service(...t);
-      let { servicePromise: u } = this.executePlugin("onRequest", i);
-      u || (u = i());
-      const o = await u;
-      return n !== this.currentRequestId ? A() : (this.setState({ data: o, error: void 0 }), this.executePlugin("onSuccess", o, t), this.options.onSuccess?.(o, t), this.onFinished(), o);
-    } catch (i) {
+      const a = () => this.service(...t);
+      let { servicePromise: u } = this.executePlugin("onRequest", a);
+      return u || (u = a()), n !== this.currentRequestId ? A() : (this.setState({ data: await u, error: void 0 }), this.executePlugin("onSuccess", t), this.options.onSuccess?.(t), this.onFinished(), this.state.data);
+    } catch (a) {
       if (n !== this.currentRequestId)
         return A();
-      const u = i;
-      throw this.setState({ data: void 0, error: u }), this.executePlugin("onError", u, t), this.options.onError?.(u, t), this.onFinished(), u;
+      throw this.setState({ data: void 0, res: void 0, error: a }), this.executePlugin("onError", t), this.options.onError?.(t), this.onFinished(), this.state.error;
     }
   };
   run = (...t) => {
@@ -117,42 +116,38 @@ class X {
     this.run(...this.state.params);
   };
   refreshAsync = async () => await this.runAsync(...this.state.params);
-  mutate = (t) => {
-    J(t) ? t(this.state.data) : this.setState({ data: t }), this.executePlugin("onMutate", this.state.data);
-  };
   cancel = () => {
     this.executePlugin("onCancel"), this.currentRequestId++, this.loading(!1);
   };
 }
-function Y(e, t, n) {
-  const s = {
+function Q(e, t, n) {
+  const i = {
     manual: !1,
     ...t
-  }, r = new X(e, s);
+  }, r = new J(e, i);
   r.pluginImpls = n.map(
-    (m) => m(r, s)
-  ), W(() => {
-    if (!s.manual) {
-      const m = r.state.params;
-      r.run(...m);
+    (h) => h(r, i)
+  ), H(() => {
+    if (!i.manual) {
+      const h = r.state.params;
+      r.run(...h);
     }
-  }), S(r.cancel);
-  const { run: a, cancel: i, refresh: u, runAsync: o, refreshAsync: v, abort: c, mutate: g } = r;
+  }), F(r.cancel);
+  const { run: s, cancel: a, refresh: u, runAsync: c, refreshAsync: v, abort: o } = r;
   return {
-    ...$(r.state),
-    run: a,
-    cancel: i,
+    ...W(r.state),
+    run: s,
+    cancel: a,
     refresh: u,
-    runAsync: o,
-    mutate: g,
-    abort: c,
+    runAsync: c,
+    abort: o,
     refreshAsync: v,
-    clearCache: D
+    clearCache: _
   };
 }
-const Z = b((e, { abortPrevious: t = !0 }) => {
+const X = b((e, { abortPrevious: t = !0 }) => {
   let n = null;
-  const s = () => {
+  const i = () => {
     n = new AbortController(), e.setState({
       signal: n.signal,
       isAborted: n.signal.aborted
@@ -164,189 +159,177 @@ const Z = b((e, { abortPrevious: t = !0 }) => {
     }));
   }, {
     onBefore: () => {
-      typeof t == "boolean" && t && e.abort(), s();
+      typeof t == "boolean" && t && e.abort(), i();
     },
     onRequest: (r) => () => r(),
     onCancel: () => {
       e.abort(), n = null;
     }
   };
-}), y = /* @__PURE__ */ new Map(), G = (e, { data: t, params: n, time: s }) => {
-  y.has(e) && y.get(e)?.forEach((a) => a({ data: t, params: n, time: s }));
-}, E = (e, t) => (y.has(e) ? y.get(e)?.add(t) : y.set(e, /* @__PURE__ */ new Set()), () => {
+}), y = /* @__PURE__ */ new Map(), Y = (e, { data: t, params: n, time: i }) => {
+  y.has(e) && y.get(e)?.forEach((s) => s({ data: t, params: n, time: i }));
+}, q = (e, t) => (y.has(e) ? y.get(e)?.add(t) : y.set(e, /* @__PURE__ */ new Set()), () => {
   const n = y.get(e);
   n?.delete(t), n?.size === 0 && y.delete(e);
-}), C = /* @__PURE__ */ new Map(), k = (e, t) => {
-  C.set(e, t), t.then(() => {
+}), S = /* @__PURE__ */ new Map(), Z = (e, t) => {
+  S.set(e, t), t.then(() => {
   }).catch(() => {
   }).finally(() => {
-    K(e);
+    I(e);
   });
-}, I = (e) => C.get(e), K = (e) => {
-  e && typeof e == "string" ? C.delete(e) : C.clear();
-}, ee = b(
+}, G = (e) => S.get(e), I = (e) => {
+  e && typeof e == "string" ? S.delete(e) : S.clear();
+}, k = b(
   (e, {
     cacheKey: t,
     cacheTime: n = 3e5,
-    staleTime: s = 0,
+    staleTime: i = 0,
     setCache: r,
-    getCache: a
+    getCache: s
   }) => {
-    const i = w(null);
+    const a = R(null);
     let u = null;
-    const { is: o, value: v } = p(s, !0);
-    if (!o)
+    const { is: c, value: v } = p(i, !0);
+    if (!c)
       return {};
-    const c = typeof t == "function" ? t : () => t, g = (f, l) => {
-      r ? r(f, l) : Q(f, n, l), G(f, l);
-    }, m = (f) => a ? a(f) : V(f);
-    function R() {
-      const f = c();
+    const o = typeof t == "function" ? t : () => t, h = (f, l) => {
+      r ? r(f, l) : U(f, n, l), Y(f, l);
+    }, m = (f) => s ? s(f) : V(f);
+    function w() {
+      const f = o();
       if (!f) return;
       const l = m(f);
       l && Reflect.has(l, "data") && e.setState({
         data: l.data,
         params: l.params
-      }), i.value = E(f, (d) => {
+      }), a.value = q(f, (g) => {
         e.setState({
-          data: d.data
+          data: g.data
         });
       });
     }
-    return R(), S(() => {
-      i.value?.();
+    return w(), F(() => {
+      a.value?.();
     }), {
       onBefore: (f) => {
-        const l = c(f);
+        const l = o(f);
         if (!l) return null;
-        const d = m(l);
-        return !d || !Reflect.has(d, "data") ? {} : v === -1 || Date.now() - d.time < v ? {
-          data: d.data,
+        const g = m(l);
+        return !g || !Reflect.has(g, "data") ? {} : v === -1 || Date.now() - g.time < v ? {
+          data: g.data,
           error: void 0,
           isReturn: !0
         } : {
-          data: d.data,
+          data: g.data,
           error: void 0
         };
       },
       onRequest: (f) => {
-        const l = c(e.state.params);
+        const l = o(e.state.params);
         if (!l) return f;
-        let d = I(l);
-        return d && d !== u ? () => d : (d = f(), u = d, k(l, d), () => d);
+        let g = G(l);
+        return g && g !== u ? () => g : (g = f(), u = g, Z(l, g), () => g);
       },
-      onSuccess: (f, l) => {
-        const d = c(l);
-        d && (i.value?.(), g(d, {
-          data: f,
-          params: l,
+      onSuccess: (f) => {
+        const l = o(f);
+        l && (a.value?.(), h(l, {
+          data: e.state.data,
+          params: f,
           time: Date.now()
-        }), i.value = E(d, (_) => {
+        }), a.value = q(l, (g) => {
           e.setState({
-            data: _.data
-          });
-        }));
-      },
-      onMutate(f) {
-        const l = c(e.state.params);
-        l && (i.value?.(), g(l, {
-          data: f,
-          params: e.state.params,
-          time: Date.now()
-        }), i.value = E(l, (d) => {
-          e.setState({
-            data: d.data
+            data: g.data
           });
         }));
       }
     };
   }
-), te = b((e, { errorRetryCount: t = 0, errorRetryInterval: n }) => {
-  const s = w(), r = w(0), a = w(!1), i = z(
+), K = b((e, { errorRetryCount: t = 0, errorRetryInterval: n }) => {
+  const i = R(), r = R(0), s = R(!1), a = $(
     () => 1e3 * Math.pow(2, r.value)
   ), u = () => {
-    let c = null;
+    let o = null;
     r.value++;
-    const { value: g } = p(h(t), !0), m = g === -1, R = r.value <= g;
-    if (m || R) {
-      let { is: f, value: l } = p(h(n));
-      f || (l = h(Math.min(i.value, 3e4))), c = setTimeout(() => {
-        a.value = !0, e.refresh();
+    const { value: h } = p(d(t), !0), m = h === -1, w = r.value <= h;
+    if (m || w) {
+      let { is: f, value: l } = p(d(n));
+      f || (l = d(Math.min(a.value, 3e4))), o = setTimeout(() => {
+        s.value = !0, e.refresh();
       }, l);
     }
     return () => {
-      c && clearTimeout(c);
+      o && clearTimeout(o);
     };
-  }, o = () => {
-    s.value?.();
-  }, { is: v } = p(h(t), !0);
+  }, c = () => {
+    i.value?.();
+  }, { is: v } = p(d(t), !0);
   return v ? {
     onBefore: () => {
-      a.value || (r.value = 0), a.value = !1, o();
+      s.value || (r.value = 0), s.value = !1, c();
     },
     onSuccess: () => {
       r.value = 0;
     },
     onError: () => {
-      s.value = u();
+      i.value = u();
     },
     onCancel: () => {
-      r.value = 0, o();
+      r.value = 0, c();
     }
   } : {};
-}), O = () => T || F(window.document?.visibilityState) ? !0 : document.visibilityState === "visible", x = /* @__PURE__ */ new Set(), ne = (e) => (x.add(e), () => {
-  x.delete(e);
-}), re = () => {
-  O() && x.forEach((e) => {
+}), M = () => T || P(window.document?.visibilityState) ? !0 : document.visibilityState === "visible", E = /* @__PURE__ */ new Set(), ee = (e) => (E.add(e), () => {
+  E.delete(e);
+}), te = () => {
+  M() && E.forEach((e) => {
     e();
   });
 };
-!T && window?.addEventListener && window.addEventListener("visibilitychange", re, !1);
-const se = b(
-  (e, { pollingInterval: t, pollingWhenHidden: n = !0, errorRetryCount: s }) => {
-    const r = w(null), a = w(), i = () => {
+!T && window?.addEventListener && window.addEventListener("visibilitychange", te, !1);
+const ne = b(
+  (e, { pollingInterval: t, pollingWhenHidden: n = !0, errorRetryCount: i }) => {
+    const r = R(null), s = R(), a = () => {
       let u;
-      const { value: o } = p(
-        h(s),
+      const { value: c } = p(
+        d(i),
         !0
       );
-      if (e.state.error && o !== 0) return;
-      const { is: v, value: c } = p(
-        h(t)
+      if (e.state.error && c !== 0) return;
+      const { is: v, value: o } = p(
+        d(t)
       );
       return v ? (u = setTimeout(() => {
-        !h(n) && !O() ? r.value = ne(e.refresh) : e.refresh();
-      }, c), () => {
+        !d(n) && !M() ? r.value = ee(e.refresh) : e.refresh();
+      }, o), () => {
         u && clearTimeout(u), r.value?.();
       }) : void 0;
     };
-    return M(
-      [() => h(t), () => h(n)],
+    return B(
+      [() => d(t), () => d(n)],
       () => {
-        a.value?.(), a.value = i();
+        s.value?.(), s.value = a();
       }
-    ), S(() => {
+    ), F(() => {
       r.value?.();
     }), {
       onBefore: () => {
-        a.value?.();
+        s.value?.();
       },
       onCancel: () => {
-        a.value?.();
+        s.value?.();
       },
       onFinally: () => {
-        a.value = i();
+        s.value = a();
       }
     };
   }
-), ie = b(
-  (e, { manual: t, refreshDeps: n, refreshDepsAction: s }) => {
-    if (F(n) || typeof n != "object" && typeof n != "function")
+), re = b(
+  (e, { manual: t, refreshDeps: n, refreshDepsAction: i }) => {
+    if (P(n) || typeof n != "object" && typeof n != "function")
       return {};
-    const r = M(
+    const r = B(
       n,
       () => {
-        t || (s ? s() : e.refresh());
+        t || (i ? i() : e.refresh());
       },
       {
         deep: !0
@@ -358,175 +341,175 @@ const se = b(
       }
     };
   }
-), ae = () => (!T && window.navigator?.onLine) ?? !0, B = /* @__PURE__ */ new Set(), ue = (e) => (B.add(e), () => {
-  B.delete(e);
-}), q = () => {
-  !O() || !ae() || B.forEach((e) => {
+), ie = () => (!T && window.navigator?.onLine) ?? !0, x = /* @__PURE__ */ new Set(), se = (e) => (x.add(e), () => {
+  x.delete(e);
+}), j = () => {
+  !M() || !ie() || x.forEach((e) => {
     e();
   });
 };
-!T && window?.addEventListener && (window.addEventListener("visibilitychange", q, !1), window.addEventListener("focus", q, !1));
-const oe = b(
+!T && window?.addEventListener && (window.addEventListener("visibilitychange", j, !1), window.addEventListener("focus", j, !1));
+const ae = b(
   (e, { refocusTimespan: t = 5e3, refreshOnWindowFocus: n = !1 }) => {
-    const s = w(), { is: r } = p(h(t));
-    if (!r || F(h(n)) || typeof h(n) != "boolean")
+    const i = R(), { is: r } = p(d(t));
+    if (!r || P(d(n)) || typeof d(n) != "boolean")
       return {};
-    const a = (i, u) => {
-      let o = !1;
+    const s = (a, u) => {
+      let c = !1;
       return () => {
-        o || (o = !0, i(), setTimeout(() => {
-          o = !1;
+        c || (c = !0, a(), setTimeout(() => {
+          c = !1;
         }, u));
       };
     };
     return L(() => {
-      s.value?.(), h(n) && (s.value = ue(
-        a(e.refresh, h(t))
+      i.value?.(), d(n) && (i.value = se(
+        s(e.refresh, d(t))
       ));
-    }), S(() => {
-      s.value?.();
+    }), F(() => {
+      i.value?.();
     }), {};
   }
-), le = b(
-  (e, { manual: t, ready: n = !0, defaultParams: s = [] }) => {
-    const r = M(
-      () => h(n),
-      (a) => {
-        !t && a && e.run(...s);
+), ue = b(
+  (e, { manual: t, ready: n = !0, defaultParams: i = [] }) => {
+    const r = B(
+      () => d(n),
+      (s) => {
+        !t && s && e.run(...i);
       },
       {
         flush: "sync"
       }
     );
     return {
-      onBefore: () => ({ isReady: h(n) }),
+      onBefore: () => ({ isReady: d(n) }),
       onCancel: () => {
         r();
       }
     };
   }
 );
-function ce(e, t, n) {
-  var s = null, r = null, a = typeof n == "boolean" ? { leading: n, trailing: !n } : Object.assign({ leading: !1, trailing: !0 }, n), i = !1, u = null, o = a.leading, v = a.trailing, c = function() {
-    s = null, r = null;
-  }, g = function() {
-    i = !0, e.apply(r, s), c();
+function oe(e, t, n) {
+  var i = null, r = null, s = typeof n == "boolean" ? { leading: n, trailing: !n } : Object.assign({ leading: !1, trailing: !0 }, n), a = !1, u = null, c = s.leading, v = s.trailing, o = function() {
+    i = null, r = null;
+  }, h = function() {
+    a = !0, e.apply(r, i), o();
   }, m = function() {
-    if (o === !0 && (u = null), i) {
-      c();
+    if (c === !0 && (u = null), a) {
+      o();
       return;
     }
     if (v === !0) {
-      g();
+      h();
       return;
     }
-    c();
-  }, R = function() {
+    o();
+  }, w = function() {
     var l = u !== null;
-    return l && clearTimeout(u), c(), u = null, i = !1, l;
+    return l && clearTimeout(u), o(), u = null, a = !1, l;
   }, f = function() {
-    i = !1, s = arguments, r = this, u === null ? o === !0 && g() : clearTimeout(u), u = setTimeout(m, t);
+    a = !1, i = arguments, r = this, u === null ? c === !0 && h() : clearTimeout(u), u = setTimeout(m, t);
   };
-  return f.cancel = R, f;
+  return f.cancel = w, f;
 }
-const fe = b(
-  (e, { debounceWait: t, debounceOptions: n, manual: s }) => {
-    const r = w(!1);
-    let a = null;
-    const i = e.runAsync;
-    return s || (r.value = !0), L(() => {
-      const { is: u, value: o } = p(h(t));
+const le = b(
+  (e, { debounceWait: t, debounceOptions: n, manual: i }) => {
+    const r = R(!1);
+    let s = null;
+    const a = e.runAsync;
+    return i || (r.value = !0), L(() => {
+      const { is: u, value: c } = p(d(t));
       if (!u) return;
-      const v = h(n);
-      a = ce(
-        (c) => c(),
-        o,
+      const v = d(n);
+      s = oe(
+        (o) => o(),
+        c,
         v
-      ), e.runAsync = (...c) => new Promise((g, m) => {
-        r.value ? (r.value = !1, i(...c).then(g).catch(m)) : a(() => {
-          i(...c).then(g).catch(m);
+      ), e.runAsync = (...o) => new Promise((h, m) => {
+        r.value ? (r.value = !1, a(...o).then(h).catch(m)) : s(() => {
+          a(...o).then(h).catch(m);
         });
       }), N(() => {
-        a?.cancel(), e.runAsync = i;
+        s?.cancel(), e.runAsync = a;
       });
     }), {
       onCancel: () => {
-        a?.cancel();
+        s?.cancel();
       }
     };
   }
 );
-function de(e, t, n) {
-  var s = null, r = null, a = !1, i = null, u = Object.assign({ leading: !0, trailing: !0 }, n), o = u.leading, v = u.trailing, c = function() {
-    s = null, r = null;
-  }, g = function() {
-    a = !0, e.apply(r, s), i = setTimeout(m, t), c();
+function ce(e, t, n) {
+  var i = null, r = null, s = !1, a = null, u = Object.assign({ leading: !0, trailing: !0 }, n), c = u.leading, v = u.trailing, o = function() {
+    i = null, r = null;
+  }, h = function() {
+    s = !0, e.apply(r, i), a = setTimeout(m, t), o();
   }, m = function() {
-    if (i = null, a) {
-      c();
+    if (a = null, s) {
+      o();
       return;
     }
     if (v === !0) {
-      g();
+      h();
       return;
     }
-    c();
-  }, R = function() {
-    var l = i !== null;
-    return l && clearTimeout(i), c(), i = null, a = !1, l;
+    o();
+  }, w = function() {
+    var l = a !== null;
+    return l && clearTimeout(a), o(), a = null, s = !1, l;
   }, f = function() {
-    if (s = arguments, r = this, a = !1, i === null && o === !0) {
-      g();
+    if (i = arguments, r = this, s = !1, a === null && c === !0) {
+      h();
       return;
     }
-    v === !0 && (i = setTimeout(m, t));
+    v === !0 && (a = setTimeout(m, t));
   };
-  return f.cancel = R, f;
+  return f.cancel = w, f;
 }
-const he = b(
+const fe = b(
   (e, { throttleWait: t, throttleOptions: n }) => {
-    let s = null;
+    let i = null;
     const r = e.runAsync;
     return L(() => {
-      const { is: a, value: i } = p(h(t));
-      if (!a) return;
-      const u = h(n);
-      s = de(
-        (o) => o(),
-        i,
+      const { is: s, value: a } = p(d(t));
+      if (!s) return;
+      const u = d(n);
+      i = ce(
+        (c) => c(),
+        a,
         u
-      ), e.runAsync = (...o) => new Promise((v, c) => {
-        s(() => {
-          r(...o).then(v).catch(c);
+      ), e.runAsync = (...c) => new Promise((v, o) => {
+        i(() => {
+          r(...c).then(v).catch(o);
         });
       }), N(() => {
-        s?.cancel(), e.runAsync = r;
+        i?.cancel(), e.runAsync = r;
       });
     }), {
       onCancel: () => {
-        s?.cancel();
+        i?.cancel();
       }
     };
   }
-), ve = [
-  te,
-  se,
-  ie,
-  oe,
-  Z,
+), de = [
+  K,
+  ne,
+  re,
+  ae,
+  X,
+  ue,
   le,
   fe,
-  he,
-  ee
+  k
 ];
-function me(e, t, n) {
-  return Y(e, t || {}, [
+function ve(e, t, n) {
+  return Q(e, t || {}, [
     ...n || [],
-    ...ve
+    ...de
   ]);
 }
 export {
-  D as clearCache,
+  _ as clearCache,
   b as definePlugin,
-  me as useRequest
+  ve as useRequest
 };

package/dist/vue3-request.umd.js

@@ -1 +1 @@
-(function(w,i){typeof exports=="object"&&typeof module<"u"?i(exports,require("vue")):typeof define=="function"&&define.amd?define(["exports","vue"],i):(w=typeof globalThis<"u"?globalThis:w||self,i(w.Vue3Request={},w.Vue))})(this,function(w,i){"use strict";const p=e=>e,P=e=>e==null,C=typeof window>"u";function B(e){return P(e)?e:typeof e=="number"&&!isNaN(e)}function b(e,t){return B(e)===void 0?{is:!1,value:0}:B(e)?t&&e===-1?{is:!0,value:-1}:{is:!0,value:e===0||e&&e<0?0:e}:{is:!1,value:0}}const q=(e,t)=>{let n=t;for(let s=e.length;s-- >0;){const r=e[s];n=r(n)}return n?.()},T=()=>new Promise(()=>{}),j=e=>e instanceof Function,S=new Map,N=(e,t,{data:n,params:s,time:r})=>{let o;const a=L(e),{is:l,value:u}=b(t,!0);l&&(a?.timer&&clearTimeout(a.timer),u!==-1&&(o=setTimeout(()=>{F(e)},u)),S.set(e,{data:n,params:s,time:r,timer:o}))},L=e=>S.get(e),F=e=>{e&&typeof e=="string"?S.delete(e):S.clear()};class U{constructor(t,n){this.service=t,this.options=n,this.state=i.reactive({data:void 0,error:void 0,params:n?.defaultParams||[],loading:!1,isFinished:!1,isAborted:!1,signal:new AbortController().signal})}currentRequestId=0;pluginImpls=[];state;abort=()=>{};setState=t=>{Object.assign(this.state,t)};executePlugin=(t,...n)=>{if(t==="onRequest")return{servicePromise:q(this.pluginImpls.map(r=>r.onRequest).filter(Boolean),n[0])};{const s=this.pluginImpls.map(r=>r[t]?.(...n)).filter(Boolean);return Object.assign({},...s)}};loading=t=>{this.setState({loading:t,isFinished:!t})};onFinished=()=>{this.executePlugin("onFinally",this.state.params,this.state.data,this.state.error),this.loading(!1),this.options.onFinally?.(this.state.params,this.state.data,this.state.error)};runAsync=async(...t)=>{const n=++this.currentRequestId,{isReturn:s,isReady:r,...o}=this.executePlugin("onBefore",t);if(!r)return T();if(this.setState({params:t,...o}),this.loading(!0),s)return this.loading(!1),o.data;this.options.onBefore?.(t);try{const a=()=>this.service(...t);let{servicePromise:l}=this.executePlugin("onRequest",a);l||(l=a());const u=await l;return n!==this.currentRequestId?T():(this.setState({data:u,error:void 0}),this.executePlugin("onSuccess",u,t),this.options.onSuccess?.(u,t),this.onFinished(),u)}catch(a){if(n!==this.currentRequestId)return T();const l=a;throw this.setState({data:void 0,error:l}),this.executePlugin("onError",l,t),this.options.onError?.(l,t),this.onFinished(),l}};run=(...t)=>{this.runAsync(...t).catch(n=>{this.options.onError})};refresh=()=>{this.run(...this.state.params)};refreshAsync=async()=>await this.runAsync(...this.state.params);mutate=t=>{j(t)?t(this.state.data):this.setState({data:t}),this.executePlugin("onMutate",this.state.data)};cancel=()=>{this.executePlugin("onCancel"),this.currentRequestId++,this.loading(!1)}}function D(e,t,n){const s={manual:!1,...t},r=new U(e,s);r.pluginImpls=n.map(v=>v(r,s)),i.onMounted(()=>{if(!s.manual){const v=r.state.params;r.run(...v)}}),i.onUnmounted(r.cancel);const{run:o,cancel:a,refresh:l,runAsync:u,refreshAsync:g,abort:f,mutate:m}=r;return{...i.toRefs(r.state),run:o,cancel:a,refresh:l,runAsync:u,mutate:m,abort:f,refreshAsync:g,clearCache:F}}const W=p((e,{abortPrevious:t=!0})=>{let n=null;const s=()=>{n=new AbortController,e.setState({signal:n.signal,isAborted:n.signal.aborted})};return e.abort=()=>{n&&!n.signal.aborted&&!e.state.isFinished&&(n.abort(),e.setState({isAborted:n.signal.aborted}))},{onBefore:()=>{typeof t=="boolean"&&t&&e.abort(),s()},onRequest:r=>()=>r(),onCancel:()=>{e.abort(),n=null}}}),R=new Map,_=(e,{data:t,params:n,time:s})=>{R.has(e)&&R.get(e)?.forEach(o=>o({data:t,params:n,time:s}))},A=(e,t)=>(R.has(e)?R.get(e)?.add(t):R.set(e,new Set),()=>{const n=R.get(e);n?.delete(t),n?.size===0&&R.delete(e)}),V=new Map,H=(e,t)=>{V.set(e,t),t.then(()=>{}).catch(()=>{}).finally(()=>{z(e)})},$=e=>V.get(e),z=e=>{e&&typeof e=="string"?V.delete(e):V.clear()},J=p((e,{cacheKey:t,cacheTime:n=3e5,staleTime:s=0,setCache:r,getCache:o})=>{const a=i.ref(null);let l=null;const{is:u,value:g}=b(s,!0);if(!u)return{};const f=typeof t=="function"?t:()=>t,m=(d,c)=>{r?r(d,c):N(d,n,c),_(d,c)},v=d=>o?o(d):L(d);function y(){const d=f();if(!d)return;const c=v(d);c&&Reflect.has(c,"data")&&e.setState({data:c.data,params:c.params}),a.value=A(d,h=>{e.setState({data:h.data})})}return y(),i.onUnmounted(()=>{a.value?.()}),{onBefore:d=>{const c=f(d);if(!c)return null;const h=v(c);return!h||!Reflect.has(h,"data")?{}:g===-1||Date.now()-h.time<g?{data:h.data,error:void 0,isReturn:!0}:{data:h.data,error:void 0}},onRequest:d=>{const c=f(e.state.params);if(!c)return d;let h=$(c);return h&&h!==l?()=>h:(h=d(),l=h,H(c,h),()=>h)},onSuccess:(d,c)=>{const h=f(c);h&&(a.value?.(),m(h,{data:d,params:c,time:Date.now()}),a.value=A(h,oe=>{e.setState({data:oe.data})}))},onMutate(d){const c=f(e.state.params);c&&(a.value?.(),m(c,{data:d,params:e.state.params,time:Date.now()}),a.value=A(c,h=>{e.setState({data:h.data})}))}}}),Q=p((e,{errorRetryCount:t=0,errorRetryInterval:n})=>{const s=i.ref(),r=i.ref(0),o=i.ref(!1),a=i.computed(()=>1e3*Math.pow(2,r.value)),l=()=>{let f=null;r.value++;const{value:m}=b(i.toValue(t),!0),v=m===-1,y=r.value<=m;if(v||y){let{is:d,value:c}=b(i.toValue(n));d||(c=i.toValue(Math.min(a.value,3e4))),f=setTimeout(()=>{o.value=!0,e.refresh()},c)}return()=>{f&&clearTimeout(f)}},u=()=>{s.value?.()},{is:g}=b(i.toValue(t),!0);return g?{onBefore:()=>{o.value||(r.value=0),o.value=!1,u()},onSuccess:()=>{r.value=0},onError:()=>{s.value=l()},onCancel:()=>{r.value=0,u()}}:{}}),E=()=>C||P(window.document?.visibilityState)?!0:document.visibilityState==="visible",x=new Set,X=e=>(x.add(e),()=>{x.delete(e)}),Y=()=>{E()&&x.forEach(e=>{e()})};!C&&window?.addEventListener&&window.addEventListener("visibilitychange",Y,!1);const Z=p((e,{pollingInterval:t,pollingWhenHidden:n=!0,errorRetryCount:s})=>{const r=i.ref(null),o=i.ref(),a=()=>{let l;const{value:u}=b(i.toValue(s),!0);if(e.state.error&&u!==0)return;const{is:g,value:f}=b(i.toValue(t));return g?(l=setTimeout(()=>{!i.toValue(n)&&!E()?r.value=X(e.refresh):e.refresh()},f),()=>{l&&clearTimeout(l),r.value?.()}):void 0};return i.watch([()=>i.toValue(t),()=>i.toValue(n)],()=>{o.value?.(),o.value=a()}),i.onUnmounted(()=>{r.value?.()}),{onBefore:()=>{o.value?.()},onCancel:()=>{o.value?.()},onFinally:()=>{o.value=a()}}}),G=p((e,{manual:t,refreshDeps:n,refreshDepsAction:s})=>{if(P(n)||typeof n!="object"&&typeof n!="function")return{};const r=i.watch(n,()=>{t||(s?s():e.refresh())},{deep:!0});return{onCancel:()=>{r()}}}),k=()=>(!C&&window.navigator?.onLine)??!0,M=new Set,I=e=>(M.add(e),()=>{M.delete(e)}),O=()=>{!E()||!k()||M.forEach(e=>{e()})};!C&&window?.addEventListener&&(window.addEventListener("visibilitychange",O,!1),window.addEventListener("focus",O,!1));const K=p((e,{refocusTimespan:t=5e3,refreshOnWindowFocus:n=!1})=>{const s=i.ref(),{is:r}=b(i.toValue(t));if(!r||P(i.toValue(n))||typeof i.toValue(n)!="boolean")return{};const o=(a,l)=>{let u=!1;return()=>{u||(u=!0,a(),setTimeout(()=>{u=!1},l))}};return i.watchEffect(()=>{s.value?.(),i.toValue(n)&&(s.value=I(o(e.refresh,i.toValue(t))))}),i.onUnmounted(()=>{s.value?.()}),{}}),ee=p((e,{manual:t,ready:n=!0,defaultParams:s=[]})=>{const r=i.watch(()=>i.toValue(n),o=>{!t&&o&&e.run(...s)},{flush:"sync"});return{onBefore:()=>({isReady:i.toValue(n)}),onCancel:()=>{r()}}});function te(e,t,n){var s=null,r=null,o=typeof n=="boolean"?{leading:n,trailing:!n}:Object.assign({leading:!1,trailing:!0},n),a=!1,l=null,u=o.leading,g=o.trailing,f=function(){s=null,r=null},m=function(){a=!0,e.apply(r,s),f()},v=function(){if(u===!0&&(l=null),a){f();return}if(g===!0){m();return}f()},y=function(){var c=l!==null;return c&&clearTimeout(l),f(),l=null,a=!1,c},d=function(){a=!1,s=arguments,r=this,l===null?u===!0&&m():clearTimeout(l),l=setTimeout(v,t)};return d.cancel=y,d}const ne=p((e,{debounceWait:t,debounceOptions:n,manual:s})=>{const r=i.ref(!1);let o=null;const a=e.runAsync;return s||(r.value=!0),i.watchEffect(()=>{const{is:l,value:u}=b(i.toValue(t));if(!l)return;const g=i.toValue(n);o=te(f=>f(),u,g),e.runAsync=(...f)=>new Promise((m,v)=>{r.value?(r.value=!1,a(...f).then(m).catch(v)):o(()=>{a(...f).then(m).catch(v)})}),i.onWatcherCleanup(()=>{o?.cancel(),e.runAsync=a})}),{onCancel:()=>{o?.cancel()}}});function re(e,t,n){var s=null,r=null,o=!1,a=null,l=Object.assign({leading:!0,trailing:!0},n),u=l.leading,g=l.trailing,f=function(){s=null,r=null},m=function(){o=!0,e.apply(r,s),a=setTimeout(v,t),f()},v=function(){if(a=null,o){f();return}if(g===!0){m();return}f()},y=function(){var c=a!==null;return c&&clearTimeout(a),f(),a=null,o=!1,c},d=function(){if(s=arguments,r=this,o=!1,a===null&&u===!0){m();return}g===!0&&(a=setTimeout(v,t))};return d.cancel=y,d}const ie=p((e,{throttleWait:t,throttleOptions:n})=>{let s=null;const r=e.runAsync;return i.watchEffect(()=>{const{is:o,value:a}=b(i.toValue(t));if(!o)return;const l=i.toValue(n);s=re(u=>u(),a,l),e.runAsync=(...u)=>new Promise((g,f)=>{s(()=>{r(...u).then(g).catch(f)})}),i.onWatcherCleanup(()=>{s?.cancel(),e.runAsync=r})}),{onCancel:()=>{s?.cancel()}}}),se=[Q,Z,G,K,W,ee,ne,ie,J];function ae(e,t,n){return D(e,t||{},[...n||[],...se])}w.clearCache=F,w.definePlugin=p,w.useRequest=ae,Object.defineProperty(w,Symbol.toStringTag,{value:"Module"})});
+(function(w,i){typeof exports=="object"&&typeof module<"u"?i(exports,require("vue")):typeof define=="function"&&define.amd?define(["exports","vue"],i):(w=typeof globalThis<"u"?globalThis:w||self,i(w.Vue3Request={},w.Vue))})(this,function(w,i){"use strict";const p=e=>e,P=e=>e==null,C=typeof window>"u";function q(e){return P(e)?e:typeof e=="number"&&!isNaN(e)}function b(e,t){return q(e)===void 0?{is:!1,value:0}:q(e)?t&&e===-1?{is:!0,value:-1}:{is:!0,value:e===0||e&&e<0?0:e}:{is:!1,value:0}}const O=(e,t)=>{let n=t;for(let s=e.length;s-- >0;){const r=e[s];n=r(n)}return n?.()},T=()=>new Promise(()=>{}),V=new Map,j=(e,t,{data:n,params:s,time:r})=>{let a;const o=B(e),{is:l,value:f}=b(t,!0);l&&(o?.timer&&clearTimeout(o.timer),f!==-1&&(a=setTimeout(()=>{F(e)},f)),V.set(e,{data:n,params:s,time:r,timer:a}))},B=e=>V.get(e),F=e=>{e&&typeof e=="string"?V.delete(e):V.clear()};class N{constructor(t,n){this.service=t,this.options=n,this.state=i.reactive({data:void 0,res:void 0,error:void 0,params:n?.defaultParams||[],loading:!1,isFinished:!1,isAborted:!1,signal:new AbortController().signal})}currentRequestId=0;pluginImpls=[];state;abort=()=>{};setState=t=>{if(Object.assign(this.state,t),t.data&&typeof t.data=="object"&&!P(t.data)){const n=this.options.resKey||"data";Reflect.has(t.data,n)&&(this.state.res=t.data[n])}};executePlugin=(t,...n)=>{if(t==="onRequest")return{servicePromise:O(this.pluginImpls.map(r=>r.onRequest).filter(Boolean),n[0])};{const s=this.pluginImpls.map(r=>r[t]?.(...n)).filter(Boolean);return Object.assign({},...s)}};loading=t=>{this.setState({loading:t,isFinished:!t})};onFinished=()=>{this.executePlugin("onFinally",this.state.params),this.loading(!1),this.options.onFinally?.(this.state.params)};runAsync=async(...t)=>{const n=++this.currentRequestId,{isReturn:s,isReady:r,...a}=this.executePlugin("onBefore",t);if(!r)return T();if(this.setState({params:t,...a}),this.loading(!0),s)return this.loading(!1),a.data;this.options.onBefore?.(t);try{const o=()=>this.service(...t);let{servicePromise:l}=this.executePlugin("onRequest",o);return l||(l=o()),n!==this.currentRequestId?T():(this.setState({data:await l,error:void 0}),this.executePlugin("onSuccess",t),this.options.onSuccess?.(t),this.onFinished(),this.state.data)}catch(o){if(n!==this.currentRequestId)return T();throw this.setState({data:void 0,res:void 0,error:o}),this.executePlugin("onError",t),this.options.onError?.(t),this.onFinished(),this.state.error}};run=(...t)=>{this.runAsync(...t).catch(n=>{this.options.onError})};refresh=()=>{this.run(...this.state.params)};refreshAsync=async()=>await this.runAsync(...this.state.params);cancel=()=>{this.executePlugin("onCancel"),this.currentRequestId++,this.loading(!1)}}function U(e,t,n){const s={manual:!1,...t},r=new N(e,s);r.pluginImpls=n.map(h=>h(r,s)),i.onMounted(()=>{if(!s.manual){const h=r.state.params;r.run(...h)}}),i.onUnmounted(r.cancel);const{run:a,cancel:o,refresh:l,runAsync:f,refreshAsync:g,abort:u}=r;return{...i.toRefs(r.state),run:a,cancel:o,refresh:l,runAsync:f,abort:u,refreshAsync:g,clearCache:F}}const W=p((e,{abortPrevious:t=!0})=>{let n=null;const s=()=>{n=new AbortController,e.setState({signal:n.signal,isAborted:n.signal.aborted})};return e.abort=()=>{n&&!n.signal.aborted&&!e.state.isFinished&&(n.abort(),e.setState({isAborted:n.signal.aborted}))},{onBefore:()=>{typeof t=="boolean"&&t&&e.abort(),s()},onRequest:r=>()=>r(),onCancel:()=>{e.abort(),n=null}}}),R=new Map,_=(e,{data:t,params:n,time:s})=>{R.has(e)&&R.get(e)?.forEach(a=>a({data:t,params:n,time:s}))},L=(e,t)=>(R.has(e)?R.get(e)?.add(t):R.set(e,new Set),()=>{const n=R.get(e);n?.delete(t),n?.size===0&&R.delete(e)}),S=new Map,D=(e,t)=>{S.set(e,t),t.then(()=>{}).catch(()=>{}).finally(()=>{$(e)})},H=e=>S.get(e),$=e=>{e&&typeof e=="string"?S.delete(e):S.clear()},z=p((e,{cacheKey:t,cacheTime:n=3e5,staleTime:s=0,setCache:r,getCache:a})=>{const o=i.ref(null);let l=null;const{is:f,value:g}=b(s,!0);if(!f)return{};const u=typeof t=="function"?t:()=>t,h=(d,c)=>{r?r(d,c):j(d,n,c),_(d,c)},v=d=>a?a(d):B(d);function y(){const d=u();if(!d)return;const c=v(d);c&&Reflect.has(c,"data")&&e.setState({data:c.data,params:c.params}),o.value=L(d,m=>{e.setState({data:m.data})})}return y(),i.onUnmounted(()=>{o.value?.()}),{onBefore:d=>{const c=u(d);if(!c)return null;const m=v(c);return!m||!Reflect.has(m,"data")?{}:g===-1||Date.now()-m.time<g?{data:m.data,error:void 0,isReturn:!0}:{data:m.data,error:void 0}},onRequest:d=>{const c=u(e.state.params);if(!c)return d;let m=H(c);return m&&m!==l?()=>m:(m=d(),l=m,D(c,m),()=>m)},onSuccess:d=>{const c=u(d);c&&(o.value?.(),h(c,{data:e.state.data,params:d,time:Date.now()}),o.value=L(c,m=>{e.setState({data:m.data})}))}}}),J=p((e,{errorRetryCount:t=0,errorRetryInterval:n})=>{const s=i.ref(),r=i.ref(0),a=i.ref(!1),o=i.computed(()=>1e3*Math.pow(2,r.value)),l=()=>{let u=null;r.value++;const{value:h}=b(i.toValue(t),!0),v=h===-1,y=r.value<=h;if(v||y){let{is:d,value:c}=b(i.toValue(n));d||(c=i.toValue(Math.min(o.value,3e4))),u=setTimeout(()=>{a.value=!0,e.refresh()},c)}return()=>{u&&clearTimeout(u)}},f=()=>{s.value?.()},{is:g}=b(i.toValue(t),!0);return g?{onBefore:()=>{a.value||(r.value=0),a.value=!1,f()},onSuccess:()=>{r.value=0},onError:()=>{s.value=l()},onCancel:()=>{r.value=0,f()}}:{}}),A=()=>C||P(window.document?.visibilityState)?!0:document.visibilityState==="visible",E=new Set,Q=e=>(E.add(e),()=>{E.delete(e)}),X=()=>{A()&&E.forEach(e=>{e()})};!C&&window?.addEventListener&&window.addEventListener("visibilitychange",X,!1);const Y=p((e,{pollingInterval:t,pollingWhenHidden:n=!0,errorRetryCount:s})=>{const r=i.ref(null),a=i.ref(),o=()=>{let l;const{value:f}=b(i.toValue(s),!0);if(e.state.error&&f!==0)return;const{is:g,value:u}=b(i.toValue(t));return g?(l=setTimeout(()=>{!i.toValue(n)&&!A()?r.value=Q(e.refresh):e.refresh()},u),()=>{l&&clearTimeout(l),r.value?.()}):void 0};return i.watch([()=>i.toValue(t),()=>i.toValue(n)],()=>{a.value?.(),a.value=o()}),i.onUnmounted(()=>{r.value?.()}),{onBefore:()=>{a.value?.()},onCancel:()=>{a.value?.()},onFinally:()=>{a.value=o()}}}),Z=p((e,{manual:t,refreshDeps:n,refreshDepsAction:s})=>{if(P(n)||typeof n!="object"&&typeof n!="function")return{};const r=i.watch(n,()=>{t||(s?s():e.refresh())},{deep:!0});return{onCancel:()=>{r()}}}),G=()=>(!C&&window.navigator?.onLine)??!0,x=new Set,I=e=>(x.add(e),()=>{x.delete(e)}),M=()=>{!A()||!G()||x.forEach(e=>{e()})};!C&&window?.addEventListener&&(window.addEventListener("visibilitychange",M,!1),window.addEventListener("focus",M,!1));const k=p((e,{refocusTimespan:t=5e3,refreshOnWindowFocus:n=!1})=>{const s=i.ref(),{is:r}=b(i.toValue(t));if(!r||P(i.toValue(n))||typeof i.toValue(n)!="boolean")return{};const a=(o,l)=>{let f=!1;return()=>{f||(f=!0,o(),setTimeout(()=>{f=!1},l))}};return i.watchEffect(()=>{s.value?.(),i.toValue(n)&&(s.value=I(a(e.refresh,i.toValue(t))))}),i.onUnmounted(()=>{s.value?.()}),{}}),K=p((e,{manual:t,ready:n=!0,defaultParams:s=[]})=>{const r=i.watch(()=>i.toValue(n),a=>{!t&&a&&e.run(...s)},{flush:"sync"});return{onBefore:()=>({isReady:i.toValue(n)}),onCancel:()=>{r()}}});function ee(e,t,n){var s=null,r=null,a=typeof n=="boolean"?{leading:n,trailing:!n}:Object.assign({leading:!1,trailing:!0},n),o=!1,l=null,f=a.leading,g=a.trailing,u=function(){s=null,r=null},h=function(){o=!0,e.apply(r,s),u()},v=function(){if(f===!0&&(l=null),o){u();return}if(g===!0){h();return}u()},y=function(){var c=l!==null;return c&&clearTimeout(l),u(),l=null,o=!1,c},d=function(){o=!1,s=arguments,r=this,l===null?f===!0&&h():clearTimeout(l),l=setTimeout(v,t)};return d.cancel=y,d}const te=p((e,{debounceWait:t,debounceOptions:n,manual:s})=>{const r=i.ref(!1);let a=null;const o=e.runAsync;return s||(r.value=!0),i.watchEffect(()=>{const{is:l,value:f}=b(i.toValue(t));if(!l)return;const g=i.toValue(n);a=ee(u=>u(),f,g),e.runAsync=(...u)=>new Promise((h,v)=>{r.value?(r.value=!1,o(...u).then(h).catch(v)):a(()=>{o(...u).then(h).catch(v)})}),i.onWatcherCleanup(()=>{a?.cancel(),e.runAsync=o})}),{onCancel:()=>{a?.cancel()}}});function ne(e,t,n){var s=null,r=null,a=!1,o=null,l=Object.assign({leading:!0,trailing:!0},n),f=l.leading,g=l.trailing,u=function(){s=null,r=null},h=function(){a=!0,e.apply(r,s),o=setTimeout(v,t),u()},v=function(){if(o=null,a){u();return}if(g===!0){h();return}u()},y=function(){var c=o!==null;return c&&clearTimeout(o),u(),o=null,a=!1,c},d=function(){if(s=arguments,r=this,a=!1,o===null&&f===!0){h();return}g===!0&&(o=setTimeout(v,t))};return d.cancel=y,d}const re=p((e,{throttleWait:t,throttleOptions:n})=>{let s=null;const r=e.runAsync;return i.watchEffect(()=>{const{is:a,value:o}=b(i.toValue(t));if(!a)return;const l=i.toValue(n);s=ne(f=>f(),o,l),e.runAsync=(...f)=>new Promise((g,u)=>{s(()=>{r(...f).then(g).catch(u)})}),i.onWatcherCleanup(()=>{s?.cancel(),e.runAsync=r})}),{onCancel:()=>{s?.cancel()}}}),ie=[J,Y,Z,k,W,K,te,re,z];function se(e,t,n){return U(e,t||{},[...n||[],...ie])}w.clearCache=F,w.definePlugin=p,w.useRequest=se,Object.defineProperty(w,Symbol.toStringTag,{value:"Module"})});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue3-request",
-  "version": "1.0.24",
+  "version": "1.0.26",
   "type": "module",
   "description": "A Vue3 asynchronous request processing library, designed to simplify your asynchronous operations and API calls.",
   "main": "dist/vue3-request.es.js",