@net-vert/core 0.0.9 → 0.1.1

package/README.md

@@ -83,7 +83,6 @@ retryApi.get('/unstable-api');
 ## 🔎 缓存设计说明
 
 - 本库默认内置缓存支持
-- **后续将完全依赖官方独立包：`@net-vert/cache`**
 - 用户无需关注存储机制，专注请求本身
 
 ---
@@ -98,64 +97,117 @@ retryApi.get('/unstable-api');
 | `requestExtender.idempotencyRequestor(options)` | 创建幂等请求器 |
 | `requestExtender.retryRequestor(options)` | 创建重试请求器 |
 
-非常专业！以下是针对你这份缓存扩展的专属文档（带源码思路和示例）：  
 
 ---
 
 ## 🗂 缓存扩展 `requestExtender.cacheRequestor(options)`
 
-`cacheRequestor` 是 `@net-vert/core` 内置的缓存增强器，为请求增加缓存命中机制，避免重复请求，提升性能。
+`cacheRequestor` 是 `@net-vert/core` 内置的智能缓存增强器，提供多维度缓存控制能力，支持同步/异步校验策略,所有cacheRequestor共享一个存储空间。
 
 ### ✅ 核心特性
 
-- 支持本地缓存或内存缓存（未来由 `@net-vert/cache` 提供存储支持）
-- 同一请求中的并发合并（Promise 复用）
-- 支持缓存过期时间配置
-- 支持缓存 key 自定义生成逻辑
-- 自动处理 Promise 缓存清理
+- **🚀 多级缓存策略**  
+  内存缓存 + 持久化存储（未来由 `@net-vert/cache` 提供）
+  
+- **🔗 智能并发合并**  
+  相同请求共享 Promise，避免重复网络消耗
+
+- **⏳ 动态缓存控制**  
+  支持时间/逻辑双重失效校验机制
+
+- **🧩 弹性校验策略**  
+  支持同步/异步缓存有效性检查
 
 ---
 
-### ⚙️ 配置参数（可选）
+### ⚙️ 配置参数
 
-| 参数         | 类型                                             | 说明                                           | 默认值         |
-| ------------ | ----------------------------------------------- | ---------------------------------------------- | -------------- |
-| `key`        | `(config: UnifiedConfig) => string`              | 自定义缓存 key 生成规则                        | `config.url`   |
-| `persist`    | `boolean`                                       | 是否持久化缓存（默认走内存）                   | `false`        |
-| `cacheTime`  | `number` 或 `({config, response}) => number`    | 缓存有效期（毫秒）或动态计算缓存时间           | `Infinity`     |
+| 参数         | 类型                                                                 | 说明                                                          | 默认值         |
+|--------------|--------------------------------------------------------------------|-------------------------------------------------------------|----------------|
+| `key`        | `(config: UnifiedConfig) => string`                               | 自定义缓存键生成规则                                         | `config.url`   |
+| `persist`    | `boolean`                                                         | 启用持久化存储（默认内存存储）                                | `false`        |
+| `duration`   | `number` 或 `({ key, config, response }) => number`               | 缓存时间（ms）或动态计算函数                                  | `Infinity`     |
+| `isValid`    | `({ key, config, cachedData }) => boolean \| Promise<boolean>`    | 缓存有效性校验（支持异步校验）                                | -              |
 
 ---
 
-### 📥 使用示例
+### 📥 基础使用
 
 ```typescript
 import { requestExtender } from '@net-vert/core';
 
-const cachedApi = requestExtender.cacheRequestor({
-  cacheTime: 5000, // 缓存 5 秒
-  key: (config) => `${config.method}-${config.url}` // 自定义缓存 key
+const api = requestExtender.cacheRequestor({
+  duration: 3000, // 缓存3秒
+  key: config => `${config.method}:${config.url}` // 复合键
 });
 
-// 第一次请求发出
-cachedApi.get('/user/info', { params: { id: 1 } }).then(console.log);
+// 首次请求将缓存
+api.get('/user').then(console.log); 
 
-// 5 秒内相同请求直接走缓存
-cachedApi.get('/user/info', { params: { id: 1 } }).then(console.log);
+// 3秒内相同请求直接返回缓存
+api.get('/user').then(console.log); 
 ```
 
