soon-fetch 4.0.2-beta.1 → 4.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.js CHANGED
@@ -1 +1 @@
1
- var t=t=>{const e=[],r=t.match(/:([^:/]+)\/?/g);return r&&r.forEach(t=>{e.push(t.replace(/\//g,"").replace(/:/g,""))}),e},e=(t="")=>t.endsWith("/")?t.slice(0,-1):t,r=(t="")=>t.startsWith("/")?t:"/"+t,n=(t="")=>t.startsWith("http"),o=(t,o)=>n(t)?t:e(n(o)?o:r(o))+e(r(t)),a=t=>{if(!t)return[];if(t instanceof URLSearchParams||"string"==typeof t||Array.isArray(t))return Array.from(new URLSearchParams(t).entries());const e=[];return Object.entries(t).forEach(([t,r])=>{(Array.isArray(r)?r:[r]).forEach(r=>{e.push([t,String(r??"")])})}),e},s=(e,r)=>{const{query:n,params:s,baseURL:i}=r;let c=e.trim();t(e).forEach(t=>{s&&void 0!==s[t]&&(c=c.replaceAll(":"+t,""+s[t]))});const[f,u]=c.split("?"),l=new URLSearchParams([...a(u),...a(n)]),h=o(f??"",i);let p=h;return l.size&&(p=h+"?"+l),{query:l,url:p,path:h}},i=(...t)=>{const e=new Headers;return t.forEach(t=>{t&&(t instanceof Headers?t.forEach((t,r)=>e.set(r,t)):Array.isArray(t)?t.forEach(([t,r])=>e.set(t,r)):Object.entries(t).forEach(([t,r])=>e.set(t,r)))}),e};function c(t,e){const r=(t??[]).filter(t=>!!t);return e&&r.push(AbortSignal.timeout(e)),r.length?AbortSignal.any(r):void 0}function f(t){return[Int8Array,Uint8Array,Uint8ClampedArray,Int16Array,Uint16Array,Int32Array,Uint32Array,Float32Array,Float64Array,BigInt64Array,BigUint64Array].some(e=>t instanceof e)}function u(t){return null!=t&&("object"==typeof t&&(!(t instanceof FormData)&&(!(t instanceof Blob)&&(!(t instanceof ArrayBuffer)&&(!(t instanceof DataView)&&(!(t instanceof ReadableStream)&&(!(t instanceof URLSearchParams)&&!f(t))))))))}function l(t){const e=new FormData;return t&&"object"==typeof t&&!Array.isArray(t)&&Object.entries(t).forEach(([t,r])=>{if(null==r||"function"==typeof r)return;let n;n=r instanceof Blob?r:"object"==typeof r?JSON.stringify(r):String(r),e.append(t,n)}),e}var h=0,p=(t="")=>`${t}_nonce_${Date.now()}_${h++}__`;function y(t){return Array.from(new Uint8Array(t)).map(t=>t.toString(16).padStart(2,"0")).join("")}async function b(t){const e=await t.arrayBuffer();return globalThis.crypto?.subtle?.digest?y(await globalThis.crypto.subtle.digest("SHA-256",e)):p("blob")}async function d(t){if(null==t)return t;if("string"==typeof t)return t;if("object"!=typeof t)return String(t);if(t instanceof FormData){const e={},r=[];t.forEach((t,e)=>r.push([e,t]));for(const[t,n]of r)e[t]=n instanceof Blob?`__blob_${await b(n)}__`:n;return e}if(t instanceof Blob)return`__blob_${await b(t)}__`;if(t instanceof ArrayBuffer)return globalThis.crypto?.subtle?.digest?`__ab_${y(await globalThis.crypto.subtle.digest("SHA-256",t))}__`:p("__ab");if(t instanceof DataView){const e=t.buffer.slice(t.byteOffset,t.byteOffset+t.byteLength);return globalThis.crypto?.subtle?.digest?`__ab_${y(await globalThis.crypto.subtle.digest("SHA-256",e))}__`:p("__ab")}return t instanceof URLSearchParams?t.toString():t instanceof ReadableStream?p("_"):(f(t),t)}var g=t=>{if(t instanceof Response)return t.clone();if("function"==typeof t||t instanceof Promise||null===t||"object"!=typeof t)return t;try{return structuredClone(t)}catch(e){return JSON.parse(JSON.stringify(t))}};function m(...t){const e=Object.assign({},...t);return e.headers=i(...t.map(t=>t?.headers)),e.signal=c(t.map(t=>t?.signal),e.timeout),e}function O(t){const{url:e,options:r,baseURL:n,baseOptions:o}=t,a=m(o,r),{url:i,query:f}=s(e,{...a,baseURL:n});a.query=f;const l=a?.body,h=u(l);a.body=h?JSON.stringify(l):null!=l&&"string"!=typeof l&&"object"!=typeof l?String(l):l,h&&a.headers.set("Content-Type","application/json");const p=new AbortController;return a.signal=c([a.signal,p.signal]),{url:i,options:a,is_body_json:h,abortController:p}}var _=["get","post","put","delete","patch"];function A(t,e){const r={};return t.forEach(t=>{r[t]=e(t)}),r}function E(e){const r=(r,n,o)=>{const a=!!t(r).length;return(...t)=>{const s=[...t],{hasBody:i,hasQuery:c,isFormData:f,options:u}=o||{},h=a?s.shift():void 0,p=c?s.shift():void 0;let y=i?s.shift():void 0;f&&(y=l(y));const b=s.shift(),d=u?{...u,...b}:b;return e(r,n,h,p,y,d)}},n={hasBody:!0},o={hasQuery:!0},a={isFormData:!0},s={};return _.forEach(t=>{const e=t.toUpperCase();s[e]=e=>({Ok:()=>r(e,t),Options:n=>({Ok:()=>r(e,t,{options:n})}),Body:()=>({Ok:()=>r(e,t,{...n}),Options:o=>({Ok:()=>r(e,t,{...n,options:o})})}),FormData:()=>({Ok:()=>r(e,t,{...n,...a}),Options:o=>({Ok:()=>r(e,t,{...n,...a,options:o})})}),Params:()=>({Ok:()=>r(e,t),Options:n=>({Ok:()=>r(e,t,{options:n})}),Body:()=>({Ok:()=>r(e,t,{...n}),Options:o=>({Ok:()=>r(e,t,{...n,options:o})})}),FormData:()=>({Ok:()=>r(e,t,{...n,...a}),Options:o=>({Ok:()=>r(e,t,{...n,...a,options:o})})}),Query:()=>({Ok:()=>r(e,t,{...o}),Options:n=>({Ok:()=>r(e,t,{...o,options:n})}),Body:()=>({Ok:()=>r(e,t,{...n,...o}),Options:a=>({Ok:()=>r(e,t,{...n,...o,options:a})})}),FormData:()=>({Ok:()=>r(e,t,{...n,...o,...a}),Options:s=>({Ok:()=>r(e,t,{...n,...o,...a,options:s})})})})}),Query:()=>({Ok:()=>r(e,t,{...o}),Options:n=>({Ok:()=>r(e,t,{...o,options:n})}),Body:()=>({Ok:()=>r(e,t,{...n,...o}),Options:a=>({Ok:()=>r(e,t,{...n,...o,options:a})})}),FormData:()=>({Ok:()=>r(e,t,{...n,...o,...a}),Options:s=>({Ok:()=>r(e,t,{...n,...o,...a,options:s})})})})})}),s}function k(t,e=!1){if(Array.isArray(t)){const r=[...t];return e&&r.sort(),r.map(t=>k(t,e))}if("object"==typeof t&&null!==t){const r={};return Object.keys(t).sort().forEach(n=>{r[n]=k(t[n],e)}),r}return t}function S(t,e,r){const n={body:e,headers:Object.fromEntries(t.headers.entries())};return(t.method??"get").toLowerCase()+t.url+JSON.stringify(r?k(n):n)}async function w(t,e){const{url:r,options:n}=O(t);return S({url:r,...n},await d(t.options?.body),e)}function v(t,e){const{url:r,options:n}=O(t);return S({url:r,...n},function(t){if(null==t)return t;if("string"==typeof t)return t;if("object"!=typeof t)return String(t);if(t instanceof FormData){const e={},r=[];t.forEach((t,e)=>r.push([e,t]));for(const[t,n]of r)e[t]=n instanceof Blob?p("__blob"):n;return e}return t instanceof URLSearchParams?t.toString():u(t)||f(t)?t:p("_")}(t.options?.body),e)}function j(t={}){const e=t.maxCacheSize??1e5,r={},n=t=>r[t],o=(t,e)=>{const n=r[t];n?Object.assign(n,e):r[t]={...e}},a=t=>{delete r[t]},s=(t,e)=>{try{const r=n(t);r&&(e(r),Object.keys(r).some(t=>void 0!==r[t])?o(t,r):a(t))}catch(r){console.error("Error during request cleanup:",r);try{a(t)}catch(s){console.error("Failed to remove request after cleanup error:",s)}}},i=t=>delete t.cache,c=t=>delete t.cache_expiredTime;function f(t,a,f){const u=n(t)||{};u.cache=g(a),u.cache_expiredTime=f,o(t,u),(()=>{try{const t=Object.entries(r).filter(([t,e])=>void 0!==e.cache);if(t.length>e){t.sort(([,t],[,e])=>(t.cache_expiredTime||0)-(e.cache_expiredTime||0));const r=t.length-e;t.slice(0,r).forEach(([t])=>{s(t,t=>{i(t),c(t)})})}}catch(t){console.error("Error during cache size management:",t)}})()}const u=()=>{Object.keys(r).forEach(t=>{delete r[t]})},l=()=>{Object.entries(r).forEach(([t,e])=>{e.abortController&&e.abortController.abort("abort all")})};return{entry:t=>({cache:{get:()=>function(t){const e=n(t);if(e&&void 0!==e.cache)return e.cache_expiredTime&&e.cache_expiredTime>Date.now()?g(e.cache):void s(t,t=>{i(t),c(t)})}(t),remove:()=>function(t){s(t,t=>{i(t),c(t)})}(t),set:(e,r)=>f(t,e,r)},share:{get:()=>function(t){return n(t)?.promise}(t),set:e=>function(t,e){const r=n(t)||{};r.promise=e,o(t,r),e.finally(()=>{s(t,t=>{delete t.promise})})}(t,e)},abort(e,r){r&&r.length>0&&r[r.length-1]!==n(t)?.abortController&&(r.pop()?.abort("race abort"),r.push(e),o(t,{abortController:e}))}}),dispose:()=>{l(),u()},get:n,set:o,remove:a,getAll:()=>({...r}),removeAll:u,clearCache:()=>{Object.entries(r).forEach(([t,e])=>{void 0!==e.cache&&s(t,t=>{i(t),c(t)})})},clearExpiredCache:()=>{const t=Date.now();Object.entries(r).forEach(([e,r])=>{r.cache_expiredTime&&r.cache_expiredTime<t&&s(e,t=>{i(t),c(t)})})},abortAll:l}}function T(t){let e=[],r=!1;return(n,o)=>{e.push({success:n,fail:o}),r||(r=!0,t().then(()=>{e.forEach(t=>t.success())}).catch(t=>{e.forEach(t=>t.fail())}).finally(()=>{r=!1,e=[]}))}}function U(t,e,r=0){return new Promise((n,o)=>{let a=0;const s=t.getReader(),i=[];!function t(){s.read().then(({done:o,value:s})=>{if(o){const t=new Uint8Array(a);let o=0;return i.forEach(e=>{t.set(e,o),o+=e.length}),e(100,a,r),void n(t.buffer)}s&&(i.push(s),a+=s.length,r>0?e(Math.min(100,Math.round(a/r*100)),a,r):e(0,a,0)),t()}).catch(t=>{console.error("Error reading response body:",t),o(t)})}()})}function B(t,e){return new Promise((r,n)=>{if(!t.body)return void n(/* @__PURE__ */new Error("Response body is null"));const o=t.headers.get("content-length"),a=o?parseInt(o,10):0;U(t.body,e,a).then(r).catch(n)})}function C(t,e,r,n,o){return new Promise((a,s)=>{const i=t.entry(r),{share:c,aborts:f,staleTime:u}=o??{},l=new AbortController,h=()=>l.signal.removeEventListener("abort",p),p=()=>{h(),s(l.signal.reason)};if(l.signal.addEventListener("abort",p),i.abort(c?l:n,f),c){const t=i.share.get();if(t)return h(),a(t.then(t=>g(t)))}if(u){const t=i.cache.get();if(void 0!==t)return h(),a(t)}const y=e();c&&i.share.set(y),y.then(t=>{h(),a(t),u&&i.cache.set(t,/* @__PURE__ */(new Date).getTime()+u)}).catch(t=>{h(),s(t)})})}var D=j(),R=async t=>{const e=O(t),r=e.options,n=e.url,{share:o,staleTime:a,aborts:s}=r??{};if(!o&&!a&&!s)return fetch(n,r);const i=S({url:n,...r},await d(t.options?.body),t.sortRequestKey);return C(t.store??D,()=>fetch(n,r),i,e.abortController,r)};function F(t){const e=E((e,r,n,o,a,s)=>t(e,{...s,method:r,params:n,query:o,body:a})),r=A([..._,"head","options"],e=>(r,n)=>t(r,{...n,method:e}));return{request:t,...e,...r,fork:(e,r)=>F((n,a)=>t(o(n,e),r?{...r,...a}:a))}}export{j as createRequestStore,E as createShortApi,A as createShortMethods,T as createSilentRefresh,F as createSoon,k as deepSort,v as genRequestKey,w as genRequestKeyAsync,u as isBodyJson,i as mergeHeaders,m as mergeOptions,c as mergeSignals,O as parseOptions,a as parseQuery2Arr,s as parseUrl,B as progressDownload,U as progressReadBody,C as requestWithStore,R as soonFetch,l as toFormData};
1
+ var t=t=>{const e=[],r=t.match(/:([^:/]+)\/?/g);return r&&r.forEach(t=>{e.push(t.replace(/\//g,"").replace(/:/g,""))}),e},e=(t="")=>t.endsWith("/")?t.slice(0,-1):t,r=(t="")=>t.startsWith("/")?t:"/"+t,n=(t="")=>t.startsWith("http"),o=(t,o)=>n(t)?t:e(n(o)?o:r(o))+e(r(t)),a=t=>{if(!t)return[];if(t instanceof URLSearchParams||"string"==typeof t||Array.isArray(t))return Array.from(new URLSearchParams(t).entries());const e=[];return Object.entries(t).forEach(([t,r])=>{(Array.isArray(r)?r:[r]).forEach(r=>{e.push([t,String(r??"")])})}),e},s=(e,r)=>{const{query:n,params:s,baseURL:i}=r;let c=e.trim();t(e).forEach(t=>{s&&void 0!==s[t]&&(c=c.split(":"+t).join(""+s[t]))});const[f,u]=c.split("?"),l=new URLSearchParams([...a(u),...a(n)]),h=o(f??"",i);let p=h;return l.size&&(p=h+"?"+l),{query:l,url:p,path:h}},i=(...t)=>{const e=new Headers;return t.forEach(t=>{t&&(t instanceof Headers?t.forEach((t,r)=>e.set(r,t)):Array.isArray(t)?t.forEach(([t,r])=>e.set(t,r)):Object.entries(t).forEach(([t,r])=>e.set(t,r)))}),e};function c(t,e){const r=(t??[]).filter(t=>!!t);return e&&r.push(AbortSignal.timeout(e)),r.length?AbortSignal.any(r):void 0}function f(t){return[Int8Array,Uint8Array,Uint8ClampedArray,Int16Array,Uint16Array,Int32Array,Uint32Array,Float32Array,Float64Array,BigInt64Array,BigUint64Array].some(e=>t instanceof e)}function u(t){return null!=t&&("object"==typeof t&&(!(t instanceof FormData)&&(!(t instanceof Blob)&&(!(t instanceof ArrayBuffer)&&(!(t instanceof DataView)&&(!(t instanceof ReadableStream)&&(!(t instanceof URLSearchParams)&&!f(t))))))))}function l(t){const e=new FormData;return t&&"object"==typeof t&&!Array.isArray(t)&&Object.entries(t).forEach(([t,r])=>{if(null==r||"function"==typeof r)return;let n;n=r instanceof Blob?r:"object"==typeof r?JSON.stringify(r):String(r),e.append(t,n)}),e}var h=0,p=(t="")=>`${t}_nonce_${Date.now()}_${h++}__`;function y(t){return Array.from(new Uint8Array(t)).map(t=>t.toString(16).padStart(2,"0")).join("")}async function b(t){const e=await t.arrayBuffer();return globalThis.crypto?.subtle?.digest?y(await globalThis.crypto.subtle.digest("SHA-256",e)):p("blob")}async function d(t){if(null==t)return t;if("string"==typeof t)return t;if("object"!=typeof t)return String(t);if(t instanceof FormData){const e={},r=[];t.forEach((t,e)=>r.push([e,t]));for(const[t,n]of r)e[t]=n instanceof Blob?`__blob_${await b(n)}__`:n;return e}if(t instanceof Blob)return`__blob_${await b(t)}__`;if(t instanceof ArrayBuffer)return globalThis.crypto?.subtle?.digest?`__ab_${y(await globalThis.crypto.subtle.digest("SHA-256",t))}__`:p("__ab");if(t instanceof DataView){const e=t.buffer.slice(t.byteOffset,t.byteOffset+t.byteLength);return globalThis.crypto?.subtle?.digest?`__ab_${y(await globalThis.crypto.subtle.digest("SHA-256",e))}__`:p("__ab")}return t instanceof URLSearchParams?t.toString():t instanceof ReadableStream?p("_"):(f(t),t)}var g=t=>{if(t instanceof Response)return t.clone();if("function"==typeof t||t instanceof Promise||null===t||"object"!=typeof t)return t;try{return structuredClone(t)}catch(e){return JSON.parse(JSON.stringify(t))}};function m(...t){const e=Object.assign({},...t);return e.headers=i(...t.map(t=>t?.headers)),e.signal=c(t.map(t=>t?.signal),e.timeout),e}function O(t){const{url:e,options:r,baseURL:n,baseOptions:o}=t,a=m(o,r),{url:i,query:f}=s(e,{...a,baseURL:n});a.query=f;const l=a?.body,h=u(l);a.body=h?JSON.stringify(l):null!=l&&"string"!=typeof l&&"object"!=typeof l?String(l):l,h&&a.headers.set("Content-Type","application/json");const p=new AbortController;return a.signal=c([a.signal,p.signal]),{url:i,options:a,is_body_json:h,abortController:p}}var _=["get","post","put","delete","patch"];function A(t,e){const r={};return t.forEach(t=>{r[t]=e(t)}),r}function E(e){const r=(r,n,o)=>{const a=!!t(r).length;return(...t)=>{const s=[...t],{hasBody:i,hasQuery:c,isFormData:f,options:u}=o||{},h=a?s.shift():void 0,p=c?s.shift():void 0;let y=i?s.shift():void 0;f&&(y=l(y));const b=s.shift(),d=u?{...u,...b}:b;return e(r,n,h,p,y,d)}},n={hasBody:!0},o={hasQuery:!0},a={isFormData:!0},s={};return _.forEach(t=>{const e=t.toUpperCase();s[e]=e=>({Ok:()=>r(e,t),Options:n=>({Ok:()=>r(e,t,{options:n})}),Body:()=>({Ok:()=>r(e,t,{...n}),Options:o=>({Ok:()=>r(e,t,{...n,options:o})})}),FormData:()=>({Ok:()=>r(e,t,{...n,...a}),Options:o=>({Ok:()=>r(e,t,{...n,...a,options:o})})}),Params:()=>({Ok:()=>r(e,t),Options:n=>({Ok:()=>r(e,t,{options:n})}),Body:()=>({Ok:()=>r(e,t,{...n}),Options:o=>({Ok:()=>r(e,t,{...n,options:o})})}),FormData:()=>({Ok:()=>r(e,t,{...n,...a}),Options:o=>({Ok:()=>r(e,t,{...n,...a,options:o})})}),Query:()=>({Ok:()=>r(e,t,{...o}),Options:n=>({Ok:()=>r(e,t,{...o,options:n})}),Body:()=>({Ok:()=>r(e,t,{...n,...o}),Options:a=>({Ok:()=>r(e,t,{...n,...o,options:a})})}),FormData:()=>({Ok:()=>r(e,t,{...n,...o,...a}),Options:s=>({Ok:()=>r(e,t,{...n,...o,...a,options:s})})})})}),Query:()=>({Ok:()=>r(e,t,{...o}),Options:n=>({Ok:()=>r(e,t,{...o,options:n})}),Body:()=>({Ok:()=>r(e,t,{...n,...o}),Options:a=>({Ok:()=>r(e,t,{...n,...o,options:a})})}),FormData:()=>({Ok:()=>r(e,t,{...n,...o,...a}),Options:s=>({Ok:()=>r(e,t,{...n,...o,...a,options:s})})})})})}),s}function k(t,e=!1){if(Array.isArray(t)){const r=[...t];return e&&r.sort(),r.map(t=>k(t,e))}if("object"==typeof t&&null!==t){const r={};return Object.keys(t).sort().forEach(n=>{r[n]=k(t[n],e)}),r}return t}function S(t,e,r){const n={body:e,headers:Object.fromEntries(t.headers.entries())};return(t.method??"get").toLowerCase()+t.url+JSON.stringify(r?k(n):n)}async function w(t,e){const{url:r,options:n}=O(t);return S({url:r,...n},await d(t.options?.body),e)}function v(t,e){const{url:r,options:n}=O(t);return S({url:r,...n},function(t){if(null==t)return t;if("string"==typeof t)return t;if("object"!=typeof t)return String(t);if(t instanceof FormData){const e={},r=[];t.forEach((t,e)=>r.push([e,t]));for(const[t,n]of r)e[t]=n instanceof Blob?p("__blob"):n;return e}return t instanceof URLSearchParams?t.toString():u(t)||f(t)?t:p("_")}(t.options?.body),e)}function j(t={}){const e=t.maxCacheSize??1e5,r={},n=t=>r[t],o=(t,e)=>{const n=r[t];n?Object.assign(n,e):r[t]={...e}},a=t=>{delete r[t]},s=(t,e)=>{try{const r=n(t);r&&(e(r),Object.keys(r).some(t=>void 0!==r[t])?o(t,r):a(t))}catch(r){console.error("Error during request cleanup:",r);try{a(t)}catch(s){console.error("Failed to remove request after cleanup error:",s)}}},i=t=>delete t.cache,c=t=>delete t.cache_expiredTime;function f(t,a,f){const u=n(t)||{};u.cache=g(a),u.cache_expiredTime=f,o(t,u),(()=>{try{const t=Object.entries(r).filter(([t,e])=>void 0!==e.cache);if(t.length>e){t.sort(([,t],[,e])=>(t.cache_expiredTime||0)-(e.cache_expiredTime||0));const r=t.length-e;t.slice(0,r).forEach(([t])=>{s(t,t=>{i(t),c(t)})})}}catch(t){console.error("Error during cache size management:",t)}})()}const u=()=>{Object.keys(r).forEach(t=>{delete r[t]})},l=()=>{Object.entries(r).forEach(([t,e])=>{e.abortController&&e.abortController.abort("abort all")})};return{entry:t=>({cache:{get:()=>function(t){const e=n(t);if(e&&void 0!==e.cache)return e.cache_expiredTime&&e.cache_expiredTime>Date.now()?g(e.cache):void s(t,t=>{i(t),c(t)})}(t),remove:()=>function(t){s(t,t=>{i(t),c(t)})}(t),set:(e,r)=>f(t,e,r)},share:{get:()=>function(t){return n(t)?.promise}(t),set:e=>function(t,e){const r=n(t)||{};r.promise=e,o(t,r),e.finally(()=>{s(t,t=>{delete t.promise})})}(t,e)},abort(e,r){r&&r.length>0&&r[r.length-1]!==n(t)?.abortController&&(r.pop()?.abort("race abort"),r.push(e),o(t,{abortController:e}))}}),dispose:()=>{l(),u()},get:n,set:o,remove:a,getAll:()=>({...r}),removeAll:u,clearCache:()=>{Object.entries(r).forEach(([t,e])=>{void 0!==e.cache&&s(t,t=>{i(t),c(t)})})},clearExpiredCache:()=>{const t=Date.now();Object.entries(r).forEach(([e,r])=>{r.cache_expiredTime&&r.cache_expiredTime<t&&s(e,t=>{i(t),c(t)})})},abortAll:l}}function T(t){let e=[],r=!1;return(n,o)=>{e.push({success:n,fail:o}),r||(r=!0,t().then(()=>{e.forEach(t=>t.success())}).catch(t=>{e.forEach(t=>t.fail())}).finally(()=>{r=!1,e=[]}))}}function U(t,e,r=0){return new Promise((n,o)=>{let a=0;const s=t.getReader(),i=[];!function t(){s.read().then(({done:o,value:s})=>{if(o){const t=new Uint8Array(a);let o=0;return i.forEach(e=>{t.set(e,o),o+=e.length}),e(100,a,r),void n(t.buffer)}s&&(i.push(s),a+=s.length,r>0?e(Math.min(100,Math.round(a/r*100)),a,r):e(0,a,0)),t()}).catch(t=>{console.error("Error reading response body:",t),o(t)})}()})}function B(t,e){return new Promise((r,n)=>{if(!t.body)return void n(/* @__PURE__ */new Error("Response body is null"));const o=t.headers.get("content-length"),a=o?parseInt(o,10):0;U(t.body,e,a).then(r).catch(n)})}function C(t,e,r,n,o){return new Promise((a,s)=>{const i=t.entry(r),{share:c,aborts:f,staleTime:u}=o??{},l=new AbortController,h=()=>l.signal.removeEventListener("abort",p),p=()=>{h(),s(l.signal.reason)};if(l.signal.addEventListener("abort",p),i.abort(c?l:n,f),c){const t=i.share.get();if(t)return h(),a(t.then(t=>g(t)))}if(u){const t=i.cache.get();if(void 0!==t)return h(),a(t)}const y=e();c&&i.share.set(y),y.then(t=>{h(),a(t),u&&i.cache.set(t,/* @__PURE__ */(new Date).getTime()+u)}).catch(t=>{h(),s(t)})})}var D=j(),R=async t=>{const e=O(t),r=e.options,n=e.url,{share:o,staleTime:a,aborts:s}=r??{};if(!o&&!a&&!s)return fetch(n,r);const i=S({url:n,...r},await d(t.options?.body),t.sortRequestKey);return C(t.store??D,()=>fetch(n,r),i,e.abortController,r)};function F(t){const e=E((e,r,n,o,a,s)=>t(e,{...s,method:r,params:n,query:o,body:a})),r=A([..._,"head","options"],e=>(r,n)=>t(r,{...n,method:e}));return{request:t,...e,...r,fork:(e,r)=>F((n,a)=>t(o(n,e),r?{...r,...a}:a))}}export{j as createRequestStore,E as createShortApi,A as createShortMethods,T as createSilentRefresh,F as createSoon,k as deepSort,v as genRequestKey,w as genRequestKeyAsync,u as isBodyJson,i as mergeHeaders,m as mergeOptions,c as mergeSignals,O as parseOptions,a as parseQuery2Arr,s as parseUrl,B as progressDownload,U as progressReadBody,C as requestWithStore,R as soonFetch,l as toFormData};
package/dist/index.umd.js CHANGED
@@ -1 +1 @@
1
- !function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports):"function"==typeof define&&define.amd?define(["exports"],t):t((e="undefined"!=typeof globalThis?globalThis:e||self).SoonFetch={})}(this,function(e){Object.defineProperty(e,Symbol.toStringTag,{value:"Module"});var t=e=>{const t=[],r=e.match(/:([^:/]+)\/?/g);return r&&r.forEach(e=>{t.push(e.replace(/\//g,"").replace(/:/g,""))}),t},r=(e="")=>e.endsWith("/")?e.slice(0,-1):e,o=(e="")=>e.startsWith("/")?e:"/"+e,n=(e="")=>e.startsWith("http"),a=(e,t)=>n(e)?e:r(n(t)?t:o(t))+r(o(e)),s=e=>{if(!e)return[];if(e instanceof URLSearchParams||"string"==typeof e||Array.isArray(e))return Array.from(new URLSearchParams(e).entries());const t=[];return Object.entries(e).forEach(([e,r])=>{(Array.isArray(r)?r:[r]).forEach(r=>{t.push([e,String(r??"")])})}),t},i=(e,r)=>{const{query:o,params:n,baseURL:i}=r;let c=e.trim();t(e).forEach(e=>{n&&void 0!==n[e]&&(c=c.replaceAll(":"+e,""+n[e]))});const[f,u]=c.split("?"),l=new URLSearchParams([...s(u),...s(o)]),h=a(f??"",i);let p=h;return l.size&&(p=h+"?"+l),{query:l,url:p,path:h}},c=(...e)=>{const t=new Headers;return e.forEach(e=>{e&&(e instanceof Headers?e.forEach((e,r)=>t.set(r,e)):Array.isArray(e)?e.forEach(([e,r])=>t.set(e,r)):Object.entries(e).forEach(([e,r])=>t.set(e,r)))}),t};function f(e,t){const r=(e??[]).filter(e=>!!e);return t&&r.push(AbortSignal.timeout(t)),r.length?AbortSignal.any(r):void 0}function u(e){return[Int8Array,Uint8Array,Uint8ClampedArray,Int16Array,Uint16Array,Int32Array,Uint32Array,Float32Array,Float64Array,BigInt64Array,BigUint64Array].some(t=>e instanceof t)}function l(e){return null!=e&&("object"==typeof e&&(!(e instanceof FormData)&&(!(e instanceof Blob)&&(!(e instanceof ArrayBuffer)&&(!(e instanceof DataView)&&(!(e instanceof ReadableStream)&&(!(e instanceof URLSearchParams)&&!u(e))))))))}function h(e){const t=new FormData;return e&&"object"==typeof e&&!Array.isArray(e)&&Object.entries(e).forEach(([e,r])=>{if(null==r||"function"==typeof r)return;let o;o=r instanceof Blob?r:"object"==typeof r?JSON.stringify(r):String(r),t.append(e,o)}),t}var p=0,y=(e="")=>`${e}_nonce_${Date.now()}_${p++}__`;function d(e){return Array.from(new Uint8Array(e)).map(e=>e.toString(16).padStart(2,"0")).join("")}async function b(e){const t=await e.arrayBuffer();return globalThis.crypto?.subtle?.digest?d(await globalThis.crypto.subtle.digest("SHA-256",t)):y("blob")}async function g(e){if(null==e)return e;if("string"==typeof e)return e;if("object"!=typeof e)return String(e);if(e instanceof FormData){const t={},r=[];e.forEach((e,t)=>r.push([t,e]));for(const[e,o]of r)t[e]=o instanceof Blob?`__blob_${await b(o)}__`:o;return t}if(e instanceof Blob)return`__blob_${await b(e)}__`;if(e instanceof ArrayBuffer)return globalThis.crypto?.subtle?.digest?`__ab_${d(await globalThis.crypto.subtle.digest("SHA-256",e))}__`:y("__ab");if(e instanceof DataView){const t=e.buffer.slice(e.byteOffset,e.byteOffset+e.byteLength);return globalThis.crypto?.subtle?.digest?`__ab_${d(await globalThis.crypto.subtle.digest("SHA-256",t))}__`:y("__ab")}return e instanceof URLSearchParams?e.toString():e instanceof ReadableStream?y("_"):(u(e),e)}var m=e=>{if(e instanceof Response)return e.clone();if("function"==typeof e||e instanceof Promise||null===e||"object"!=typeof e)return e;try{return structuredClone(e)}catch(t){return JSON.parse(JSON.stringify(e))}};function O(...e){const t=Object.assign({},...e);return t.headers=c(...e.map(e=>e?.headers)),t.signal=f(e.map(e=>e?.signal),t.timeout),t}function _(e){const{url:t,options:r,baseURL:o,baseOptions:n}=e,a=O(n,r),{url:s,query:c}=i(t,{...a,baseURL:o});a.query=c;const u=a?.body,h=l(u);a.body=h?JSON.stringify(u):null!=u&&"string"!=typeof u&&"object"!=typeof u?String(u):u,h&&a.headers.set("Content-Type","application/json");const p=new AbortController;return a.signal=f([a.signal,p.signal]),{url:s,options:a,is_body_json:h,abortController:p}}var A=["get","post","put","delete","patch"];function S(e,t){const r={};return e.forEach(e=>{r[e]=t(e)}),r}function E(e){const r=(r,o,n)=>{const a=!!t(r).length;return(...t)=>{const s=[...t],{hasBody:i,hasQuery:c,isFormData:f,options:u}=n||{},l=a?s.shift():void 0,p=c?s.shift():void 0;let y=i?s.shift():void 0;f&&(y=h(y));const d=s.shift(),b=u?{...u,...d}:d;return e(r,o,l,p,y,b)}},o={hasBody:!0},n={hasQuery:!0},a={isFormData:!0},s={};return A.forEach(e=>{const t=e.toUpperCase();s[t]=t=>({Ok:()=>r(t,e),Options:o=>({Ok:()=>r(t,e,{options:o})}),Body:()=>({Ok:()=>r(t,e,{...o}),Options:n=>({Ok:()=>r(t,e,{...o,options:n})})}),FormData:()=>({Ok:()=>r(t,e,{...o,...a}),Options:n=>({Ok:()=>r(t,e,{...o,...a,options:n})})}),Params:()=>({Ok:()=>r(t,e),Options:o=>({Ok:()=>r(t,e,{options:o})}),Body:()=>({Ok:()=>r(t,e,{...o}),Options:n=>({Ok:()=>r(t,e,{...o,options:n})})}),FormData:()=>({Ok:()=>r(t,e,{...o,...a}),Options:n=>({Ok:()=>r(t,e,{...o,...a,options:n})})}),Query:()=>({Ok:()=>r(t,e,{...n}),Options:o=>({Ok:()=>r(t,e,{...n,options:o})}),Body:()=>({Ok:()=>r(t,e,{...o,...n}),Options:a=>({Ok:()=>r(t,e,{...o,...n,options:a})})}),FormData:()=>({Ok:()=>r(t,e,{...o,...n,...a}),Options:s=>({Ok:()=>r(t,e,{...o,...n,...a,options:s})})})})}),Query:()=>({Ok:()=>r(t,e,{...n}),Options:o=>({Ok:()=>r(t,e,{...n,options:o})}),Body:()=>({Ok:()=>r(t,e,{...o,...n}),Options:a=>({Ok:()=>r(t,e,{...o,...n,options:a})})}),FormData:()=>({Ok:()=>r(t,e,{...o,...n,...a}),Options:s=>({Ok:()=>r(t,e,{...o,...n,...a,options:s})})})})})}),s}function k(e,t=!1){if(Array.isArray(e)){const r=[...e];return t&&r.sort(),r.map(e=>k(e,t))}if("object"==typeof e&&null!==e){const r={};return Object.keys(e).sort().forEach(o=>{r[o]=k(e[o],t)}),r}return e}function w(e,t,r){const o={body:t,headers:Object.fromEntries(e.headers.entries())};return(e.method??"get").toLowerCase()+e.url+JSON.stringify(r?k(o):o)}function v(e={}){const t=e.maxCacheSize??1e5,r={},o=e=>r[e],n=(e,t)=>{const o=r[e];o?Object.assign(o,t):r[e]={...t}},a=e=>{delete r[e]},s=(e,t)=>{try{const r=o(e);r&&(t(r),Object.keys(r).some(e=>void 0!==r[e])?n(e,r):a(e))}catch(r){console.error("Error during request cleanup:",r);try{a(e)}catch(s){console.error("Failed to remove request after cleanup error:",s)}}},i=e=>delete e.cache,c=e=>delete e.cache_expiredTime;function f(e,a,f){const u=o(e)||{};u.cache=m(a),u.cache_expiredTime=f,n(e,u),(()=>{try{const e=Object.entries(r).filter(([e,t])=>void 0!==t.cache);if(e.length>t){e.sort(([,e],[,t])=>(e.cache_expiredTime||0)-(t.cache_expiredTime||0));const r=e.length-t;e.slice(0,r).forEach(([e])=>{s(e,e=>{i(e),c(e)})})}}catch(e){console.error("Error during cache size management:",e)}})()}const u=()=>{Object.keys(r).forEach(e=>{delete r[e]})},l=()=>{Object.entries(r).forEach(([e,t])=>{t.abortController&&t.abortController.abort("abort all")})};return{entry:e=>({cache:{get:()=>function(e){const t=o(e);if(t&&void 0!==t.cache)return t.cache_expiredTime&&t.cache_expiredTime>Date.now()?m(t.cache):void s(e,e=>{i(e),c(e)})}(e),remove:()=>function(e){s(e,e=>{i(e),c(e)})}(e),set:(t,r)=>f(e,t,r)},share:{get:()=>function(e){return o(e)?.promise}(e),set:t=>function(e,t){const r=o(e)||{};r.promise=t,n(e,r),t.finally(()=>{s(e,e=>{delete e.promise})})}(e,t)},abort(t,r){r&&r.length>0&&r[r.length-1]!==o(e)?.abortController&&(r.pop()?.abort("race abort"),r.push(t),n(e,{abortController:t}))}}),dispose:()=>{l(),u()},get:o,set:n,remove:a,getAll:()=>({...r}),removeAll:u,clearCache:()=>{Object.entries(r).forEach(([e,t])=>{void 0!==t.cache&&s(e,e=>{i(e),c(e)})})},clearExpiredCache:()=>{const e=Date.now();Object.entries(r).forEach(([t,r])=>{r.cache_expiredTime&&r.cache_expiredTime<e&&s(t,e=>{i(e),c(e)})})},abortAll:l}}function j(e,t,r=0){return new Promise((o,n)=>{let a=0;const s=e.getReader(),i=[];!function e(){s.read().then(({done:n,value:s})=>{if(n){const e=new Uint8Array(a);let n=0;return i.forEach(t=>{e.set(t,n),n+=t.length}),t(100,a,r),void o(e.buffer)}s&&(i.push(s),a+=s.length,r>0?t(Math.min(100,Math.round(a/r*100)),a,r):t(0,a,0)),e()}).catch(e=>{console.error("Error reading response body:",e),n(e)})}()})}function T(e,t,r,o,n){return new Promise((a,s)=>{const i=e.entry(r),{share:c,aborts:f,staleTime:u}=n??{},l=new AbortController,h=()=>l.signal.removeEventListener("abort",p),p=()=>{h(),s(l.signal.reason)};if(l.signal.addEventListener("abort",p),i.abort(c?l:o,f),c){const e=i.share.get();if(e)return h(),a(e.then(e=>m(e)))}if(u){const e=i.cache.get();if(void 0!==e)return h(),a(e)}const y=t();c&&i.share.set(y),y.then(e=>{h(),a(e),u&&i.cache.set(e,(new Date).getTime()+u)}).catch(e=>{h(),s(e)})})}var R=v();e.createRequestStore=v,e.createShortApi=E,e.createShortMethods=S,e.createSilentRefresh=function(e){let t=[],r=!1;return(o,n)=>{t.push({success:o,fail:n}),r||(r=!0,e().then(()=>{t.forEach(e=>e.success())}).catch(e=>{t.forEach(e=>e.fail())}).finally(()=>{r=!1,t=[]}))}},e.createSoon=function e(t){const r=E((e,r,o,n,a,s)=>t(e,{...s,method:r,params:o,query:n,body:a})),o=S([...A,"head","options"],e=>(r,o)=>t(r,{...o,method:e}));return{request:t,...r,...o,fork:(r,o)=>e((e,n)=>t(a(e,r),o?{...o,...n}:n))}},e.deepSort=k,e.genRequestKey=function(e,t){const{url:r,options:o}=_(e);return w({url:r,...o},function(e){if(null==e)return e;if("string"==typeof e)return e;if("object"!=typeof e)return String(e);if(e instanceof FormData){const t={},r=[];e.forEach((e,t)=>r.push([t,e]));for(const[e,o]of r)t[e]=o instanceof Blob?y("__blob"):o;return t}return e instanceof URLSearchParams?e.toString():l(e)||u(e)?e:y("_")}(e.options?.body),t)},e.genRequestKeyAsync=async function(e,t){const{url:r,options:o}=_(e);return w({url:r,...o},await g(e.options?.body),t)},e.isBodyJson=l,e.mergeHeaders=c,e.mergeOptions=O,e.mergeSignals=f,e.parseOptions=_,e.parseQuery2Arr=s,e.parseUrl=i,e.progressDownload=function(e,t){return new Promise((r,o)=>{if(!e.body)return void o(new Error("Response body is null"));const n=e.headers.get("content-length"),a=n?parseInt(n,10):0;j(e.body,t,a).then(r).catch(o)})},e.progressReadBody=j,e.requestWithStore=T,e.soonFetch=async e=>{const t=_(e),r=t.options,o=t.url,{share:n,staleTime:a,aborts:s}=r??{};if(!n&&!a&&!s)return fetch(o,r);const i=w({url:o,...r},await g(e.options?.body),e.sortRequestKey);return T(e.store??R,()=>fetch(o,r),i,t.abortController,r)},e.toFormData=h});
1
+ !function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports):"function"==typeof define&&define.amd?define(["exports"],t):t((e="undefined"!=typeof globalThis?globalThis:e||self).SoonFetch={})}(this,function(e){Object.defineProperty(e,Symbol.toStringTag,{value:"Module"});var t=e=>{const t=[],r=e.match(/:([^:/]+)\/?/g);return r&&r.forEach(e=>{t.push(e.replace(/\//g,"").replace(/:/g,""))}),t},r=(e="")=>e.endsWith("/")?e.slice(0,-1):e,o=(e="")=>e.startsWith("/")?e:"/"+e,n=(e="")=>e.startsWith("http"),a=(e,t)=>n(e)?e:r(n(t)?t:o(t))+r(o(e)),s=e=>{if(!e)return[];if(e instanceof URLSearchParams||"string"==typeof e||Array.isArray(e))return Array.from(new URLSearchParams(e).entries());const t=[];return Object.entries(e).forEach(([e,r])=>{(Array.isArray(r)?r:[r]).forEach(r=>{t.push([e,String(r??"")])})}),t},i=(e,r)=>{const{query:o,params:n,baseURL:i}=r;let c=e.trim();t(e).forEach(e=>{n&&void 0!==n[e]&&(c=c.split(":"+e).join(""+n[e]))});const[f,u]=c.split("?"),l=new URLSearchParams([...s(u),...s(o)]),h=a(f??"",i);let p=h;return l.size&&(p=h+"?"+l),{query:l,url:p,path:h}},c=(...e)=>{const t=new Headers;return e.forEach(e=>{e&&(e instanceof Headers?e.forEach((e,r)=>t.set(r,e)):Array.isArray(e)?e.forEach(([e,r])=>t.set(e,r)):Object.entries(e).forEach(([e,r])=>t.set(e,r)))}),t};function f(e,t){const r=(e??[]).filter(e=>!!e);return t&&r.push(AbortSignal.timeout(t)),r.length?AbortSignal.any(r):void 0}function u(e){return[Int8Array,Uint8Array,Uint8ClampedArray,Int16Array,Uint16Array,Int32Array,Uint32Array,Float32Array,Float64Array,BigInt64Array,BigUint64Array].some(t=>e instanceof t)}function l(e){return null!=e&&("object"==typeof e&&(!(e instanceof FormData)&&(!(e instanceof Blob)&&(!(e instanceof ArrayBuffer)&&(!(e instanceof DataView)&&(!(e instanceof ReadableStream)&&(!(e instanceof URLSearchParams)&&!u(e))))))))}function h(e){const t=new FormData;return e&&"object"==typeof e&&!Array.isArray(e)&&Object.entries(e).forEach(([e,r])=>{if(null==r||"function"==typeof r)return;let o;o=r instanceof Blob?r:"object"==typeof r?JSON.stringify(r):String(r),t.append(e,o)}),t}var p=0,y=(e="")=>`${e}_nonce_${Date.now()}_${p++}__`;function d(e){return Array.from(new Uint8Array(e)).map(e=>e.toString(16).padStart(2,"0")).join("")}async function b(e){const t=await e.arrayBuffer();return globalThis.crypto?.subtle?.digest?d(await globalThis.crypto.subtle.digest("SHA-256",t)):y("blob")}async function g(e){if(null==e)return e;if("string"==typeof e)return e;if("object"!=typeof e)return String(e);if(e instanceof FormData){const t={},r=[];e.forEach((e,t)=>r.push([t,e]));for(const[e,o]of r)t[e]=o instanceof Blob?`__blob_${await b(o)}__`:o;return t}if(e instanceof Blob)return`__blob_${await b(e)}__`;if(e instanceof ArrayBuffer)return globalThis.crypto?.subtle?.digest?`__ab_${d(await globalThis.crypto.subtle.digest("SHA-256",e))}__`:y("__ab");if(e instanceof DataView){const t=e.buffer.slice(e.byteOffset,e.byteOffset+e.byteLength);return globalThis.crypto?.subtle?.digest?`__ab_${d(await globalThis.crypto.subtle.digest("SHA-256",t))}__`:y("__ab")}return e instanceof URLSearchParams?e.toString():e instanceof ReadableStream?y("_"):(u(e),e)}var m=e=>{if(e instanceof Response)return e.clone();if("function"==typeof e||e instanceof Promise||null===e||"object"!=typeof e)return e;try{return structuredClone(e)}catch(t){return JSON.parse(JSON.stringify(e))}};function O(...e){const t=Object.assign({},...e);return t.headers=c(...e.map(e=>e?.headers)),t.signal=f(e.map(e=>e?.signal),t.timeout),t}function _(e){const{url:t,options:r,baseURL:o,baseOptions:n}=e,a=O(n,r),{url:s,query:c}=i(t,{...a,baseURL:o});a.query=c;const u=a?.body,h=l(u);a.body=h?JSON.stringify(u):null!=u&&"string"!=typeof u&&"object"!=typeof u?String(u):u,h&&a.headers.set("Content-Type","application/json");const p=new AbortController;return a.signal=f([a.signal,p.signal]),{url:s,options:a,is_body_json:h,abortController:p}}var A=["get","post","put","delete","patch"];function S(e,t){const r={};return e.forEach(e=>{r[e]=t(e)}),r}function E(e){const r=(r,o,n)=>{const a=!!t(r).length;return(...t)=>{const s=[...t],{hasBody:i,hasQuery:c,isFormData:f,options:u}=n||{},l=a?s.shift():void 0,p=c?s.shift():void 0;let y=i?s.shift():void 0;f&&(y=h(y));const d=s.shift(),b=u?{...u,...d}:d;return e(r,o,l,p,y,b)}},o={hasBody:!0},n={hasQuery:!0},a={isFormData:!0},s={};return A.forEach(e=>{const t=e.toUpperCase();s[t]=t=>({Ok:()=>r(t,e),Options:o=>({Ok:()=>r(t,e,{options:o})}),Body:()=>({Ok:()=>r(t,e,{...o}),Options:n=>({Ok:()=>r(t,e,{...o,options:n})})}),FormData:()=>({Ok:()=>r(t,e,{...o,...a}),Options:n=>({Ok:()=>r(t,e,{...o,...a,options:n})})}),Params:()=>({Ok:()=>r(t,e),Options:o=>({Ok:()=>r(t,e,{options:o})}),Body:()=>({Ok:()=>r(t,e,{...o}),Options:n=>({Ok:()=>r(t,e,{...o,options:n})})}),FormData:()=>({Ok:()=>r(t,e,{...o,...a}),Options:n=>({Ok:()=>r(t,e,{...o,...a,options:n})})}),Query:()=>({Ok:()=>r(t,e,{...n}),Options:o=>({Ok:()=>r(t,e,{...n,options:o})}),Body:()=>({Ok:()=>r(t,e,{...o,...n}),Options:a=>({Ok:()=>r(t,e,{...o,...n,options:a})})}),FormData:()=>({Ok:()=>r(t,e,{...o,...n,...a}),Options:s=>({Ok:()=>r(t,e,{...o,...n,...a,options:s})})})})}),Query:()=>({Ok:()=>r(t,e,{...n}),Options:o=>({Ok:()=>r(t,e,{...n,options:o})}),Body:()=>({Ok:()=>r(t,e,{...o,...n}),Options:a=>({Ok:()=>r(t,e,{...o,...n,options:a})})}),FormData:()=>({Ok:()=>r(t,e,{...o,...n,...a}),Options:s=>({Ok:()=>r(t,e,{...o,...n,...a,options:s})})})})})}),s}function k(e,t=!1){if(Array.isArray(e)){const r=[...e];return t&&r.sort(),r.map(e=>k(e,t))}if("object"==typeof e&&null!==e){const r={};return Object.keys(e).sort().forEach(o=>{r[o]=k(e[o],t)}),r}return e}function w(e,t,r){const o={body:t,headers:Object.fromEntries(e.headers.entries())};return(e.method??"get").toLowerCase()+e.url+JSON.stringify(r?k(o):o)}function j(e={}){const t=e.maxCacheSize??1e5,r={},o=e=>r[e],n=(e,t)=>{const o=r[e];o?Object.assign(o,t):r[e]={...t}},a=e=>{delete r[e]},s=(e,t)=>{try{const r=o(e);r&&(t(r),Object.keys(r).some(e=>void 0!==r[e])?n(e,r):a(e))}catch(r){console.error("Error during request cleanup:",r);try{a(e)}catch(s){console.error("Failed to remove request after cleanup error:",s)}}},i=e=>delete e.cache,c=e=>delete e.cache_expiredTime;function f(e,a,f){const u=o(e)||{};u.cache=m(a),u.cache_expiredTime=f,n(e,u),(()=>{try{const e=Object.entries(r).filter(([e,t])=>void 0!==t.cache);if(e.length>t){e.sort(([,e],[,t])=>(e.cache_expiredTime||0)-(t.cache_expiredTime||0));const r=e.length-t;e.slice(0,r).forEach(([e])=>{s(e,e=>{i(e),c(e)})})}}catch(e){console.error("Error during cache size management:",e)}})()}const u=()=>{Object.keys(r).forEach(e=>{delete r[e]})},l=()=>{Object.entries(r).forEach(([e,t])=>{t.abortController&&t.abortController.abort("abort all")})};return{entry:e=>({cache:{get:()=>function(e){const t=o(e);if(t&&void 0!==t.cache)return t.cache_expiredTime&&t.cache_expiredTime>Date.now()?m(t.cache):void s(e,e=>{i(e),c(e)})}(e),remove:()=>function(e){s(e,e=>{i(e),c(e)})}(e),set:(t,r)=>f(e,t,r)},share:{get:()=>function(e){return o(e)?.promise}(e),set:t=>function(e,t){const r=o(e)||{};r.promise=t,n(e,r),t.finally(()=>{s(e,e=>{delete e.promise})})}(e,t)},abort(t,r){r&&r.length>0&&r[r.length-1]!==o(e)?.abortController&&(r.pop()?.abort("race abort"),r.push(t),n(e,{abortController:t}))}}),dispose:()=>{l(),u()},get:o,set:n,remove:a,getAll:()=>({...r}),removeAll:u,clearCache:()=>{Object.entries(r).forEach(([e,t])=>{void 0!==t.cache&&s(e,e=>{i(e),c(e)})})},clearExpiredCache:()=>{const e=Date.now();Object.entries(r).forEach(([t,r])=>{r.cache_expiredTime&&r.cache_expiredTime<e&&s(t,e=>{i(e),c(e)})})},abortAll:l}}function v(e,t,r=0){return new Promise((o,n)=>{let a=0;const s=e.getReader(),i=[];!function e(){s.read().then(({done:n,value:s})=>{if(n){const e=new Uint8Array(a);let n=0;return i.forEach(t=>{e.set(t,n),n+=t.length}),t(100,a,r),void o(e.buffer)}s&&(i.push(s),a+=s.length,r>0?t(Math.min(100,Math.round(a/r*100)),a,r):t(0,a,0)),e()}).catch(e=>{console.error("Error reading response body:",e),n(e)})}()})}function T(e,t,r,o,n){return new Promise((a,s)=>{const i=e.entry(r),{share:c,aborts:f,staleTime:u}=n??{},l=new AbortController,h=()=>l.signal.removeEventListener("abort",p),p=()=>{h(),s(l.signal.reason)};if(l.signal.addEventListener("abort",p),i.abort(c?l:o,f),c){const e=i.share.get();if(e)return h(),a(e.then(e=>m(e)))}if(u){const e=i.cache.get();if(void 0!==e)return h(),a(e)}const y=t();c&&i.share.set(y),y.then(e=>{h(),a(e),u&&i.cache.set(e,(new Date).getTime()+u)}).catch(e=>{h(),s(e)})})}var R=j();e.createRequestStore=j,e.createShortApi=E,e.createShortMethods=S,e.createSilentRefresh=function(e){let t=[],r=!1;return(o,n)=>{t.push({success:o,fail:n}),r||(r=!0,e().then(()=>{t.forEach(e=>e.success())}).catch(e=>{t.forEach(e=>e.fail())}).finally(()=>{r=!1,t=[]}))}},e.createSoon=function e(t){const r=E((e,r,o,n,a,s)=>t(e,{...s,method:r,params:o,query:n,body:a})),o=S([...A,"head","options"],e=>(r,o)=>t(r,{...o,method:e}));return{request:t,...r,...o,fork:(r,o)=>e((e,n)=>t(a(e,r),o?{...o,...n}:n))}},e.deepSort=k,e.genRequestKey=function(e,t){const{url:r,options:o}=_(e);return w({url:r,...o},function(e){if(null==e)return e;if("string"==typeof e)return e;if("object"!=typeof e)return String(e);if(e instanceof FormData){const t={},r=[];e.forEach((e,t)=>r.push([t,e]));for(const[e,o]of r)t[e]=o instanceof Blob?y("__blob"):o;return t}return e instanceof URLSearchParams?e.toString():l(e)||u(e)?e:y("_")}(e.options?.body),t)},e.genRequestKeyAsync=async function(e,t){const{url:r,options:o}=_(e);return w({url:r,...o},await g(e.options?.body),t)},e.isBodyJson=l,e.mergeHeaders=c,e.mergeOptions=O,e.mergeSignals=f,e.parseOptions=_,e.parseQuery2Arr=s,e.parseUrl=i,e.progressDownload=function(e,t){return new Promise((r,o)=>{if(!e.body)return void o(new Error("Response body is null"));const n=e.headers.get("content-length"),a=n?parseInt(n,10):0;v(e.body,t,a).then(r).catch(o)})},e.progressReadBody=v,e.requestWithStore=T,e.soonFetch=async e=>{const t=_(e),r=t.options,o=t.url,{share:n,staleTime:a,aborts:s}=r??{};if(!n&&!a&&!s)return fetch(o,r);const i=w({url:o,...r},await g(e.options?.body),e.sortRequestKey);return T(e.store??R,()=>fetch(o,r),i,t.abortController,r)},e.toFormData=h});
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "soon-fetch",
3
- "version": "4.0.2-beta.1",
3
+ "version": "4.1.0",
4
4
  "description": "a request lib alternative to axios with timeout, request reusing, race, response cache ...",
5
5
  "homepage": "https://github.com/leafio/soon-fetch",
6
6
  "type": "module",