@net-vert/core 1.2.1 → 1.3.0

package/README.md

@@ -11,11 +11,11 @@ GitHub 开源仓库 👉 [https://github.com/yvygyyth/net-vert](https://github.c
 
 ## ✨ 核心特性
 
-✅ **依赖倒置设计** - 解耦网络层，按需注入 axios、fetch 或自定义请求器  
-✅ **中间件扩展** - 内置缓存、幂等、重试、并发控制、同步模式等强大中间件  
-✅ **类型安全** - TypeScript 全类型提示，开发体验丝滑  
-✅ **零配置上手** - API 极简，开箱即用  
-✅ **灵活组合** - 多种中间件自由组合，满足复杂业务场景  
+✅ **依赖倒置设计** - 解耦网络层，按需注入 axios、fetch 或自定义请求器
+✅ **中间件扩展** - 内置缓存、幂等、重试、并发控制等强大中间件
+✅ **类型安全** - TypeScript 全类型提示，开发体验丝滑
+✅ **零配置上手** - API 极简，开箱即用
+✅ **灵活组合** - 多种中间件自由组合，满足复杂业务场景
 ✅ **Tree-Shaking** - 支持按需引入，打包体积更小
 
 ---
@@ -129,7 +129,7 @@ import { createRequestor, cache } from '@net-vert/core'
 
 const requestor = createRequestor({
   extensions: [
-    cache({ 
+    cache({
       duration: 5000  // 缓存 5 秒
     })
   ]
@@ -157,10 +157,10 @@ interface CacheOptions<D = any, R = any> {
    * - number: 固定时长
    * - function: 动态计算（可根据响应内容决定缓存时长）
    */
-  duration?: number | ((ctx: { 
+  duration?: number | ((ctx: {
     key: string
     config: RequestConfig<D>
-    response: R 
+    response: R
   }) => number)
 
   /**
@@ -354,7 +354,7 @@ import { createRequestor, retry } from '@net-vert/core'
 
 const requestor = createRequestor({
   extensions: [
-    retry({ 
+    retry({
       retries: 3,    // 最多重试 3 次
       delay: 1000    // 每次重试延迟 1 秒
     })
@@ -447,7 +447,7 @@ import { createRequestor, concurrent } from '@net-vert/core'
 
 const requestor = createRequestor({
   extensions: [
-    concurrent({ 
+    concurrent({
       parallelCount: 3  // 最多同时 3 个请求
     })
   ]
@@ -511,140 +511,6 @@ const results = await Promise.all(
 
 ---
 
-### 5. 同步模式中间件 (`sync`)
-
-让异步请求支持"Suspense 风格"的同步调用，适用于 React Suspense 等场景。
-
-> **⚠️ 重要**：`sync` 中间件**必须放在中间件数组的第一位**，否则会导致功能异常。详见 [中间件顺序规则](#️-重要中间件顺序规则)。
-
-#### 基础用法（Suspense 模式）
-
-```typescript
-import { createRequestor, sync } from '@net-vert/core'
-
-const requestor = createRequestor({
-  extensions: [sync()]
-})
-
-// 首次调用会抛出 Promise（触发 Suspense）
-try {
-  const data = requestor.get('/api/users')
-} catch (promise) {
-  await promise  // 等待数据加载
-}
-
-// 再次调用会同步返回缓存数据
-const data = requestor.get('/api/users')  // 同步返回，不再抛出
-console.log(data)  // 直接获取数据
-```
-
-#### React Suspense 集成
-
-```tsx
-import { createRequestor, sync } from '@net-vert/core'
-
-const requestor = createRequestor({
-  extensions: [sync()]
-})
-
-function UserProfile({ userId }) {
-  // 首次渲染会抛出 Promise，触发 Suspense
-  // 数据加载完成后重新渲染，此时同步返回数据
-  const user = requestor.get(`/api/users/${userId}`)
-  
-  return <div>{user.name}</div>
-}
-
-function App() {
-  return (
-    <Suspense fallback={<div>Loading...</div>}>
-      <UserProfile userId={1} />
-    </Suspense>
-  )
-}
-```
-
-#### 配置选项
-
-```typescript
-interface SyncOptions<D = any, R = any> {
-  /**
-   * 缓存 key 生成函数
-   * 默认：基于 method + url + params 生成
-   */
-  key?: (ctx: { config: RequestConfig<D> }) => string
-
-  /**
-   * 是否启用 Suspense 模式（抛出 Promise）
-   * - true: 首次调用抛出 Promise（默认）
-   * - false: 首次调用返回 Promise
-   */
-  suspense?: boolean
-
-  /**
-   * 自定义 Promise 包装函数
-   * 可用于添加元数据或修改返回结构
-   */
-  wrapSuspense?: (params: {
-    key: string
-    config: RequestConfig<D>
-    p: Promise<R>
-  }) => Promise<R>
-
-  /**
-   * 缓存有效期（毫秒）
-   * 默认：永久缓存
-   */
-  duration?: number
-
-  /**
-   * 是否持久化
-   * 默认：false
-   */
-  persist?: boolean
-}
-```
-
-#### 高级示例
-
-**非 Suspense 模式**
-
-```typescript
-const requestor = createRequestor({
-  extensions: [
-    sync({ suspense: false })  // 关闭 Suspense 模式
-  ]
-})
-
-// 首次调用返回 Promise
-const promise = requestor.get('/api/users')
-await promise
-
-// 再次调用同步返回缓存
-const data = requestor.get('/api/users')  // 同步返回
-```
-
-**自定义 Promise 包装**
-
-```typescript
-const requestor = createRequestor({
-  extensions: [
-    sync({
-      wrapSuspense: ({ p, key }) => {
-        // 给 Promise 添加元数据
-        return p.then(data => ({
-          ...data,
-          __cacheKey: key,
-          __timestamp: Date.now()
-        }))
-      }
-    })
-  ]
-})
-```
-
----
-
 ## 🔗 中间件组合
 
 多个中间件可以自由组合，执行顺序遵循数组顺序：
@@ -660,68 +526,15 @@ const requestor = createRequestor({
 })
 ```
 
-### ⚠️ 重要：中间件顺序规则
-
-在组合中间件时，需要注意以下**强制性规则**，否则会导致功能异常：
-
-1. **同步模式中间件（`sync`）必须放在第一位**
-   ```typescript
-   // ✅ 正确
-   const requestor = createRequestor({
-     extensions: [
-       sync(),                        // 必须第一个
-       idempotent(),
-       cache({ duration: 5000 })
-     ]
-   })
-   
-   // ❌ 错误 - 某些情况下 sync 不在第一位会导致同步调用失败，幂等缓存的promise会被sync模块直接改变，导致幂等缓存失效.重试也会因为同步模块抛错误耗尽失败次数，同步模块的同步能力也可能因为部分中间件的异步特性而失效
-   const requestor = createRequestor({
-     extensions: [
-       retry() | idempotent(),
-       sync()                        // 错误位置！
-     ]
-   })
-   ```
-
-2. **自定义中间件如果需要拦截所有请求，必须前置**
-   
-   自定义中间件的位置决定了它在中间件链中的执行时机：
-   - **前置**：可以拦截和修改所有请求（包括被其他中间件处理的请求）
-   - **后置**：只能处理未被前面中间件拦截的请求（如缓存命中的请求不会到达后置中间件）
-
-   ```typescript
-   const loggerMiddleware: Middleware = async ({ config, next }) => {
-     console.log('Request:', config.url)
-     return await next()
-   }
-   
-   // ✅ 正确 - logger 在最前面，可以记录所有请求
-   const requestor = createRequestor({
-     extensions: [
-       loggerMiddleware,              // 第一个执行
-       cache({ duration: 5000 }),
-       retry({ retries: 3 })
-     ]
-   })
-   
-   // ⚠️ 注意 - logger 在 cache 之后，缓存命中的请求不会被记录
-   const requestor = createRequestor({
-     extensions: [
-       cache({ duration: 5000 }),
-       loggerMiddleware,              // 缓存命中时不会执行
-       retry({ retries: 3 })
-     ]
-   })
-   ```
-
-3. **推荐的中间件顺序**（从前到后）：
-   - `sync()` - 同步模式（如果使用）
-   - 自定义拦截中间件（日志、鉴权等）
-   - `idempotent()` - 幂等处理
-   - `cache()` - 缓存
-   - `retry()` - 重试
-   - `concurrent()` - 并发控制
+### 推荐的中间件顺序
+
+在组合中间件时，建议遵循以下顺序（从前到后）：
+
+1. 自定义拦截中间件（日志、鉴权等）
+2. `idempotent()` - 幂等处理
+3. `cache()` - 缓存
+4. `retry()` - 重试
+5. `concurrent()` - 并发控制
 
 ### 常见组合模式
 
@@ -747,25 +560,6 @@ const requestor = createRequestor({
 })
 ```
 
-#### 3. 全能组合（适用于复杂场景）
-
-```typescript
-const requestor = createRequestor({
-  extensions: [
-    idempotent(),                         // 1. 防止并发重复
-    cache({ 
-      duration: 10000, 
-      persist: true                       // 2. 持久化缓存 10 秒
-    }),
-    retry({ 
-      retries: 3, 
-      delay: ({ attempt }) => Math.pow(2, attempt) * 100  // 3. 指数退避重试
-    }),
-    concurrent({ parallelCount: 3 })      // 4. 限制并发数
-  ]
-})
-```
-
 ---
 
 ## 🎯 便捷组合方法
@@ -899,7 +693,7 @@ inject(config => instance.request(config))
 export const queryRequestor = createRequestor({
   extensions: [
     idempotent(),
-    cache({ 
+    cache({
       duration: 30000,    // 缓存 30 秒
       persist: true       // 持久化
     })
@@ -909,8 +703,8 @@ export const queryRequestor = createRequestor({
 // 3. 创建数据变更请求器（带重试）
 export const mutationRequestor = createRequestor({
   extensions: [
-    retry({ 
-      retries: 3, 
+    retry({
+      retries: 3,
       delay: ({ attempt }) => Math.pow(2, attempt) * 200,
       retryCondition: ({ lastResponse }) => {
         // 只在网络错误或 5xx 时重试
@@ -949,44 +743,38 @@ async function uploadFiles(files: File[]) {
     formData.append('file', file)
     return uploadRequestor.post('/upload', formData)
   })
-  
+
   return Promise.all(tasks)
 }
 ```
 
-### 示例 3：React Suspense 集成
+### 示例 3：自定义中间件
 
-```tsx
-import { inject, createRequestor, sync } from '@net-vert/core'
-import { Suspense } from 'react'
-
-// 注入请求器
-inject(config => fetch(config.url).then(res => res.json()))
-
-// 创建 Suspense 风格的请求器
-const suspenseRequestor = createRequestor({
-  extensions: [sync()]
-})
+```typescript
+import { createRequestor, type Middleware } from '@net-vert/core'
 
-// API 封装
-const api = {
-  getUser: (id: number) => suspenseRequestor.get(`/api/users/${id}`),
-  getPosts: () => suspenseRequestor.get('/api/posts')
-}
+// 自定义日志中间件
+const loggerMiddleware: Middleware = async ({ config, next }) => {
+  console.log('Request:', config.method, config.url)
+  const startTime = Date.now()
 
-// 组件
-function UserProfile({ userId }: { userId: number }) {
-  const user = api.getUser(userId)  // 首次会触发 Suspense
-  return <div>{user.name}</div>
+  try {
+    const result = await next()
+    console.log('Success:', Date.now() - startTime, 'ms')
+    return result
+  } catch (error) {
+    console.error('Error:', error)
+    throw error
+  }
 }
 
-function App() {
-  return (
-    <Suspense fallback={<div>Loading...</div>}>
-      <UserProfile userId={1} />
-    </Suspense>
-  )
-}
+// 使用自定义中间件
+const requestor = createRequestor({
+  extensions: [
+    loggerMiddleware,
+    cache({ duration: 5000 })
+  ]
+})
 ```
 
 ---
@@ -1004,7 +792,7 @@ import { createRequestor, type Middleware } from '@net-vert/core'
 const loggerMiddleware: Middleware = async ({ config, next }) => {
   console.log('Request:', config.method, config.url)
   const startTime = Date.now()
-  
+
   try {
     const result = await next()
     console.log('Success:', Date.now() - startTime, 'ms')
@@ -1021,7 +809,7 @@ const requestor = createRequestor({
 })
 ```
 
-> **⚠️ 重要提示**：如果你的自定义中间件需要拦截所有请求（如日志记录、鉴权检查等），**必须将其放在中间件数组的最前面**（`sync` 除外）。否则，被前置中间件（如 `cache`）拦截的请求不会经过你的自定义中间件。详见 [中间件顺序规则](#️-重要中间件顺序规则)。
+> **💡 提示**：如果你的自定义中间件需要拦截所有请求（如日志记录、鉴权检查等），建议将其放在中间件数组的最前面。否则，被前置中间件（如 `cache`）拦截的请求不会经过你的自定义中间件。
 
 ### 动态切换请求器
 
@@ -1059,17 +847,17 @@ describe('API Tests', () => {
       code: 200,
       data: { url: config.url }
     }))
-    
+
     inject(mockRequestor)
-    
+
     const requestor = createRequestor({
       extensions: [cache({ duration: 5000 })]
     })
-    
+
     // 发起两次相同请求
     await requestor.get('/api/test')
     await requestor.get('/api/test')
-    
+
     // 验证只调用了一次
     expect(mockRequestor).toHaveBeenCalledTimes(1)
   })

package/dist/index.d.ts

@@ -42,7 +42,7 @@ declare interface CacheKeyContext<D = any> {
 }
 
 /** 缓存中间件类型（带 storage 实例）*/
-declare type CacheMiddleware<D = any, R = any> = TypedMiddleware<MIDDLEWARE_TYPE.CACHE, false, D, R> & {
+declare type CacheMiddleware<D = any, R = any> = TypedMiddleware<MIDDLEWARE_TYPE.CACHE, D, R> & {
     storage: CacheStorageInstance<R>;
 };
 
@@ -87,7 +87,7 @@ declare type ConcurrentContext<D = any> = {
     config: RequestConfig<D>;
 };
 
-declare type ConcurrentMiddleware<D = any, R = any> = TypedMiddleware<MIDDLEWARE_TYPE.CONCURRENT, false, D, R> & {
+declare type ConcurrentMiddleware<D = any, R = any> = TypedMiddleware<MIDDLEWARE_TYPE.CONCURRENT, D, R> & {
     pool: ConcurrentPool;
 };
 
@@ -120,14 +120,14 @@ RetryOptions<D>
  * 适用场景：数据查询接口，既需要缓存提升性能，又要避免重复请求
  * @param config 组合配置对象
  */
-export declare function createCachedIdempotentRequestor<D = any, R = any>(config: CachedIdempotentConfig<D, R>): Requestor<false>;
+export declare function createCachedIdempotentRequestor<D = any, R = any>(config: CachedIdempotentConfig<D, R>): Requestor;
 
 /**
  * 创建带并发控制和重试的请求器
  * 适用场景：批量请求场景，需要控制并发数量，失败后自动重试
  * @param config 组合配置对象
  */
-export declare function createConcurrentRetryRequestor<D = any>(config: ConcurrentRetryConfig<D>): Requestor<false>;
+export declare function createConcurrentRetryRequestor<D = any>(config: ConcurrentRetryConfig<D>): Requestor;
 
 declare const createPromiseCache: () => {
     getPromise: <T = unknown>(key: SafeKey) => Promise<T> | undefined;
@@ -136,11 +136,12 @@ declare const createPromiseCache: () => {
     clearCache: () => void;
 };
 
-export declare function createRequestor<const Extensions extends readonly Middleware[]>(config: CreateRequestorConfig<Extensions> & {
-    extensions: Extensions;
-}): Requestor<HasSyncMiddleware<Extensions>>;
-
-export declare function createRequestor(config?: CreateRequestorConfig): Requestor<false>;
+/**
+ * 创建请求器
+ * @param config 配置对象（可选）
+ * @returns 返回 Requestor 实例（所有方法都返回 Promise）
+ */
+export declare function createRequestor<const Extensions extends readonly Middleware[] = []>(config?: CreateRequestorConfig<Extensions>): Requestor;
 
 export declare interface CreateRequestorConfig<Extensions extends readonly Middleware[] = readonly Middleware[]> {
     extensions?: Extensions;
@@ -212,8 +213,6 @@ export declare type FlattenWithInstanceKey<Types extends readonly any[]> = WithI
 
 export declare type HandlerParams<T extends keyof Requestor> = Parameters<Requestor[T]>;
 
-export declare type HasSyncMiddleware<T extends readonly any[]> = T extends readonly [infer First, ...infer Rest] ? First extends TypedMiddleware<MIDDLEWARE_TYPE.SYNC, true, any, any> ? true : HasSyncMiddleware<Rest> : false;
-
 declare type Id = string | number;
 
 declare type IdempotencyContext<D = any> = {
@@ -226,7 +225,7 @@ declare type IdempotencyOptions<D = any> = {
 
 export declare const idempotent: <D = any, R = any>(options?: Partial<IdempotencyOptions<D>>) => IdempotentMiddleware<D, R>;
 
-declare type IdempotentMiddleware<D = any, R = any> = TypedMiddleware<MIDDLEWARE_TYPE.IDEMPOTENT, false, D, R> & {
+declare type IdempotentMiddleware<D = any, R = any> = TypedMiddleware<MIDDLEWARE_TYPE.IDEMPOTENT, D, R> & {
     promiseCache: PromiseCache;
 };
 
@@ -234,13 +233,11 @@ export declare const inject: (requestor: BaseRequestor, instanceKey?: string) =>
 
 export declare type Key = string | symbol | number;
 
-export declare type MaybePromise<IsSync, R> = IsSync extends true ? R : IsSync extends false ? Promise<R> : R | Promise<R>;
-
-export declare type Middleware<IsSync extends boolean = false, D = any, R = any> = (context: {
+export declare type Middleware<D = any, R = any> = (context: {
     config: RequestConfig<D>;
-    next: () => MaybePromise<IsSync, R>;
+    next: () => Promise<R>;
     ctx: MiddlewareContext;
-}) => MaybePromise<IsSync, R>;
+}) => Promise<R>;
 
 declare enum MIDDLEWARE_TYPE {
     CACHE = "cache",
@@ -272,15 +269,15 @@ export declare interface RequestConfig<D = any> extends Record<string, any> {
 
 declare type RequestMethod = REQUEST_METHOD;
 
-export declare interface Requestor<IsSync extends boolean = false> {
-    request: <R = any, D = any>(config: RequestConfig<D>) => MaybePromise<IsSync, R>;
-    get: <R = any, D = any>(url: string, config?: WithoutMethod<D>) => MaybePromise<IsSync, R>;
-    post: <R = any, D = any>(url: string, data?: D, config?: WithoutMethod<D>) => MaybePromise<IsSync, R>;
-    put: <R = any, D = any>(url: string, data?: D, config?: WithoutMethod<D>) => MaybePromise<IsSync, R>;
-    delete: <R = any, D = any>(url: string, config?: WithoutMethod<D>) => MaybePromise<IsSync, R>;
+export declare interface Requestor {
+    request: <R = any, D = any>(config: RequestConfig<D>) => Promise<R>;
+    get: <R = any, D = any>(url: string, config?: WithoutMethod<D>) => Promise<R>;
+    post: <R = any, D = any>(url: string, data?: D, config?: WithoutMethod<D>) => Promise<R>;
+    put: <R = any, D = any>(url: string, data?: D, config?: WithoutMethod<D>) => Promise<R>;
+    delete: <R = any, D = any>(url: string, config?: WithoutMethod<D>) => Promise<R>;
 }
 
-export declare const retry: <D = any, R = any>(options?: Partial<RetryOptions<D>>) => TypedMiddleware<MIDDLEWARE_TYPE.RETRY, false, D, R>;
+export declare const retry: <D = any, R = any>(options?: Partial<RetryOptions<D>>) => TypedMiddleware<MIDDLEWARE_TYPE.RETRY, D, R>;
 
 declare type RetryContext<D = any> = {
     config: RequestConfig<D>;
@@ -301,27 +298,6 @@ export declare type StoreDescriptor = StoreKey | {
     factory: StoreFactory<Store<AnyRecord>, any[]>;
 };
 
-/**
- * 缓存中有数据则直接返回。
- * suspense 为 true 时，会抛出一个 Promise（而不是普通错误），Promise resolve 后得到数据。
- * suspense 为 false 时，会返回一个 Promise，Promise resolve 后得到数据，调用者需要用 await 或 .then 捕获。
- */
-export declare function sync<D = any, R = any>(options: Partial<SyncOptions<D>> & {
-    suspense: true;
-}): TypedMiddleware<MIDDLEWARE_TYPE.SYNC, true, D, R>;
-
-export declare function sync<D = any, R = any>(options: Partial<SyncOptions<D>> & {
-    suspense: false;
-}): TypedMiddleware<MIDDLEWARE_TYPE.SYNC, any, D, R>;
-
-export declare function sync<D = any, R = any>(options?: Partial<SyncOptions<D>>): TypedMiddleware<MIDDLEWARE_TYPE.SYNC, true, D, R>;
-
-declare interface SyncOptions<D = any, R = any> extends CacheOptions<D, R> {
-    isValid: (ctx: CacheCheckContext<D, R>) => boolean;
-    suspense: boolean;
-    wrapSuspense?: (params: WrapSuspense<D, R>) => any;
-}
-
 declare type Task<T> = () => Promise<T>;
 
 declare type TaskItem<T> = {
@@ -332,7 +308,7 @@ declare type TaskItem<T> = {
 
 declare type TaskItemList<T> = TaskQueue<TaskItem<T>>;
 
-export declare type TypedMiddleware<Type extends MiddlewareType, IsSync extends boolean = false, D = any, R = any> = Middleware<IsSync, D, R> & {
+export declare type TypedMiddleware<Type extends MiddlewareType, D = any, R = any> = Middleware<D, R> & {
     __middlewareType: Type;
 };
 
@@ -357,10 +333,4 @@ export declare type WithInstanceKey<T> = T & {
 
 export declare type WithoutMethod<D = any> = Omit<RequestConfig<D>, 'method' | 'url'>;
 
-declare type WrapSuspense<D = any, R = any> = {
-    key: CacheKey;
-    config: RequestConfig<D>;
-    p: Promise<R>;
-};
-
 export { }

package/dist/index.js

@@ -1,11 +1,11 @@
-import { TaskQueue as j } from "id-queue";
-var f = /* @__PURE__ */ ((r) => (r.GET = "get", r.POST = "post", r.PUT = "put", r.DELETE = "delete", r))(f || {}), m = /* @__PURE__ */ ((r) => (r.CACHE = "cache", r.RETRY = "retry", r.IDEMPOTENT = "idempotent", r.CONCURRENT = "concurrent", r.SYNC = "sync", r))(m || {});
-const S = "default", D = {
+import { TaskQueue as F } from "id-queue";
+var h = /* @__PURE__ */ ((r) => (r.GET = "get", r.POST = "post", r.PUT = "put", r.DELETE = "delete", r))(h || {}), m = /* @__PURE__ */ ((r) => (r.CACHE = "cache", r.RETRY = "retry", r.IDEMPOTENT = "idempotent", r.CONCURRENT = "concurrent", r.SYNC = "sync", r))(m || {});
+const p = "default", j = {
   retries: 3,
   delay: 0,
   retryCondition: () => !0
-}, F = (r) => {
-  const e = { ...D, ...r };
+}, D = (r) => {
+  const e = { ...j, ...r };
   return Object.assign(async ({ config: n, next: s }) => {
     let o = 0, i;
     for (; o <= e.retries; )
@@ -23,22 +23,22 @@ const S = "default", D = {
           throw a;
         o++;
         const u = typeof e.delay == "function" ? e.delay(c) : e.delay;
-        u > 0 && await new Promise((l) => setTimeout(l, u));
+        u > 0 && await new Promise((w) => setTimeout(w, u));
       }
     throw i;
   }, { __middlewareType: m.RETRY });
-}, $ = () => {
+}, T = () => {
   const r = /* @__PURE__ */ new Map();
   return { getPromise: (o) => r.get(o), setPromise: (o, i) => {
     r.set(o, i), i.finally(() => r.delete(o));
   }, delPromise: (o) => r.delete(o), clearCache: () => r.clear() };
-}, E = (r) => {
+}, V = (r) => {
   const { config: e } = r, { method: t, url: n, data: s } = e;
   return [t, n, JSON.stringify(s)].join("|");
-}, T = {
-  key: E
-}, q = (r) => {
-  const e = { ...T, ...r }, t = $();
+}, q = {
+  key: V
+}, E = (r) => {
+  const e = { ...q, ...r }, t = T();
   return Object.assign(({ config: s, next: o }) => {
     const i = e.key({ config: s }), a = t.getPromise(i);
     if (a)
@@ -55,7 +55,7 @@ class R {
   tasks;
   runningCount;
   constructor(e = 4) {
-    this.parallelCount = e, this.tasks = new j(), this.runningCount = 0;
+    this.parallelCount = e, this.tasks = new F(), this.runningCount = 0;
   }
   // 加入
   add(e, t) {
@@ -84,26 +84,26 @@ class R {
     }
   }
 }
-let B = 0;
-const _ = {
+let $ = 0;
+const B = {
   parallelCount: 4,
-  createId: () => B++
+  createId: () => $++
 }, K = (r) => {
-  const { parallelCount: e, createId: t } = { ..._, ...r }, n = new R(e);
+  const { parallelCount: e, createId: t } = { ...B, ...r }, n = new R(e);
   return Object.assign(({ config: o, next: i }) => {
     const a = t({ config: o });
     return n.add(a, () => i());
   }, { __middlewareType: m.CONCURRENT, pool: n });
-}, v = /* @__PURE__ */ new Map(), y = (r, e) => {
-  v.set(e, r);
+}, I = /* @__PURE__ */ new Map(), y = (r, e) => {
+  I.set(e, r);
 };
-function A(r) {
-  const e = v.get(r);
+function _(r) {
+  const e = I.get(r);
   if (!e)
     throw new Error(`Store实例 ${String(r)} 未注册`);
   return e;
 }
-class J {
+class A {
   store = /* @__PURE__ */ new Map();
   getItem(e) {
     return this.store.get(e);
@@ -132,7 +132,7 @@ class J {
       e(s, n, t), t++;
   }
 }
-const z = (r) => !!r && (typeof r == "object" || typeof r == "function") && typeof r.then == "function", b = (r) => typeof window < "u" ? r() : {
+const J = (r) => !!r && (typeof r == "object" || typeof r == "function") && typeof r.then == "function", C = (r) => typeof window < "u" ? r() : {
   getItem() {
     return null;
   },
@@ -148,12 +148,12 @@ const z = (r) => !!r && (typeof r == "object" || typeof r == "function") && type
   get length() {
     return 0;
   }
-}, h = b(() => window.localStorage);
-class G {
+}, l = C(() => window.localStorage);
+class z {
   constructor() {
   }
   getItem(e) {
-    const t = String(e), n = h.getItem(t);
+    const t = String(e), n = l.getItem(t);
     if (n !== null)
       try {
         return JSON.parse(n);
@@ -165,7 +165,7 @@ class G {
   setItem(e, t) {
     const n = String(e);
     try {
-      h.setItem(n, JSON.stringify(t));
+      l.setItem(n, JSON.stringify(t));
     } catch (s) {
       throw console.error(`Failed to set value for key: ${n}`, s), s;
     }
@@ -173,21 +173,21 @@ class G {
   }
   removeItem(e) {
     const t = String(e);
-    h.removeItem(t);
+    l.removeItem(t);
   }
   clear() {
-    h.clear();
+    l.clear();
   }
   length() {
-    return h.length;
+    return l.length;
   }
   key(e) {
-    return h.key(e);
+    return l.key(e);
   }
   keys() {
     const e = [];
-    for (let t = 0; t < h.length; t++) {
-      const n = h.key(t);
+    for (let t = 0; t < l.length; t++) {
+      const n = l.key(t);
       n && e.push(n);
     }
     return e;
@@ -199,8 +199,8 @@ class G {
     });
   }
 }
-const d = b(() => window.sessionStorage);
-class U {
+const d = C(() => window.sessionStorage);
+class G {
   constructor() {
   }
   getItem(e) {
@@ -250,7 +250,7 @@ class U {
     });
   }
 }
-class Y {
+class U {
   dbName;
   storeName;
   dbPromise = null;
@@ -379,11 +379,11 @@ const g = {
   session: "session",
   indexeddb: "indexeddb"
 };
-function N(r, e) {
+function k(r, e) {
   Object.assign(r, e);
 }
 function M(r) {
-  return N(r, {
+  return k(r, {
     async getItemOrDefault(e, t) {
       const n = await this.getItem(e);
       return n !== null ? n : t;
@@ -400,7 +400,7 @@ function M(r) {
   }), r;
 }
 function X(r) {
-  return N(r, {
+  return k(r, {
     getItemOrDefault(e, t) {
       const n = this.getItem(e);
       return n !== null ? n : t;
@@ -416,50 +416,50 @@ function X(r) {
     }
   }), r;
 }
-function Z(r) {
+function Y(r) {
   const e = r.getItem("");
-  return z(e) ? M(r) : X(r);
+  return J(e) ? M(r) : X(r);
 }
-function w(r, ...e) {
-  const t = A(r);
+function f(r, ...e) {
+  const t = _(r);
   let n;
   try {
     n = new t(...e);
   } catch {
     n = t(...e);
   }
-  return Z(n);
+  return Y(n);
 }
-y(J, g.memory);
-y(G, g.local);
-y(U, g.session);
-y(Y, g.indexeddb);
-function C(r, e) {
+y(A, g.memory);
+y(z, g.local);
+y(G, g.session);
+y(U, g.indexeddb);
+function S(r, e) {
   return {
     value: r,
     expireAt: Date.now() + e
   };
 }
-function I(r, e = Date.now()) {
+function v(r, e = Date.now()) {
   return r.expireAt <= e;
 }
-function x(r, e = Date.now()) {
-  return I(r, e) ? void 0 : r.value;
+function Z(r, e = Date.now()) {
+  return v(r, e) ? void 0 : r.value;
 }
 const H = (r) => {
   const { config: e } = r, { method: t, url: n, data: s } = e;
   return [t, n, JSON.stringify(s)].join("|");
-}, L = () => !0, k = 24 * 60 * 60 * 1e3, Q = {
+}, L = () => !0, b = 24 * 60 * 60 * 1e3, Q = {
   key: H,
-  duration: k,
+  duration: b,
   isValid: L,
   store: g.memory
   // 默认不持久化，使用内存存储
 };
-let W = class {
+class W {
   store;
   constructor(e) {
-    return typeof e == "string" ? this.store = w(e) : (y(e.factory, e.key), this.store = w(e.key)), new Proxy(this, {
+    return typeof e == "string" ? this.store = f(e) : (y(e.factory, e.key), this.store = f(e.key)), new Proxy(this, {
       get(t, n) {
         if (n in t)
           return t[n];
@@ -474,8 +474,8 @@ let W = class {
    * @param value 要缓存的值
    * @param duration 过期时长（毫秒），默认 24 小时
    */
-  setCache(e, t, n = k) {
-    const s = C(t, n);
+  setCache(e, t, n = b) {
+    const s = S(t, n);
     this.store.setItem(e, s);
   }
   /**
@@ -486,7 +486,7 @@ let W = class {
   async getCache(e) {
     const t = await this.store.getItem(e);
     if (t)
-      return x(t);
+      return Z(t);
   }
   /**
    * 检查是否有有效的缓存（未过期）
@@ -495,9 +495,9 @@ let W = class {
    */
   async hasValidCache(e) {
     const t = await this.store.getItem(e);
-    return t ? !I(t) : !1;
+    return t ? !v(t) : !1;
   }
-};
+}
 const ee = W, te = (r) => {
   const e = { ...Q, ...r }, t = new ee(e.store), n = (o) => typeof e.duration == "function" ? e.duration(o) : e.duration;
   return Object.assign(async ({ config: o, next: i }) => {
@@ -510,121 +510,45 @@ const ee = W, te = (r) => {
       })) return c;
       t.removeItem(a);
     }
-    const u = await i(), l = n({ key: a, config: o, cachedData: c, response: u }), p = C(u, l);
-    return t.setItem(a, p), u;
+    const u = await i(), w = n({ key: a, config: o, cachedData: c, response: u }), O = S(u, w);
+    return t.setItem(a, O), u;
   }, {
     __middlewareType: m.CACHE,
     storage: t
   });
-};
-class re {
-  store;
-  constructor(e) {
-    return typeof e == "string" ? this.store = w(e) : (y(e.factory, e.key), this.store = w(e.key)), new Proxy(this, {
-      get(t, n) {
-        if (n in t)
-          return t[n];
-        const s = t.store[n];
-        return typeof s == "function" ? s.bind(t.store) : s;
-      }
-    });
-  }
-  /**
-   * 设置缓存（自动包装成 ExpirableValue）
-   * @param key 缓存 key
-   * @param value 要缓存的值
-   * @param duration 过期时长（毫秒），默认 24 小时
-   */
-  setCache(e, t, n = k) {
-    const s = C(t, n);
-    this.store.setItem(e, s);
-  }
-  /**
-   * 获取缓存值（检查过期，如果过期返回 undefined）
-   * @param key 缓存 key
-   * @returns 未过期返回值，已过期返回 undefined
-   */
-  getCache(e) {
-    const t = this.store.getItem(e);
-    if (t)
-      return x(t);
-  }
-  /**
-   * 检查是否有有效的缓存（未过期）
-   * @param key 缓存 key
-   * @returns true 表示有有效缓存，false 表示无缓存或已过期
-   */
-  hasValidCache(e) {
-    const t = this.store.getItem(e);
-    return t ? !I(t) : !1;
-  }
-}
-const ne = re, se = (r) => {
-  const { config: e } = r, { method: t, url: n } = e;
-  return [t, n].join("|");
-}, oe = {
-  suspense: !0,
-  key: se,
-  duration: 24 * 60 * 60 * 1e3,
-  isValid: () => !0,
-  store: g.memory
-};
-function me(r) {
-  const e = { ...oe, ...r }, t = new ne(e.store), n = (o) => typeof e.duration == "function" ? e.duration(o) : e.duration;
-  return Object.assign(({ config: o, next: i }) => {
-    const a = e.key({ config: o }), c = t.getCache(a);
-    if (c) {
-      if (e.isValid({
-        key: a,
-        config: o,
-        cachedData: c
-      })) return c;
-      t.removeItem(a);
-    }
-    if (e.suspense)
-      throw (e.wrapSuspense ? e.wrapSuspense({ key: a, config: o, p: i() }) : i()).then((l) => {
-        const p = n({ key: a, config: o, cachedData: c, response: l });
-        return t.setCache(a, l, p), l;
-      });
-    return i().then((u) => {
-      const l = n({ key: a, config: o, cachedData: c, response: u });
-      return t.setCache(a, u, l), u;
-    });
-  }, { __middlewareType: m.SYNC });
-}
-const P = /* @__PURE__ */ new Map(), ye = (r, e = S) => {
-  P.set(e, r);
-}, ae = (r = S) => {
-  const e = P.get(r);
+}, N = /* @__PURE__ */ new Map(), ce = (r, e = p) => {
+  N.set(e, r);
+}, re = (r = p) => {
+  const e = N.get(r);
   if (!e) throw new Error(`Requestor实例 ${String(r)} 未注册`);
   return e;
-}, V = {
+}, P = {
   get: (r, e) => ({
     url: r,
-    method: f.GET,
+    method: h.GET,
     ...e,
     params: e?.params
   }),
   post: (r, e, t) => ({
     url: r,
-    method: f.POST,
+    method: h.POST,
     data: e,
     ...t
   }),
   delete: (r, e) => ({
     url: r,
-    method: f.DELETE,
+    method: h.DELETE,
     ...e
   }),
   put: (r, e, t) => ({
     url: r,
-    method: f.PUT,
+    method: h.PUT,
     data: e,
     ...t
   }),
   request: (r) => r
-}, ie = Object.keys(V);
-function ce(r, e, t) {
+}, ne = Object.keys(P);
+function se(r, e, t) {
   const n = {}, s = (o) => {
     if (o === e.length)
       return t(r);
@@ -637,13 +561,13 @@ function ce(r, e, t) {
   };
   return s(0);
 }
-function ue(r, e) {
+function oe(r, e) {
   const t = {}, n = e ?? [];
-  return ie.forEach(
+  return ne.forEach(
     (s) => {
       t[s] = (...o) => {
-        const i = V[s](...o);
-        return ce(
+        const i = P[s](...o);
+        return se(
           i,
           n,
           r
@@ -652,42 +576,41 @@ function ue(r, e) {
     }
   ), t;
 }
-function O(r) {
-  const { extensions: e, instanceKey: t } = r ?? {}, n = ae(t);
-  return ue(
+function x(r) {
+  const { extensions: e, instanceKey: t } = r ?? {}, n = re(t);
+  return oe(
     n,
     e
   );
 }
-function ge(r) {
+function ue(r) {
   const { instanceKey: e, key: t, duration: n, isValid: s, store: o, ...i } = r;
-  return O({
+  return x({
     instanceKey: e,
     extensions: [
-      q(i),
+      E(i),
       te({ key: t, duration: n, isValid: s, store: o })
     ]
   });
 }
-function fe(r) {
+function le(r) {
   const { instanceKey: e, parallelCount: t, createId: n, retries: s, delay: o, retryCondition: i } = r;
-  return O({
+  return x({
     instanceKey: e,
     extensions: [
       K({ parallelCount: t, createId: n }),
-      F({ retries: s, delay: o, retryCondition: i })
+      D({ retries: s, delay: o, retryCondition: i })
     ]
   });
 }
 export {
   te as cache,
   K as concurrent,
-  ge as createCachedIdempotentRequestor,
-  fe as createConcurrentRetryRequestor,
-  O as createRequestor,
-  q as idempotent,
-  ye as inject,
-  F as retry,
-  me as sync,
-  ae as useRequestor
+  ue as createCachedIdempotentRequestor,
+  le as createConcurrentRetryRequestor,
+  x as createRequestor,
+  E as idempotent,
+  ce as inject,
+  D as retry,
+  re as useRequestor
 };

package/dist/index.umd.cjs

@@ -1 +1 @@
-(function(u,w){typeof exports=="object"&&typeof module<"u"?w(exports,require("id-queue")):typeof define=="function"&&define.amd?define(["exports","id-queue"],w):(u=typeof globalThis<"u"?globalThis:u||self,w(u.netVertCore={},u.idQueue))})(this,function(u,w){"use strict";var p=(r=>(r.GET="get",r.POST="post",r.PUT="put",r.DELETE="delete",r))(p||{}),y=(r=>(r.CACHE="cache",r.RETRY="retry",r.IDEMPOTENT="idempotent",r.CONCURRENT="concurrent",r.SYNC="sync",r))(y||{});const N="default",E={retries:3,delay:0,retryCondition:()=>!0},P=r=>{const e={...E,...r};return Object.assign(async({config:n,next:s})=>{let o=0,a;for(;o<=e.retries;)try{return await s()}catch(i){if(a=i,o===e.retries)throw i;const c={config:n,lastResponse:i,attempt:o};if(!e.retryCondition(c))throw i;o++;const l=typeof e.delay=="function"?e.delay(c):e.delay;l>0&&await new Promise(d=>setTimeout(d,l))}throw a},{__middlewareType:y.RETRY})},B=()=>{const r=new Map;return{getPromise:o=>r.get(o),setPromise:(o,a)=>{r.set(o,a),a.finally(()=>r.delete(o))},delPromise:o=>r.delete(o),clearCache:()=>r.clear()}},K={key:r=>{const{config:e}=r,{method:t,url:n,data:s}=e;return[t,n,JSON.stringify(s)].join("|")}},V=r=>{const e={...K,...r},t=B();return Object.assign(({config:s,next:o})=>{const a=e.key({config:s}),i=t.getPromise(a);if(i)return i;const c=o();return t.setPromise(a,c),c},{__middlewareType:y.IDEMPOTENT,promiseCache:t})};class _{parallelCount;tasks;runningCount;constructor(e=4){this.parallelCount=e,this.tasks=new w.TaskQueue,this.runningCount=0}add(e,t){return new Promise((n,s)=>{this.tasks.enqueue(e,{task:t,resolve:n,reject:s}),this._run()})}remove(e){this.tasks.remove(e)}execute(e){const{task:t,resolve:n,reject:s}=e;return t().then(n).catch(s).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)}}}let A=0;const J={parallelCount:4,createId:()=>A++},x=r=>{const{parallelCount:e,createId:t}={...J,...r},n=new _(e);return Object.assign(({config:o,next:a})=>{const i=t({config:o});return n.add(i,()=>a())},{__middlewareType:y.CONCURRENT,pool:n})},O=new Map,f=(r,e)=>{O.set(e,r)};function z(r){const e=O.get(r);if(!e)throw new Error(`Store实例 ${String(r)} 未注册`);return e}class G{store=new Map;getItem(e){return this.store.get(e)}setItem(e,t){return this.store.set(e,t),t}removeItem(e){this.store.delete(e)}clear(){this.store.clear()}length(){return this.store.size}key(e){return Array.from(this.store.keys())[e]}keys(){return Array.from(this.store.keys())}iterate(e){let t=0;for(const[n,s]of this.store.entries())e(s,n,t),t++}}const U=r=>!!r&&(typeof r=="object"||typeof r=="function")&&typeof r.then=="function",q=r=>typeof window<"u"?r():{getItem(){return null},setItem(){},removeItem(){},clear(){},key(){return null},get length(){return 0}},h=q(()=>window.localStorage);class M{constructor(){}getItem(e){const t=String(e),n=h.getItem(t);if(n!==null)try{return JSON.parse(n)}catch(s){console.error(`Failed to parse value for key: ${t}`,s);return}}setItem(e,t){const n=String(e);try{h.setItem(n,JSON.stringify(t))}catch(s){throw console.error(`Failed to set value for key: ${n}`,s),s}return t}removeItem(e){const t=String(e);h.removeItem(t)}clear(){h.clear()}length(){return h.length}key(e){return h.key(e)}keys(){const e=[];for(let t=0;t<h.length;t++){const n=h.key(t);n&&e.push(n)}return e}iterate(e){this.keys().forEach((t,n)=>{const s=this.getItem(t);s!==void 0&&e(s,t,n)})}}const m=q(()=>window.sessionStorage);class Y{constructor(){}getItem(e){const t=String(e),n=m.getItem(t);if(n!==null)try{return JSON.parse(n)}catch(s){console.error(`Failed to parse value for key: ${t}`,s);return}}setItem(e,t){const n=String(e);try{m.setItem(n,JSON.stringify(t))}catch(s){throw console.error(`Failed to set value for key: ${n}`,s),s}return t}removeItem(e){const t=String(e);m.removeItem(t)}clear(){m.clear()}length(){return m.length}key(e){return m.key(e)}keys(){const e=[];for(let t=0;t<m.length;t++){const n=m.key(t);n&&e.push(n)}return e}iterate(e){this.keys().forEach((t,n)=>{const s=this.getItem(t);s!==void 0&&e(s,t,n)})}}class X{dbName;storeName;dbPromise=null;DB_VERSION=1;constructor(e,t){this.dbName=e,this.storeName=t,this.initDB()}initDB(){if(typeof window>"u"||!window.indexedDB){console.warn("IndexedDB is not available");return}this.dbPromise=new Promise((e,t)=>{const n=indexedDB.open(this.dbName,this.DB_VERSION);n.onerror=()=>{t(new Error(`Failed to open database: ${this.dbName}`))},n.onsuccess=()=>{e(n.result)},n.onupgradeneeded=s=>{const o=s.target.result;o.objectStoreNames.contains(this.storeName)||o.createObjectStore(this.storeName)}})}async getDB(){if(!this.dbPromise)throw new Error("IndexedDB is not initialized");return this.dbPromise}async withStore(e,t){const n=await this.getDB();return new Promise((s,o)=>{const a=n.transaction([this.storeName],e).objectStore(this.storeName),i=t(a);i.onsuccess=()=>{s(i.result)},i.onerror=()=>{o(i.error)}})}async getItem(e){try{const t=await this.withStore("readonly",n=>n.get(String(e)));return t===void 0?void 0:t}catch(t){console.error(`Failed to get value for key: ${String(e)}`,t);return}}async setItem(e,t){try{return await this.withStore("readwrite",n=>n.put(t,String(e))),t}catch(n){throw console.error(`Failed to set value for key: ${String(e)}`,n),n}}async removeItem(e){try{await this.withStore("readwrite",t=>t.delete(String(e)))}catch(t){throw console.error(`Failed to remove value for key: ${String(e)}`,t),t}}async clear(){try{await this.withStore("readwrite",e=>e.clear())}catch(e){throw console.error("Failed to clear storage",e),e}}async length(){try{return await this.withStore("readonly",e=>e.count())}catch(e){return console.error("Failed to get storage length",e),0}}async key(e){try{return(await this.withStore("readonly",t=>t.getAllKeys()))[e]}catch(t){console.error("Failed to get key",t);return}}async keys(){try{return await this.withStore("readonly",e=>e.getAllKeys())}catch(e){return console.error("Failed to get all keys",e),[]}}async iterate(e){try{const t=(await this.getDB()).transaction([this.storeName],"readonly").objectStore(this.storeName).openCursor();return new Promise((n,s)=>{let o=0;t.onsuccess=a=>{const i=a.target.result;if(i){const c=i.key,l=i.value;e(l,c,o),o++,i.continue()}else n()},t.onerror=()=>{s(t.error)}})}catch(t){console.error("Failed to iterate storage",t)}}}const g={memory:"memory",local:"local",session:"session",indexeddb:"indexeddb"};function j(r,e){Object.assign(r,e)}function Z(r){return j(r,{async getItemOrDefault(e,t){const n=await this.getItem(e);return n!==null?n:t},async hasItem(e){return await this.getItem(e)!==null},async removeItems(e){await Promise.all(e.map(t=>this.removeItem(t)))},async getItems(e){return await Promise.all(e.map(t=>this.getItem(t)))}}),r}function H(r){return j(r,{getItemOrDefault(e,t){const n=this.getItem(e);return n!==null?n:t},hasItem(e){return this.getItem(e)!==null},removeItems(e){e.forEach(t=>this.removeItem(t))},getItems(e){return e.map(t=>this.getItem(t))}}),r}function L(r){const e=r.getItem("");return U(e)?Z(r):H(r)}function C(r,...e){const t=z(r);let n;try{n=new t(...e)}catch{n=t(...e)}return L(n)}f(G,g.memory),f(M,g.local),f(Y,g.session),f(X,g.indexeddb);function I(r,e){return{value:r,expireAt:Date.now()+e}}function k(r,e=Date.now()){return r.expireAt<=e}function R(r,e=Date.now()){return k(r,e)?void 0:r.value}const Q=r=>{const{config:e}=r,{method:t,url:n,data:s}=e;return[t,n,JSON.stringify(s)].join("|")},W=()=>!0,S=24*60*60*1e3,ee={key:Q,duration:S,isValid:W,store:g.memory},te=class{store;constructor(e){return typeof e=="string"?this.store=C(e):(f(e.factory,e.key),this.store=C(e.key)),new Proxy(this,{get(t,n){if(n in t)return t[n];const s=t.store[n];return typeof s=="function"?s.bind(t.store):s}})}setCache(e,t,n=S){const s=I(t,n);this.store.setItem(e,s)}async getCache(e){const t=await this.store.getItem(e);if(t)return R(t)}async hasValidCache(e){const t=await this.store.getItem(e);return t?!k(t):!1}},T=r=>{const e={...ee,...r},t=new te(e.store),n=o=>typeof e.duration=="function"?e.duration(o):e.duration;return Object.assign(async({config:o,next:a})=>{const i=e.key({config:o}),c=await t.getCache(i);if(c){if(await e.isValid({key:i,config:o,cachedData:c}))return c;t.removeItem(i)}const l=await a(),d=n({key:i,config:o,cachedData:c,response:l}),v=I(l,d);return t.setItem(i,v),l},{__middlewareType:y.CACHE,storage:t})};class re{store;constructor(e){return typeof e=="string"?this.store=C(e):(f(e.factory,e.key),this.store=C(e.key)),new Proxy(this,{get(t,n){if(n in t)return t[n];const s=t.store[n];return typeof s=="function"?s.bind(t.store):s}})}setCache(e,t,n=S){const s=I(t,n);this.store.setItem(e,s)}getCache(e){const t=this.store.getItem(e);if(t)return R(t)}hasValidCache(e){const t=this.store.getItem(e);return t?!k(t):!1}}const ne=re,se={suspense:!0,key:r=>{const{config:e}=r,{method:t,url:n}=e;return[t,n].join("|")},duration:24*60*60*1e3,isValid:()=>!0,store:g.memory};function oe(r){const e={...se,...r},t=new ne(e.store),n=o=>typeof e.duration=="function"?e.duration(o):e.duration;return Object.assign(({config:o,next:a})=>{const i=e.key({config:o}),c=t.getCache(i);if(c){if(e.isValid({key:i,config:o,cachedData:c}))return c;t.removeItem(i)}if(e.suspense)throw(e.wrapSuspense?e.wrapSuspense({key:i,config:o,p:a()}):a()).then(d=>{const v=n({key:i,config:o,cachedData:c,response:d});return t.setCache(i,d,v),d});return a().then(l=>{const d=n({key:i,config:o,cachedData:c,response:l});return t.setCache(i,l,d),l})},{__middlewareType:y.SYNC})}const D=new Map,ie=(r,e=N)=>{D.set(e,r)},F=(r=N)=>{const e=D.get(r);if(!e)throw new Error(`Requestor实例 ${String(r)} 未注册`);return e},$={get:(r,e)=>({url:r,method:p.GET,...e,params:e?.params}),post:(r,e,t)=>({url:r,method:p.POST,data:e,...t}),delete:(r,e)=>({url:r,method:p.DELETE,...e}),put:(r,e,t)=>({url:r,method:p.PUT,data:e,...t}),request:r=>r},ae=Object.keys($);function ce(r,e,t){const n={},s=o=>{if(o===e.length)return t(r);const a=e[o];return a({config:r,ctx:n,next:()=>s(o+1)})};return s(0)}function ue(r,e){const t={},n=e??[];return ae.forEach(s=>{t[s]=(...o)=>{const a=$[s](...o);return ce(a,n,r)}}),t}function b(r){const{extensions:e,instanceKey:t}=r??{},n=F(t);return ue(n,e)}function le(r){const{instanceKey:e,key:t,duration:n,isValid:s,store:o,...a}=r;return b({instanceKey:e,extensions:[V(a),T({key:t,duration:n,isValid:s,store:o})]})}function de(r){const{instanceKey:e,parallelCount:t,createId:n,retries:s,delay:o,retryCondition:a}=r;return b({instanceKey:e,extensions:[x({parallelCount:t,createId:n}),P({retries:s,delay:o,retryCondition:a})]})}u.cache=T,u.concurrent=x,u.createCachedIdempotentRequestor=le,u.createConcurrentRetryRequestor=de,u.createRequestor=b,u.idempotent=V,u.inject=ie,u.retry=P,u.sync=oe,u.useRequestor=F,Object.defineProperty(u,Symbol.toStringTag,{value:"Module"})});
+(function(c,m){typeof exports=="object"&&typeof module<"u"?m(exports,require("id-queue")):typeof define=="function"&&define.amd?define(["exports","id-queue"],m):(c=typeof globalThis<"u"?globalThis:c||self,m(c.netVertCore={},c.idQueue))})(this,function(c,m){"use strict";var y=(r=>(r.GET="get",r.POST="post",r.PUT="put",r.DELETE="delete",r))(y||{}),g=(r=>(r.CACHE="cache",r.RETRY="retry",r.IDEMPOTENT="idempotent",r.CONCURRENT="concurrent",r.SYNC="sync",r))(g||{});const C="default",V={retries:3,delay:0,retryCondition:()=>!0},k=r=>{const e={...V,...r};return Object.assign(async({config:n,next:o})=>{let s=0,a;for(;s<=e.retries;)try{return await o()}catch(i){if(a=i,s===e.retries)throw i;const u={config:n,lastResponse:i,attempt:s};if(!e.retryCondition(u))throw i;s++;const h=typeof e.delay=="function"?e.delay(u):e.delay;h>0&&await new Promise(I=>setTimeout(I,h))}throw a},{__middlewareType:g.RETRY})},E=()=>{const r=new Map;return{getPromise:s=>r.get(s),setPromise:(s,a)=>{r.set(s,a),a.finally(()=>r.delete(s))},delPromise:s=>r.delete(s),clearCache:()=>r.clear()}},$={key:r=>{const{config:e}=r,{method:t,url:n,data:o}=e;return[t,n,JSON.stringify(o)].join("|")}},S=r=>{const e={...$,...r},t=E();return Object.assign(({config:o,next:s})=>{const a=e.key({config:o}),i=t.getPromise(a);if(i)return i;const u=s();return t.setPromise(a,u),u},{__middlewareType:g.IDEMPOTENT,promiseCache:t})};class B{parallelCount;tasks;runningCount;constructor(e=4){this.parallelCount=e,this.tasks=new m.TaskQueue,this.runningCount=0}add(e,t){return new Promise((n,o)=>{this.tasks.enqueue(e,{task:t,resolve:n,reject:o}),this._run()})}remove(e){this.tasks.remove(e)}execute(e){const{task:t,resolve:n,reject:o}=e;return t().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)}}}let K=0;const _={parallelCount:4,createId:()=>K++},v=r=>{const{parallelCount:e,createId:t}={..._,...r},n=new B(e);return Object.assign(({config:s,next:a})=>{const i=t({config:s});return n.add(i,()=>a())},{__middlewareType:g.CONCURRENT,pool:n})},b=new Map,f=(r,e)=>{b.set(e,r)};function A(r){const e=b.get(r);if(!e)throw new Error(`Store实例 ${String(r)} 未注册`);return e}class J{store=new Map;getItem(e){return this.store.get(e)}setItem(e,t){return this.store.set(e,t),t}removeItem(e){this.store.delete(e)}clear(){this.store.clear()}length(){return this.store.size}key(e){return Array.from(this.store.keys())[e]}keys(){return Array.from(this.store.keys())}iterate(e){let t=0;for(const[n,o]of this.store.entries())e(o,n,t),t++}}const z=r=>!!r&&(typeof r=="object"||typeof r=="function")&&typeof r.then=="function",N=r=>typeof window<"u"?r():{getItem(){return null},setItem(){},removeItem(){},clear(){},key(){return null},get length(){return 0}},l=N(()=>window.localStorage);class G{constructor(){}getItem(e){const t=String(e),n=l.getItem(t);if(n!==null)try{return JSON.parse(n)}catch(o){console.error(`Failed to parse value for key: ${t}`,o);return}}setItem(e,t){const n=String(e);try{l.setItem(n,JSON.stringify(t))}catch(o){throw console.error(`Failed to set value for key: ${n}`,o),o}return t}removeItem(e){const t=String(e);l.removeItem(t)}clear(){l.clear()}length(){return l.length}key(e){return l.key(e)}keys(){const e=[];for(let t=0;t<l.length;t++){const n=l.key(t);n&&e.push(n)}return e}iterate(e){this.keys().forEach((t,n)=>{const o=this.getItem(t);o!==void 0&&e(o,t,n)})}}const d=N(()=>window.sessionStorage);class U{constructor(){}getItem(e){const t=String(e),n=d.getItem(t);if(n!==null)try{return JSON.parse(n)}catch(o){console.error(`Failed to parse value for key: ${t}`,o);return}}setItem(e,t){const n=String(e);try{d.setItem(n,JSON.stringify(t))}catch(o){throw console.error(`Failed to set value for key: ${n}`,o),o}return t}removeItem(e){const t=String(e);d.removeItem(t)}clear(){d.clear()}length(){return d.length}key(e){return d.key(e)}keys(){const e=[];for(let t=0;t<d.length;t++){const n=d.key(t);n&&e.push(n)}return e}iterate(e){this.keys().forEach((t,n)=>{const o=this.getItem(t);o!==void 0&&e(o,t,n)})}}class M{dbName;storeName;dbPromise=null;DB_VERSION=1;constructor(e,t){this.dbName=e,this.storeName=t,this.initDB()}initDB(){if(typeof window>"u"||!window.indexedDB){console.warn("IndexedDB is not available");return}this.dbPromise=new Promise((e,t)=>{const n=indexedDB.open(this.dbName,this.DB_VERSION);n.onerror=()=>{t(new Error(`Failed to open database: ${this.dbName}`))},n.onsuccess=()=>{e(n.result)},n.onupgradeneeded=o=>{const s=o.target.result;s.objectStoreNames.contains(this.storeName)||s.createObjectStore(this.storeName)}})}async getDB(){if(!this.dbPromise)throw new Error("IndexedDB is not initialized");return this.dbPromise}async withStore(e,t){const n=await this.getDB();return new Promise((o,s)=>{const a=n.transaction([this.storeName],e).objectStore(this.storeName),i=t(a);i.onsuccess=()=>{o(i.result)},i.onerror=()=>{s(i.error)}})}async getItem(e){try{const t=await this.withStore("readonly",n=>n.get(String(e)));return t===void 0?void 0:t}catch(t){console.error(`Failed to get value for key: ${String(e)}`,t);return}}async setItem(e,t){try{return await this.withStore("readwrite",n=>n.put(t,String(e))),t}catch(n){throw console.error(`Failed to set value for key: ${String(e)}`,n),n}}async removeItem(e){try{await this.withStore("readwrite",t=>t.delete(String(e)))}catch(t){throw console.error(`Failed to remove value for key: ${String(e)}`,t),t}}async clear(){try{await this.withStore("readwrite",e=>e.clear())}catch(e){throw console.error("Failed to clear storage",e),e}}async length(){try{return await this.withStore("readonly",e=>e.count())}catch(e){return console.error("Failed to get storage length",e),0}}async key(e){try{return(await this.withStore("readonly",t=>t.getAllKeys()))[e]}catch(t){console.error("Failed to get key",t);return}}async keys(){try{return await this.withStore("readonly",e=>e.getAllKeys())}catch(e){return console.error("Failed to get all keys",e),[]}}async iterate(e){try{const t=(await this.getDB()).transaction([this.storeName],"readonly").objectStore(this.storeName).openCursor();return new Promise((n,o)=>{let s=0;t.onsuccess=a=>{const i=a.target.result;if(i){const u=i.key,h=i.value;e(h,u,s),s++,i.continue()}else n()},t.onerror=()=>{o(t.error)}})}catch(t){console.error("Failed to iterate storage",t)}}}const w={memory:"memory",local:"local",session:"session",indexeddb:"indexeddb"};function P(r,e){Object.assign(r,e)}function X(r){return P(r,{async getItemOrDefault(e,t){const n=await this.getItem(e);return n!==null?n:t},async hasItem(e){return await this.getItem(e)!==null},async removeItems(e){await Promise.all(e.map(t=>this.removeItem(t)))},async getItems(e){return await Promise.all(e.map(t=>this.getItem(t)))}}),r}function Y(r){return P(r,{getItemOrDefault(e,t){const n=this.getItem(e);return n!==null?n:t},hasItem(e){return this.getItem(e)!==null},removeItems(e){e.forEach(t=>this.removeItem(t))},getItems(e){return e.map(t=>this.getItem(t))}}),r}function Z(r){const e=r.getItem("");return z(e)?X(r):Y(r)}function q(r,...e){const t=A(r);let n;try{n=new t(...e)}catch{n=t(...e)}return Z(n)}f(J,w.memory),f(G,w.local),f(U,w.session),f(M,w.indexeddb);function O(r,e){return{value:r,expireAt:Date.now()+e}}function R(r,e=Date.now()){return r.expireAt<=e}function H(r,e=Date.now()){return R(r,e)?void 0:r.value}const L=r=>{const{config:e}=r,{method:t,url:n,data:o}=e;return[t,n,JSON.stringify(o)].join("|")},Q=()=>!0,j=24*60*60*1e3,W={key:L,duration:j,isValid:Q,store:w.memory};class ee{store;constructor(e){return typeof e=="string"?this.store=q(e):(f(e.factory,e.key),this.store=q(e.key)),new Proxy(this,{get(t,n){if(n in t)return t[n];const o=t.store[n];return typeof o=="function"?o.bind(t.store):o}})}setCache(e,t,n=j){const o=O(t,n);this.store.setItem(e,o)}async getCache(e){const t=await this.store.getItem(e);if(t)return H(t)}async hasValidCache(e){const t=await this.store.getItem(e);return t?!R(t):!1}}const te=ee,x=r=>{const e={...W,...r},t=new te(e.store),n=s=>typeof e.duration=="function"?e.duration(s):e.duration;return Object.assign(async({config:s,next:a})=>{const i=e.key({config:s}),u=await t.getCache(i);if(u){if(await e.isValid({key:i,config:s,cachedData:u}))return u;t.removeItem(i)}const h=await a(),I=n({key:i,config:s,cachedData:u,response:h}),ce=O(h,I);return t.setItem(i,ce),h},{__middlewareType:g.CACHE,storage:t})},T=new Map,re=(r,e=C)=>{T.set(e,r)},F=(r=C)=>{const e=T.get(r);if(!e)throw new Error(`Requestor实例 ${String(r)} 未注册`);return e},D={get:(r,e)=>({url:r,method:y.GET,...e,params:e?.params}),post:(r,e,t)=>({url:r,method:y.POST,data:e,...t}),delete:(r,e)=>({url:r,method:y.DELETE,...e}),put:(r,e,t)=>({url:r,method:y.PUT,data:e,...t}),request:r=>r},ne=Object.keys(D);function oe(r,e,t){const n={},o=s=>{if(s===e.length)return t(r);const a=e[s];return a({config:r,ctx:n,next:()=>o(s+1)})};return o(0)}function se(r,e){const t={},n=e??[];return ne.forEach(o=>{t[o]=(...s)=>{const a=D[o](...s);return oe(a,n,r)}}),t}function p(r){const{extensions:e,instanceKey:t}=r??{},n=F(t);return se(n,e)}function ie(r){const{instanceKey:e,key:t,duration:n,isValid:o,store:s,...a}=r;return p({instanceKey:e,extensions:[S(a),x({key:t,duration:n,isValid:o,store:s})]})}function ae(r){const{instanceKey:e,parallelCount:t,createId:n,retries:o,delay:s,retryCondition:a}=r;return p({instanceKey:e,extensions:[v({parallelCount:t,createId:n}),k({retries:o,delay:s,retryCondition:a})]})}c.cache=x,c.concurrent=v,c.createCachedIdempotentRequestor=ie,c.createConcurrentRetryRequestor=ae,c.createRequestor=p,c.idempotent=S,c.inject=re,c.retry=k,c.useRequestor=F,Object.defineProperty(c,Symbol.toStringTag,{value:"Module"})});

package/package.json

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