----
+### 🎯 动态缓存示例
 
-### 🔥 示例动态缓存时间计算
+#### 根据响应数据设置缓存时间
+```typescript
+requestExtender.cacheRequestor({
+  duration: ({ response }) => response.data.isHot ? 10000 : 3000
+});
+```
 
+#### 权限变更时失效缓存
 ```typescript
-const dynamicCachedApi = requestExtender.cacheRequestor({
-  cacheTime: ({ config, response }) => {
-    // 根据接口返回决定缓存时间
-    return response.isHot ? 10000 : 3000;
+requestExtender.cacheRequestor({
+  isValid: ({ cachedData }) => {
+    return cachedData.value.permission === currentUser.permission
   }
 });
 ```
 
+#### 异步校验缓存有效性
+```typescript
+requestExtender.cacheRequestor({
+  async isValid({ key }) {
+    const { valid } = await fetch('/cache/validate', { body: key })
+    return valid
+  }
+});
+```
+
+---
+
+### 🛠 工作机制
+
+```mermaid
+graph TB
+    A[请求进入] --> B{存在Promise缓存?}
+    B -->|是| C[共享请求]
+    B -->|否| D{存在物理缓存?}
+    D -->|是| E[执行isValid校验]
+    E -->|有效| F[返回缓存]
+    E -->|无效| G[清理缓存]
+    D -->|否| H[发起新请求]
+    H --> I[缓存响应数据]
+```
+
+---
+
+### ⚠️ 注意事项
+
+1. **缓存穿透防护**  
+   当 `isValid` 返回 `false` 时会主动清理缓存，后续请求将触发新请求
+
+2. **异步校验建议**  
+   耗时较长的异步校验建议配合 `duration` 使用，避免校验期间重复请求
+
+3. **内存管理**  
+   高频数据建议启用 `persist` 持久化存储，防止内存溢出
+```
+
+```
+
 ## ♻️ 幂等扩展 `requestExtender.idempotencyRequestor(options)`
 
 `idempotencyRequestor` 是基于 `cacheRequestor` 封装的幂等增强器，确保同一参数的请求，在请求未完成前只发送一次，自动合并并发请求，避免重复提交和资源浪费。
@@ -298,6 +350,179 @@ idempotentApi.post('/user/create', { name: 'Alice' }).then(console.log);
 
 ---
 
