vue3-request 1.0.23 → 1.0.25

package/README.md

@@ -1,7 +1,44 @@
+更多内容请查看<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、res、error、signal、params 等状态
+- 🔄 提供 run、runAsync、refresh、cancel、abort 等便捷方法
+- 🎛️ 支持手动和自动执行模式，满足不同业务场景
+
+🧩 强大的插件生态 内置 9 大核心插件，开箱即用：
+
+- <img src="https://Flame-00.github.io/vue3-request/cancel.svg" alt="取消请求" width="20" height="20" /> 请求中止
+- 🔄 错误重试
+- ⚡ 防抖节流
+- 💾 智能缓存
+- 🔁 轮询请求
+- 👁️ 窗口聚焦刷新
+- 📦 依赖刷新
+- ⏳ 准备状态控制
+- 💻 完整 TypeScript 支持
+- 🔌 框架无关
+- 📝 丰富的生命周期
+- 🎨 可扩展架构
+- 📚 完善文档
+
 ## ⚡ 快速安装
 
 ```bash [pnpm]
 pnpm add vue3-request
+# or
+npm i vue3-request
+# or
+yarn add vue3-request
+# or
+cnpm i vue3-request
 ```
 
 ## 🚀 5 分钟上手
@@ -28,7 +65,6 @@ const getUserInfo = async () => {
 };
 
 // 一行代码搞定状态管理
