@net-vert/core 0.5.0 → 0.5.1

package/dist/index.d.ts

@@ -31,6 +31,11 @@ declare type Duration = number | (({ key, config, response }: {
     response: any;
 }) => number);
 
+declare type IdempotencyOptions = {
+    key?: (config: UnifiedConfig) => string;
+    duration?: number;
+};
+
 export declare const inject: (requestor: UnifiedRequestor, instanceKey?: string) => void;
 
 declare type IsValidParams = {
@@ -76,10 +81,27 @@ export declare const requestExtender: {
             clear: () => void;
         };
     };
-    idempotencyRequestor: (config?: {
-        key?: (config: UnifiedConfig) => string;
-    }) => {
+    idempotencyRequestor: (config?: IdempotencyOptions) => {
         requestor: Requestor;
+        store: {
+            has(key: string): boolean;
+            get<T>(key: string): T | undefined;
+            set<T>(key: string, value: T): T;
+            remove(key: string): void;
+            clear(): void;
+        } | {
+            has: (key: string) => Promise<boolean>;
+            get: <T>(key: string) => Promise<T | null>;
+            set: <T>(key: string, value: T) => Promise<T>;
+            remove: (key: string) => Promise<void>;
+            clear: () => Promise<void>;
+        } | {
+            has: (key: string) => boolean;
+            get: (key: string) => any;
+            set: <T>(key: string, value: T) => Map<string, any>;
+            remove: (key: string) => boolean;
+            clear: () => void;
+        };
     };
     retryRequestor: (config?: RetryOptions) => {
         requestor: Requestor;

package/dist/index.js

@@ -32,9 +32,9 @@ function T(t) {
   const e = {};
   return Object.keys(k).forEach(
     (r) => {
-      e[r] = (...n) => {
-        const o = k[r](...n);
-        return t(o);
+      e[r] = (...o) => {
+        const n = k[r](...o);
+        return t(n);
       };
     }
   ), e;
@@ -56,18 +56,18 @@ class O {
     if (r)
       try {
         return JSON.parse(r);
-      } catch (n) {
-        console.error("Error parsing cached data", n);
+      } catch (o) {
+        console.error("Error parsing cached data", o);
         return;
       }
   }
   // 设置缓存
   set(e, r) {
     try {
-      const n = JSON.stringify(r);
-      localStorage.setItem(e, n);
-    } catch (n) {
-      console.error("Error saving data to localStorage", n);
+      const o = JSON.stringify(r);
+      localStorage.setItem(e, o);
+    } catch (o) {
+      console.error("Error saving data to localStorage", o);
     }
     return r;
   }
@@ -84,27 +84,27 @@ const H = new O(), U = ({ persist: t, name: e, sync: r }) => {
   if (t && r)
     return H;
   if (t) {
-    const n = E.createInstance({
+    const o = E.createInstance({
       name: e
       // driver: sync
       // ?undefined
       // :localforage.LOCALSTORAGE,
     });
     return {
-      has: (o) => n.keys().then((s) => s.includes(o)),
-      get: (o) => n.getItem(o),
-      set: (o, s) => n.setItem(o, s),
-      remove: (o) => n.removeItem(o),
-      clear: () => n.clear()
+      has: (n) => o.keys().then((s) => s.includes(n)),
+      get: (n) => o.getItem(n),
+      set: (n, s) => o.setItem(n, s),
+      remove: (n) => o.removeItem(n),
+      clear: () => o.clear()
     };
   } else {
-    const n = /* @__PURE__ */ new Map();
+    const o = /* @__PURE__ */ new Map();
     return {
-      has: (o) => n.has(o),
-      get: (o) => n.get(o),
-      set: (o, s) => n.set(o, s),
-      remove: (o) => n.delete(o),
-      clear: () => n.clear()
+      has: (n) => o.has(n),
+      get: (n) => o.get(n),
+      set: (n, s) => o.set(n, s),
+      remove: (n) => o.delete(n),
+      clear: () => o.clear()
     };
   }
 }, _ = () => {
@@ -130,48 +130,48 @@ const H = new O(), U = ({ persist: t, name: e, sync: r }) => {
   duration: 1 / 0,
   sync: !1
 }, S = (t) => {
-  const e = { ...J, ...t }, { name: r, persist: n, sync: o } = e, s = U({ persist: n, name: r, sync: o }), { getPromise: u, setPromise: P, delPromise: g } = _();
+  const e = { ...J, ...t }, { name: r, persist: o, sync: n } = e, s = U({ persist: o, name: r, sync: n }), { getPromise: u, setPromise: P, delPromise: g } = _();
   function l(a, h) {
-    const { isValid: i } = e, y = s.get(a);
+    const { isValid: i } = e, f = s.get(a);
     let C = !1;
-    if (y && x(y)) {
+    if (f && x(f)) {
       try {
         C = (i == null ? void 0 : i({
           key: a,
           config: h,
-          cachedData: y
+          cachedData: f
         })) ?? !0;
       } catch (c) {
         console.error(`校验异常 ${a}`, c);
       }
       !C && s.remove(a);
     }
-    return { shouldUseCache: C, cachedData: y };
+    return { shouldUseCache: C, cachedData: f };
   }
   async function d(a, h) {
-    const { isValid: i } = e, y = await s.get(a);
+    const { isValid: i } = e, f = await s.get(a);
     let C = !1;
-    if (y && x(y)) {
+    if (f && x(f)) {
       try {
         C = await (i == null ? void 0 : i({
           key: a,
           config: h,
-          cachedData: y
+          cachedData: f
         })) ?? !0;
       } catch (c) {
         console.error(`校验异常 ${a}`, c);
       }
       !C && s.remove(a);
     }
-    return { shouldUseCache: C, cachedData: y };
+    return { shouldUseCache: C, cachedData: f };
   }
   const p = {
     get(a, h) {
-      function i(c, f, ...m) {
+      function i(c, y, ...m) {
         const q = Reflect.apply(a[h], a, m).then(async (w) => {
           const R = typeof e.duration == "number" ? e.duration : e.duration({
             key: c,
-            config: f,
+            config: y,
             response: w
           });
           return s.set(c, A(w, R)), w;
@@ -180,20 +180,20 @@ const H = new O(), U = ({ persist: t, name: e, sync: r }) => {
         });
         return P(c, q), q;
       }
-      return o ? (...c) => {
-        const f = k[h](...c), m = e.key(f), q = u(m);
+      return n ? (...c) => {
+        const y = k[h](...c), m = e.key(y), q = u(m);
         if (q)
           return q;
-        const { shouldUseCache: w, cachedData: R } = l(m, f);
-        return w ? R.value : i(m, f, ...c);
+        const { shouldUseCache: w, cachedData: R } = l(m, y);
+        return w ? R.value : i(m, y, ...c);
       } : (...c) => {
-        const f = k[h](...c), m = e.key(f), q = u(m);
+        const y = k[h](...c), m = e.key(y), q = u(m);
         if (q)
           return q;
         const w = (async () => {
           try {
-            const { shouldUseCache: R, cachedData: D } = await d(m, f);
-            return R ? D.value : await i(m, f, ...c);
+            const { shouldUseCache: R, cachedData: D } = await d(m, y);
+            return R ? D.value : await i(m, y, ...c);
           } finally {
             g(m);
           }
@@ -207,31 +207,34 @@ const H = new O(), U = ({ persist: t, name: e, sync: r }) => {
     store: s
   };
 }, N = (t) => {
-  const { method: e, url: r, params: n, data: o } = t;
-  return [e, r, JSON.stringify(n), JSON.stringify(o)].join("|");
+  const { method: e, url: r, params: o, data: n } = t;
+  return [e, r, JSON.stringify(o), JSON.stringify(n)].join("|");
 }, b = {
-  key: N
+  key: N,
+  duration: 1e3
 }, F = (t) => {
   const e = { ...b, ...t }, {
-    requestor: r
+    requestor: r,
+    store: o
   } = S({
-    key: e.key,
+    ...e,
     persist: !1
   });
   return {
-    requestor: r
+    requestor: r,
+    store: o
   };
 }, L = {
   retries: 3,
   delay: 0,
   retryCondition: () => !0
 }, $ = (t) => {
-  const { retries: e, delay: r, retryCondition: n } = { ...L, ...t }, o = {
+  const { retries: e, delay: r, retryCondition: o } = { ...L, ...t }, n = {
     get(s, u) {
       return (...g) => {
         let l = 0;
         const d = () => Reflect.apply(s[u], s, g).catch((p) => {
-          if (l < e && n(p)) {
+          if (l < e && o(p)) {
             l++;
             const a = typeof r == "function" ? r(l) : r;
             return new Promise((h) => {
@@ -245,7 +248,7 @@ const H = new O(), U = ({ persist: t, name: e, sync: r }) => {
     }
   };
   return {
-    requestor: new Proxy(v(), o)
+    requestor: new Proxy(v(), n)
   };
 };
 class Q {
@@ -254,11 +257,11 @@ class Q {
   }
   // 加入
   add(e, r) {
-    return new Promise((n, o) => {
+    return new Promise((o, n) => {
       this.tasks.enqueue(e, {
         task: r,
-        resolve: n,
-        reject: o
+        resolve: o,
+        reject: n
       }), this._run();
     });
   }
@@ -267,8 +270,8 @@ class Q {
     this.tasks.remove(e);
   }
   execute(e) {
-    const { task: r, resolve: n, reject: o } = e;
-    return r().then(n).catch(o).finally(() => {
+    const { task: r, resolve: o, reject: n } = e;
+    return r().then(o).catch(n).finally(() => {
       this.runningCount--, this._run();
     });
   }
@@ -284,10 +287,10 @@ const W = {
   retries: 0,
   createId: () => z()
 }, Y = (t) => {
-  const e = { ...W, ...t }, { parallelCount: r, createId: n, ...o } = e, s = new Q(r), { requestor: u = null } = o.retries > 0 ? $(o) : {}, P = {
+  const e = { ...W, ...t }, { parallelCount: r, createId: o, ...n } = e, s = new Q(r), { requestor: u = null } = n.retries > 0 ? $(n) : {}, P = {
     get(g, l) {
       return (...p) => {
-        const a = k[l](...p), h = n(a), i = () => u ? Reflect.apply(u[l], u, p) : Reflect.apply(g[l], g, p);
+        const a = k[l](...p), h = o(a), i = () => u ? Reflect.apply(u[l], u, p) : Reflect.apply(g[l], g, p);
         return s.add(h, i);
       };
     }
@@ -301,8 +304,8 @@ const W = {
   sync: !0
 }, G = (t) => {
   const e = { ...B, ...t }, { ...r } = e, {
-    requestor: n,
-    store: o
+    requestor: o,
+    store: n
   } = S(r), s = {
     get(u, P) {
       return (...l) => {
@@ -318,8 +321,8 @@ const W = {
     }
   };
   return {
-    requestor: new Proxy(n, s),
-    store: o
+    requestor: new Proxy(o, s),
+    store: n
   };
 }, K = {
   cacheRequestor: S,

package/dist/index.umd.cjs

@@ -1 +1 @@
-(function(m,k){typeof exports=="object"&&typeof module<"u"?k(exports,require("localforage"),require("id-queue")):typeof define=="function"&&define.amd?define(["exports","localforage","id-queue"],k):(m=typeof globalThis<"u"?globalThis:m||self,k(m.netVertCore={},m.localforage,m.idQueue))})(this,function(m,k,D){"use strict";const S={get:(t,e)=>({url:t,method:"get",...e,params:e==null?void 0:e.params}),post:(t,e,r)=>({url:t,method:"post",data:e,headers:{"Content-Type":"application/json",...r==null?void 0:r.headers},...r}),delete:(t,e)=>({url:t,method:"delete",...e}),put:(t,e,r)=>({url:t,method:"put",data:e,headers:{"Content-Type":"application/json",...r==null?void 0:r.headers},...r}),request:t=>t};function E(t){const e={};return Object.keys(S).forEach(r=>{e[r]=(...n)=>{const o=S[r](...n);return t(o)}}),e}const I="default",O=()=>`${Date.now()}_${Math.random().toString().slice(2,8)}`,j=new Map,z=(t,e=I)=>{j.set(e,E(t))},M=(t=I)=>{const e=j.get(t);if(!e)throw new Error(`Requestor实例 ${t} 未注册`);return e};class H{has(e){return!!this.get(e)}get(e){const r=localStorage.getItem(e);if(r)try{return JSON.parse(r)}catch(n){console.error("Error parsing cached data",n);return}}set(e,r){try{const n=JSON.stringify(r);localStorage.setItem(e,n)}catch(n){console.error("Error saving data to localStorage",n)}return r}remove(e){localStorage.removeItem(e)}clear(){localStorage.clear()}}const U=new H,_=({persist:t,name:e,sync:r})=>{if(t&&r)return U;if(t){const n=k.createInstance({name:e});return{has:o=>n.keys().then(s=>s.includes(o)),get:o=>n.getItem(o),set:(o,s)=>n.setItem(o,s),remove:o=>n.removeItem(o),clear:()=>n.clear()}}else{const n=new Map;return{has:o=>n.has(o),get:o=>n.get(o),set:(o,s)=>n.set(o,s),remove:o=>n.delete(o),clear:()=>n.clear()}}},A=()=>{const t=new Map;return{getPromise:s=>t.get(s),setPromise:(s,u)=>{t.set(s,u)},delPromise:s=>{t.delete(s)},clearCache:()=>{t.clear()}}},J=(t,e)=>({value:t,expiresAt:Date.now()+e}),T=t=>t.expiresAt>Date.now(),N={key:t=>t.url,persist:!1,duration:1/0,sync:!1},x=t=>{const e={...N,...t},{name:r,persist:n,sync:o}=e,s=_({persist:n,name:r,sync:o}),{getPromise:u,setPromise:R,delPromise:p}=A();function l(c,h){const{isValid:i}=e,y=s.get(c);let q=!1;if(y&&T(y)){try{q=(i==null?void 0:i({key:c,config:h,cachedData:y}))??!0}catch(a){console.error(`校验异常 ${c}`,a)}!q&&s.remove(c)}return{shouldUseCache:q,cachedData:y}}async function d(c,h){const{isValid:i}=e,y=await s.get(c);let q=!1;if(y&&T(y)){try{q=await(i==null?void 0:i({key:c,config:h,cachedData:y}))??!0}catch(a){console.error(`校验异常 ${c}`,a)}!q&&s.remove(c)}return{shouldUseCache:q,cachedData:y}}const C={get(c,h){function i(a,g,...f){const P=Reflect.apply(c[h],c,f).then(async w=>{const v=typeof e.duration=="number"?e.duration:e.duration({key:a,config:g,response:w});return s.set(a,J(w,v)),w}).finally(()=>{p(a)});return R(a,P),P}return o?(...a)=>{const g=S[h](...a),f=e.key(g),P=u(f);if(P)return P;const{shouldUseCache:w,cachedData:v}=l(f,g);return w?v.value:i(f,g,...a)}:(...a)=>{const g=S[h](...a),f=e.key(g),P=u(f);if(P)return P;const w=(async()=>{try{const{shouldUseCache:v,cachedData:G}=await d(f,g);return v?G.value:await i(f,g,...a)}finally{p(f)}})();return R(f,w),w}}};return{requestor:new Proxy(M(),C),store:s}},b={key:t=>{const{method:e,url:r,params:n,data:o}=t;return[e,r,JSON.stringify(n),JSON.stringify(o)].join("|")}},Q=t=>{const e={...b,...t},{requestor:r}=x({key:e.key,persist:!1});return{requestor:r}},F={retries:3,delay:0,retryCondition:()=>!0},$=t=>{const{retries:e,delay:r,retryCondition:n}={...F,...t},o={get(s,u){return(...p)=>{let l=0;const d=()=>Reflect.apply(s[u],s,p).catch(C=>{if(l<e&&n(C)){l++;const c=typeof r=="function"?r(l):r;return new Promise(h=>{setTimeout(()=>h(d()),c)})}return Promise.reject(C)});return d()}}};return{requestor:new Proxy(M(),o)}};class L{constructor(e=4){this.parallelCount=e,this.tasks=new D.TaskQueue,this.runningCount=0}add(e,r){return new Promise((n,o)=>{this.tasks.enqueue(e,{task:r,resolve:n,reject:o}),this._run()})}remove(e){this.tasks.remove(e)}execute(e){const{task:r,resolve:n,reject:o}=e;return r().then(n).catch(o).finally(()=>{this.runningCount--,this._run()})}_run(){for(;this.runningCount<this.parallelCount&&this.tasks.size>0;){const e=this.tasks.dequeue();this.runningCount++,this.execute(e)}}}const V={parallelCount:4,retries:0,createId:()=>O()},W=t=>{const e={...V,...t},{parallelCount:r,createId:n,...o}=e,s=new L(r),{requestor:u=null}=o.retries>0?$(o):{},R={get(p,l){return(...C)=>{const c=S[l](...C),h=n(c),i=()=>u?Reflect.apply(u[l],u,C):Reflect.apply(p[l],p,C);return s.add(h,i)}}};return{requestor:new Proxy(M(),R),concurrentPool:s}},Y={persist:!1,sync:!0},B={cacheRequestor:x,idempotencyRequestor:Q,retryRequestor:$,concurrentPoolRequestor:W,syncRequestor:t=>{const e={...Y,...t},{...r}=e,{requestor:n,store:o}=x(r),s={get(u,R){return(...l)=>{try{const d=Reflect.apply(u[R],u,l);if(d instanceof Promise)throw d;return d}catch(d){throw d}}}};return{requestor:new Proxy(n,s),store:o}}};m.inject=z,m.requestExtender=B,m.useRequestor=M,Object.defineProperty(m,Symbol.toStringTag,{value:"Module"})});
+(function(m,S){typeof exports=="object"&&typeof module<"u"?S(exports,require("localforage"),require("id-queue")):typeof define=="function"&&define.amd?define(["exports","localforage","id-queue"],S):(m=typeof globalThis<"u"?globalThis:m||self,S(m.netVertCore={},m.localforage,m.idQueue))})(this,function(m,S,D){"use strict";const k={get:(t,e)=>({url:t,method:"get",...e,params:e==null?void 0:e.params}),post:(t,e,r)=>({url:t,method:"post",data:e,headers:{"Content-Type":"application/json",...r==null?void 0:r.headers},...r}),delete:(t,e)=>({url:t,method:"delete",...e}),put:(t,e,r)=>({url:t,method:"put",data:e,headers:{"Content-Type":"application/json",...r==null?void 0:r.headers},...r}),request:t=>t};function E(t){const e={};return Object.keys(k).forEach(r=>{e[r]=(...n)=>{const o=k[r](...n);return t(o)}}),e}const I="default",O=()=>`${Date.now()}_${Math.random().toString().slice(2,8)}`,j=new Map,z=(t,e=I)=>{j.set(e,E(t))},M=(t=I)=>{const e=j.get(t);if(!e)throw new Error(`Requestor实例 ${t} 未注册`);return e};class H{has(e){return!!this.get(e)}get(e){const r=localStorage.getItem(e);if(r)try{return JSON.parse(r)}catch(n){console.error("Error parsing cached data",n);return}}set(e,r){try{const n=JSON.stringify(r);localStorage.setItem(e,n)}catch(n){console.error("Error saving data to localStorage",n)}return r}remove(e){localStorage.removeItem(e)}clear(){localStorage.clear()}}const U=new H,_=({persist:t,name:e,sync:r})=>{if(t&&r)return U;if(t){const n=S.createInstance({name:e});return{has:o=>n.keys().then(s=>s.includes(o)),get:o=>n.getItem(o),set:(o,s)=>n.setItem(o,s),remove:o=>n.removeItem(o),clear:()=>n.clear()}}else{const n=new Map;return{has:o=>n.has(o),get:o=>n.get(o),set:(o,s)=>n.set(o,s),remove:o=>n.delete(o),clear:()=>n.clear()}}},A=()=>{const t=new Map;return{getPromise:s=>t.get(s),setPromise:(s,u)=>{t.set(s,u)},delPromise:s=>{t.delete(s)},clearCache:()=>{t.clear()}}},J=(t,e)=>({value:t,expiresAt:Date.now()+e}),T=t=>t.expiresAt>Date.now(),N={key:t=>t.url,persist:!1,duration:1/0,sync:!1},x=t=>{const e={...N,...t},{name:r,persist:n,sync:o}=e,s=_({persist:n,name:r,sync:o}),{getPromise:u,setPromise:R,delPromise:p}=A();function l(a,h){const{isValid:i}=e,y=s.get(a);let q=!1;if(y&&T(y)){try{q=(i==null?void 0:i({key:a,config:h,cachedData:y}))??!0}catch(c){console.error(`校验异常 ${a}`,c)}!q&&s.remove(a)}return{shouldUseCache:q,cachedData:y}}async function d(a,h){const{isValid:i}=e,y=await s.get(a);let q=!1;if(y&&T(y)){try{q=await(i==null?void 0:i({key:a,config:h,cachedData:y}))??!0}catch(c){console.error(`校验异常 ${a}`,c)}!q&&s.remove(a)}return{shouldUseCache:q,cachedData:y}}const C={get(a,h){function i(c,g,...f){const P=Reflect.apply(a[h],a,f).then(async w=>{const v=typeof e.duration=="number"?e.duration:e.duration({key:c,config:g,response:w});return s.set(c,J(w,v)),w}).finally(()=>{p(c)});return R(c,P),P}return o?(...c)=>{const g=k[h](...c),f=e.key(g),P=u(f);if(P)return P;const{shouldUseCache:w,cachedData:v}=l(f,g);return w?v.value:i(f,g,...c)}:(...c)=>{const g=k[h](...c),f=e.key(g),P=u(f);if(P)return P;const w=(async()=>{try{const{shouldUseCache:v,cachedData:G}=await d(f,g);return v?G.value:await i(f,g,...c)}finally{p(f)}})();return R(f,w),w}}};return{requestor:new Proxy(M(),C),store:s}},b={key:t=>{const{method:e,url:r,params:n,data:o}=t;return[e,r,JSON.stringify(n),JSON.stringify(o)].join("|")},duration:1e3},Q=t=>{const e={...b,...t},{requestor:r,store:n}=x({...e,persist:!1});return{requestor:r,store:n}},F={retries:3,delay:0,retryCondition:()=>!0},$=t=>{const{retries:e,delay:r,retryCondition:n}={...F,...t},o={get(s,u){return(...p)=>{let l=0;const d=()=>Reflect.apply(s[u],s,p).catch(C=>{if(l<e&&n(C)){l++;const a=typeof r=="function"?r(l):r;return new Promise(h=>{setTimeout(()=>h(d()),a)})}return Promise.reject(C)});return d()}}};return{requestor:new Proxy(M(),o)}};class L{constructor(e=4){this.parallelCount=e,this.tasks=new D.TaskQueue,this.runningCount=0}add(e,r){return new Promise((n,o)=>{this.tasks.enqueue(e,{task:r,resolve:n,reject:o}),this._run()})}remove(e){this.tasks.remove(e)}execute(e){const{task:r,resolve:n,reject:o}=e;return r().then(n).catch(o).finally(()=>{this.runningCount--,this._run()})}_run(){for(;this.runningCount<this.parallelCount&&this.tasks.size>0;){const e=this.tasks.dequeue();this.runningCount++,this.execute(e)}}}const V={parallelCount:4,retries:0,createId:()=>O()},W=t=>{const e={...V,...t},{parallelCount:r,createId:n,...o}=e,s=new L(r),{requestor:u=null}=o.retries>0?$(o):{},R={get(p,l){return(...C)=>{const a=k[l](...C),h=n(a),i=()=>u?Reflect.apply(u[l],u,C):Reflect.apply(p[l],p,C);return s.add(h,i)}}};return{requestor:new Proxy(M(),R),concurrentPool:s}},Y={persist:!1,sync:!0},B={cacheRequestor:x,idempotencyRequestor:Q,retryRequestor:$,concurrentPoolRequestor:W,syncRequestor:t=>{const e={...Y,...t},{...r}=e,{requestor:n,store:o}=x(r),s={get(u,R){return(...l)=>{try{const d=Reflect.apply(u[R],u,l);if(d instanceof Promise)throw d;return d}catch(d){throw d}}}};return{requestor:new Proxy(n,s),store:o}}};m.inject=z,m.requestExtender=B,m.useRequestor=M,Object.defineProperty(m,Symbol.toStringTag,{value:"Module"})});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@net-vert/core",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Dependency Inversion Network Library with Type-Safe Injection.",
   "main": "dist/index",
   "type": "module",