@net-vert/core 0.0.8 → 0.0.9

package/dist/index.d.ts

@@ -1,8 +1,21 @@
+import { TaskQueue } from 'id-queue';
+
 declare interface BasicCredentials {
     username: string;
     password: string;
 }
 
+declare class ConcurrentPool {
+    parallelCount: number;
+    tasks: TaskItemList;
+    runningCount: number;
+    constructor(parallelCount?: number);
+    add(id: string, task: Task): Promise<unknown>;
+    remove(id: string): void;
+    execute(currentTask: TaskItem): Promise<any>;
+    _run(): void;
+}
+
 export declare const inject: (requestor: UnifiedRequestor, instanceKey?: string) => void;
 
 declare interface RequestConfig<D = any> {
@@ -31,11 +44,14 @@ export declare const requestExtender: {
         }) => number);
     }) => Requestor;
     idempotencyRequestor: (genKey?: (config: UnifiedConfig) => string) => Requestor;
-    retryRequestor: (config?: {
-        retries?: number;
-        delay?: number | ((attempt: number) => number);
-        retryCondition?: (error: any) => boolean;
-    }) => Requestor;
+    retryRequestor: (config?: RetryOptions) => Requestor;
+    concurrentPoolRequestor: (config: {
+        parallelCount?: number;
+        createId?: (config: UnifiedConfig) => string;
+    } & RetryOptions) => {
+        requestor: Requestor;
+        concurrentPool: ConcurrentPool;
+    };
 };
 
 export declare interface Requestor {
@@ -46,6 +62,22 @@ export declare interface Requestor {
     request<R = any, D = any>(config: UnifiedConfig<D>): Promise<R>;
 }
 
+declare type RetryOptions = {
+    retries?: number;
+    delay?: number | ((attempt: number) => number);
+    retryCondition?: (error: any) => boolean;
+};
+
+declare type Task = () => Promise<any>;
+
+declare type TaskItem = {
+    task: Task;
+    resolve: (value: any) => any;
+    reject: (value: any) => any;
+};
+
+declare type TaskItemList = TaskQueue<TaskItem>;
+
 export declare type UnifiedConfig<D = any> = RequestConfig<D> & {
     url: string;
     method: keyof Requestor;

package/dist/index.js

@@ -1,77 +1,77 @@
 const y = {
-  get: (t, e) => ({
-    url: t,
+  get: (r, e) => ({
+    url: r,
     method: "get",
     ...e,
     params: e == null ? void 0 : e.params
   }),
-  post: (t, e, r) => ({
-    url: t,
+  post: (r, e, t) => ({
+    url: r,
     method: "post",
     data: e,
-    headers: { "Content-Type": "application/json", ...r == null ? void 0 : r.headers },
-    ...r
+    headers: { "Content-Type": "application/json", ...t == null ? void 0 : t.headers },
+    ...t
   }),
-  delete: (t, e) => ({
-    url: t,
+  delete: (r, e) => ({
+    url: r,
     method: "delete",
     ...e
   }),
-  put: (t, e, r) => ({
-    url: t,
+  put: (r, e, t) => ({
+    url: r,
     method: "put",
     data: e,
-    headers: { "Content-Type": "application/json", ...r == null ? void 0 : r.headers },
-    ...r
+    headers: { "Content-Type": "application/json", ...t == null ? void 0 : t.headers },
+    ...t
   }),
-  request: (t) => t
+  request: (r) => r
 };
-function x(t) {
+function k(r) {
   const e = {};
   return Object.keys(y).forEach(
-    (r) => {
-      e[r] = (...s) => {
-        const a = y[r](...s);
-        return t(a);
+    (t) => {
+      e[t] = (...s) => {
+        const n = y[t](...s);
+        return r(n);
       };
     }
   ), {
     ...e,
-    request: t
+    request: r
   };
 }
-const P = "default", f = /* @__PURE__ */ new Map(), N = (t, e = P) => {
-  f.set(e, x(t));
-}, w = (t = P) => {
-  const e = f.get(t);
-  if (!e) throw new Error(`Requestor实例 ${t} 未注册`);
+const P = "default", w = /* @__PURE__ */ new Map(), L = (r, e = P) => {
+  w.set(e, k(r));
+}, C = (r = P) => {
+  const e = w.get(r);
+  if (!e) throw new Error(`Requestor实例 ${r} 未注册`);
   return e;
 };
-class E {
+class M {
   // 是否存在
   has(e) {
     return !!localStorage.getItem(e);
   }
   // 获取缓存
   get(e) {
-    const r = localStorage.getItem(e);
-    if (r)
+    const t = localStorage.getItem(e);
+    if (t)
       try {
-        return JSON.parse(r);
+        return JSON.parse(t);
       } catch (s) {
         console.error("Error parsing cached data", s);
         return;
       }
   }
   // 设置缓存
-  set(e, r) {
+  set(e, t) {
     try {
-      const s = JSON.stringify(r);
+      const s = JSON.stringify(t);
       localStorage.setItem(e, s);
     } catch (s) {
       console.error("Error saving data to localStorage", s);
     }
-    return r;
+    return t;
   }
   // 删除缓存
   delete(e) {
@@ -82,90 +82,197 @@ class E {
     localStorage.clear();
   }
 }
-const T = new E(), M = /* @__PURE__ */ new Map(), v = (t) => t ? T : M, j = () => {
-  const t = /* @__PURE__ */ new Map();
+const T = new M(), E = /* @__PURE__ */ new Map(), j = (r) => r ? T : E, I = () => {
+  const r = /* @__PURE__ */ new Map();
   return {
-    getPromise: (o) => t.get(o),
-    setPromise: (o, i) => {
-      t.set(o, i);
+    getPromise: (o) => r.get(o),
+    setPromise: (o, l) => {
+      r.set(o, l);
     },
     delPromise: (o) => {
-      t.delete(o);
+      r.delete(o);
     },
     clearCache: () => {
-      t.clear();
+      r.clear();
     }
   };
-}, I = {
-  key: (t) => t.url,
+}, b = {
+  key: (r) => r.url,
   persist: !1,
   cacheTime: 1 / 0
-}, C = (t, e) => ({
-  value: t,
+}, x = (r, e) => ({
+  value: r,
   expiresAt: Date.now() + e
-}), O = (t) => Date.now() > t.expiresAt, R = (t = {}) => {
-  const e = { ...I, ...t }, r = v(e.persist), { getPromise: s, setPromise: a, delPromise: o } = j(), i = {
-    get(d, c) {
-      return (...l) => {
-        const h = y[c](...l), n = e.key(h), q = s(n);
-        if (q)
-          return console.log(`===> 已存在该请求: ${n}`), q;
-        const p = r.get(n);
-        if (p && !O(p))
-          return p.value;
+}), z = (r) => Date.now() > r.expiresAt, R = (r = {}) => {
+  const e = { ...b, ...r }, t = j(e.persist), { getPromise: s, setPromise: n, delPromise: o } = I(), l = {
+    get(c, i) {
+      return (...u) => {
+        const h = y[i](...u), a = e.key(h), m = s(a);
+        if (m)
+          return console.log(`===> 已存在该请求: ${a}`), m;
+        const f = t.get(a);
+        if (f && !z(f))
+          return f.value;
         {
-          const g = Reflect.apply(d[c], d, l).then((u) => (typeof e.cacheTime == "number" ? r.set(n, C(u, e.cacheTime)) : r.set(
-            n,
-            C(
-              u,
-              e.cacheTime({ config: h, response: u })
+          const v = Reflect.apply(c[i], c, u).then((d) => (typeof e.cacheTime == "number" ? t.set(a, x(d, e.cacheTime)) : t.set(
+            a,
+            x(
+              d,
+              e.cacheTime({ config: h, response: d })
             )
-          ), console.log("===>cache", "成功", n, u), u)).finally(() => {
-            o(n);
+          ), console.log("===>cache", "成功", a, d), d)).finally(() => {
+            o(a);
           });
-          return a(n, g), g;
+          return n(a, v), v;
         }
       };
     }
   };
-  return new Proxy(w(), i);
-}, k = (t) => {
-  const { method: e, url: r, params: s, data: a } = t;
-  return [e, r, JSON.stringify(s), JSON.stringify(a)].join("|");
-}, A = (t) => R({
-  key: (e) => t ? t(e) : k(e),
+  return new Proxy(C(), l);
+}, O = (r) => {
+  const { method: e, url: t, params: s, data: n } = r;
+  return [e, t, JSON.stringify(s), JSON.stringify(n)].join("|");
+}, D = (r) => R({
+  key: (e) => r ? r(e) : O(e),
   persist: !1
-}), D = {
+}), _ = {
   retries: 3,
-  delay: 1e3,
+  delay: 0,
   retryCondition: () => !0
-}, J = (t = {}) => {
-  const { retries: e, delay: r, retryCondition: s } = { ...D, ...t }, a = {
-    get(o, i) {
-      return (...d) => {
-        let c = 0;
-        const m = () => Reflect.apply(o[i], o, d).catch((l) => {
-          if (c < e && s(l)) {
-            c++;
-            const h = typeof r == "function" ? r(c) : r;
-            return new Promise((n) => {
-              setTimeout(() => n(m()), h);
+}, S = (r = {}) => {
+  const { retries: e, delay: t, retryCondition: s } = { ..._, ...r }, n = {
+    get(o, l) {
+      return (...c) => {
+        let i = 0;
+        const p = () => Reflect.apply(o[l], o, c).catch((u) => {
+          if (i < e && s(u)) {
+            i++;
+            const h = typeof t == "function" ? t(i) : t;
+            return new Promise((a) => {
+              setTimeout(() => a(p()), h);
             });
           }
-          return Promise.reject(l);
+          return Promise.reject(u);
         });
-        return m();
+        return p();
       };
     }
   };
-  return new Proxy(w(), a);
-}, z = {
+  return new Proxy(C(), n);
+};
+var A = Object.defineProperty, J = (r, e, t) => e in r ? A(r, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[e] = t, q = (r, e, t) => J(r, typeof e != "symbol" ? e + "" : e, t);
+class N {
+  // 尾部指针（最新加入的任务）
+  constructor(e) {
+    if (q(this, "map"), q(this, "head"), q(this, "tail"), this.map = /* @__PURE__ */ new Map(), this.head = null, this.tail = null, e)
+      for (const [t, s] of e)
+        this.enqueue(t, s);
+  }
+  // 添加任务（O(1)）
+  enqueue(e, t) {
+    this.has(e) && this.remove(e);
+    const s = { id: e, data: t, next: null, prev: this.tail };
+    this.tail ? this.tail.next = s : this.head = s, this.tail = s, this.map.set(e, s);
+  }
+  // 取出最早的任务（O(1)）
+  dequeue() {
+    if (!this.head) return null;
+    const e = this.head;
+    return this.head = e.next, this.head ? this.head.prev = null : this.tail = null, this.map.delete(e.id), e.data;
+  }
+  // 通过 ID 删除任务（O(1)）
+  remove(e) {
+    const t = this.map.get(e);
+    return t ? (t.prev ? t.prev.next = t.next : this.head = t.next, t.next ? t.next.prev = t.prev : this.tail = t.prev, this.map.delete(e), !0) : !1;
+  }
+  // 通过 ID 获取任务（O(1)）
+  getTask(e) {
+    var t;
+    return (t = this.map.get(e)) == null ? void 0 : t.data;
+  }
+  // 通过id更新任务
+  update(e, t) {
+    const s = this.map.get(e);
+    return s ? (s.data = t, !0) : !1;
+  }
+  has(e) {
+    return this.map.has(e);
+  }
+  peek() {
+    var e;
+    return ((e = this.head) == null ? void 0 : e.data) ?? null;
+  }
+  clear() {
+    this.map.clear(), this.head = null, this.tail = null;
+  }
+  // 获取当前队列大小
+  get size() {
+    return this.map.size;
+  }
+  get queue() {
+    const e = [];
+    let t = this.head;
+    for (; t; )
+      e.push(t.data), t = t.next;
+    return e;
+  }
+}
+class $ {
+  constructor(e = 4) {
+    this.parallelCount = e, this.tasks = new N(), this.runningCount = 0;
+  }
+  // 加入
+  add(e, t) {
+    return console.log("poolinset", e, t), new Promise((s, n) => {
+      this.tasks.enqueue(e, {
+        task: t,
+        resolve: s,
+        reject: n
+      }), this._run();
+    });
+  }
+  // 删除
+  remove(e) {
+    this.tasks.remove(e);
+  }
+  execute(e) {
+    const { task: t, resolve: s, reject: n } = e;
+    return t().then(s).catch(n).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 H = {
+  parallelCount: 4,
+  retries: 0,
+  createId: () => `${Date.now()}_${Math.random().toString().slice(2, 8)}`
+}, F = (r) => {
+  const e = { ...H, ...r }, { parallelCount: t, createId: s, ...n } = e, o = new $(t), l = n.retries > 0 ? S(n) : null, g = {
+    get(c, i) {
+      return (...u) => {
+        const h = y[i](...u), a = s(h), m = () => l ? l.request(h) : Reflect.apply(c[i], c, u);
+        return o.add(a, m);
+      };
+    }
+  };
+  return {
+    requestor: new Proxy(C(), g),
+    concurrentPool: o
+  };
+}, U = {
   cacheRequestor: R,
-  idempotencyRequestor: A,
-  retryRequestor: J
+  idempotencyRequestor: D,
+  retryRequestor: S,
+  concurrentPoolRequestor: F
 };
 export {
-  N as inject,
-  z as requestExtender,
-  w as useRequestor
+  L as inject,
+  U as requestExtender,
+  C as useRequestor
 };

package/dist/index.umd.cjs

@@ -1 +1 @@
-(function(c,i){typeof exports=="object"&&typeof module<"u"?i(exports):typeof define=="function"&&define.amd?define(["exports"],i):(c=typeof globalThis<"u"?globalThis:c||self,i(c["net-vert/core"]={}))})(this,function(c){"use strict";const i={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 T(t){const e={};return Object.keys(i).forEach(r=>{e[r]=(...o)=>{const a=i[r](...o);return t(a)}}),{...e,request:t}}const g="default",P=new Map,j=(t,e=g)=>{P.set(e,T(t))},y=(t=g)=>{const e=P.get(t);if(!e)throw new Error(`Requestor实例 ${t} 未注册`);return e};class v{has(e){return!!localStorage.getItem(e)}get(e){const r=localStorage.getItem(e);if(r)try{return JSON.parse(r)}catch(o){console.error("Error parsing cached data",o);return}}set(e,r){try{const o=JSON.stringify(r);localStorage.setItem(e,o)}catch(o){console.error("Error saving data to localStorage",o)}return r}delete(e){localStorage.removeItem(e)}clear(){localStorage.clear()}}const x=new v,E=new Map,M=t=>t?x:E,O=()=>{const t=new Map;return{getPromise:s=>t.get(s),setPromise:(s,l)=>{t.set(s,l)},delPromise:s=>{t.delete(s)},clearCache:()=>{t.clear()}}},I={key:t=>t.url,persist:!1,cacheTime:1/0},C=(t,e)=>({value:t,expiresAt:Date.now()+e}),b=t=>Date.now()>t.expiresAt,R=(t={})=>{const e={...I,...t},r=M(e.persist),{getPromise:o,setPromise:a,delPromise:s}=O(),l={get(m,u){return(...d)=>{const p=i[u](...d),n=e.key(p),S=o(n);if(S)return console.log(`===> 已存在该请求: ${n}`),S;const q=r.get(n);if(q&&!b(q))return q.value;{const w=Reflect.apply(m[u],m,d).then(h=>(typeof e.cacheTime=="number"?r.set(n,C(h,e.cacheTime)):r.set(n,C(h,e.cacheTime({config:p,response:h}))),console.log("===>cache","成功",n,h),h)).finally(()=>{s(n)});return a(n,w),w}}}};return new Proxy(y(),l)},k=t=>{const{method:e,url:r,params:o,data:a}=t;return[e,r,JSON.stringify(o),JSON.stringify(a)].join("|")},A=t=>R({key:e=>t?t(e):k(e),persist:!1}),D={retries:3,delay:1e3,retryCondition:()=>!0},J={cacheRequestor:R,idempotencyRequestor:A,retryRequestor:(t={})=>{const{retries:e,delay:r,retryCondition:o}={...D,...t},a={get(s,l){return(...m)=>{let u=0;const f=()=>Reflect.apply(s[l],s,m).catch(d=>{if(u<e&&o(d)){u++;const p=typeof r=="function"?r(u):r;return new Promise(n=>{setTimeout(()=>n(f()),p)})}return Promise.reject(d)});return f()}}};return new Proxy(y(),a)}};c.inject=j,c.requestExtender=J,c.useRequestor=y,Object.defineProperty(c,Symbol.toStringTag,{value:"Module"})});
+(function(u,c){typeof exports=="object"&&typeof module<"u"?c(exports):typeof define=="function"&&define.amd?define(["exports"],c):(u=typeof globalThis<"u"?globalThis:u||self,c(u["net-vert/core"]={}))})(this,function(u){"use strict";const c={get:(r,e)=>({url:r,method:"get",...e,params:e==null?void 0:e.params}),post:(r,e,t)=>({url:r,method:"post",data:e,headers:{"Content-Type":"application/json",...t==null?void 0:t.headers},...t}),delete:(r,e)=>({url:r,method:"delete",...e}),put:(r,e,t)=>({url:r,method:"put",data:e,headers:{"Content-Type":"application/json",...t==null?void 0:t.headers},...t}),request:r=>r};function T(r){const e={};return Object.keys(c).forEach(t=>{e[t]=(...s)=>{const n=c[t](...s);return r(n)}}),{...e,request:r}}const P="default",x=new Map,k=(r,e=P)=>{x.set(e,T(r))},f=(r=P)=>{const e=x.get(r);if(!e)throw new Error(`Requestor实例 ${r} 未注册`);return e};class j{has(e){return!!localStorage.getItem(e)}get(e){const t=localStorage.getItem(e);if(t)try{return JSON.parse(t)}catch(s){console.error("Error parsing cached data",s);return}}set(e,t){try{const s=JSON.stringify(t);localStorage.setItem(e,s)}catch(s){console.error("Error saving data to localStorage",s)}return t}delete(e){localStorage.removeItem(e)}clear(){localStorage.clear()}}const b=new j,E=new Map,I=r=>r?b:E,O=()=>{const r=new Map;return{getPromise:o=>r.get(o),setPromise:(o,l)=>{r.set(o,l)},delPromise:o=>{r.delete(o)},clearCache:()=>{r.clear()}}},z={key:r=>r.url,persist:!1,cacheTime:1/0},w=(r,e)=>({value:r,expiresAt:Date.now()+e}),D=r=>Date.now()>r.expiresAt,R=(r={})=>{const e={...z,...r},t=I(e.persist),{getPromise:s,setPromise:n,delPromise:o}=O(),l={get(d,i){return(...h)=>{const p=c[i](...h),a=e.key(p),g=s(a);if(g)return console.log(`===> 已存在该请求: ${a}`),g;const v=t.get(a);if(v&&!D(v))return v.value;{const M=Reflect.apply(d[i],d,h).then(m=>(typeof e.cacheTime=="number"?t.set(a,w(m,e.cacheTime)):t.set(a,w(m,e.cacheTime({config:p,response:m}))),console.log("===>cache","成功",a,m),m)).finally(()=>{o(a)});return n(a,M),M}}}};return new Proxy(f(),l)},_=r=>{const{method:e,url:t,params:s,data:n}=r;return[e,t,JSON.stringify(s),JSON.stringify(n)].join("|")},A=r=>R({key:e=>r?r(e):_(e),persist:!1}),J={retries:3,delay:0,retryCondition:()=>!0},S=(r={})=>{const{retries:e,delay:t,retryCondition:s}={...J,...r},n={get(o,l){return(...d)=>{let i=0;const y=()=>Reflect.apply(o[l],o,d).catch(h=>{if(i<e&&s(h)){i++;const p=typeof t=="function"?t(i):t;return new Promise(a=>{setTimeout(()=>a(y()),p)})}return Promise.reject(h)});return y()}}};return new Proxy(f(),n)};var N=Object.defineProperty,$=(r,e,t)=>e in r?N(r,e,{enumerable:!0,configurable:!0,writable:!0,value:t}):r[e]=t,q=(r,e,t)=>$(r,typeof e!="symbol"?e+"":e,t);class H{constructor(e){if(q(this,"map"),q(this,"head"),q(this,"tail"),this.map=new Map,this.head=null,this.tail=null,e)for(const[t,s]of e)this.enqueue(t,s)}enqueue(e,t){this.has(e)&&this.remove(e);const s={id:e,data:t,next:null,prev:this.tail};this.tail?this.tail.next=s:this.head=s,this.tail=s,this.map.set(e,s)}dequeue(){if(!this.head)return null;const e=this.head;return this.head=e.next,this.head?this.head.prev=null:this.tail=null,this.map.delete(e.id),e.data}remove(e){const t=this.map.get(e);return t?(t.prev?t.prev.next=t.next:this.head=t.next,t.next?t.next.prev=t.prev:this.tail=t.prev,this.map.delete(e),!0):!1}getTask(e){var t;return(t=this.map.get(e))==null?void 0:t.data}update(e,t){const s=this.map.get(e);return s?(s.data=t,!0):!1}has(e){return this.map.has(e)}peek(){var e;return((e=this.head)==null?void 0:e.data)??null}clear(){this.map.clear(),this.head=null,this.tail=null}get size(){return this.map.size}get queue(){const e=[];let t=this.head;for(;t;)e.push(t.data),t=t.next;return e}}class F{constructor(e=4){this.parallelCount=e,this.tasks=new H,this.runningCount=0}add(e,t){return console.log("poolinset",e,t),new Promise((s,n)=>{this.tasks.enqueue(e,{task:t,resolve:s,reject:n}),this._run()})}remove(e){this.tasks.remove(e)}execute(e){const{task:t,resolve:s,reject:n}=e;return t().then(s).catch(n).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 L={parallelCount:4,retries:0,createId:()=>`${Date.now()}_${Math.random().toString().slice(2,8)}`},U={cacheRequestor:R,idempotencyRequestor:A,retryRequestor:S,concurrentPoolRequestor:r=>{const e={...L,...r},{parallelCount:t,createId:s,...n}=e,o=new F(t),l=n.retries>0?S(n):null,C={get(d,i){return(...h)=>{const p=c[i](...h),a=s(p),g=()=>l?l.request(p):Reflect.apply(d[i],d,h);return o.add(a,g)}}};return{requestor:new Proxy(f(),C),concurrentPool:o}}};u.inject=k,u.requestExtender=U,u.useRequestor=f,Object.defineProperty(u,Symbol.toStringTag,{value:"Module"})});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@net-vert/core",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "Dependency Inversion Network Library with Type-Safe Injection.",
   "main": "dist/index",
   "type": "module",
@@ -25,7 +25,11 @@
   "publishConfig": {
     "access": "public"
   },
+  "dependencies": {
+    "id-queue": "^1.0.9"
+  },
   "scripts": {
+    "test": "vitest",
     "build": "run-p type-check build-only",
     "build-only": "vite build",
     "type-check": "tsc --noEmit"