-const { data, error, loading, signal, refresh, abort } =
-  useRequest(getUserInfo); 
+const { data, error, loading, signal, refresh, abort } = useRequest(getUserInfo);
 </script>
 ```

package/dist/vue3-request.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=require("vue"),p=e=>e,C=e=>e==null,S=typeof window>"u";function E(e){return C(e)?e:typeof e=="number"&&!isNaN(e)}function b(e,t){return E(e)===void 0?{is:!1,value:0}:E(e)?t&&e===-1?{is:!0,value:-1}:{is:!0,value:e===0||e&&e<0?0:e}:{is:!1,value:0}}const L=(e,t)=>{let n=t;for(let s=e.length;s-- >0;){const r=e[s];n=r(n)}return n?.()},F=()=>new Promise(()=>{}),O=e=>e instanceof Function,R=new Map,j=(e,t,{data:n,params:s,time:r})=>{let u;const a=B(e),{is:o,value:l}=b(t,!0);o&&(a?.timer&&clearTimeout(a.timer),l!==-1&&(u=setTimeout(()=>{T(e)},l)),R.set(e,{data:n,params:s,time:r,timer:u}))},B=e=>R.get(e),T=e=>{e&&typeof e=="string"?R.delete(e):R.clear()};class N{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:L(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}),this.loading(!0),s)return this.loading(u.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=>{O(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 U(e,t,n){const s={manual:!1,...t},r=new N(e,s);r.pluginImpls=n.map(g=>g(r,s)),i.onMounted(()=>{if(!s.manual){const g=r.state.params;r.run(...g)}}),i.onUnmounted(r.cancel);const{run:u,cancel:a,refresh:o,runAsync:l,refreshAsync:v,abort:f,mutate:h}=r;return{...i.toRefs(r.state),run:u,cancel:a,refresh:o,runAsync:l,mutate:h,abort:f,refreshAsync:v,clearCache:T}}const D=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}}}),w=new Map,W=(e,{data:t,params:n,time:s})=>{w.has(e)&&w.get(e)?.forEach(u=>u({data:t,params:n,time:s}))},x=(e,t)=>(w.has(e)?w.get(e)?.add(t):w.set(e,new Set),()=>{const n=w.get(e);n?.delete(t),n?.size===0&&w.delete(e)}),P=new Map,H=(e,t)=>{P.set(e,t),t.then(n=>{}).catch(()=>{}).finally(()=>{$(e)})},_=e=>P.get(e),$=e=>{e&&typeof e=="string"?P.delete(e):P.clear()},z=p((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}=b(s,!0);if(!l)return{};const f=(c,d)=>{r?r(c,d):j(c,n,d),W(c,d)},h=c=>u?u(c):B(c);function g(){if(!t)return;const c=h(t);c&&Reflect.has(c,"data")&&e.setState({data:c.data,params:c.params}),a.value=x(t,d=>{e.setState({data:d.data})})}return g(),i.onUnmounted(()=>{a.value?.()}),{onBefore:()=>{if(!t)return null;const c=h(t);return!c||!Reflect.has(c,"data")?{}:v===-1||Date.now()-c.time<v?{loading:!1,data:c.data,error:void 0,isReturn:!0}:{data:c.data,error:void 0}},onRequest:c=>{if(!t)return c;let d=_(t);return d&&d!==o?()=>d:(d=c(),o=d,H(t,d),()=>d)},onSuccess:(c,d)=>{if(!t)return;const m={data:c,params:d,time:Date.now()};a.value?.(),f(t,m),a.value=x(t,M=>{e.setState({data:M.data})})}}}),I=p((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:h}=b(i.toValue(t),!0),g=h===-1,c=r.value<=h;if(g||c){let{is:d,value:m}=b(i.toValue(n));d||(m=i.toValue(Math.min(a.value,3e4))),f=setTimeout(()=>{u.value=!0,e.refresh()},m)}return()=>{f&&clearTimeout(f)}},l=()=>{s.value?.()},{is:v}=b(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()}}:{}}),A=()=>S||C(window.document?.visibilityState)?!0:document.visibilityState==="visible",V=new Set,J=e=>(V.add(e),()=>{V.delete(e)}),Q=()=>{A()&&V.forEach(e=>{e()})};!S&&window?.addEventListener&&window.addEventListener("visibilitychange",Q,!1);const X=p((e,{pollingInterval:t,pollingWhenHidden:n=!0,errorRetryCount:s})=>{const r=i.ref(null),u=i.ref(),a=()=>{let o;const{value:l}=b(i.toValue(s),!0);if(e.state.error&&l!==0)return;const{is:v,value:f}=b(i.toValue(t));return v?(o=setTimeout(()=>{!i.toValue(n)&&!A()?r.value=J(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()}}}),Y=p((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()}}}),Z=()=>(!S&&window.navigator?.onLine)??!0,y=new Set,G=e=>(y.add(e),()=>{y.delete(e)}),q=()=>{!A()||!Z()||y.forEach(e=>{e()})};!S&&window?.addEventListener&&(window.addEventListener("visibilitychange",q,!1),window.addEventListener("focus",q,!1));const k=p((e,{refocusTimespan:t=5e3,refreshOnWindowFocus:n=!1})=>{const s=i.ref(),{is:r}=b(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=G(u(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),u=>{!t&&u&&e.run(...s)},{flush:"sync"});return{onBefore:()=>({isReady:i.toValue(n)}),onCancel:()=>{r()}}});function ee(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},h=function(){a=!0,e.apply(r,s),f()},g=function(){if(l===!0&&(o=null),a){f();return}if(v===!0){h();return}f()},c=function(){var m=o!==null;return m&&clearTimeout(o),f(),o=null,a=!1,m},d=function(){a=!1,s=arguments,r=this,o===null?l===!0&&h():clearTimeout(o),o=setTimeout(g,t)};return d.cancel=c,d}const te=p((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}=b(i.toValue(t));if(!o)return;const v=i.toValue(n);u=ee(f=>f(),l,v),e.runAsync=(...f)=>new Promise((h,g)=>{r.value?(r.value=!1,a(...f).then(h).catch(g)):u(()=>{a(...f).then(h).catch(g)})}),i.onWatcherCleanup(()=>{u?.cancel(),e.runAsync=a})}),{onCancel:()=>{u?.cancel()}}});function ne(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},h=function(){u=!0,e.apply(r,s),a=setTimeout(g,t),f()},g=function(){if(a=null,u){f();return}if(v===!0){h();return}f()},c=function(){var m=a!==null;return m&&clearTimeout(a),f(),a=null,u=!1,m},d=function(){if(s=arguments,r=this,u=!1,a===null&&l===!0){h();return}v===!0&&(a=setTimeout(g,t))};return d.cancel=c,d}const re=p((e,{throttleWait:t,throttleOptions:n})=>{let s=null;const r=e.runAsync;return i.watchEffect(()=>{const{is:u,value:a}=b(i.toValue(t));if(!u)return;const o=i.toValue(n);s=ne(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()}}}),se=[I,X,Y,k,D,K,te,re,z];function ie(e,t,n){return U(e,t||{},[...n||[],...se])}exports.clearCache=T;exports.definePlugin=p;exports.useRequest=ie;
+"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()),this.setState({data:await o,error:void 0}),n!==this.currentRequestId?V():(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;
@@ -18,7 +18,7 @@ declare type BaseOptions<D, P extends any[]> = Partial<{
     errorRetryInterval: number | Ref<number>;
     refreshOnWindowFocus: boolean | Ref<boolean>;
     refocusTimespan: number | Ref<number>;
-    cacheKey: string;
+    cacheKey: string | ((params?: P) => string);
     cacheTime: number;
     staleTime: number;
     setCache: (cacheKey: string, cacheData: CacheParamsType) => void;
@@ -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,28 +71,30 @@ declare type PluginMethodsReturn<D, P extends any[]> = Partial<{
     signal: AbortSignal;
     isReturn: boolean;
     isReady: boolean;
-    data?: D;
-    loading: boolean;
+    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 | ((data: D) => 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;
@@ -96,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;
 }
 
@@ -109,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;
@@ -121,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 F, toRefs as _, ref as R, computed as $, toValue as d, watch as x, watchEffect as B, onWatcherCleanup as j } from "vue";
-const p = (e) => e, S = (e) => e == null, T = typeof window > "u";
-function L(e) {
-  return S(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 b(e, t) {
-  return L(e) === void 0 ? {
+function p(e, t) {
+  return O(e) === void 0 ? {
     is: !1,
     value: 0
-  } : L(e) ? t && e === -1 ? {
+  } : O(e) ? t && e === -1 ? {
     is: !0,
     value: -1
   } : {
@@ -20,25 +20,26 @@ function b(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?.();
-}, y = () => new Promise(() => {
-}), I = (e) => e instanceof Function, P = /* @__PURE__ */ new Map(), U = (e, t, { data: n, params: s, time: r }) => {
-  let i;
-  const u = N(e), { is: a, value: o } = b(t, !0);
-  a && (u?.timer && clearTimeout(u.timer), o !== -1 && (i = setTimeout(() => {
-    V(e);
-  }, o)), P.set(e, { data: n, params: s, time: r, timer: i }));
-}, N = (e) => P.get(e), V = (e) => {
-  e && typeof e == "string" ? P.delete(e) : P.clear();
+}, A = () => new Promise(() => {
+}), 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 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,7 +54,10 @@ class J {
   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")
@@ -64,48 +68,43 @@ class J {
         )
       };
     {
-      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, ...i } = this.executePlugin(
+    const n = ++this.currentRequestId, { isReturn: i, isReady: r, ...s } = this.executePlugin(
       "onBefore",
       t
     );
     if (!r)
-      return y();
-    if (this.setState({ params: t }), this.loading(!0), s)
-      return this.loading(i.loading || !1), i.data;
+      return A();
+    if (this.setState({ params: t, ...s }), this.loading(!0), i)
+      return this.loading(!1), s.data;
     this.options.onBefore?.(t);
     try {
-      const u = () => this.service(...t);
-      let { servicePromise: a } = this.executePlugin("onRequest", u);
-      a || (a = u());
-      const o = await a;
-      return n !== this.currentRequestId ? y() : (this.setState({ data: o, error: void 0 }), this.executePlugin("onSuccess", o, t), this.options.onSuccess?.(o, t), this.onFinished(), o);
-    } catch (u) {
+      const a = () => this.service(...t);
+      let { servicePromise: u } = this.executePlugin("onRequest", a);
+      return u || (u = a()), this.setState({ data: await u, error: void 0 }), n !== this.currentRequestId ? A() : (this.executePlugin("onSuccess", t), this.options.onSuccess?.(t), this.onFinished(), this.state.data);
+    } catch (a) {
       if (n !== this.currentRequestId)
-        return y();
-      const a = u;
-      throw this.setState({ data: void 0, error: a }), this.executePlugin("onError", a, t), this.options.onError?.(a, t), this.onFinished(), a;
+        return A();
+      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,47 @@ class J {
     this.run(...this.state.params);
   };
   refreshAsync = async () => await this.runAsync(...this.state.params);
-  mutate = (t) => {
-    I(t) ? t(this.state.data) : this.setState({ data: t }), this.executePlugin("onMutate", this.state.data);
-  };
+  // mutate = (data: D | ((data: D) => D)) => {
+  //   if (isFunction(data)) {
+  //     this.setState({ data: data(this.state.data!) });
+  //   } else {
+  //     this.setState({ data });
+  //   }
+  //   this.executePlugin("onMutate", this.state.data);
+  // };
   cancel = () => {
     this.executePlugin("onCancel"), this.currentRequestId++, this.loading(!1);
   };
 }
 function Q(e, t, n) {
-  const s = {
+  const i = {
     manual: !1,
     ...t
-  }, r = new J(e, s);
+  }, r = new J(e, i);
   r.pluginImpls = n.map(
-    (g) => g(r, s)
-  ), W(() => {
-    if (!s.manual) {
-      const g = r.state.params;
-      r.run(...g);
+    (h) => h(r, i)
+  ), H(() => {
+    if (!i.manual) {
+      const h = r.state.params;
+      r.run(...h);
     }
   }), F(r.cancel);
-  const { run: i, cancel: u, refresh: a, runAsync: o, refreshAsync: v, abort: c, mutate: h } = r;
+  const { run: s, cancel: a, refresh: u, runAsync: c, refreshAsync: v, abort: o } = r;
   return {
-    ..._(r.state),
-    run: i,
-    cancel: u,
-    refresh: a,
-    runAsync: o,
-    mutate: h,
-    abort: c,
+    ...W(r.state),
+    run: s,
+    cancel: a,
+    refresh: u,
+    runAsync: c,
+    // mutate,
+    abort: o,
     refreshAsync: v,
-    clearCache: V
+    clearCache: _
   };
 }
-const X = p((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,176 +168,192 @@ const X = p((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;
     }
   };
-}), w = /* @__PURE__ */ new Map(), Y = (e, { data: t, params: n, time: s }) => {
-  w.has(e) && w.get(e)?.forEach((i) => i({ data: t, params: n, time: s }));
-}, M = (e, t) => (w.has(e) ? w.get(e)?.add(t) : w.set(e, /* @__PURE__ */ new Set()), () => {
-  const n = w.get(e);
-  n?.delete(t), n?.size === 0 && w.delete(e);
-}), C = /* @__PURE__ */ new Map(), Z = (e, t) => {
-  C.set(e, t), t.then((n) => {
+}), 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);
+}), S = /* @__PURE__ */ new Map(), Z = (e, t) => {
+  S.set(e, t), t.then(() => {
   }).catch(() => {
   }).finally(() => {
-    k(e);
+    I(e);
   });
-}, G = (e) => C.get(e), k = (e) => {
-  e && typeof e == "string" ? C.delete(e) : C.clear();
-}, K = p(
+}, 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: i
+    getCache: s
   }) => {
-    const u = R(null);
-    let a = null;
-    const { is: o, value: v } = b(s, !0);
-    if (!o)
+    const a = R(null);
+    let u = null;
+    const { is: c, value: v } = p(i, !0);
+    if (!c)
       return {};
-    const c = (l, f) => {
-      r ? r(l, f) : U(l, n, f), Y(l, f);
-    }, h = (l) => i ? i(l) : N(l);
-    function g() {
-      if (!t) return;
-      const l = h(t);
+    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
-      }), u.value = M(t, (f) => {
+      }), a.value = q(f, (g) => {
         e.setState({
-          data: f.data
+          data: g.data
         });
       });
     }
-    return g(), F(() => {
-      u.value?.();
+    return w(), F(() => {
+      a.value?.();
     }), {
-      onBefore: () => {
-        if (!t) return null;
-        const l = h(t);
-        return !l || !Reflect.has(l, "data") ? {} : v === -1 || Date.now() - l.time < v ? {
-          loading: !1,
-          data: l.data,
+      onBefore: (f) => {
+        const l = o(f);
+        if (!l) return null;
+        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: l.data,
+          data: g.data,
           error: void 0
         };
       },
-      onRequest: (l) => {
-        if (!t) return l;
-        let f = G(t);
-        return f && f !== a ? () => f : (f = l(), a = f, Z(t, f), () => f);
+      onRequest: (f) => {
+        const l = o(e.state.params);
+        if (!l) return f;
+        let g = G(l);
+        return g && g !== u ? () => g : (g = f(), u = g, Z(l, g), () => g);
       },
-      onSuccess: (l, f) => {
-        if (!t) return;
-        const m = {
-          data: l,
+      onSuccess: (f) => {
+        const l = o(f);
+        l && (a.value?.(), h(l, {
+          data: e.state.data,
           params: f,
           time: Date.now()
-        };
-        u.value?.(), c(t, m), u.value = M(t, (D) => {
+        }), a.value = q(l, (g) => {
           e.setState({
-            data: D.data
+            data: g.data
           });
-        });
+        }));
       }
+      // onMutate(data) {
+      //   const cacheKey = _getCacheKey(requestInstance.state.params);
+      //   if (!cacheKey) return;
+      //   unSubscribe.value?.();
+      //   _setCache(cacheKey, {
+      //     data,
+      //     params: requestInstance.state.params,
+      //     time: Date.now(),
+      //   });
+      //   unSubscribe.value = on(cacheKey, (cacheData) => {
+      //     requestInstance.setState({
+      //       data: cacheData.data,
+      //     });
+      //   });
+      // },
     };
   }
-), ee = p((e, { errorRetryCount: t = 0, errorRetryInterval: n }) => {
-  const s = R(), r = R(0), i = R(!1), u = $(
+), K = b((e, { errorRetryCount: t = 0, errorRetryInterval: n }) => {
+  const i = R(), r = R(0), s = R(!1), a = $(
     () => 1e3 * Math.pow(2, r.value)
-  ), a = () => {
-    let c = null;
+  ), u = () => {
+    let o = null;
     r.value++;
-    const { value: h } = b(d(t), !0), g = h === -1, l = r.value <= h;
-    if (g || l) {
-      let { is: f, value: m } = b(d(n));
-      f || (m = d(Math.min(u.value, 3e4))), c = setTimeout(() => {
-        i.value = !0, e.refresh();
-      }, m);
+    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 } = b(d(t), !0);
+  }, c = () => {
+    i.value?.();
+  }, { is: v } = p(d(t), !0);
   return v ? {
     onBefore: () => {
-      i.value || (r.value = 0), i.value = !1, o();
+      s.value || (r.value = 0), s.value = !1, c();
     },
     onSuccess: () => {
       r.value = 0;
     },
     onError: () => {
-      s.value = a();
+      i.value = u();
     },
     onCancel: () => {
-      r.value = 0, o();
+      r.value = 0, c();
     }
   } : {};
-}), q = () => T || S(window.document?.visibilityState) ? !0 : document.visibilityState === "visible", A = /* @__PURE__ */ new Set(), te = (e) => (A.add(e), () => {
-  A.delete(e);
-}), ne = () => {
-  q() && A.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", ne, !1);
-const re = p(
-  (e, { pollingInterval: t, pollingWhenHidden: n = !0, errorRetryCount: s }) => {
-    const r = R(null), i = R(), u = () => {
-      let a;
-      const { value: o } = b(
-        d(s),
+!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: c } = p(
+        d(i),
         !0
       );
-      if (e.state.error && o !== 0) return;
-      const { is: v, value: c } = b(
+      if (e.state.error && c !== 0) return;
+      const { is: v, value: o } = p(
         d(t)
       );
-      return v ? (a = setTimeout(() => {
-        !d(n) && !q() ? r.value = te(e.refresh) : e.refresh();
-      }, c), () => {
-        a && clearTimeout(a), r.value?.();
+      return v ? (u = setTimeout(() => {
+        !d(n) && !M() ? r.value = ee(e.refresh) : e.refresh();
+      }, o), () => {
+        u && clearTimeout(u), r.value?.();
       }) : void 0;
     };
-    return x(
+    return B(
       [() => d(t), () => d(n)],
       () => {
-        i.value?.(), i.value = u();
+        s.value?.(), s.value = a();
       }
     ), F(() => {
       r.value?.();
     }), {
       onBefore: () => {
-        i.value?.();
+        s.value?.();
       },
       onCancel: () => {
-        i.value?.();
+        s.value?.();
       },
       onFinally: () => {
-        i.value = u();
+        s.value = a();
       }
     };
   }
-), se = p(
-  (e, { manual: t, refreshDeps: n, refreshDepsAction: s }) => {
-    if (S(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 = x(
+    const r = B(
       n,
       () => {
-        t || (s ? s() : e.refresh());
+        t || (i ? i() : e.refresh());
       },
       {
         deep: !0
@@ -345,41 +365,41 @@ const re = p(
       }
     };
   }
-), ie = () => (!T && window.navigator?.onLine) ?? !0, E = /* @__PURE__ */ new Set(), ue = (e) => (E.add(e), () => {
-  E.delete(e);
-}), O = () => {
-  !q() || !ie() || E.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", O, !1), window.addEventListener("focus", O, !1));
-const ae = p(
+!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 = R(), { is: r } = b(d(t));
-    if (!r || S(d(n)) || typeof d(n) != "boolean")
+    const i = R(), { is: r } = p(d(t));
+    if (!r || P(d(n)) || typeof d(n) != "boolean")
       return {};
-    const i = (u, a) => {
-      let o = !1;
+    const s = (a, u) => {
+      let c = !1;
       return () => {
-        o || (o = !0, u(), setTimeout(() => {
-          o = !1;
-        }, a));
+        c || (c = !0, a(), setTimeout(() => {
+          c = !1;
+        }, u));
       };
     };
-    return B(() => {
-      s.value?.(), d(n) && (s.value = ue(
-        i(e.refresh, d(t))
+    return L(() => {
+      i.value?.(), d(n) && (i.value = se(
+        s(e.refresh, d(t))
       ));
     }), F(() => {
-      s.value?.();
+      i.value?.();
     }), {};
   }
-), oe = p(
-  (e, { manual: t, ready: n = !0, defaultParams: s = [] }) => {
-    const r = x(
+), ue = b(
+  (e, { manual: t, ready: n = !0, defaultParams: i = [] }) => {
+    const r = B(
       () => d(n),
-      (i) => {
-        !t && i && e.run(...s);
+      (s) => {
+        !t && s && e.run(...i);
       },
       {
         flush: "sync"
@@ -393,127 +413,127 @@ const ae = p(
     };
   }
 );
-function le(e, t, n) {
-  var s = null, r = null, i = typeof n == "boolean" ? { leading: n, trailing: !n } : Object.assign({ leading: !1, trailing: !0 }, n), u = !1, a = null, o = i.leading, v = i.trailing, c = function() {
-    s = null, r = null;
+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() {
-    u = !0, e.apply(r, s), c();
-  }, g = function() {
-    if (o === !0 && (a = null), u) {
-      c();
+    a = !0, e.apply(r, i), o();
+  }, m = function() {
+    if (c === !0 && (u = null), a) {
+      o();
       return;
     }
     if (v === !0) {
       h();
       return;
     }
-    c();
-  }, l = function() {
-    var m = a !== null;
-    return m && clearTimeout(a), c(), a = null, u = !1, m;
+    o();
+  }, w = function() {
+    var l = u !== null;
+    return l && clearTimeout(u), o(), u = null, a = !1, l;
   }, f = function() {
-    u = !1, s = arguments, r = this, a === null ? o === !0 && h() : clearTimeout(a), a = setTimeout(g, t);
+    a = !1, i = arguments, r = this, u === null ? c === !0 && h() : clearTimeout(u), u = setTimeout(m, t);
   };
-  return f.cancel = l, f;
+  return f.cancel = w, f;
 }
-const ce = p(
-  (e, { debounceWait: t, debounceOptions: n, manual: s }) => {
+const le = b(
+  (e, { debounceWait: t, debounceOptions: n, manual: i }) => {
     const r = R(!1);
-    let i = null;
-    const u = e.runAsync;
-    return s || (r.value = !0), B(() => {
-      const { is: a, value: o } = b(d(t));
-      if (!a) return;
+    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 = d(n);
-      i = le(
-        (c) => c(),
-        o,
+      s = oe(
+        (o) => o(),
+        c,
         v
-      ), e.runAsync = (...c) => new Promise((h, g) => {
-        r.value ? (r.value = !1, u(...c).then(h).catch(g)) : i(() => {
-          u(...c).then(h).catch(g);
+      ), 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);
         });
-      }), j(() => {
-        i?.cancel(), e.runAsync = u;
+      }), N(() => {
+        s?.cancel(), e.runAsync = a;
       });
     }), {
       onCancel: () => {
-        i?.cancel();
+        s?.cancel();
       }
     };
   }
 );
-function fe(e, t, n) {
-  var s = null, r = null, i = !1, u = null, a = Object.assign({ leading: !0, trailing: !0 }, n), o = a.leading, v = a.trailing, c = function() {
-    s = null, r = null;
+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() {
-    i = !0, e.apply(r, s), u = setTimeout(g, t), c();
-  }, g = function() {
-    if (u = null, i) {
-      c();
+    s = !0, e.apply(r, i), a = setTimeout(m, t), o();
+  }, m = function() {
+    if (a = null, s) {
+      o();
       return;
     }
     if (v === !0) {
       h();
       return;
     }
-    c();
-  }, l = function() {
-    var m = u !== null;
-    return m && clearTimeout(u), c(), u = null, i = !1, m;
+    o();
+  }, w = function() {
+    var l = a !== null;
+    return l && clearTimeout(a), o(), a = null, s = !1, l;
   }, f = function() {
-    if (s = arguments, r = this, i = !1, u === null && o === !0) {
+    if (i = arguments, r = this, s = !1, a === null && c === !0) {
       h();
       return;
     }
-    v === !0 && (u = setTimeout(g, t));
+    v === !0 && (a = setTimeout(m, t));
   };
-  return f.cancel = l, f;
+  return f.cancel = w, f;
 }
-const de = p(
+const fe = b(
   (e, { throttleWait: t, throttleOptions: n }) => {
-    let s = null;
+    let i = null;
     const r = e.runAsync;
-    return B(() => {
-      const { is: i, value: u } = b(d(t));
-      if (!i) return;
-      const a = d(n);
-      s = fe(
-        (o) => o(),
-        u,
-        a
-      ), e.runAsync = (...o) => new Promise((v, c) => {
-        s(() => {
-          r(...o).then(v).catch(c);
+    return L(() => {
+      const { is: s, value: a } = p(d(t));
+      if (!s) return;
+      const u = d(n);
+      i = ce(
+        (c) => c(),
+        a,
+        u
+      ), e.runAsync = (...c) => new Promise((v, o) => {
+        i(() => {
+          r(...c).then(v).catch(o);
         });
-      }), j(() => {
-        s?.cancel(), e.runAsync = r;
+      }), N(() => {
+        i?.cancel(), e.runAsync = r;
       });
     }), {
       onCancel: () => {
-        s?.cancel();
+        i?.cancel();
       }
     };
   }
-), ve = [
-  ee,
+), de = [
+  K,
+  ne,
   re,
-  se,
   ae,
   X,
-  oe,
-  ce,
-  de,
-  K
+  ue,
+  le,
+  fe,
+  k
 ];
-function ge(e, t, n) {
+function ve(e, t, n) {
   return Q(e, t || {}, [
     ...n || [],
-    ...ve
+    ...de
   ]);
 }
 export {
-  V as clearCache,
-  p as definePlugin,
-  ge as useRequest
+  _ as clearCache,
+  b as definePlugin,
+  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 v=t=>t,P=t=>t==null,C=typeof window>"u";function q(t){return P(t)?t:typeof t=="number"&&!isNaN(t)}function p(t,e){return q(t)===void 0?{is:!1,value:0}:q(t)?e&&t===-1?{is:!0,value:-1}:{is:!0,value:t===0||t&&t<0?0:t}:{is:!1,value:0}}const L=(t,e)=>{let n=e;for(let s=t.length;s-- >0;){const r=t[s];n=r(n)}return n?.()},y=()=>new Promise(()=>{}),O=t=>t instanceof Function,S=new Map,j=(t,e,{data:n,params:s,time:r})=>{let a;const o=x(t),{is:l,value:u}=p(e,!0);l&&(o?.timer&&clearTimeout(o.timer),u!==-1&&(a=setTimeout(()=>{T(t)},u)),S.set(t,{data:n,params:s,time:r,timer:a}))},x=t=>S.get(t),T=t=>{t&&typeof t=="string"?S.delete(t):S.clear()};class N{constructor(e,n){this.service=e,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=e=>{Object.assign(this.state,e)};executePlugin=(e,...n)=>{if(e==="onRequest")return{servicePromise:L(this.pluginImpls.map(r=>r.onRequest).filter(Boolean),n[0])};{const s=this.pluginImpls.map(r=>r[e]?.(...n)).filter(Boolean);return Object.assign({},...s)}};loading=e=>{this.setState({loading:e,isFinished:!e})};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(...e)=>{const n=++this.currentRequestId,{isReturn:s,isReady:r,...a}=this.executePlugin("onBefore",e);if(!r)return y();if(this.setState({params:e}),this.loading(!0),s)return this.loading(a.loading||!1),a.data;this.options.onBefore?.(e);try{const o=()=>this.service(...e);let{servicePromise:l}=this.executePlugin("onRequest",o);l||(l=o());const u=await l;return n!==this.currentRequestId?y():(this.setState({data:u,error:void 0}),this.executePlugin("onSuccess",u,e),this.options.onSuccess?.(u,e),this.onFinished(),u)}catch(o){if(n!==this.currentRequestId)return y();const l=o;throw this.setState({data:void 0,error:l}),this.executePlugin("onError",l,e),this.options.onError?.(l,e),this.onFinished(),l}};run=(...e)=>{this.runAsync(...e).catch(n=>{this.options.onError})};refresh=()=>{this.run(...this.state.params)};refreshAsync=async()=>await this.runAsync(...this.state.params);mutate=e=>{O(e)?e(this.state.data):this.setState({data:e}),this.executePlugin("onMutate",this.state.data)};cancel=()=>{this.executePlugin("onCancel"),this.currentRequestId++,this.loading(!1)}}function U(t,e,n){const s={manual:!1,...e},r=new N(t,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:a,cancel:o,refresh:l,runAsync:u,refreshAsync:h,abort:f,mutate:g}=r;return{...i.toRefs(r.state),run:a,cancel:o,refresh:l,runAsync:u,mutate:g,abort:f,refreshAsync:h,clearCache:T}}const D=v((t,{abortPrevious:e=!0})=>{let n=null;const s=()=>{n=new AbortController,t.setState({signal:n.signal,isAborted:n.signal.aborted})};return t.abort=()=>{n&&!n.signal.aborted&&!t.state.isFinished&&(n.abort(),t.setState({isAborted:n.signal.aborted}))},{onBefore:()=>{typeof e=="boolean"&&e&&t.abort(),s()},onRequest:r=>()=>r(),onCancel:()=>{t.abort(),n=null}}}),R=new Map,W=(t,{data:e,params:n,time:s})=>{R.has(t)&&R.get(t)?.forEach(a=>a({data:e,params:n,time:s}))},B=(t,e)=>(R.has(t)?R.get(t)?.add(e):R.set(t,new Set),()=>{const n=R.get(t);n?.delete(e),n?.size===0&&R.delete(t)}),V=new Map,H=(t,e)=>{V.set(t,e),e.then(n=>{}).catch(()=>{}).finally(()=>{$(t)})},_=t=>V.get(t),$=t=>{t&&typeof t=="string"?V.delete(t):V.clear()},z=v((t,{cacheKey:e,cacheTime:n=3e5,staleTime:s=0,setCache:r,getCache:a})=>{const o=i.ref(null);let l=null;const{is:u,value:h}=p(s,!0);if(!u)return{};const f=(c,d)=>{r?r(c,d):j(c,n,d),W(c,d)},g=c=>a?a(c):x(c);function m(){if(!e)return;const c=g(e);c&&Reflect.has(c,"data")&&t.setState({data:c.data,params:c.params}),o.value=B(e,d=>{t.setState({data:d.data})})}return m(),i.onUnmounted(()=>{o.value?.()}),{onBefore:()=>{if(!e)return null;const c=g(e);return!c||!Reflect.has(c,"data")?{}:h===-1||Date.now()-c.time<h?{loading:!1,data:c.data,error:void 0,isReturn:!0}:{data:c.data,error:void 0}},onRequest:c=>{if(!e)return c;let d=_(e);return d&&d!==l?()=>d:(d=c(),l=d,H(e,d),()=>d)},onSuccess:(c,d)=>{if(!e)return;const b={data:c,params:d,time:Date.now()};o.value?.(),f(e,b),o.value=B(e,at=>{t.setState({data:at.data})})}}}),I=v((t,{errorRetryCount:e=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 f=null;r.value++;const{value:g}=p(i.toValue(e),!0),m=g===-1,c=r.value<=g;if(m||c){let{is:d,value:b}=p(i.toValue(n));d||(b=i.toValue(Math.min(o.value,3e4))),f=setTimeout(()=>{a.value=!0,t.refresh()},b)}return()=>{f&&clearTimeout(f)}},u=()=>{s.value?.()},{is:h}=p(i.toValue(e),!0);return h?{onBefore:()=>{a.value||(r.value=0),a.value=!1,u()},onSuccess:()=>{r.value=0},onError:()=>{s.value=l()},onCancel:()=>{r.value=0,u()}}:{}}),F=()=>C||P(window.document?.visibilityState)?!0:document.visibilityState==="visible",A=new Set,J=t=>(A.add(t),()=>{A.delete(t)}),Q=()=>{F()&&A.forEach(t=>{t()})};!C&&window?.addEventListener&&window.addEventListener("visibilitychange",Q,!1);const X=v((t,{pollingInterval:e,pollingWhenHidden:n=!0,errorRetryCount:s})=>{const r=i.ref(null),a=i.ref(),o=()=>{let l;const{value:u}=p(i.toValue(s),!0);if(t.state.error&&u!==0)return;const{is:h,value:f}=p(i.toValue(e));return h?(l=setTimeout(()=>{!i.toValue(n)&&!F()?r.value=J(t.refresh):t.refresh()},f),()=>{l&&clearTimeout(l),r.value?.()}):void 0};return i.watch([()=>i.toValue(e),()=>i.toValue(n)],()=>{a.value?.(),a.value=o()}),i.onUnmounted(()=>{r.value?.()}),{onBefore:()=>{a.value?.()},onCancel:()=>{a.value?.()},onFinally:()=>{a.value=o()}}}),Y=v((t,{manual:e,refreshDeps:n,refreshDepsAction:s})=>{if(P(n)||typeof n!="object"&&typeof n!="function")return{};const r=i.watch(n,()=>{e||(s?s():t.refresh())},{deep:!0});return{onCancel:()=>{r()}}}),Z=()=>(!C&&window.navigator?.onLine)??!0,E=new Set,G=t=>(E.add(t),()=>{E.delete(t)}),M=()=>{!F()||!Z()||E.forEach(t=>{t()})};!C&&window?.addEventListener&&(window.addEventListener("visibilitychange",M,!1),window.addEventListener("focus",M,!1));const k=v((t,{refocusTimespan:e=5e3,refreshOnWindowFocus:n=!1})=>{const s=i.ref(),{is:r}=p(i.toValue(e));if(!r||P(i.toValue(n))||typeof i.toValue(n)!="boolean")return{};const a=(o,l)=>{let u=!1;return()=>{u||(u=!0,o(),setTimeout(()=>{u=!1},l))}};return i.watchEffect(()=>{s.value?.(),i.toValue(n)&&(s.value=G(a(t.refresh,i.toValue(e))))}),i.onUnmounted(()=>{s.value?.()}),{}}),K=v((t,{manual:e,ready:n=!0,defaultParams:s=[]})=>{const r=i.watch(()=>i.toValue(n),a=>{!e&&a&&t.run(...s)},{flush:"sync"});return{onBefore:()=>({isReady:i.toValue(n)}),onCancel:()=>{r()}}});function tt(t,e,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,u=a.leading,h=a.trailing,f=function(){s=null,r=null},g=function(){o=!0,t.apply(r,s),f()},m=function(){if(u===!0&&(l=null),o){f();return}if(h===!0){g();return}f()},c=function(){var b=l!==null;return b&&clearTimeout(l),f(),l=null,o=!1,b},d=function(){o=!1,s=arguments,r=this,l===null?u===!0&&g():clearTimeout(l),l=setTimeout(m,e)};return d.cancel=c,d}const et=v((t,{debounceWait:e,debounceOptions:n,manual:s})=>{const r=i.ref(!1);let a=null;const o=t.runAsync;return s||(r.value=!0),i.watchEffect(()=>{const{is:l,value:u}=p(i.toValue(e));if(!l)return;const h=i.toValue(n);a=tt(f=>f(),u,h),t.runAsync=(...f)=>new Promise((g,m)=>{r.value?(r.value=!1,o(...f).then(g).catch(m)):a(()=>{o(...f).then(g).catch(m)})}),i.onWatcherCleanup(()=>{a?.cancel(),t.runAsync=o})}),{onCancel:()=>{a?.cancel()}}});function nt(t,e,n){var s=null,r=null,a=!1,o=null,l=Object.assign({leading:!0,trailing:!0},n),u=l.leading,h=l.trailing,f=function(){s=null,r=null},g=function(){a=!0,t.apply(r,s),o=setTimeout(m,e),f()},m=function(){if(o=null,a){f();return}if(h===!0){g();return}f()},c=function(){var b=o!==null;return b&&clearTimeout(o),f(),o=null,a=!1,b},d=function(){if(s=arguments,r=this,a=!1,o===null&&u===!0){g();return}h===!0&&(o=setTimeout(m,e))};return d.cancel=c,d}const rt=v((t,{throttleWait:e,throttleOptions:n})=>{let s=null;const r=t.runAsync;return i.watchEffect(()=>{const{is:a,value:o}=p(i.toValue(e));if(!a)return;const l=i.toValue(n);s=nt(u=>u(),o,l),t.runAsync=(...u)=>new Promise((h,f)=>{s(()=>{r(...u).then(h).catch(f)})}),i.onWatcherCleanup(()=>{s?.cancel(),t.runAsync=r})}),{onCancel:()=>{s?.cancel()}}}),it=[I,X,Y,k,D,K,et,rt,z];function st(t,e,n){return U(t,e||{},[...n||[],...it])}w.clearCache=T,w.definePlugin=v,w.useRequest=st,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()),this.setState({data:await l,error:void 0}),n!==this.currentRequestId?T():(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.23",
+  "version": "1.0.25",
   "type": "module",
   "description": "A Vue3 asynchronous request processing library, designed to simplify your asynchronous operations and API calls.",
   "main": "dist/vue3-request.es.js",