@vef-framework/core 2.0.9 → 2.0.10

package/dist/cjs/http/client.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=require("@vef-framework/shared"),g=require("axios"),y=require("./errors.cjs"),m=/:(?<key>\w+)/g,$=/filename[^;=\n]*=(?<name>(?<quote>['"]).*?\2|[^;\n]*)/,f="X-Skip-Authentication",k="1";class R{#e;#s;#t=!1;#n=[];constructor(e){this.#s=e;const{baseUrl:s,timeout:n=1e3*30}=e;this.#e=g.create({baseURL:s,allowAbsoluteUrls:!0,timeout:n,headers:{"Content-Type":"application/json"},paramsSerializer:t=>u.encodeQueryString(t,{arrayFormat:"repeat",skipNulls:!0,charset:"utf-8"}),responseType:"json",responseEncoding:"utf-8",validateStatus(t){return t>=200&&t<300},withCredentials:!1,timeoutErrorMessage:"请求超时"}),this.initInterceptors()}initInterceptors(){this.#e.interceptors.request.use(this.handleRequest.bind(this),this.handleRequestError.bind(this)),this.#e.interceptors.response.use(this.handleResponse.bind(this),this.handleResponseError.bind(this))}isBelongsTo(e,s){return u.isArray(s)?s.includes(e):e===s}async handleRequest(e){const s=e.headers[f]===k;if(this.#t&&!s&&!await new Promise(t=>{this.#n.push(t)}))throw new Error("登录已过期, 请重新登录");return s?delete e.headers[f]:await this.setAccessToken(e),this.replacePathParams(e),e}handleRequestError(e){const{showErrorMessage:s}=this.#s,n=e instanceof Error?e.message:String(e);return s?s(`发起请求失败: ${n||"未知错误"}`):console.error(`[HttpClient] ❌ 发起请求失败: ${n||"未知错误"}`),Promise.reject(e)}handleResponse(e){const{showWarningMessage:s,okCode:n=0}=this.#s,{code:t,message:o,data:r}=e.data;if(this.isBelongsTo(t,n))return e;throw s?s(o):console.warn(`[HttpClient] ⚠️ [${e.config.method}: ${e.config.url}] 返回错误: ${o}`),new y.BusinessError(t,o,r)}async handleResponseError(e){const{showInfoMessage:s,showWarningMessage:n,showErrorMessage:t,tokenExpiredCode:o=[]}=this.#s;if(e instanceof g.CanceledError){if(e.response){const{method:a,url:c}=e.response.config;console.warn(`[HttpClient] ⚠️ [${a}: ${c}] 被取消`)}return}const{response:r}=e;if(r){const{status:a,config:c,data:l}=r,{code:d,message:i}=l,h=`[${c.method}: ${c.url}]`;switch(a){case 401:{if(this.isBelongsTo(d,o)){if(await this.tryRefreshToken())return this.retryRequest(c);const w="登录已过期, 请重新登录";s?s(w):console.info(`[HttpClient] ℹ️ ${w}`)}await this.#s.onUnauthenticated?.();break}case 403:{n?.(`${i}, 请联系管理员为您开通`),console.warn(`[HttpClient] ⚠️ ${h} 访问被拒绝: ${i}`),await this.#s.onAccessDenied?.();break}case 400:{n?n(i):console.warn(`[HttpClient] ⚠️ ${h} 参数错误: ${i}`);break}default:t?t(i):console.error(`[HttpClient] ❌ ${h} 返回错误: ${i}`)}}else{const a=`请求失败: ${e.message||"未知错误"}`;t?t(a):console.error(`[HttpClient] ❌ ${a}`)}throw e}async setAccessToken(e){const{getAuthTokens:s}=this.#s;if(s){const t=(await s())?.accessToken;t&&(e.headers.Authorization=`Bearer ${t}`)}}replacePathParams(e){const{url:s,params:n={}}=e;return s&&m.test(s)&&(e.url=s.replaceAll(m,(t,o)=>{if(!Object.hasOwn(n,o))return console.warn(`[HttpClient] ⚠️ 接口: ${s} 路径参数 ${o} 未在查询参数中定义, 请检查`),"unknown";const r=n[o];return u.isNullish(r)?(console.warn(`[HttpClient] ⚠️ 接口: ${s} 路径参数 ${o} 在查询参数中为空, 请检查`),"unknown"):r})),e}async tryRefreshToken(){const{getAuthTokens:e,refreshToken:s,setAuthTokens:n}=this.#s;if(!e||!s||!n)return!1;this.#t=!0;let t=!1;try{const o=await e();if(!o)return!1;const r=await s(o);return await n(Object.freeze(r)),t=!0}catch(o){return console.error(`[HttpClient] ❌ 刷新令牌失败: ${o}`),!1}finally{this.#t=!1;for(const o of this.#n)o(t);this.#n=[]}}async retryRequest(e){const s={...e};return await this.setAccessToken(s),this.#e(s)}async get(e,s){return(await this.#e.get(e,s)).data}async post(e,s){const{data:n,...t}=s??{};return(await this.#e.post(e,n,t)).data}async put(e,s){const{data:n,...t}=s??{};return(await this.#e.put(e,n,t)).data}async delete(e,s){return(await this.#e.delete(e,s)).data}async upload(e,s){const{data:n,onProgress:t,...o}=s??{};return(await this.#e.postForm(e,n,{...o,onUploadProgress:u.isFunction(t)?t:void 0})).data}async download(e,s){const{onProgress:n,filename:t,...o}=s??{},{data:r,headers:a}=await this.#e.get(e,{...o,responseType:"blob",responseEncoding:"binary",onDownloadProgress:u.isFunction(n)?n:void 0});try{const l=JSON.parse(await r.text());throw new Error(l.message)}catch{}const c=a["content-disposition"];if(u.isString(c)){const l=$.exec(c);if(l&&l.groups){const{name:d}=l.groups,i=decodeURIComponent(d),h=URL.createObjectURL(r);try{const p=document.createElement("a");p.href=h,p.download=u.isFunction(t)?t(i):t??i,p.click()}finally{URL.revokeObjectURL(h)}}}}}exports.HttpClient=R;exports.skipAuthenticationHeader=f;exports.skipAuthenticationValue=k;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=require("@vef-framework/shared"),g=require("axios"),$=require("./errors.cjs"),m=/:(?<key>\w+)/g,R=/filename[^;=\n]*=(?<name>(?<quote>['"]).*?\2|[^;\n]*)/,f="X-Skip-Authentication",k="1";class b{#e;#s;#t=!1;#n=[];constructor(e){this.#s=e;const{baseUrl:s,timeout:n=1e3*30}=e;this.#e=g.create({baseURL:s,allowAbsoluteUrls:!0,timeout:n,headers:{"Content-Type":"application/json"},paramsSerializer:t=>u.encodeQueryString(t,{arrayFormat:"repeat",skipNulls:!0,charset:"utf-8"}),responseType:"json",responseEncoding:"utf-8",validateStatus(t){return t>=200&&t<300},withCredentials:!1,timeoutErrorMessage:"请求超时"}),this.initInterceptors()}initInterceptors(){this.#e.interceptors.request.use(this.handleRequest.bind(this),this.handleRequestError.bind(this)),this.#e.interceptors.response.use(this.handleResponse.bind(this),this.handleResponseError.bind(this))}isBelongsTo(e,s){return u.isArray(s)?s.includes(e):e===s}async handleRequest(e){const s=e.headers[f]===k;if(this.#t&&!s&&!await new Promise(t=>{this.#n.push(t)}))throw new Error("登录已过期, 请重新登录");return s?delete e.headers[f]:await this.setAccessToken(e),this.replacePathParams(e),e}handleRequestError(e){const{showErrorMessage:s}=this.#s,n=e instanceof Error?e.message:String(e);return s?s(`发起请求失败: ${n||"未知错误"}`):console.error(`[HttpClient] ❌ 发起请求失败: ${n||"未知错误"}`),Promise.reject(e)}handleResponse(e){const{showWarningMessage:s,okCode:n=0}=this.#s,{code:t,message:o,data:r}=e.data;if(this.isBelongsTo(t,n))return e;throw s?s(o):console.warn(`[HttpClient] ⚠️ [${e.config.method}: ${e.config.url}] 返回错误: ${o}`),new $.BusinessError(t,o,r)}async handleResponseError(e){const{showInfoMessage:s,showWarningMessage:n,showErrorMessage:t,tokenExpiredCode:o=[]}=this.#s;if(e instanceof g.CanceledError){if(e.response){const{method:a,url:c}=e.response.config;console.warn(`[HttpClient] ⚠️ [${a}: ${c}] 被取消`)}return}const{response:r}=e;if(r){const{status:a,config:c,data:l}=r,{code:d,message:i}=l,p=`[${c.method}: ${c.url}]`;switch(a){case 401:{if(this.isBelongsTo(d,o)){let h;if(this.#t?h=await new Promise(y=>{this.#n.push(y)}):h=await this.tryRefreshToken(),h)return this.retryRequest(c);const w="登录已过期, 请重新登录";s?s(w):console.info(`[HttpClient] ℹ️ ${w}`)}await this.#s.onUnauthenticated?.();break}case 403:{n?.(`${i}, 请联系管理员为您开通`),console.warn(`[HttpClient] ⚠️ ${p} 访问被拒绝: ${i}`),await this.#s.onAccessDenied?.();break}case 400:{n?n(i):console.warn(`[HttpClient] ⚠️ ${p} 参数错误: ${i}`);break}default:t?t(i):console.error(`[HttpClient] ❌ ${p} 返回错误: ${i}`)}}else{const a=`请求失败: ${e.message||"未知错误"}`;t?t(a):console.error(`[HttpClient] ❌ ${a}`)}throw e}async setAccessToken(e){const{getAuthTokens:s}=this.#s;if(s){const t=(await s())?.accessToken;t&&(e.headers.Authorization=`Bearer ${t}`)}}replacePathParams(e){const{url:s,params:n={}}=e;return s&&m.test(s)&&(e.url=s.replaceAll(m,(t,o)=>{if(!Object.hasOwn(n,o))return console.warn(`[HttpClient] ⚠️ 接口: ${s} 路径参数 ${o} 未在查询参数中定义, 请检查`),"unknown";const r=n[o];return u.isNullish(r)?(console.warn(`[HttpClient] ⚠️ 接口: ${s} 路径参数 ${o} 在查询参数中为空, 请检查`),"unknown"):r})),e}async tryRefreshToken(){const{getAuthTokens:e,refreshToken:s,setAuthTokens:n}=this.#s;if(!e||!s||!n)return!1;this.#t=!0;let t=!1;try{const o=await e();if(!o)return!1;const r=await s(o);return await n(Object.freeze(r)),t=!0}catch(o){return console.error(`[HttpClient] ❌ 刷新令牌失败: ${o}`),!1}finally{this.#t=!1;for(const o of this.#n)o(t);this.#n=[]}}async retryRequest(e){const s={...e};return await this.setAccessToken(s),this.#e(s)}async get(e,s){return(await this.#e.get(e,s)).data}async post(e,s){const{data:n,...t}=s??{};return(await this.#e.post(e,n,t)).data}async put(e,s){const{data:n,...t}=s??{};return(await this.#e.put(e,n,t)).data}async delete(e,s){return(await this.#e.delete(e,s)).data}async upload(e,s){const{data:n,onProgress:t,...o}=s??{};return(await this.#e.postForm(e,n,{...o,onUploadProgress:u.isFunction(t)?t:void 0})).data}async download(e,s){const{onProgress:n,filename:t,...o}=s??{},{data:r,headers:a}=await this.#e.get(e,{...o,responseType:"blob",responseEncoding:"binary",onDownloadProgress:u.isFunction(n)?n:void 0});try{const l=JSON.parse(await r.text());throw new Error(l.message)}catch{}const c=a["content-disposition"];if(u.isString(c)){const l=R.exec(c);if(l&&l.groups){const{name:d}=l.groups,i=decodeURIComponent(d),p=URL.createObjectURL(r);try{const h=document.createElement("a");h.href=p,h.download=u.isFunction(t)?t(i):t??i,h.click()}finally{URL.revokeObjectURL(p)}}}}}exports.HttpClient=b;exports.skipAuthenticationHeader=f;exports.skipAuthenticationValue=k;

package/dist/es/http/client.js

@@ -1,8 +1,8 @@
-import { encodeQueryString as m, isArray as k, isNullish as y, isFunction as d, isString as $ } from "@vef-framework/shared";
-import R, { CanceledError as C } from "axios";
-import { BusinessError as T } from "./errors.js";
-const w = /:(?<key>\w+)/g, b = /filename[^;=\n]*=(?<name>(?<quote>['"]).*?\2|[^;\n]*)/, g = "X-Skip-Authentication", E = "1";
-class O {
+import { encodeQueryString as k, isArray as y, isNullish as $, isFunction as d, isString as R } from "@vef-framework/shared";
+import C, { CanceledError as T } from "axios";
+import { BusinessError as b } from "./errors.js";
+const w = /:(?<key>\w+)/g, E = /filename[^;=\n]*=(?<name>(?<quote>['"]).*?\2|[^;\n]*)/, g = "X-Skip-Authentication", A = "1";
+class q {
   /**
    * The axios instance.
    */
@@ -25,14 +25,14 @@ class O {
       baseUrl: s,
       timeout: n = 1e3 * 30
     } = e;
-    this.#e = R.create({
+    this.#e = C.create({
       baseURL: s,
       allowAbsoluteUrls: !0,
       timeout: n,
       headers: {
         "Content-Type": "application/json"
       },
-      paramsSerializer: (t) => m(
+      paramsSerializer: (t) => k(
         t,
         {
           arrayFormat: "repeat",
@@ -66,7 +66,7 @@ class O {
    * @returns The result.
    */
   isBelongsTo(e, s) {
-    return k(s) ? s.includes(e) : e === s;
+    return y(s) ? s.includes(e) : e === s;
   }
   /**
    * Handle the request.
@@ -75,7 +75,7 @@ class O {
    * @returns The axios request config.
    */
   async handleRequest(e) {
-    const s = e.headers[g] === E;
+    const s = e.headers[g] === A;
     if (this.#t && !s && !await new Promise((t) => {
       this.#n.push(t);
     }))
@@ -108,7 +108,7 @@ class O {
     } = e.data;
     if (this.isBelongsTo(t, n))
       return e;
-    throw s ? s(o) : console.warn(`[HttpClient] ⚠️ [${e.config.method}: ${e.config.url}] 返回错误: ${o}`), new T(t, o, r);
+    throw s ? s(o) : console.warn(`[HttpClient] ⚠️ [${e.config.method}: ${e.config.url}] 返回错误: ${o}`), new b(t, o, r);
   }
   /**
    * Handle the response error.
@@ -122,7 +122,7 @@ class O {
       showErrorMessage: t,
       tokenExpiredCode: o = []
     } = this.#s;
-    if (e instanceof C) {
+    if (e instanceof T) {
       if (e.response) {
         const { method: i, url: c } = e.response.config;
         console.warn(`[HttpClient] ⚠️ [${i}: ${c}] 被取消`);
@@ -135,11 +135,14 @@ class O {
         status: i,
         config: c,
         data: l
-      } = r, { code: p, message: a } = l, h = `[${c.method}: ${c.url}]`;
+      } = r, { code: p, message: a } = l, u = `[${c.method}: ${c.url}]`;
       switch (i) {
         case 401: {
           if (this.isBelongsTo(p, o)) {
-            if (await this.tryRefreshToken())
+            let h;
+            if (this.#t ? h = await new Promise((m) => {
+              this.#n.push(m);
+            }) : h = await this.tryRefreshToken(), h)
               return this.retryRequest(c);
             const f = "登录已过期, 请重新登录";
             s ? s(f) : console.info(`[HttpClient] ℹ️ ${f}`);
@@ -148,15 +151,15 @@ class O {
           break;
         }
         case 403: {
-          n?.(`${a}, 请联系管理员为您开通`), console.warn(`[HttpClient] ⚠️ ${h} 访问被拒绝: ${a}`), await this.#s.onAccessDenied?.();
+          n?.(`${a}, 请联系管理员为您开通`), console.warn(`[HttpClient] ⚠️ ${u} 访问被拒绝: ${a}`), await this.#s.onAccessDenied?.();
           break;
         }
         case 400: {
-          n ? n(a) : console.warn(`[HttpClient] ⚠️ ${h} 参数错误: ${a}`);
+          n ? n(a) : console.warn(`[HttpClient] ⚠️ ${u} 参数错误: ${a}`);
           break;
         }
         default:
-          t ? t(a) : console.error(`[HttpClient] ❌ ${h} 返回错误: ${a}`);
+          t ? t(a) : console.error(`[HttpClient] ❌ ${u} 返回错误: ${a}`);
       }
     } else {
       const i = `请求失败: ${e.message || "未知错误"}`;
@@ -188,7 +191,7 @@ class O {
       if (!Object.hasOwn(n, o))
         return console.warn(`[HttpClient] ⚠️ 接口: ${s} 路径参数 ${o} 未在查询参数中定义, 请检查`), "unknown";
       const r = n[o];
-      return y(r) ? (console.warn(`[HttpClient] ⚠️ 接口: ${s} 路径参数 ${o} 在查询参数中为空, 请检查`), "unknown") : r;
+      return $(r) ? (console.warn(`[HttpClient] ⚠️ 接口: ${s} 路径参数 ${o} 在查询参数中为空, 请检查`), "unknown") : r;
     })), e;
   }
   /**
@@ -336,22 +339,22 @@ class O {
     } catch {
     }
     const c = i["content-disposition"];
-    if ($(c)) {
-      const l = b.exec(c);
+    if (R(c)) {
+      const l = E.exec(c);
       if (l && l.groups) {
-        const { name: p } = l.groups, a = decodeURIComponent(p), h = URL.createObjectURL(r);
+        const { name: p } = l.groups, a = decodeURIComponent(p), u = URL.createObjectURL(r);
         try {
-          const u = document.createElement("a");
-          u.href = h, u.download = d(t) ? t(a) : t ?? a, u.click();
+          const h = document.createElement("a");
+          h.href = u, h.download = d(t) ? t(a) : t ?? a, h.click();
         } finally {
-          URL.revokeObjectURL(h);
+          URL.revokeObjectURL(u);
         }
       }
     }
   }
 }
 export {
-  O as HttpClient,
+  q as HttpClient,
   g as skipAuthenticationHeader,
-  E as skipAuthenticationValue
+  A as skipAuthenticationValue
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vef-framework/core",
   "type": "module",
-  "version": "2.0.9",
+  "version": "2.0.10",
   "private": false,
   "description": "Core features for VEF framework",
   "author": {
@@ -64,7 +64,7 @@
     "use-immer": "^0.11.0",
     "xstate": "^5.24.0",
     "zustand": "^5.0.8",
-    "@vef-framework/shared": "2.0.9"
+    "@vef-framework/shared": "2.0.10"
   },
   "devDependencies": {
     "react": "^19.2.0"