+```markdown
+# 🚀 并发请求控制器 `createConcurrentPoolRequestor`
+
+提供智能并发控制与自动重试能力的请求扩展器，适用于需要精准控制请求并发的场景。
+
+---
+
+## 📦 核心模块
+
+### 1. 并发池 `ConcurrentPool`
+```typescript
+export class ConcurrentPool {
+    parallelCount: number      // 最大并行任务数
+    tasks: TaskItemList        // 待执行任务队列
+    runningCount: number       // 当前运行中任务数
+    
+    constructor(parallelCount = 4)  // 初始化并发池
+    
+    // 添加任务到队列
+    add(id: string, task: Task): Promise<any>
+    
+    // 移除指定任务
+    remove(id: string): void
+    
+    // 执行单个任务（内部方法）
+    private execute(currentTask: TaskItem): void
+    
+    // 启动任务处理（内部调度器）
+    private _run(): void
+}
+```
+
+---
+
+### 2. 请求器工厂函数
+```typescript
+createConcurrentPoolRequestor(config): {
+    requestor: Requestor,     // 增强后的请求器实例
+    concurrentPool: ConcurrentPool // 关联的并发池
+}
+```
+
+---
+
+## ⚙️ 配置参数
+
+| 参数             | 类型                                   | 说明                           | 默认值               |
+|------------------|---------------------------------------|------------------------------|---------------------|
+| `parallelCount`  | `number`                              | 最大并行请求数                  | 4                   |
+| `createId`       | `(config: UnifiedConfig) => string`   | 生成唯一任务ID的函数            | 时间戳+随机数        |
+| `retries`        | `number`                              | 失败重试次数                   | 0 (不重试)          |
+
+---
+
+## 🎯 功能特性
+
+### 1. 智能并发控制
+```mermaid
+graph TD
+    A[新请求到达] --> B{运行中任务 < 最大并发数?}
+    B -->|是| C[立即执行]
+    B -->|否| D[进入等待队列]
+    C --> E[任务完成]
+    E --> F{队列有等待任务?}
+    F -->|是| G[触发下一个任务]
+```
+
+### 2. 自动重试机制
+```typescript
+// 集成重试模块的工作流
+sequenceDiagram
+    participant P as 并发池
+    participant R as 重试模块
+    participant S as 服务器
+    
+    P->>R: 执行请求
+    R->>S: 尝试请求
+    alt 成功
+        S-->>R: 返回数据
+        R-->>P: 传递结果
+    else 失败
+        R->>R: 重试逻辑(最多retries次)
+        R-->>P: 最终结果/错误
+    end
+```
+
+---
+
+## 📝 使用示例
+
+### 基础使用
+```typescript
+import createConcurrentPoolRequestor from '@/requests/modules/concurrentPoolRequestor'
+
+// 创建最大并发数为3的请求器
+const { requestor } = createConcurrentPoolRequestor({
+    parallelCount: 3,
+    retries: 2, // 失败自动重试2次
+    delay: 500  // 重试间隔500ms
+})
+
+// 批量发起请求
+const requests = Array(10).fill(0).map(() => 
+    requestor.get('/api/data')
+)
+
+Promise.all(requests).then(results => {
+    console.log('所有请求完成:', results)
+})
+```
+
+### 高级控制
+```typescript
+// 获取并发池实例进行精细控制
+const { requestor, concurrentPool } = createConcurrentPoolRequestor()
+
+// 动态调整并发数
+concurrentPool.parallelCount = 5 
+
+// 取消特定请求
+const reqId = 'custom-id-123'
+requestor.post('/api/submit', { data }, {
+    __id: reqId // 通过配置注入自定义ID
+}).catch(err => {
+    if (err.message === 'ABORTED') {
+        console.log('请求被主动取消')
+    }
+})
+
+// 主动取消任务
+concurrentPool.remove(reqId)
+```
+
+---
+
+## ⚠️ 注意事项
+
+1. **ID生成策略**  
+   确保`createId`函数生成的ID具有唯一性：
+   ```typescript
+   createId: config => `${config.method}:${config.url}:${hash(config.params)}`
+   ```
+
+2. **资源释放**  
+   长时间运行的实例需手动释放资源：
+   ```typescript
+   // 清空任务队列
+   concurrentPool.tasks.clear() 
+   ```
+
+---
+
+## 🛠 设计理念
+
+### 1. 队列优先级策略
+```typescript
+// 可扩展为优先级队列
+interface PriorityTaskItem extends TaskItem {
+    priority: number
+}
+
+// 自定义队列实现
+class PriorityQueue implements TaskItemList {
+    enqueue(id: string, item: PriorityTaskItem) {
+        // 根据优先级插入队列
+    }
+}
+### 1. 队列优先级策略
+```typescript
+一个实例对象控制着单独的并发池
+
+```
+
 ## 📤 开源信息
 
 - 仓库地址：[https://github.com/yvygyyth/net-vert](https://github.com/yvygyyth/net-vert)

package/dist/index.d.ts

@@ -1,10 +1,5 @@
 import { TaskQueue } from 'id-queue';
 
-declare interface BasicCredentials {
-    username: string;
-    password: string;
-}
-
 declare class ConcurrentPool {
     parallelCount: number;
     tasks: TaskItemList;
@@ -26,8 +21,6 @@ declare interface RequestConfig<D = any> {
     params?: Record<string, any> | string;
     data?: D;
     timeout?: number;
-    auth?: BasicCredentials;
-    responseType?: ResponseType;
     onUploadProgress?: <P extends ProgressEvent>(progressEvent: P) => void;
     onDownloadProgress?: <P extends ProgressEvent>(progressEvent: P) => void;
     validateStatus?: ((status: number) => boolean) | null;
@@ -38,14 +31,23 @@ export declare const requestExtender: {
     cacheRequestor: (config?: {
         key?: (config: UnifiedConfig) => string;
         persist?: boolean;
-        cacheTime?: number | (({ config, response }: {
+        duration?: number | (({ key, config, response }: {
+            key: string;
             config: UnifiedConfig;
             response: any;
         }) => number);
+        isValid?: (params: {
+            key: string;
+            config: UnifiedConfig;
+            cachedData: {
+                value: any;
+                expiresAt: number;
+            };
+        }) => boolean | Promise<boolean>;
     }) => Requestor;
     idempotencyRequestor: (genKey?: (config: UnifiedConfig) => string) => Requestor;
     retryRequestor: (config?: RetryOptions) => Requestor;
-    concurrentPoolRequestor: (config: {
+    concurrentPoolRequestor: (config?: {
         parallelCount?: number;
         createId?: (config: UnifiedConfig) => string;
     } & RetryOptions) => {
@@ -55,11 +57,11 @@ export declare const requestExtender: {
 };
 
 export declare interface Requestor {
-    get<R = any, D = any>(url: string, config?: RequestConfig<D>): Promise<R>;
+    get<R = any, D = any>(url: string, config?: WithDynamicProps<RequestConfig<D>>): Promise<R>;
     post<R = any, D = any>(url: string, data?: D, config?: RequestConfig<D>): Promise<R>;
-    delete<R = any, D = any>(url: string, config?: RequestConfig<D>): Promise<R>;
-    put<R = any, D = any>(url: string, data?: D, config?: RequestConfig<D>): Promise<R>;
-    request<R = any, D = any>(config: UnifiedConfig<D>): Promise<R>;
+    delete<R = any, D = any>(url: string, config?: WithDynamicProps<RequestConfig<D>>): Promise<R>;
+    put<R = any, D = any>(url: string, data?: D, config?: WithDynamicProps<RequestConfig<D>>): Promise<R>;
+    request<R = any, D = any>(config: WithDynamicProps<UnifiedConfig<D>>): Promise<R>;
 }
 
 declare type RetryOptions = {
@@ -87,4 +89,6 @@ export declare type UnifiedRequestor = <R = any, D = any>(config: UnifiedConfig<
 
 export declare const useRequestor: (instanceKey?: string) => Requestor;
 
+declare type WithDynamicProps<T, V = any> = T & Record<string, V>;
+
 export { }

package/dist/index.js

@@ -1,232 +1,179 @@
-const y = {
-  get: (r, e) => ({
-    url: r,
+import h from "localforage";
+import { TaskQueue as I } from "id-queue";
+const f = {
+  get: (t, e) => ({
+    url: t,
     method: "get",
     ...e,
     params: e == null ? void 0 : e.params
   }),
-  post: (r, e, t) => ({
-    url: r,
+  post: (t, e, r) => ({
+    url: t,
     method: "post",
     data: e,
-    headers: { "Content-Type": "application/json", ...t == null ? void 0 : t.headers },
-    ...t
+    headers: { "Content-Type": "application/json", ...r == null ? void 0 : r.headers },
+    ...r
   }),
-  delete: (r, e) => ({
-    url: r,
+  delete: (t, e) => ({
+    url: t,
     method: "delete",
     ...e
   }),
-  put: (r, e, t) => ({
-    url: r,
+  put: (t, e, r) => ({
+    url: t,
     method: "put",
     data: e,
-    headers: { "Content-Type": "application/json", ...t == null ? void 0 : t.headers },
-    ...t
+    headers: { "Content-Type": "application/json", ...r == null ? void 0 : r.headers },
+    ...r
   }),
-  request: (r) => r
+  request: (t) => t
 };
-function k(r) {
+function j(t) {
   const e = {};
-  return Object.keys(y).forEach(
-    (t) => {
-      e[t] = (...s) => {
-        const n = y[t](...s);
-        return r(n);
+  return Object.keys(f).forEach(
+    (r) => {
+      e[r] = (...o) => {
+        const n = f[r](...o);
+        return t(n);
       };
     }
   ), {
     ...e,
-    request: r
+    request: 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} 未注册`);
+const R = "default", k = /* @__PURE__ */ new Map(), U = (t, e = R) => {
+  k.set(e, j(t));
+}, g = (t = R) => {
+  const e = k.get(t);
+  if (!e) throw new Error(`Requestor实例 ${t} 未注册`);
   return e;
 };
-class M {
-  // 是否存在
-  has(e) {
-    return !!localStorage.getItem(e);
+class E {
+  constructor(e) {
+    e && h.config(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;
-      }
+  async has(e) {
+    return await h.getItem(e) !== null;
   }
-  // 设置缓存
-  set(e, t) {
+  async get(e) {
     try {
-      const s = JSON.stringify(t);
-      localStorage.setItem(e, s);
-    } catch (s) {
-      console.error("Error saving data to localStorage", s);
+      return await h.getItem(e) ?? void 0;
+    } catch (r) {
+      console.error("Error getting data", r);
+      return;
     }
-    return t;
   }
-  // 删除缓存
-  delete(e) {
-    localStorage.removeItem(e);
+  async set(e, r) {
+    return await h.setItem(e, r), r;
+  }
+  async delete(e) {
+    await h.removeItem(e);
   }
-  // 清空所有缓存
-  clear() {
-    localStorage.clear();
+  async clear() {
+    await h.clear();
   }
 }
-const T = new M(), E = /* @__PURE__ */ new Map(), j = (r) => r ? T : E, I = () => {
-  const r = /* @__PURE__ */ new Map();
+const S = new E(), T = /* @__PURE__ */ new Map(), $ = (t) => t ? S : T, D = () => {
+  const t = /* @__PURE__ */ new Map();
   return {
-    getPromise: (o) => r.get(o),
-    setPromise: (o, l) => {
-      r.set(o, l);
+    getPromise: (s) => t.get(s),
+    setPromise: (s, i) => {
+      t.set(s, i);
     },
-    delPromise: (o) => {
-      r.delete(o);
+    delPromise: (s) => {
+      t.delete(s);
     },
     clearCache: () => {
-      r.clear();
+      t.clear();
     }
   };
-}, b = {
-  key: (r) => r.url,
-  persist: !1,
-  cacheTime: 1 / 0
-}, x = (r, e) => ({
-  value: r,
+}, _ = (t, e) => ({
+  value: t,
   expiresAt: Date.now() + e
-}), 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 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", "成功", a, d), d)).finally(() => {
-            o(a);
-          });
-          return n(a, v), v;
+}), z = (t) => t.expiresAt > Date.now(), A = {
+  key: (t) => t.url,
+  persist: !1,
+  duration: 1 / 0
+}, x = (t) => {
+  const e = { ...A, ...t }, r = $(e.persist), { getPromise: o, setPromise: n, delPromise: s } = D(), i = {
+    get(d, c) {
+      return async (...u) => {
+        const l = f[c](...u), a = e.key(l), p = o(a);
+        if (p)
+          return p;
+        const C = r.get(a);
+        let w = !1;
+        if (C && z(C)) {
+          try {
+            w = e.isValid ? await e.isValid({
+              key: a,
+              config: l,
+              cachedData: C
+            }) : !0;
+          } catch (m) {
+            console.error(`校验异常 ${a}`, m);
+          }
+          w || r.delete(a);
         }
+        if (w)
+          return C.value;
+        const P = Reflect.apply(d[c], d, u).then(async (m) => {
+          const v = typeof e.duration == "number" ? e.duration : e.duration({
+            key: a,
+            config: l,
+            response: m
+          });
+          return r.set(a, _(m, v)), m;
+        }).finally(() => {
+          s(a);
+        });
+        return n(a, P), P;
       };
     }
   };
-  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),
+  return new Proxy(g(), i);
+}, O = (t) => {
+  const { method: e, url: r, params: o, data: n } = t;
+  return [e, r, JSON.stringify(o), JSON.stringify(n)].join("|");
+}, H = (t) => x({
+  key: (e) => t ? t(e) : O(e),
   persist: !1
-}), _ = {
+}), V = {
   retries: 3,
   delay: 0,
   retryCondition: () => !0
-}, 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;
+}, M = (t) => {
+  const { retries: e, delay: r, retryCondition: o } = { ...V, ...t }, n = {
+    get(s, i) {
+      return (...d) => {
+        let c = 0;
+        const y = () => Reflect.apply(s[i], s, d).catch((u) => {
+          if (c < e && o(u)) {
+            c++;
+            const l = typeof r == "function" ? r(c) : r;
             return new Promise((a) => {
-              setTimeout(() => a(p()), h);
+              setTimeout(() => a(y()), l);
             });
           }
           return Promise.reject(u);
         });
-        return p();
+        return y();
       };
     }
   };
-  return new Proxy(C(), n);
+  return new Proxy(g(), 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 $ {
+class b {
   constructor(e = 4) {
-    this.parallelCount = e, this.tasks = new N(), this.runningCount = 0;
+    this.parallelCount = e, this.tasks = new I(), this.runningCount = 0;
   }
   // 加入
-  add(e, t) {
-    return console.log("poolinset", e, t), new Promise((s, n) => {
+  add(e, r) {
+    return console.log("poolinset", e, r), new Promise((o, n) => {
       this.tasks.enqueue(e, {
-        task: t,
-        resolve: s,
+        task: r,
+        resolve: o,
         reject: n
       }), this._run();
     });
@@ -236,8 +183,8 @@ class $ {
     this.tasks.remove(e);
   }
   execute(e) {
-    const { task: t, resolve: s, reject: n } = e;
-    return t().then(s).catch(n).finally(() => {
+    const { task: r, resolve: o, reject: n } = e;
+    return r().then(o).catch(n).finally(() => {
       this.runningCount--, this._run();
     });
   }
@@ -248,31 +195,31 @@ class $ {
     }
   }
 }
-const H = {
+const F = {
   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) {
+}, J = (t) => {
+  const e = { ...F, ...t }, { parallelCount: r, createId: o, ...n } = e, s = new b(r), i = n.retries > 0 ? M(n) : null, q = {
+    get(d, c) {
       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);
+        const l = f[c](...u), a = o(l), p = () => i ? i.request(l) : Reflect.apply(d[c], d, u);
+        return s.add(a, p);
       };
     }
   };
   return {
-    requestor: new Proxy(C(), g),
-    concurrentPool: o
+    requestor: new Proxy(g(), q),
+    concurrentPool: s
   };
-}, U = {
-  cacheRequestor: R,
-  idempotencyRequestor: D,
-  retryRequestor: S,
-  concurrentPoolRequestor: F
+}, Q = {
+  cacheRequestor: x,
+  idempotencyRequestor: H,
+  retryRequestor: M,
+  concurrentPoolRequestor: J
 };
 export {
-  L as inject,
-  U as requestExtender,
-  C as useRequestor
+  U as inject,
+  Q as requestExtender,
+  g as useRequestor
 };

package/dist/index.umd.cjs

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@net-vert/core",
-  "version": "0.0.9",
+  "version": "0.1.1",
   "description": "Dependency Inversion Network Library with Type-Safe Injection.",
   "main": "dist/index",
   "type": "module",
@@ -26,7 +26,8 @@
     "access": "public"
   },
   "dependencies": {
-    "id-queue": "^1.0.9"
+    "id-queue": "^1.0.9",
+    "localforage": "^1.10.0"
   },
   "scripts": {
     "test": "vitest",