@seayoo-web/request 2.0.10 → 2.1.0

package/README.md

@@ -138,6 +138,12 @@ setConfig({ timeout: 10000 })
 
 说明：用于控制 get 请求的缓冲时效，单位 ms，默认 500，设置为 0 则禁用缓冲
 
+### defaultTypeGuardMessage
+
+类型：string
+
+说明：默认的类型守卫错误提示，仅支持全局配置，默认 “响应数据未能正确识别“，单个 api 可通过传入完整的类型守卫（{ guard, message }）来定制提示消息。
+
 ### message
 
 类型：false | ((
@@ -288,7 +294,7 @@ status 表示网络错误或者http 状态码错误时重试；
 
 类型：null | ((isError: boolean, message: string, code: string, status:number) => void)
 
-说明：全局默认提示函数，isError 表示需要提示的消息是否为错误消息，message 为提示内容，code 为状态描述码，status 为 http 状态码
+说明：全局默认提示函数，isError 表示需要提示的消息是否为错误消息，message 为提示内容，code 为状态描述码或内置错误码（可导出 RequestInteralError 进行对比），status 为 http 状态码
 
 ### logHandler
 

package/dist/index.cjs

@@ -1,2 +1,2 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("./type-CrucJEBR.cjs"),q=require("./request.fetch-K4MJcDmZ.cjs"),y=async function(t,s,e){return o.handleResponse(await o.retryRequest(R,t,s,e),t,s,e)};async function m(t,s,e,n){const r=e==null?void 0:e.body,u=(e==null?void 0:e.method)==="PUT"?"PUT":"POST";if(s instanceof Blob){const i=new o.RequestGlobalConfig(n),f=await R(t,i,{...e,method:u,body:s});return o.handleResponse(f,t,i,e)}const c=new FormData,d={...s};r instanceof Object&&Object.entries(r).forEach(([i,f])=>{f instanceof Blob?d[i]=f:Array.isArray(f)?f.forEach((a,g)=>{c.append(`${i}[${g}]`,String(a))}):c.append(i,String(f))});for(const i in d)c.append(i,d[i]);const b=new o.RequestGlobalConfig(n),w=await R(t,b,{...e,method:u,body:c});return o.handleResponse(w,t,b,e)}const R=async function(t,s,e){const n=await o.convertOptions(t,s,e),r=n.method,u=e==null?void 0:e.onUploadProgress,c=o.Dt(n.url,n.params);return await new Promise(d=>{let b=null,w=!1;const i=function(){w||(a.abort(),w=!0)};function f(){b!==null&&clearTimeout(b),n.abort&&n.abort.removeEventListener("abort",i)}const a=new XMLHttpRequest;if(a.open(r,c,!0),u){let g=1;a.upload.addEventListener("progress",h=>{g=h.total,u({total:h.total,loaded:h.loaded})}),a.addEventListener("load",()=>{u({loaded:g,total:g})})}a.addEventListener("load",()=>{f(),d({url:c,method:r,status:a.status,statusText:a.statusText,headers:E(a),body:r==="HEAD"?"":a.responseText})}),a.addEventListener("error",g=>{f(),d({url:c,method:r,status:-1,statusText:o.RequestInteralError.Unknown,body:"",rawError:g})},!0),a.addEventListener("abort",()=>{f(),d({url:c,method:r,status:-1,statusText:o.RequestInteralError.Aborted,body:""})}),Object.entries(n.headers).forEach(([g,h])=>{a.setRequestHeader(g,h)}),n.credentials==="include"&&(a.withCredentials=!0),a.send(n.body||void 0),n.abort&&n.abort.addEventListener("abort",i),n.timeout>0&&(b=setTimeout(i,n.timeout))})};function E(t){const s={};if(!t)return s;const e=t.getAllResponseHeaders();return e&&e!=="null"&&e.replace(/\r/g,"").split(`
-`).forEach(n=>{const r=n.trim();if(!r)return;const u=r.split(":"),c=u[0].trim();c&&(s[c]=(u[1]||"").trim())}),s}async function H(t,s,e={}){const n=window;"callback"in e||(e.callback="jsonxData"+Math.random().toString(16).slice(2));const r=e.callback+"";if(!t)return null;const u=o.Dt(t,e,!0);return new Promise(c=>{n[r]=function(d){if(r in window&&delete n[r],s(d))return d;console.warn("response type check faild",t,d),c(null)},o.Me(u).catch(function(){c(null),delete n[r]})})}async function T(t,s,e={}){const n=window;return"var"in e||(e.var="jsonxData"+Math.random().toString(16).slice(2)),t?await o.Me(o.Dt(t,e,!0)).then(()=>{const r=n[e.var+""];return s(r)?r:(console.warn("response type check faild",t,r),null)}).catch(()=>null):null}const C=async function(t,s,e){return await m(t,s,e,{baseURL:l.getConfig("baseURL"),logHandler:l.getConfig("logHandler"),errorHandler:l.getConfig("errorHandler"),requestTransformer:l.getConfig("requestTransformer"),messageHandler:l.getConfig("messageHandler"),responseHandler:l.getConfig("responseHandler")})};function p(t){if(!o.Kt.window)throw new Error("Default Module Only Support In Browser");return o.Kt.fetch?new o.NetRequestHandler(q.fetchRequest,t):new o.NetRequestHandler(y,t)}const l=p(),x=l.setConfig,D=l.request,j=l.head,L=l.get,S=l.post,U=l.del,k=l.put,v=l.patch;exports.RequestInteralError=o.RequestInteralError;exports.getResponseRulesDescription=o.getResponseRulesDescription;exports.NetRequest=p;exports.del=U;exports.get=L;exports.head=j;exports.jsonp=H;exports.jsonx=T;exports.patch=v;exports.post=S;exports.put=k;exports.request=D;exports.setGlobalConfig=x;exports.upload=C;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("./retry-CRrgnQtP.cjs"),q=require("./request.fetch-YPs3rgIZ.cjs"),y=async function(t,s,e){return o.handleResponse(await o.retryRequest(R,t,s,e),t,s,e)};async function m(t,s,e,n){const r=e==null?void 0:e.body,u=(e==null?void 0:e.method)==="PUT"?"PUT":"POST";if(s instanceof Blob){const i=new o.RequestGlobalConfig(n),f=await R(t,i,{...e,method:u,body:s});return o.handleResponse(f,t,i,e)}const c=new FormData,d={...s};r instanceof Object&&Object.entries(r).forEach(([i,f])=>{f instanceof Blob?d[i]=f:Array.isArray(f)?f.forEach((a,g)=>{c.append(`${i}[${g}]`,String(a))}):c.append(i,String(f))});for(const i in d)c.append(i,d[i]);const b=new o.RequestGlobalConfig(n),w=await R(t,b,{...e,method:u,body:c});return o.handleResponse(w,t,b,e)}const R=async function(t,s,e){const n=await o.convertOptions(t,s,e),r=n.method,u=e==null?void 0:e.onUploadProgress,c=o.Ht(n.url,n.params);return await new Promise(d=>{let b=null,w=!1;const i=function(){w||(a.abort(),w=!0)};function f(){b!==null&&clearTimeout(b),n.abort&&n.abort.removeEventListener("abort",i)}const a=new XMLHttpRequest;if(a.open(r,c,!0),u){let g=1;a.upload.addEventListener("progress",h=>{g=h.total,u({total:h.total,loaded:h.loaded})}),a.addEventListener("load",()=>{u({loaded:g,total:g})})}a.addEventListener("load",()=>{f(),d({url:c,method:r,status:a.status,statusText:a.statusText,headers:H(a),body:r==="HEAD"?"":a.responseText})}),a.addEventListener("error",g=>{f(),d({url:c,method:r,status:-1,statusText:o.RequestInteralError.Unknown,body:"",rawError:g})},!0),a.addEventListener("abort",()=>{f(),d({url:c,method:r,status:-1,statusText:o.RequestInteralError.Aborted,body:""})}),Object.entries(n.headers).forEach(([g,h])=>{a.setRequestHeader(g,h)}),n.credentials==="include"&&(a.withCredentials=!0),a.send(n.body||void 0),n.abort&&n.abort.addEventListener("abort",i),n.timeout>0&&(b=setTimeout(i,n.timeout))})};function H(t){const s={};if(!t)return s;const e=t.getAllResponseHeaders();return e&&e!=="null"&&e.replace(/\r/g,"").split(`
+`).forEach(n=>{const r=n.trim();if(!r)return;const u=r.split(":"),c=u[0].trim();c&&(s[c]=(u[1]||"").trim())}),s}async function E(t,s,e={}){const n=window;"callback"in e||(e.callback="jsonxData"+Math.random().toString(16).slice(2));const r=e.callback+"";if(!t)return null;const u=o.Ht(t,e,!0);return new Promise(c=>{n[r]=function(d){if(r in window&&delete n[r],s(d))return d;console.warn("response type check faild",t,d),c(null)},o.Oe(u).catch(function(){c(null),delete n[r]})})}async function T(t,s,e={}){const n=window;return"var"in e||(e.var="jsonxData"+Math.random().toString(16).slice(2)),t?await o.Oe(o.Ht(t,e,!0)).then(()=>{const r=n[e.var+""];return s(r)?r:(console.warn("response type check faild",t,r),null)}).catch(()=>null):null}const C=async function(t,s,e){return await m(t,s,e,{baseURL:l.getConfig("baseURL"),logHandler:l.getConfig("logHandler"),errorHandler:l.getConfig("errorHandler"),requestTransformer:l.getConfig("requestTransformer"),messageHandler:l.getConfig("messageHandler"),responseHandler:l.getConfig("responseHandler")})};function p(t){if(!o.ee.window)throw new Error("Default Module Only Support In Browser");return o.ee.fetch?new o.NetRequestHandler(q.fetchRequest,t):new o.NetRequestHandler(y,t)}const l=p(),x=l.setConfig,j=l.request,L=l.head,S=l.get,O=l.post,U=l.del,k=l.put,v=l.patch;exports.RequestInteralError=o.RequestInteralError;exports.getResponseRulesDescription=o.getResponseRulesDescription;exports.NetRequest=p;exports.del=U;exports.get=S;exports.head=L;exports.jsonp=E;exports.jsonx=T;exports.patch=v;exports.post=O;exports.put=k;exports.request=j;exports.setGlobalConfig=x;exports.upload=C;

package/dist/index.js

@@ -1,10 +1,10 @@
-import { h as w, r as T, R as y, c as x, D as p, a as R, M as E, K as H, N as q } from "./type-CRH6iqXf.js";
-import { g as z } from "./type-CRH6iqXf.js";
-import { f as C } from "./request.fetch-DR4KeRZ0.js";
+import { h as w, r as T, R as y, c as x, H as p, a as R, O as E, e as H, N as q } from "./retry-8Z8eLh90.js";
+import { g as J } from "./retry-8Z8eLh90.js";
+import { f as C } from "./request.fetch-idcpAgJt.js";
 const L = async function(t, a, e) {
   return w(await T(m, t, a, e), t, a, e);
 };
-async function D(t, a, e, n) {
+async function U(t, a, e, n) {
   const r = e == null ? void 0 : e.body, i = (e == null ? void 0 : e.method) === "PUT" ? "PUT" : "POST";
   if (a instanceof Blob) {
     const l = new y(n), u = await m(t, l, {
@@ -54,7 +54,7 @@ const m = async function(t, a, e) {
         method: r,
         status: o.status,
         statusText: o.statusText,
-        headers: U(o),
+        headers: k(o),
         body: r === "HEAD" ? "" : o.responseText
       });
     }), o.addEventListener(
@@ -83,7 +83,7 @@ const m = async function(t, a, e) {
     }), n.credentials === "include" && (o.withCredentials = !0), o.send(n.body || void 0), n.abort && n.abort.addEventListener("abort", l), n.timeout > 0 && (b = setTimeout(l, n.timeout));
   });
 };
-function U(t) {
+function k(t) {
   const a = {};
   if (!t)
     return a;
@@ -114,15 +114,15 @@ async function v(t, a, e = {}) {
     });
   });
 }
-async function M(t, a, e = {}) {
+async function D(t, a, e = {}) {
   const n = window;
   return "var" in e || (e.var = "jsonxData" + Math.random().toString(16).slice(2)), t ? await E(p(t, e, !0)).then(() => {
     const r = n[e.var + ""];
     return a(r) ? r : (console.warn("response type check faild", t, r), null);
   }).catch(() => null) : null;
 }
-const O = async function(t, a, e) {
-  return await D(t, a, e, {
+const P = async function(t, a, e) {
+  return await U(t, a, e, {
     baseURL: c.getConfig("baseURL"),
     logHandler: c.getConfig("logHandler"),
     errorHandler: c.getConfig("errorHandler"),
@@ -131,25 +131,25 @@ const O = async function(t, a, e) {
     responseHandler: c.getConfig("responseHandler")
   });
 };
-function k(t) {
+function O(t) {
   if (!H.window)
     throw new Error("Default Module Only Support In Browser");
   return H.fetch ? new q(C, t) : new q(L, t);
 }
-const c = k(), P = c.setConfig, A = c.request, N = c.head, B = c.get, X = c.post, F = c.del, G = c.put, I = c.patch;
+const c = O(), A = c.setConfig, M = c.request, N = c.head, B = c.get, X = c.post, F = c.del, G = c.put, I = c.patch;
 export {
-  k as NetRequest,
+  O as NetRequest,
   R as RequestInteralError,
   F as del,
   B as get,
-  z as getResponseRulesDescription,
+  J as getResponseRulesDescription,
   N as head,
   v as jsonp,
-  M as jsonx,
+  D as jsonx,
   I as patch,
   X as post,
   G as put,
-  A as request,
-  P as setGlobalConfig,
-  O as upload
+  M as request,
+  A as setGlobalConfig,
+  P as upload
 };

package/dist/node.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./type-CrucJEBR.cjs"),b=require("./request.fetch-K4MJcDmZ.cjs"),y=require("node:http"),g=require("node:https"),w=async function(o,u,c){return e.handleResponse(await e.retryRequest(E,o,u,c),o,u,c)},E=async function(o,u,c){const t=await e.convertOptions(o,u,c);if(!e.Y(t.url))return{url:t.url,method:t.method,status:-1,statusText:e.RequestInteralError.URLFormatError,headers:{},body:""};const p=/^https:\/\//i.test(t.url)?g:y,a=new URL(t.url),i=t.params;i instanceof Object&&Object.keys(i).forEach(n=>a.searchParams.set(n,i[n]));const f=t.method==="HEAD";return new Promise(n=>{const d=p.request(a,{headers:t.headers,method:t.method,timeout:t.timeout>0?t.timeout:void 0},function(s){const l=[];s.on("data",h=>l.push(h)),s.on("end",()=>{const h=e.fromEntries(Object.entries(s.headers).map(([R,m])=>[R.toLowerCase(),Array.isArray(m)?m.join(","):m]));n({url:a.toString(),method:t.method,status:s.statusCode||-1,statusText:s.statusMessage||e.RequestInteralError.Unknown,headers:h,body:f?"":Buffer.concat(l).toString("utf-8")})})});d.on("error",s=>{n({url:a.toString(),method:t.method,status:-1,statusText:e.RequestInteralError.Unknown,body:"",rawError:s})}),d.on("timeout",()=>{n({url:a.toString(),method:t.method,status:-1,statusText:e.RequestInteralError.Timeout,body:""})}),t.body&&d.write(t.body),d.end()})};function q(o){return e.Kt.fetch?new e.NetRequestHandler(b.fetchRequest,o):new e.NetRequestHandler(w,o)}const r=q(),S=r.setConfig,T=r.head,j=r.get,C=r.post,N=r.del,O=r.put,U=r.patch;exports.NetRequest=q;exports.del=N;exports.get=j;exports.head=T;exports.patch=U;exports.post=C;exports.put=O;exports.setGlobalConfig=S;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./retry-CRrgnQtP.cjs"),b=require("./request.fetch-YPs3rgIZ.cjs"),y=require("node:http"),g=require("node:https"),w=async function(o,u,c){return e.handleResponse(await e.retryRequest(E,o,u,c),o,u,c)},E=async function(o,u,c){const t=await e.convertOptions(o,u,c);if(!e.Y(t.url))return{url:t.url,method:t.method,status:-1,statusText:e.RequestInteralError.URLFormatError,headers:{},body:""};const p=/^https:\/\//i.test(t.url)?g:y,a=new URL(t.url),i=t.params;i instanceof Object&&Object.keys(i).forEach(n=>a.searchParams.set(n,i[n]));const f=t.method==="HEAD";return new Promise(n=>{const d=p.request(a,{headers:t.headers,method:t.method,timeout:t.timeout>0?t.timeout:void 0},function(s){const l=[];s.on("data",h=>l.push(h)),s.on("end",()=>{const h=e.fromEntries(Object.entries(s.headers).map(([R,m])=>[R.toLowerCase(),Array.isArray(m)?m.join(","):m]));n({url:a.toString(),method:t.method,status:s.statusCode||-1,statusText:s.statusMessage||e.RequestInteralError.Unknown,headers:h,body:f?"":Buffer.concat(l).toString("utf-8")})})});d.on("error",s=>{n({url:a.toString(),method:t.method,status:-1,statusText:e.RequestInteralError.Unknown,body:"",rawError:s})}),d.on("timeout",()=>{n({url:a.toString(),method:t.method,status:-1,statusText:e.RequestInteralError.Timeout,body:""})}),t.body&&d.write(t.body),d.end()})};function q(o){return e.ee.fetch?new e.NetRequestHandler(b.fetchRequest,o):new e.NetRequestHandler(w,o)}const r=q(),S=r.setConfig,T=r.head,j=r.get,C=r.post,N=r.del,O=r.put,U=r.patch;exports.NetRequest=q;exports.del=N;exports.get=j;exports.head=T;exports.patch=U;exports.post=C;exports.put=O;exports.setGlobalConfig=S;

package/dist/node.js

@@ -1,5 +1,5 @@
-import { h as y, r as q, c as w, Y as g, a as d, f as E, N as p, K as x } from "./type-CRH6iqXf.js";
-import { f as T } from "./request.fetch-DR4KeRZ0.js";
+import { h as y, r as q, c as w, Y as g, a as d, f as E, N as p, e as x } from "./retry-8Z8eLh90.js";
+import { f as T } from "./request.fetch-idcpAgJt.js";
 import U from "node:http";
 import j from "node:https";
 const C = async function(e, a, u) {
@@ -66,14 +66,14 @@ const C = async function(e, a, u) {
 function N(e) {
   return x.fetch ? new p(T, e) : new p(C, e);
 }
-const s = N(), k = s.setConfig, K = s.head, P = s.get, B = s.post, D = s.del, F = s.put, G = s.patch;
+const s = N(), k = s.setConfig, P = s.head, B = s.get, D = s.post, F = s.del, G = s.put, I = s.patch;
 export {
   N as NetRequest,
-  D as del,
-  P as get,
-  K as head,
-  G as patch,
-  B as post,
-  F as put,
+  F as del,
+  B as get,
+  P as head,
+  I as patch,
+  D as post,
+  G as put,
   k as setGlobalConfig
 };

package/dist/request.fetch-YPs3rgIZ.cjs

@@ -0,0 +1 @@
+"use strict";const s=require("./retry-CRrgnQtP.cjs"),f=async function(o,n,i){return s.handleResponse(await s.retryRequest(w,o,n,i),o,n,i)},w=async function(o,n,i){const t=await s.convertOptions(o,n,i),a=new URL(t.url),u=t.params;u instanceof Object&&Object.keys(u).forEach(e=>a.searchParams.set(e,u[e]));const r=s.ee.AbortController?new AbortController:null;function c(){r&&!r.signal.aborted&&r.abort()}t.abort&&t.abort.addEventListener("abort",c);const h=t.timeout>0?setTimeout(c,t.timeout):null,b=t.method==="HEAD";return await fetch(a,{method:t.method,headers:Object.keys(t.headers).length>0?new Headers(t.headers):void 0,body:t.body,credentials:t.credentials,signal:r==null?void 0:r.signal,redirect:"follow"}).then(async e=>{const d=b?"":await e.text().catch(m=>m),l=s.fromEntries([...e.headers.entries()]);return d instanceof Error?{url:a.toString(),method:t.method,status:e.status,statusText:e.statusText||s.RequestInteralError.Unknown,body:"",headers:l,rawError:d}:{url:a.toString(),method:t.method,status:e.status,statusText:e.statusText,headers:l,body:d}}).catch(e=>({url:a.toString(),method:t.method,status:-1,statusText:r!=null&&r.signal.aborted?s.RequestInteralError.Aborted:s.RequestInteralError.Unknown,body:"",rawError:e})).finally(()=>{h!==null&&clearTimeout(h),t.abort&&t.abort.removeEventListener("abort",c)})};exports.fetchRequest=f;

package/dist/{request.fetch-DR4KeRZ0.js → request.fetch-idcpAgJt.js}

@@ -1,4 +1,4 @@
-import { h as f, r as w, c as y, K as E, f as g, a as d } from "./type-CRH6iqXf.js";
+import { h as f, r as w, c as y, e as E, f as g, a as d } from "./retry-8Z8eLh90.js";
 const T = async function(r, o, n) {
   return f(await w(x, r, o, n), r, o, n);
 }, x = async function(r, o, n) {

package/dist/{type-CRH6iqXf.js → retry-8Z8eLh90.js}

@@ -1,10 +1,10 @@
-var K = Object.defineProperty;
-var N = (e, t, s) => t in e ? K(e, t, { enumerable: !0, configurable: !0, writable: !0, value: s }) : e[t] = s;
-var p = (e, t, s) => N(e, typeof t != "symbol" ? t + "" : t, s);
-const h = typeof globalThis < "u" ? globalThis : typeof global < "u" ? global : typeof self < "u" ? self : typeof window < "u" ? window : {}, O = {
-  wx: "wx" in h && D(h.wx),
+var N = Object.defineProperty;
+var K = (e, t, s) => t in e ? N(e, t, { enumerable: !0, configurable: !0, writable: !0, value: s }) : e[t] = s;
+var y = (e, t, s) => K(e, typeof t != "symbol" ? t + "" : t, s);
+const h = typeof globalThis < "u" ? globalThis : typeof global < "u" ? global : typeof self < "u" ? self : typeof window < "u" ? window : {}, k = {
+  wx: "wx" in h && U(h.wx),
   fetch: "fetch" in h && w(h.fetch),
-  window: "window" in h && D(h.window),
+  window: "window" in h && U(h.window),
   Blob: "Blob" in h && w(h.Blob),
   FormData: "FormData" in h && w(h.FormData),
   TextDecoder: "TextDecoder" in h && w(h.TextDecoder),
@@ -13,13 +13,13 @@ const h = typeof globalThis < "u" ? globalThis : typeof global < "u" ? global :
 function w(e) {
   return typeof e == "function";
 }
-function D(e) {
+function U(e) {
   return typeof e == "object" && e !== null;
 }
-function I(e) {
+function G(e) {
   return new Promise((t) => setTimeout(t, Math.max(0, e)));
 }
-function G() {
+function I() {
 }
 function J(e) {
   const t = e || "CustomError";
@@ -40,24 +40,24 @@ function A(e, t = !1) {
 function Z(e) {
   return e == null;
 }
-function k(e, ...t) {
+function E(e, ...t) {
   if (!e || typeof e != "object") return !1;
   const s = Object.getPrototypeOf(e);
   return s !== Object.prototype && s !== null ? !1 : t.every((r) => r in e);
 }
-function B(e) {
+function S(e) {
   return z.test(e) || Y.test(e);
 }
 function $(e) {
   return e ? e[0].toLowerCase() + e.slice(1) : "";
 }
-const _ = /_\w*/, H = /-\w*/;
-function U(e) {
-  const t = _.test(e) ? e.replace(/(?:^_*|_*$)/g, "").replace(/_+([^_])/g, (s, r) => r.toUpperCase()) : H.test(e) ? e.replace(/(?:^-*|-*$)/g, "").replace(/-+(\w)/g, (s, r) => r.toUpperCase()) : e;
+const _ = /_\w*/, B = /-\w*/;
+function D(e) {
+  const t = _.test(e) ? e.replace(/(?:^_*|_*$)/g, "").replace(/_+([^_])/g, (s, r) => r.toUpperCase()) : B.test(e) ? e.replace(/(?:^-*|-*$)/g, "").replace(/-+(\w)/g, (s, r) => r.toUpperCase()) : e;
   return $(t);
 }
 function M(e) {
-  return _.test(e) ? $(e).replace(/(?:^_*|_*$)/g, "").replace(/_+([^_])/g, (t, s) => "_" + s.toLowerCase()) : H.test(e) ? $(e.replace(/(?:^-*|-*$)/g, "")).replace(/-+(\w)/g, (t, s) => "_" + s.toLowerCase()) : $(e).replace(/[A-Z]/g, (t) => `_${t.toLowerCase()}`);
+  return _.test(e) ? $(e).replace(/(?:^_*|_*$)/g, "").replace(/_+([^_])/g, (t, s) => "_" + s.toLowerCase()) : B.test(e) ? $(e.replace(/(?:^-*|-*$)/g, "")).replace(/-+(\w)/g, (t, s) => "_" + s.toLowerCase()) : $(e).replace(/[A-Z]/g, (t) => `_${t.toLowerCase()}`);
 }
 function v(e, t) {
   try {
@@ -69,24 +69,24 @@ function v(e, t) {
 }
 "" + Math.random().toString(32).slice(2);
 function R(e, t = !1) {
-  return typeof e == "string" ? U(e) : Array.isArray(e) ? e.map((s) => !t || typeof s == "string" ? R(s) : typeof s == "object" && s ? R(s, !0) : s) : k(e) ? Object.keys(e).reduce(
+  return typeof e == "string" ? D(e) : Array.isArray(e) ? e.map((s) => !t || typeof s == "string" ? R(s) : typeof s == "object" && s ? R(s, !0) : s) : E(e) ? Object.keys(e).reduce(
     (s, r) => {
-      const a = U(String(r)), n = a.charAt(0).toLowerCase() + a.slice(1);
+      const a = D(String(r)), n = a.charAt(0).toLowerCase() + a.slice(1);
       return s[n] = t ? e[r] : R(e[r]), s;
     },
     {}
   ) : e;
 }
-function E(e, t = !1) {
-  return typeof e == "string" ? M(e) : Array.isArray(e) ? e.map((s) => !t || typeof s == "string" ? E(s) : typeof s == "object" && s ? E(s, t) : s) : k(e) ? Object.keys(e).reduce(
+function O(e, t = !1) {
+  return typeof e == "string" ? M(e) : Array.isArray(e) ? e.map((s) => !t || typeof s == "string" ? O(s) : typeof s == "object" && s ? O(s, t) : s) : E(e) ? Object.keys(e).reduce(
     (s, r) => {
       const a = M(String(r));
-      return s[a] = t ? e[r] : E(e[r]), s;
+      return s[a] = t ? e[r] : O(e[r]), s;
     },
     {}
   ) : e;
 }
-async function Re(e) {
+async function $e(e) {
   return await new Promise(function(t) {
     const s = document.getElementsByTagName("head")[0], r = document.createElement("script");
     r.setAttribute("type", "text/javascript"), r.setAttribute("charset", "utf-8"), r.onload = function() {
@@ -126,7 +126,7 @@ function te(e, t) {
   const s = e.split("#"), r = s[0].split("?"), a = r[0], n = r.length > 1 ? r[1] : "", o = s.length > 1 ? "#" + s[1] : "", c = typeof t == "string" ? [t] : Array.isArray(t) ? t : [];
   return !c.length || !n ? s[0] + o : (c.map((i) => i.replace(/([\\(){}[\]^$+\-*?|])/g, "\\$1")), (a + "?" + n.replace(new RegExp("(?:^|&)(?:" + c.join("|") + ")=[^&$]+", "g"), "").replace(/^&/, "")).replace(/\?$/, "") + o);
 }
-function Ee(e, t, s = !1) {
+function Re(e, t, s = !1) {
   const r = typeof t == "string" ? t : Object.keys(t).map((o) => `${o}=${encodeURIComponent(t[o])}`).join("&");
   if (!r)
     return e;
@@ -144,8 +144,8 @@ function se(e) {
 }
 class re {
   constructor(t = 500) {
-    p(this, "ttl");
-    p(this, "cache");
+    y(this, "ttl");
+    y(this, "cache");
     this.cache = {}, this.ttl = Math.max(t, 0);
   }
   getKey(t, s) {
@@ -171,7 +171,7 @@ class re {
 class ne {
   constructor(t) {
     // 保存的配置需要部分字段强制设置默认值
-    p(this, "config", {
+    y(this, "config", {
       baseURL: "",
       maxRetry: 0,
       retryInterval: 1e3,
@@ -179,6 +179,7 @@ class ne {
       timeout: 1e4,
       cacheTTL: 500,
       credentials: "same-origin",
+      defaultTypeGuardMessage: "响应数据未能正确识别",
       responseRule: {
         ok: {
           resolve: "body"
@@ -208,19 +209,19 @@ class ne {
     this.config.messageHandler && s && this.config.messageHandler(t, s, r, a);
   }
 }
-const x = "UnexpectResponse";
+var H = /* @__PURE__ */ ((e) => (e.UnexpectResponse = "UnexpectResponse", e.Aborted = "Aborted", e.Unknown = "Unknown", e.Timeout = "Timeout", e.NotSupport = "NotSupport", e.URLFormatError = "URLFormatError", e))(H || {});
 function ae(e, t, s, r) {
   if (t.ok && !Z(t.data) && r) {
-    const a = Q(r, "响应数据未能正确识别");
-    return a.guard(t.data) || (s.showMessage(!0, `${e} ${a.message}`, t.code, t.status), console.error(x, e, t.data), t.data = null, t.code = x, t.message = a.message), t;
+    const a = Q(r, s.get("defaultTypeGuardMessage"));
+    return a.guard(t.data) || (t.code = H.UnexpectResponse, s.showMessage(!0, `${e} ${a.message}`, t.code, t.status), console.error(t.code, e, t.data), t.data = null, t.message = a.message), t;
   }
   return t;
 }
 class Oe {
   constructor(t, s) {
-    p(this, "agent");
-    p(this, "config");
-    p(this, "cache");
+    y(this, "agent");
+    y(this, "config");
+    y(this, "cache");
     this.config = new ne(s), this.agent = t, this.cache = new re(this.config.get("cacheTTL")), this.setConfig = this.setConfig.bind(this), this.getConfig = this.getConfig.bind(this), this.request = this.request.bind(this), this.get = this.get.bind(this), this.post = this.post.bind(this), this.del = this.del.bind(this), this.patch = this.patch.bind(this), this.put = this.put.bind(this), this.head = this.head.bind(this);
   }
   /**
@@ -293,29 +294,29 @@ class Oe {
 }
 async function ke(e, t, s) {
   var m;
-  const r = Object.assign({ method: "GET" }, s), a = O.FormData ? r.body instanceof FormData : !1, n = a && r.method !== "POST" && r.method !== "PUT" ? "POST" : r.method, o = n === "GET" || n === "HEAD" || n === "DELETE";
+  const r = Object.assign({ method: "GET" }, s), a = k.FormData ? r.body instanceof FormData : !1, n = a && r.method !== "POST" && r.method !== "PUT" ? "POST" : r.method, o = n === "GET" || n === "HEAD" || n === "DELETE";
   o && r.body !== void 0 && (console.warn("request body is invalid with method get, head, delete"), delete r.body);
   const c = Object.assign(
     a || o ? {} : {
-      "Content-Type": O.Blob && r.body instanceof Blob ? r.body.type || "application/octet-stream" : "application/json;charset=utf-8"
+      "Content-Type": k.Blob && r.body instanceof Blob ? r.body.type || "application/octet-stream" : "application/json;charset=utf-8"
     },
     r.headers
-  ), i = r.params || {}, f = {};
+  ), i = r.params || {}, d = {};
   Object.keys(i).forEach((b) => {
-    i[b] !== void 0 && (f[b] = oe(i[b]));
+    i[b] !== void 0 && (d[b] = oe(i[b]));
   });
-  const u = t.getFullUrl(e), l = ce(r.body), d = r.timeout || t.get("timeout"), g = await async function() {
+  const u = t.getFullUrl(e), l = ce(r.body), f = r.timeout || t.get("timeout"), g = await async function() {
     const b = t.get("requestTransformer");
     if (b)
-      return await b({ headers: c, params: f, method: n, url: u, body: l });
-  }(), y = typeof g == "string" && g ? g : u;
-  return (m = t.get("logHandler")) == null || m({ type: "ready", url: y, method: n, headers: c, timeout: d, body: l }), {
-    url: y,
+      return await b({ headers: c, params: d, method: n, url: u, body: l });
+  }(), p = typeof g == "string" && g ? g : u;
+  return (m = t.get("logHandler")) == null || m({ type: "ready", url: p, method: n, headers: c, timeout: f, body: l }), {
+    url: p,
     method: n,
     body: l,
-    params: f,
+    params: d,
     headers: c,
-    timeout: d,
+    timeout: f,
     abort: r.abort,
     credentials: r.credentials || t.get("credentials")
   };
@@ -325,14 +326,14 @@ function oe(e) {
 }
 function ce(e) {
   if (e)
-    return typeof e == "string" || e instanceof URLSearchParams || e instanceof ArrayBuffer || O.Blob && e instanceof Blob || O.FormData && e instanceof FormData ? e : JSON.stringify(e);
+    return typeof e == "string" || e instanceof URLSearchParams || e instanceof ArrayBuffer || k.Blob && e instanceof Blob || k.FormData && e instanceof FormData ? e : JSON.stringify(e);
 }
 const q = "data", j = "message";
 function ie(e, t, s, r, a) {
   const n = a || r;
   return C(e) ? ge(n.ok || r.ok, e, t, s) : ue(n.failed || r.failed, t, s);
 }
-const ve = function(e) {
+const Ee = function(e) {
   const t = [], s = e.failed || { resolve: "json" };
   switch (t.push("- 当http状态码 <200 或者 >=400 时"), s.resolve) {
     case "body":
@@ -367,20 +368,20 @@ function ue(e, t, s) {
   };
   switch (r.resolve) {
     case "body":
-      a.message = P(s) || s;
+      a.message = x(s) || s;
       break;
     case "json":
       const { code: n, message: o } = le(s, r.converter, r.statusField, r.messageField);
-      a.code = n || t, a.message = P(s) || o;
+      a.code = n || t, a.message = x(s) || o;
       break;
   }
   return a;
 }
 function le(e, t, s, r = j) {
-  if (!B(e))
+  if (!S(e))
     return { message: "" };
   const a = F(v(e), t);
-  return !a || !k(a) ? { message: e } : {
+  return !a || !E(a) ? { message: e } : {
     code: s ? T(a, s) : "",
     message: T(a, r) || e
   };
@@ -395,12 +396,12 @@ function T(e, t) {
 function he(e) {
   return e ? typeof e == "string" ? e : JSON.stringify(e) : "";
 }
-const fe = /<title>([^<]+)<\/title>/i, de = /<message>([^<]+)<\/message>/i;
-function P(e) {
-  const t = e.match(fe);
+const de = /<title>([^<]+)<\/title>/i, fe = /<message>([^<]+)<\/message>/i;
+function x(e) {
+  const t = e.match(de);
   if (t)
     return t[1];
-  const s = e.match(de);
+  const s = e.match(fe);
   return s ? s[1] : "";
 }
 function ge(e, t, s, r) {
@@ -413,24 +414,24 @@ function ge(e, t, s, r) {
   if (t === 204 || !r)
     return n;
   if (a.resolve === "body")
-    return n.data = B(r) ? F(v(r), e.converter) : r, n;
+    return n.data = S(r) ? F(v(r), e.converter) : r, n;
   const o = F(v(r), e.converter);
-  if (!o || !k(o))
+  if (!o || !E(o))
     return n.ok = !1, n.code = "ResponseFormatError", n.message = "响应内容无法格式化为 Object", n;
-  const c = a.statusField, i = a.statusOKValue || "", f = a.dataField || q, u = a.messageField || j, l = a.ignoreMessage || "";
+  const c = a.statusField, i = a.statusOKValue || "", d = a.dataField || q, u = a.messageField || j, l = a.ignoreMessage || "";
   if (c && !(c in o))
     return n.ok = !1, n.code = "ResponseFieldMissing", n.message = "响应内容找不到状态字段 " + c, n;
-  const d = c ? o[c] + "" : "";
-  return n.ok = c ? d === i : !0, n.code = d || s, n.data = f === !0 ? o : f in o ? o[f] : null, n.message = T(o, u), l && n.message && (Array.isArray(l) && l.includes(n.message) || typeof l == "string" && n.message === l) && (n.message = ""), n;
+  const f = c ? o[c] + "" : "";
+  return n.ok = c ? f === i : !0, n.code = f || s, n.data = d === !0 ? o : d in o ? o[d] : null, n.message = T(o, u), l && n.message && (Array.isArray(l) && l.includes(n.message) || typeof l == "string" && n.message === l) && (n.message = ""), n;
 }
 function C(e) {
   return e >= 200 && e < 400;
 }
 function F(e, t) {
-  return t === "camelize" ? R(e) : t === "snakify" ? E(e) : e;
+  return t === "camelize" ? R(e) : t === "snakify" ? O(e) : e;
 }
 const me = J("APIError");
-function ye(e) {
+function pe(e) {
   const t = {};
   for (const a in e.headers)
     (a.startsWith("x-") || a.includes("trace") || a.includes("server") || /\b(?:id|uuid)\b/.test(a)) && (t[a] = e.headers[a]);
@@ -452,17 +453,17 @@ function ye(e) {
     }
   };
 }
-function pe(e) {
+function ye(e) {
   return e.reduce(
     (t, [s, r]) => (s && (t[s] = r || ""), t),
     {}
   );
 }
-function Te(e, t, s, r) {
+function ve(e, t, s, r) {
   var g;
-  const a = e.status, n = e.method, o = pe(
-    Object.entries(e.headers || {}).map(([y, m]) => [y.toLowerCase(), m])
-  ), { ok: c, code: i, data: f, message: u } = ie(
+  const a = e.status, n = e.method, o = ye(
+    Object.entries(e.headers || {}).map(([p, m]) => [p.toLowerCase(), m])
+  ), { ok: c, code: i, data: d, message: u } = ie(
     a,
     e.statusText,
     e.body,
@@ -470,7 +471,7 @@ function Te(e, t, s, r) {
     r == null ? void 0 : r.responseRule
   );
   if (!C(a)) {
-    const y = ye({
+    const p = pe({
       url: e.url,
       method: e.method,
       status: a,
@@ -489,11 +490,11 @@ function Te(e, t, s, r) {
       headers: o,
       rawError: e.rawError,
       responseBody: e.body,
-      ...y
+      ...p
     });
   }
   if (a < 0)
-    return S(
+    return P(
       { ok: !1, status: a, code: e.statusText, headers: {}, message: "", data: null },
       `${n} ${t} ${e.statusText}`,
       n,
@@ -501,12 +502,12 @@ function Te(e, t, s, r) {
       s,
       r
     );
-  const l = { ok: c, data: f, code: i, message: u, status: a, headers: o };
+  const l = { ok: c, data: d, code: i, message: u, status: a, headers: o };
   (g = s.get("responseHandler")) == null || g({ ...l }, n, t);
-  const d = c ? u : u || e.statusText;
-  return S(l, d, n, t, s, r);
+  const f = c ? u : u || e.statusText;
+  return P(l, f, n, t, s, r);
 }
-function S(e, t, s, r, a, n) {
+function P(e, t, s, r, a, n) {
   const o = a.get("message"), c = o === !1 || (n == null ? void 0 : n.message) === !1 ? !1 : (n == null ? void 0 : n.message) || o;
   if (c !== !1) {
     const i = typeof c == "function" ? c(e, s, r, t) : t;
@@ -521,7 +522,7 @@ function be(e) {
   console.error("RequestError", t);
 }
 async function we(e, t, s, r, a) {
-  const n = a || 0, o = Math.max(0, Math.min(10, (r == null ? void 0 : r.maxRetry) ?? s.get("maxRetry") ?? 0)), c = (r == null ? void 0 : r.retryResolve) ?? s.get("retryResolve"), i = s.get("logHandler") || G;
+  const n = a || 0, o = Math.max(0, Math.min(10, (r == null ? void 0 : r.maxRetry) ?? s.get("maxRetry") ?? 0)), c = (r == null ? void 0 : r.retryResolve) ?? s.get("retryResolve"), i = s.get("logHandler") || I;
   i({
     type: "prepear",
     url: t,
@@ -532,7 +533,7 @@ async function we(e, t, s, r, a) {
     headers: r == null ? void 0 : r.headers,
     options: r
   });
-  const f = Date.now(), u = await e(t, s, r), l = u.status, d = Date.now() - f, g = `[cost ${d}][${l}] ${l < 0 ? u.body : ""}`;
+  const d = Date.now(), u = await e(t, s, r), l = u.status, f = Date.now() - d, g = `[cost ${f}][${l}] ${l < 0 ? u.body : ""}`;
   i({
     type: "finished",
     url: t,
@@ -542,31 +543,30 @@ async function we(e, t, s, r, a) {
     message: n === 0 ? `finish ${g}` : `retry ${n}/${o} finish ${g}`,
     response: u,
     headers: u.headers,
-    cost: d
+    cost: f
   });
-  const y = C(l);
-  if (!o || c === "network" && l > 0 || c === "status" && y || Array.isArray(c) && !c.includes(l) || typeof c == "function" && c(u, n) !== !0 || n >= o)
+  const p = C(l);
+  if (!o || c === "network" && l > 0 || c === "status" && p || Array.isArray(c) && !c.includes(l) || typeof c == "function" && c(u, n) !== !0 || n >= o)
     return u;
   const m = (r == null ? void 0 : r.retryInterval) ?? s.get("retryInterval") ?? 1e3;
-  return await I(
+  return await G(
     Math.max(
       100,
       m === "2EB" ? Math.pow(2, n) * 1e3 : typeof m == "function" ? m(n + 1) || 0 : m
     )
   ), await we(e, t, s, r, n + 1);
 }
-var je = /* @__PURE__ */ ((e) => (e.Aborted = "Aborted", e.Unknown = "Unknown", e.Timeout = "Timeout", e.NotSupport = "NotSupport", e.URLFormatError = "URLFormatError", e))(je || {});
 export {
-  Ee as D,
-  O as K,
-  Re as M,
+  Re as H,
   Oe as N,
+  $e as O,
   ne as R,
   A as Y,
-  je as a,
+  H as a,
   ke as c,
-  pe as f,
-  ve as g,
-  Te as h,
+  k as e,
+  ye as f,
+  Ee as g,
+  ve as h,
   we as r
 };

package/dist/retry-CRrgnQtP.cjs

@@ -0,0 +1,2 @@
+"use strict";var I=Object.defineProperty;var J=(e,t,s)=>t in e?I(e,t,{enumerable:!0,configurable:!0,writable:!0,value:s}):e[t]=s;var y=(e,t,s)=>J(e,typeof t!="symbol"?t+"":t,s);const h=typeof globalThis<"u"?globalThis:typeof global<"u"?global:typeof self<"u"?self:typeof window<"u"?window:{},R={wx:"wx"in h&&D(h.wx),fetch:"fetch"in h&&w(h.fetch),window:"window"in h&&D(h.window),Blob:"Blob"in h&&w(h.Blob),FormData:"FormData"in h&&w(h.FormData),TextDecoder:"TextDecoder"in h&&w(h.TextDecoder),AbortController:"AbortController"in h&&w(h.AbortController)};function w(e){return typeof e=="function"}function D(e){return typeof e=="object"&&e!==null}function V(e){return new Promise(t=>setTimeout(t,Math.max(0,e)))}function W(){}function z(e){const t=e||"CustomError";return class extends Error{constructor(s){super(s),Object.defineProperty(this,"name",{value:t,enumerable:!1,configurable:!0}),"setPrototypeOf"in Object&&Object.setPrototypeOf(this,new.target.prototype),"captureStackTrace"in Error&&typeof Error.captureStackTrace=="function"&&Error.captureStackTrace(this,this.constructor)}}}const Y=/^(?:https?:)?\/\/.+$/i,Z=/^https?:\/\/.+$/i,Q=/^\{[\d\D]*\}$/,X=/^\[[\d\D]*\]$/;function k(e,t=!1){return t?Y.test(e):Z.test(e)}function ee(e){return e==null}function v(e,...t){if(!e||typeof e!="object")return!1;const s=Object.getPrototypeOf(e);return s!==Object.prototype&&s!==null?!1:t.every(r=>r in e)}function _(e){return Q.test(e)||X.test(e)}function $(e){return e?e[0].toLowerCase()+e.slice(1):""}const B=/_\w*/,H=/-\w*/;function M(e){const t=B.test(e)?e.replace(/(?:^_*|_*$)/g,"").replace(/_+([^_])/g,(s,r)=>r.toUpperCase()):H.test(e)?e.replace(/(?:^-*|-*$)/g,"").replace(/-+(\w)/g,(s,r)=>r.toUpperCase()):e;return $(t)}function L(e){return B.test(e)?$(e).replace(/(?:^_*|_*$)/g,"").replace(/_+([^_])/g,(t,s)=>"_"+s.toLowerCase()):H.test(e)?$(e.replace(/(?:^-*|-*$)/g,"")).replace(/-+(\w)/g,(t,s)=>"_"+s.toLowerCase()):$(e).replace(/[A-Z]/g,t=>`_${t.toLowerCase()}`)}function T(e,t){try{const s=JSON.parse(e);return t?t(s)?s:null:s}catch{return null}}""+Math.random().toString(32).slice(2);function O(e,t=!1){return typeof e=="string"?M(e):Array.isArray(e)?e.map(s=>!t||typeof s=="string"?O(s):typeof s=="object"&&s?O(s,!0):s):v(e)?Object.keys(e).reduce((s,r)=>{const o=M(String(r)),n=o.charAt(0).toLowerCase()+o.slice(1);return s[n]=t?e[r]:O(e[r]),s},{}):e}function E(e,t=!1){return typeof e=="string"?L(e):Array.isArray(e)?e.map(s=>!t||typeof s=="string"?E(s):typeof s=="object"&&s?E(s,t):s):v(e)?Object.keys(e).reduce((s,r)=>{const o=L(String(r));return s[o]=t?e[r]:E(e[r]),s},{}):e}async function te(e){return await new Promise(function(t){const s=document.getElementsByTagName("head")[0],r=document.createElement("script");r.setAttribute("type","text/javascript"),r.setAttribute("charset","utf-8"),r.onload=function(){s.removeChild(r),t(!0)},r.onerror=function(){s.removeChild(r),t(!1)},r.setAttribute("src",e),s.appendChild(r)})}function se(e,t="数据未能正确识别"){return typeof e=="function"?{guard:e,message:t}:{guard:e.guard,message:e.message||t}}function re(e,t=""){return!t||k(e,!0)?x(e):(x(t)+"/"+e).replace(/\/{2,}/g,"/").replace(/:\//,"://")}function x(e){return k(e,!0)?e.startsWith("http")?e:("location"in globalThis?location.protocol:"https:")+e:("location"in globalThis?location.origin:"http://127.0.0.1")+"/"+e.replace(/^\/+/,"")}function ne(e,t){const s={};return(e.match(/([^=&#?]+)=[^&#]*/g)||[]).forEach(function(r){const o=r.split("="),n=o[0],a=decodeURIComponent(o[1]||"");s[n]!==void 0?s[n]+=","+a:s[n]=a}),t!==!0?s[t]||"":s}function oe(e,t){if(t){if(t===!0)return e.replace(/\?[^#]*/,"")}else return e;const s=e.split("#"),r=s[0].split("?"),o=r[0],n=r.length>1?r[1]:"",a=s.length>1?"#"+s[1]:"",c=typeof t=="string"?[t]:Array.isArray(t)?t:[];return!c.length||!n?s[0]+a:(c.map(i=>i.replace(/([\\(){}[\]^$+\-*?|])/g,"\\$1")),(o+"?"+n.replace(new RegExp("(?:^|&)(?:"+c.join("|")+")=[^&$]+","g"),"").replace(/^&/,"")).replace(/\?$/,"")+a)}function ae(e,t,s=!1){const r=typeof t=="string"?t:Object.keys(t).map(a=>`${a}=${encodeURIComponent(t[a])}`).join("&");if(!r)return e;const o=e.split("#");s&&(o[0]=oe(o[0],(r.match(/([^=&#?]+)=[^&#]+/g)||[]).map(a=>a.replace(/=.+$/,""))));const n=o[0].indexOf("?")+1?"&":"?";return(o[0]+n+r+(o.length>1?"#"+o[1]:"")).replace(/\?&/,"?")}function ce(e){const t=e.match(/(?:\?|&)([^=]+)(?:&|$)/g);return t?t.join("").replace(/(?:\?|^&+|&+$)/g,"").replace(/&{2}/g,"&").split("&").sort():[]}class ie{constructor(t=500){y(this,"ttl");y(this,"cache");this.cache={},this.ttl=Math.max(t,0)}getKey(t,s){const r=t.replace(/#.+/,""),o=r.replace(/\?.+/g,""),n=Object.assign(ne(r,!0),s),a=ce(r),c=Object.keys(n).sort().map(i=>`${i}#${n[i]}`);return`${o}_${c.join(",")}_${a.join(",")}`}updateTTL(t){this.ttl=Math.max(t,0)}get(t){if(this.ttl===0)return null;const s=this.cache[t];return s?s.ttl<Date.now()?(delete this.cache[t],null):s.res:null}set(t,s){this.ttl!==0&&(this.cache[t]={ttl:Date.now()+this.ttl,res:s})}}class q{constructor(t){y(this,"config",{baseURL:"",maxRetry:0,retryInterval:1e3,retryResolve:"network",timeout:1e4,cacheTTL:500,credentials:"same-origin",defaultTypeGuardMessage:"响应数据未能正确识别",responseRule:{ok:{resolve:"body"},failed:{resolve:"json",messageField:"message"}}});t&&this.set(t)}set(t){if(t.baseURL&&!/^\/.+/.test(t.baseURL)&&!k(t.baseURL))throw console.warn("baseURL 需要以 / 开头，或者是完整的 url 地址"),new Error("BaseURLError");Object.assign(this.config,t)}get(t){return this.config[t]}getFullUrl(t){return re(t,this.config.baseURL)}showMessage(t,s,r,o){this.config.messageHandler&&s&&this.config.messageHandler(t,s,r,o)}}var C=(e=>(e.UnexpectResponse="UnexpectResponse",e.Aborted="Aborted",e.Unknown="Unknown",e.Timeout="Timeout",e.NotSupport="NotSupport",e.URLFormatError="URLFormatError",e))(C||{});function ue(e,t,s,r){if(t.ok&&!ee(t.data)&&r){const o=se(r,s.get("defaultTypeGuardMessage"));return o.guard(t.data)||(t.code=C.UnexpectResponse,s.showMessage(!0,`${e} ${o.message}`,t.code,t.status),console.error(t.code,e,t.data),t.data=null,t.message=o.message),t}return t}class le{constructor(t,s){y(this,"agent");y(this,"config");y(this,"cache");this.config=new q(s),this.agent=t,this.cache=new ie(this.config.get("cacheTTL")),this.setConfig=this.setConfig.bind(this),this.getConfig=this.getConfig.bind(this),this.request=this.request.bind(this),this.get=this.get.bind(this),this.post=this.post.bind(this),this.del=this.del.bind(this),this.patch=this.patch.bind(this),this.put=this.put.bind(this),this.head=this.head.bind(this)}async request(t,s){try{return await this.agent(t,this.config,s)}catch(r){return console.error("RequestError",r),{ok:!1,status:-9,code:"Unkonwn",message:String(r),headers:{},data:null}}}async guard(t,s,r){return ue(t,s,this.config,r)}setConfig(t){this.config.set(t),this.cache.updateTTL(this.config.get("cacheTTL"))}getConfig(t){return this.config.get(t)}async head(t,s){const r=Object.assign({},s||null);return r.method="HEAD",this.guard(t,await this.request(t,r),null)}async get(t,s,r){const o=Object.assign({},r||null);o.method="GET";const n=this.cache.getKey(t,o.params),a=this.cache.get(n);if(a)return this.guard(t,await a,s||null);const c=this.request(t,o);return this.cache.set(n,c),this.guard(t,await c,s||null)}async post(t,s,r,o){const n=Object.assign({},o||null);return n.method="POST",n.body=s||{},this.guard(t,await this.request(t,n),r||null)}async del(t,s,r){const o=Object.assign({},r||null);return o.method="DELETE",this.guard(t,await this.request(t,o),s||null)}async put(t,s,r,o){const n=Object.assign({},o||null);return n.method="PUT",n.body=s||{},this.guard(t,await this.request(t,n),r||null)}async patch(t,s,r,o){const n=Object.assign({},o||null);return n.method="PATCH",n.body=s||{},this.guard(t,await this.request(t,n),r||null)}}async function he(e,t,s){var m;const r=Object.assign({method:"GET"},s),o=R.FormData?r.body instanceof FormData:!1,n=o&&r.method!=="POST"&&r.method!=="PUT"?"POST":r.method,a=n==="GET"||n==="HEAD"||n==="DELETE";a&&r.body!==void 0&&(console.warn("request body is invalid with method get, head, delete"),delete r.body);const c=Object.assign(o||a?{}:{"Content-Type":R.Blob&&r.body instanceof Blob?r.body.type||"application/octet-stream":"application/json;charset=utf-8"},r.headers),i=r.params||{},d={};Object.keys(i).forEach(b=>{i[b]!==void 0&&(d[b]=de(i[b]))});const u=t.getFullUrl(e),l=fe(r.body),f=r.timeout||t.get("timeout"),g=await async function(){const b=t.get("requestTransformer");if(b)return await b({headers:c,params:d,method:n,url:u,body:l})}(),p=typeof g=="string"&&g?g:u;return(m=t.get("logHandler"))==null||m({type:"ready",url:p,method:n,headers:c,timeout:f,body:l}),{url:p,method:n,body:l,params:d,headers:c,timeout:f,abort:r.abort,credentials:r.credentials||t.get("credentials")}}function de(e){return typeof e=="string"?e:Array.isArray(e)?e.join(","):e+""}function fe(e){if(e)return typeof e=="string"||e instanceof URLSearchParams||e instanceof ArrayBuffer||R.Blob&&e instanceof Blob||R.FormData&&e instanceof FormData?e:JSON.stringify(e)}const N="data",j="message";function ge(e,t,s,r,o){const n=o||r;return U(e)?je(n.ok||r.ok,e,t,s):pe(n.failed||r.failed,t,s)}const me=function(e){const t=[],s=e.failed||{resolve:"json"};switch(t.push("- 当http状态码 <200 或者 >=400 时"),s.resolve){case"body":t.push("  将响应内容格式化为字符串并作为错误消息");break;case"json":t.push("  将响应解析为json，并读取 "+(s.messageField||j)+" 作为错误消息");break}const r=e.ok||{resolve:"body"};switch(t.push("- 当http状态码 >=200 并且 <400 时"),r.resolve){case"body":t.push("  将响应尝试解析为 json，并作为数据内容返回");break;case"json":t.push("  将响应解析为 json，读取 "+(r.dataField||N)+" 作为响应数据，读取 "+(r.messageField||j)+" 作为提示消息"),r.statusField&&t.push("  当 "+r.statusField+" 为 "+(r.statusOKValue||"空值")+" 时是成功提示，否则是错误消息"),r.ignoreMessage&&t.push("  并忽略以下消息："+r.ignoreMessage);break}return t.join(`
+`)};function pe(e,t,s){const r=e||{resolve:"json",messageField:j},o={ok:!1,code:t,message:s,data:null};switch(r.resolve){case"body":o.message=P(s)||s;break;case"json":const{code:n,message:a}=ye(s,r.converter,r.statusField,r.messageField);o.code=n||t,o.message=P(s)||a;break}return o}function ye(e,t,s,r=j){if(!_(e))return{message:""};const o=A(T(e),t);return!o||!v(o)?{message:e}:{code:s?F(o,s):"",message:F(o,r)||e}}function F(e,t){const s=Array.isArray(t)?t:[t];for(const r of s)if(r in e)return be(e[r]);return""}function be(e){return e?typeof e=="string"?e:JSON.stringify(e):""}const we=/<title>([^<]+)<\/title>/i,Re=/<message>([^<]+)<\/message>/i;function P(e){const t=e.match(we);if(t)return t[1];const s=e.match(Re);return s?s[1]:""}function je(e,t,s,r){const o=e||{resolve:"body"},n={ok:!0,code:s,message:"",data:null};if(t===204||!r)return n;if(o.resolve==="body")return n.data=_(r)?A(T(r),e.converter):r,n;const a=A(T(r),e.converter);if(!a||!v(a))return n.ok=!1,n.code="ResponseFormatError",n.message="响应内容无法格式化为 Object",n;const c=o.statusField,i=o.statusOKValue||"",d=o.dataField||N,u=o.messageField||j,l=o.ignoreMessage||"";if(c&&!(c in a))return n.ok=!1,n.code="ResponseFieldMissing",n.message="响应内容找不到状态字段 "+c,n;const f=c?a[c]+"":"";return n.ok=c?f===i:!0,n.code=f||s,n.data=d===!0?a:d in a?a[d]:null,n.message=F(a,u),l&&n.message&&(Array.isArray(l)&&l.includes(n.message)||typeof l=="string"&&n.message===l)&&(n.message=""),n}function U(e){return e>=200&&e<400}function A(e,t){return t==="camelize"?O(e):t==="snakify"?E(e):e}const $e=z("APIError");function Oe(e){const t={};for(const o in e.headers)(o.startsWith("x-")||o.includes("trace")||o.includes("server")||/\b(?:id|uuid)\b/.test(o))&&(t[o]=e.headers[o]);const s=e.url.replace(/^(?:https?:)?\/*/i,"").replace(/\?.+/,""),r=e.status<0?"unknown":e.status;return{sentryError:new $e(`${s} | ${r}${e.code?` | ${e.code}`:""}`),sentryTags:{...t,status:r,method:e.method,code:e.code||"unknown",message:e.message||"empty"},sentryExtra:{url:e.url,responseBody:e.body||"empty",responseHeaders:e.headers,rawError:e.error}}}function K(e){return e.reduce((t,[s,r])=>(s&&(t[s]=r||""),t),{})}function Ee(e,t,s,r){var g;const o=e.status,n=e.method,a=K(Object.entries(e.headers||{}).map(([p,m])=>[p.toLowerCase(),m])),{ok:c,code:i,data:d,message:u}=ge(o,e.statusText,e.body,s.get("responseRule"),r==null?void 0:r.responseRule);if(!U(o)){const p=Oe({url:e.url,method:e.method,status:o,code:i,message:u,body:e.body,headers:a,error:e.rawError});(s.get("errorHandler")||ke)({url:t,method:n,status:o,code:i,message:u,headers:a,rawError:e.rawError,responseBody:e.body,...p})}if(o<0)return S({ok:!1,status:o,code:e.statusText,headers:{},message:"",data:null},`${n} ${t} ${e.statusText}`,n,t,s,r);const l={ok:c,data:d,code:i,message:u,status:o,headers:a};(g=s.get("responseHandler"))==null||g({...l},n,t);const f=c?u:u||e.statusText;return S(l,f,n,t,s,r)}function S(e,t,s,r,o,n){const a=o.get("message"),c=a===!1||(n==null?void 0:n.message)===!1?!1:(n==null?void 0:n.message)||a;if(c!==!1){const i=typeof c=="function"?c(e,s,r,t):t;i instanceof Error?o.showMessage(!0,i.message,e.code,e.status):i&&typeof i=="object"&&"message"in i?o.showMessage(!1,i.message,e.code,e.status):o.showMessage(!e.ok,i,e.code,e.status)}return e}function ke(e){const t={};for(const s in e)s.startsWith("sentry")||(t[s]=e[s]);console.error("RequestError",t)}async function G(e,t,s,r,o){const n=o||0,a=Math.max(0,Math.min(10,(r==null?void 0:r.maxRetry)??s.get("maxRetry")??0)),c=(r==null?void 0:r.retryResolve)??s.get("retryResolve"),i=s.get("logHandler")||W;i({type:"prepear",url:t,method:(r==null?void 0:r.method)||"GET",retry:n,maxRetry:a,message:n===0?"start":`retry ${n}/${a} start`,headers:r==null?void 0:r.headers,options:r});const d=Date.now(),u=await e(t,s,r),l=u.status,f=Date.now()-d,g=`[cost ${f}][${l}] ${l<0?u.body:""}`;i({type:"finished",url:t,method:u.method,retry:n,maxRetry:a,message:n===0?`finish ${g}`:`retry ${n}/${a} finish ${g}`,response:u,headers:u.headers,cost:f});const p=U(l);if(!a||c==="network"&&l>0||c==="status"&&p||Array.isArray(c)&&!c.includes(l)||typeof c=="function"&&c(u,n)!==!0||n>=a)return u;const m=(r==null?void 0:r.retryInterval)??s.get("retryInterval")??1e3;return await V(Math.max(100,m==="2EB"?Math.pow(2,n)*1e3:typeof m=="function"?m(n+1)||0:m)),await G(e,t,s,r,n+1)}exports.Ht=ae;exports.NetRequestHandler=le;exports.Oe=te;exports.RequestGlobalConfig=q;exports.RequestInteralError=C;exports.Y=k;exports.convertOptions=he;exports.ee=R;exports.fromEntries=K;exports.getResponseRulesDescription=me;exports.handleResponse=Ee;exports.retryRequest=G;

package/dist/wx.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./type-CrucJEBR.cjs"),l=async function(t,n,r){return e.handleResponse(await e.retryRequest(p,t,n,r),t,n,r)},p=async function(t,n,r){const s=await e.convertOptions(t,n,r),u=s.method==="PATCH"?"POST":s.method,a=e.Dt(s.url,s.params);return e.Kt.wx?new Promise(d=>{wx.request({url:a,data:s.body,header:s.headers,method:u,dataType:"string",responseType:"text",fail(){d({url:a,method:u,status:-1,statusText:e.RequestInteralError.Unknown,body:""})},success(c){d({url:a,method:u,status:c.statusCode,statusText:c.statusCode+"",headers:{...c.header},body:s.method==="HEAD"?"":f(c.data)})}})}):{url:a,method:u,status:-1,statusText:e.RequestInteralError.NotSupport,body:""}};function f(t){return typeof t=="string"?t:t instanceof ArrayBuffer&&e.Kt.TextDecoder?new TextDecoder().decode(t):JSON.stringify(t)}function i(t){return new e.NetRequestHandler(l,t)}const o=i(),y=o.setConfig,g=o.head,h=o.get,q=o.post,x=o.del,R=o.put;exports.NetRequest=i;exports.del=x;exports.get=h;exports.head=g;exports.post=q;exports.put=R;exports.setGlobalConfig=y;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const t=require("./retry-CRrgnQtP.cjs"),l=async function(e,r,n){return t.handleResponse(await t.retryRequest(f,e,r,n),e,r,n)},f=async function(e,r,n){const s=await t.convertOptions(e,r,n),u=s.method==="PATCH"?"POST":s.method,a=t.Ht(s.url,s.params);return t.ee.wx?new Promise(d=>{wx.request({url:a,data:s.body,header:s.headers,method:u,dataType:"string",responseType:"text",fail(){d({url:a,method:u,status:-1,statusText:t.RequestInteralError.Unknown,body:""})},success(c){d({url:a,method:u,status:c.statusCode,statusText:c.statusCode+"",headers:{...c.header},body:s.method==="HEAD"?"":p(c.data)})}})}):{url:a,method:u,status:-1,statusText:t.RequestInteralError.NotSupport,body:""}};function p(e){return typeof e=="string"?e:e instanceof ArrayBuffer&&t.ee.TextDecoder?new TextDecoder().decode(e):JSON.stringify(e)}function i(e){return new t.NetRequestHandler(l,e)}const o=i(),y=o.setConfig,g=o.head,h=o.get,q=o.post,x=o.del,R=o.put;exports.NetRequest=i;exports.del=x;exports.get=h;exports.head=g;exports.post=q;exports.put=R;exports.setGlobalConfig=y;

package/dist/wx.js

@@ -1,4 +1,4 @@
-import { h as f, r as p, c as l, D as h, K as i, a as d, N as y } from "./type-CRH6iqXf.js";
+import { h as f, r as p, c as l, H as h, e as i, a as d, N as y } from "./retry-8Z8eLh90.js";
 const x = async function(t, o, n) {
   return f(await p(m, t, o, n), t, o, n);
 }, m = async function(t, o, n) {
@@ -45,10 +45,10 @@ function w(t) {
 function T(t) {
   return new y(x, t);
 }
-const s = T(), q = s.setConfig, R = s.head, b = s.get, C = s.post, D = s.del, N = s.put;
+const s = T(), q = s.setConfig, R = s.head, b = s.get, C = s.post, H = s.del, N = s.put;
 export {
   T as NetRequest,
-  D as del,
+  H as del,
   b as get,
   R as head,
   C as post,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seayoo-web/request",
-  "version": "2.0.10",
+  "version": "2.1.0",
   "description": "requst tools for seayoo web",
   "type": "module",
   "source": "./src/index.ts",
@@ -59,7 +59,7 @@
     "happy-dom": "^12.10.3",
     "msw": "^2.7.0",
     "vitest": "^3.0.5",
-    "@seayoo-web/utils": "^2.2.0"
+    "@seayoo-web/utils": "^3.0.4"
   },
   "scripts": {
     "build": "vite build && tsc --emitDeclarationOnly",

package/types/inc/config.d.ts

@@ -4,7 +4,7 @@ export declare class RequestGlobalConfig {
     private config;
     constructor(config?: IRequestGlobalConfig);
     set(config: Partial<IRequestGlobalConfig>): void;
-    get<T extends keyof IRequestGlobalConfig>(key: T): SomeRequired<IRequestGlobalConfig, "timeout" | "credentials" | "baseURL" | "maxRetry" | "cacheTTL" | "responseRule" | "retryInterval" | "retryResolve">[T];
+    get<T extends keyof IRequestGlobalConfig>(key: T): SomeRequired<IRequestGlobalConfig, "timeout" | "credentials" | "baseURL" | "maxRetry" | "cacheTTL" | "responseRule" | "retryInterval" | "retryResolve" | "defaultTypeGuardMessage">[T];
     /** 基于 baseURL 返回完整的 url 地址 */
     getFullUrl(url: string): string;
     /** 提示消息 */

package/types/inc/guard.d.ts

@@ -1,3 +1,3 @@
+import { type IResponseResult, type TypeGuardParam } from "./type";
 import type { RequestGlobalConfig } from "./config";
-import type { IResponseResult, TypeGuardParam } from "./type";
 export declare function checkTypedDataResult<T>(url: string, result: IResponseResult, config: RequestGlobalConfig, typeGard: TypeGuardParam<T> | null): IResponseResult<T | null | unknown>;

package/types/inc/main.d.ts

@@ -21,7 +21,7 @@ export declare class NetRequestHandler {
     /**
      * 读取默认的请求配置
      */
-    getConfig<T extends keyof IRequestGlobalConfig>(key: T): import("@seayoo-web/utils").SomeRequired<IRequestGlobalConfig, "timeout" | "credentials" | "baseURL" | "maxRetry" | "cacheTTL" | "responseRule" | "retryInterval" | "retryResolve">[T];
+    getConfig<T extends keyof IRequestGlobalConfig>(key: T): import("@seayoo-web/utils").SomeRequired<IRequestGlobalConfig, "timeout" | "credentials" | "baseURL" | "maxRetry" | "cacheTTL" | "responseRule" | "retryInterval" | "retryResolve" | "defaultTypeGuardMessage">[T];
     /**
      * 发送一个 HEAD 请求，并且不处理响应 body
      */

package/types/inc/type.d.ts

@@ -2,6 +2,8 @@ import type { RequestGlobalConfig } from "./config";
 import type { MaybePromise, TypeGuard, TypeGuardFn } from "@seayoo-web/utils";
 export type IBaseRequestBody = Blob | ArrayBuffer | FormData | URLSearchParams | string;
 export declare const enum RequestInteralError {
+    /** 响应数据校验失败 */
+    UnexpectResponse = "UnexpectResponse",
     /** 请求被取消 */
     Aborted = "Aborted",
     /** 未知错误，通常是网络错误 */
@@ -83,6 +85,8 @@ export type IRequestGlobalConfig = {
     baseURL?: string;
     /** 用于 get 请求的缓存时长，单位 ms，建议不小于 100 */
     cacheTTL?: number;
+    /** 接口响应错误时的默认提示消息 */
+    defaultTypeGuardMessage?: string;
     /**
      * 全局 request 转化函数，headers 和 params 为引用型数据可直接修改，如果返回字符串，则替换原来的 url 进行请求
      */

package/dist/request.fetch-K4MJcDmZ.cjs

@@ -1 +0,0 @@
-"use strict";const s=require("./type-CrucJEBR.cjs"),f=async function(o,n,i){return s.handleResponse(await s.retryRequest(w,o,n,i),o,n,i)},w=async function(o,n,i){const t=await s.convertOptions(o,n,i),a=new URL(t.url),u=t.params;u instanceof Object&&Object.keys(u).forEach(e=>a.searchParams.set(e,u[e]));const r=s.Kt.AbortController?new AbortController:null;function c(){r&&!r.signal.aborted&&r.abort()}t.abort&&t.abort.addEventListener("abort",c);const h=t.timeout>0?setTimeout(c,t.timeout):null,b=t.method==="HEAD";return await fetch(a,{method:t.method,headers:Object.keys(t.headers).length>0?new Headers(t.headers):void 0,body:t.body,credentials:t.credentials,signal:r==null?void 0:r.signal,redirect:"follow"}).then(async e=>{const d=b?"":await e.text().catch(m=>m),l=s.fromEntries([...e.headers.entries()]);return d instanceof Error?{url:a.toString(),method:t.method,status:e.status,statusText:e.statusText||s.RequestInteralError.Unknown,body:"",headers:l,rawError:d}:{url:a.toString(),method:t.method,status:e.status,statusText:e.statusText,headers:l,body:d}}).catch(e=>({url:a.toString(),method:t.method,status:-1,statusText:r!=null&&r.signal.aborted?s.RequestInteralError.Aborted:s.RequestInteralError.Unknown,body:"",rawError:e})).finally(()=>{h!==null&&clearTimeout(h),t.abort&&t.abort.removeEventListener("abort",c)})};exports.fetchRequest=f;

package/dist/type-CrucJEBR.cjs

@@ -1,2 +0,0 @@
-"use strict";var J=Object.defineProperty;var V=(e,t,s)=>t in e?J(e,t,{enumerable:!0,configurable:!0,writable:!0,value:s}):e[t]=s;var p=(e,t,s)=>V(e,typeof t!="symbol"?t+"":t,s);const h=typeof globalThis<"u"?globalThis:typeof global<"u"?global:typeof self<"u"?self:typeof window<"u"?window:{},R={wx:"wx"in h&&D(h.wx),fetch:"fetch"in h&&w(h.fetch),window:"window"in h&&D(h.window),Blob:"Blob"in h&&w(h.Blob),FormData:"FormData"in h&&w(h.FormData),TextDecoder:"TextDecoder"in h&&w(h.TextDecoder),AbortController:"AbortController"in h&&w(h.AbortController)};function w(e){return typeof e=="function"}function D(e){return typeof e=="object"&&e!==null}function W(e){return new Promise(t=>setTimeout(t,Math.max(0,e)))}function Y(){}function z(e){const t=e||"CustomError";return class extends Error{constructor(s){super(s),Object.defineProperty(this,"name",{value:t,enumerable:!1,configurable:!0}),"setPrototypeOf"in Object&&Object.setPrototypeOf(this,new.target.prototype),"captureStackTrace"in Error&&typeof Error.captureStackTrace=="function"&&Error.captureStackTrace(this,this.constructor)}}}const Z=/^(?:https?:)?\/\/.+$/i,Q=/^https?:\/\/.+$/i,X=/^\{[\d\D]*\}$/,ee=/^\[[\d\D]*\]$/;function k(e,t=!1){return t?Z.test(e):Q.test(e)}function te(e){return e==null}function v(e,...t){if(!e||typeof e!="object")return!1;const s=Object.getPrototypeOf(e);return s!==Object.prototype&&s!==null?!1:t.every(r=>r in e)}function B(e){return X.test(e)||ee.test(e)}function $(e){return e?e[0].toLowerCase()+e.slice(1):""}const _=/_\w*/,q=/-\w*/;function U(e){const t=_.test(e)?e.replace(/(?:^_*|_*$)/g,"").replace(/_+([^_])/g,(s,r)=>r.toUpperCase()):q.test(e)?e.replace(/(?:^-*|-*$)/g,"").replace(/-+(\w)/g,(s,r)=>r.toUpperCase()):e;return $(t)}function M(e){return _.test(e)?$(e).replace(/(?:^_*|_*$)/g,"").replace(/_+([^_])/g,(t,s)=>"_"+s.toLowerCase()):q.test(e)?$(e.replace(/(?:^-*|-*$)/g,"")).replace(/-+(\w)/g,(t,s)=>"_"+s.toLowerCase()):$(e).replace(/[A-Z]/g,t=>`_${t.toLowerCase()}`)}function T(e,t){try{const s=JSON.parse(e);return t?t(s)?s:null:s}catch{return null}}""+Math.random().toString(32).slice(2);function E(e,t=!1){return typeof e=="string"?U(e):Array.isArray(e)?e.map(s=>!t||typeof s=="string"?E(s):typeof s=="object"&&s?E(s,!0):s):v(e)?Object.keys(e).reduce((s,r)=>{const o=U(String(r)),n=o.charAt(0).toLowerCase()+o.slice(1);return s[n]=t?e[r]:E(e[r]),s},{}):e}function O(e,t=!1){return typeof e=="string"?M(e):Array.isArray(e)?e.map(s=>!t||typeof s=="string"?O(s):typeof s=="object"&&s?O(s,t):s):v(e)?Object.keys(e).reduce((s,r)=>{const o=M(String(r));return s[o]=t?e[r]:O(e[r]),s},{}):e}async function se(e){return await new Promise(function(t){const s=document.getElementsByTagName("head")[0],r=document.createElement("script");r.setAttribute("type","text/javascript"),r.setAttribute("charset","utf-8"),r.onload=function(){s.removeChild(r),t(!0)},r.onerror=function(){s.removeChild(r),t(!1)},r.setAttribute("src",e),s.appendChild(r)})}function re(e,t="数据未能正确识别"){return typeof e=="function"?{guard:e,message:t}:{guard:e.guard,message:e.message||t}}function ne(e,t=""){return!t||k(e,!0)?L(e):(L(t)+"/"+e).replace(/\/{2,}/g,"/").replace(/:\//,"://")}function L(e){return k(e,!0)?e.startsWith("http")?e:("location"in globalThis?location.protocol:"https:")+e:("location"in globalThis?location.origin:"http://127.0.0.1")+"/"+e.replace(/^\/+/,"")}function oe(e,t){const s={};return(e.match(/([^=&#?]+)=[^&#]*/g)||[]).forEach(function(r){const o=r.split("="),n=o[0],a=decodeURIComponent(o[1]||"");s[n]!==void 0?s[n]+=","+a:s[n]=a}),t!==!0?s[t]||"":s}function ae(e,t){if(t){if(t===!0)return e.replace(/\?[^#]*/,"")}else return e;const s=e.split("#"),r=s[0].split("?"),o=r[0],n=r.length>1?r[1]:"",a=s.length>1?"#"+s[1]:"",c=typeof t=="string"?[t]:Array.isArray(t)?t:[];return!c.length||!n?s[0]+a:(c.map(i=>i.replace(/([\\(){}[\]^$+\-*?|])/g,"\\$1")),(o+"?"+n.replace(new RegExp("(?:^|&)(?:"+c.join("|")+")=[^&$]+","g"),"").replace(/^&/,"")).replace(/\?$/,"")+a)}function ce(e,t,s=!1){const r=typeof t=="string"?t:Object.keys(t).map(a=>`${a}=${encodeURIComponent(t[a])}`).join("&");if(!r)return e;const o=e.split("#");s&&(o[0]=ae(o[0],(r.match(/([^=&#?]+)=[^&#]+/g)||[]).map(a=>a.replace(/=.+$/,""))));const n=o[0].indexOf("?")+1?"&":"?";return(o[0]+n+r+(o.length>1?"#"+o[1]:"")).replace(/\?&/,"?")}function ie(e){const t=e.match(/(?:\?|&)([^=]+)(?:&|$)/g);return t?t.join("").replace(/(?:\?|^&+|&+$)/g,"").replace(/&{2}/g,"&").split("&").sort():[]}class ue{constructor(t=500){p(this,"ttl");p(this,"cache");this.cache={},this.ttl=Math.max(t,0)}getKey(t,s){const r=t.replace(/#.+/,""),o=r.replace(/\?.+/g,""),n=Object.assign(oe(r,!0),s),a=ie(r),c=Object.keys(n).sort().map(i=>`${i}#${n[i]}`);return`${o}_${c.join(",")}_${a.join(",")}`}updateTTL(t){this.ttl=Math.max(t,0)}get(t){if(this.ttl===0)return null;const s=this.cache[t];return s?s.ttl<Date.now()?(delete this.cache[t],null):s.res:null}set(t,s){this.ttl!==0&&(this.cache[t]={ttl:Date.now()+this.ttl,res:s})}}class H{constructor(t){p(this,"config",{baseURL:"",maxRetry:0,retryInterval:1e3,retryResolve:"network",timeout:1e4,cacheTTL:500,credentials:"same-origin",responseRule:{ok:{resolve:"body"},failed:{resolve:"json",messageField:"message"}}});t&&this.set(t)}set(t){if(t.baseURL&&!/^\/.+/.test(t.baseURL)&&!k(t.baseURL))throw console.warn("baseURL 需要以 / 开头，或者是完整的 url 地址"),new Error("BaseURLError");Object.assign(this.config,t)}get(t){return this.config[t]}getFullUrl(t){return ne(t,this.config.baseURL)}showMessage(t,s,r,o){this.config.messageHandler&&s&&this.config.messageHandler(t,s,r,o)}}const P="UnexpectResponse";function le(e,t,s,r){if(t.ok&&!te(t.data)&&r){const o=re(r,"响应数据未能正确识别");return o.guard(t.data)||(s.showMessage(!0,`${e} ${o.message}`,t.code,t.status),console.error(P,e,t.data),t.data=null,t.code=P,t.message=o.message),t}return t}class he{constructor(t,s){p(this,"agent");p(this,"config");p(this,"cache");this.config=new H(s),this.agent=t,this.cache=new ue(this.config.get("cacheTTL")),this.setConfig=this.setConfig.bind(this),this.getConfig=this.getConfig.bind(this),this.request=this.request.bind(this),this.get=this.get.bind(this),this.post=this.post.bind(this),this.del=this.del.bind(this),this.patch=this.patch.bind(this),this.put=this.put.bind(this),this.head=this.head.bind(this)}async request(t,s){try{return await this.agent(t,this.config,s)}catch(r){return console.error("RequestError",r),{ok:!1,status:-9,code:"Unkonwn",message:String(r),headers:{},data:null}}}async guard(t,s,r){return le(t,s,this.config,r)}setConfig(t){this.config.set(t),this.cache.updateTTL(this.config.get("cacheTTL"))}getConfig(t){return this.config.get(t)}async head(t,s){const r=Object.assign({},s||null);return r.method="HEAD",this.guard(t,await this.request(t,r),null)}async get(t,s,r){const o=Object.assign({},r||null);o.method="GET";const n=this.cache.getKey(t,o.params),a=this.cache.get(n);if(a)return this.guard(t,await a,s||null);const c=this.request(t,o);return this.cache.set(n,c),this.guard(t,await c,s||null)}async post(t,s,r,o){const n=Object.assign({},o||null);return n.method="POST",n.body=s||{},this.guard(t,await this.request(t,n),r||null)}async del(t,s,r){const o=Object.assign({},r||null);return o.method="DELETE",this.guard(t,await this.request(t,o),s||null)}async put(t,s,r,o){const n=Object.assign({},o||null);return n.method="PUT",n.body=s||{},this.guard(t,await this.request(t,n),r||null)}async patch(t,s,r,o){const n=Object.assign({},o||null);return n.method="PATCH",n.body=s||{},this.guard(t,await this.request(t,n),r||null)}}async function fe(e,t,s){var m;const r=Object.assign({method:"GET"},s),o=R.FormData?r.body instanceof FormData:!1,n=o&&r.method!=="POST"&&r.method!=="PUT"?"POST":r.method,a=n==="GET"||n==="HEAD"||n==="DELETE";a&&r.body!==void 0&&(console.warn("request body is invalid with method get, head, delete"),delete r.body);const c=Object.assign(o||a?{}:{"Content-Type":R.Blob&&r.body instanceof Blob?r.body.type||"application/octet-stream":"application/json;charset=utf-8"},r.headers),i=r.params||{},f={};Object.keys(i).forEach(b=>{i[b]!==void 0&&(f[b]=de(i[b]))});const u=t.getFullUrl(e),l=ge(r.body),d=r.timeout||t.get("timeout"),g=await async function(){const b=t.get("requestTransformer");if(b)return await b({headers:c,params:f,method:n,url:u,body:l})}(),y=typeof g=="string"&&g?g:u;return(m=t.get("logHandler"))==null||m({type:"ready",url:y,method:n,headers:c,timeout:d,body:l}),{url:y,method:n,body:l,params:f,headers:c,timeout:d,abort:r.abort,credentials:r.credentials||t.get("credentials")}}function de(e){return typeof e=="string"?e:Array.isArray(e)?e.join(","):e+""}function ge(e){if(e)return typeof e=="string"||e instanceof URLSearchParams||e instanceof ArrayBuffer||R.Blob&&e instanceof Blob||R.FormData&&e instanceof FormData?e:JSON.stringify(e)}const K="data",j="message";function me(e,t,s,r,o){const n=o||r;return C(e)?$e(n.ok||r.ok,e,t,s):pe(n.failed||r.failed,t,s)}const ye=function(e){const t=[],s=e.failed||{resolve:"json"};switch(t.push("- 当http状态码 <200 或者 >=400 时"),s.resolve){case"body":t.push("  将响应内容格式化为字符串并作为错误消息");break;case"json":t.push("  将响应解析为json，并读取 "+(s.messageField||j)+" 作为错误消息");break}const r=e.ok||{resolve:"body"};switch(t.push("- 当http状态码 >=200 并且 <400 时"),r.resolve){case"body":t.push("  将响应尝试解析为 json，并作为数据内容返回");break;case"json":t.push("  将响应解析为 json，读取 "+(r.dataField||K)+" 作为响应数据，读取 "+(r.messageField||j)+" 作为提示消息"),r.statusField&&t.push("  当 "+r.statusField+" 为 "+(r.statusOKValue||"空值")+" 时是成功提示，否则是错误消息"),r.ignoreMessage&&t.push("  并忽略以下消息："+r.ignoreMessage);break}return t.join(`
-`)};function pe(e,t,s){const r=e||{resolve:"json",messageField:j},o={ok:!1,code:t,message:s,data:null};switch(r.resolve){case"body":o.message=x(s)||s;break;case"json":const{code:n,message:a}=be(s,r.converter,r.statusField,r.messageField);o.code=n||t,o.message=x(s)||a;break}return o}function be(e,t,s,r=j){if(!B(e))return{message:""};const o=A(T(e),t);return!o||!v(o)?{message:e}:{code:s?F(o,s):"",message:F(o,r)||e}}function F(e,t){const s=Array.isArray(t)?t:[t];for(const r of s)if(r in e)return we(e[r]);return""}function we(e){return e?typeof e=="string"?e:JSON.stringify(e):""}const Re=/<title>([^<]+)<\/title>/i,je=/<message>([^<]+)<\/message>/i;function x(e){const t=e.match(Re);if(t)return t[1];const s=e.match(je);return s?s[1]:""}function $e(e,t,s,r){const o=e||{resolve:"body"},n={ok:!0,code:s,message:"",data:null};if(t===204||!r)return n;if(o.resolve==="body")return n.data=B(r)?A(T(r),e.converter):r,n;const a=A(T(r),e.converter);if(!a||!v(a))return n.ok=!1,n.code="ResponseFormatError",n.message="响应内容无法格式化为 Object",n;const c=o.statusField,i=o.statusOKValue||"",f=o.dataField||K,u=o.messageField||j,l=o.ignoreMessage||"";if(c&&!(c in a))return n.ok=!1,n.code="ResponseFieldMissing",n.message="响应内容找不到状态字段 "+c,n;const d=c?a[c]+"":"";return n.ok=c?d===i:!0,n.code=d||s,n.data=f===!0?a:f in a?a[f]:null,n.message=F(a,u),l&&n.message&&(Array.isArray(l)&&l.includes(n.message)||typeof l=="string"&&n.message===l)&&(n.message=""),n}function C(e){return e>=200&&e<400}function A(e,t){return t==="camelize"?E(e):t==="snakify"?O(e):e}const Ee=z("APIError");function Oe(e){const t={};for(const o in e.headers)(o.startsWith("x-")||o.includes("trace")||o.includes("server")||/\b(?:id|uuid)\b/.test(o))&&(t[o]=e.headers[o]);const s=e.url.replace(/^(?:https?:)?\/*/i,"").replace(/\?.+/,""),r=e.status<0?"unknown":e.status;return{sentryError:new Ee(`${s} | ${r}${e.code?` | ${e.code}`:""}`),sentryTags:{...t,status:r,method:e.method,code:e.code||"unknown",message:e.message||"empty"},sentryExtra:{url:e.url,responseBody:e.body||"empty",responseHeaders:e.headers,rawError:e.error}}}function N(e){return e.reduce((t,[s,r])=>(s&&(t[s]=r||""),t),{})}function ke(e,t,s,r){var g;const o=e.status,n=e.method,a=N(Object.entries(e.headers||{}).map(([y,m])=>[y.toLowerCase(),m])),{ok:c,code:i,data:f,message:u}=me(o,e.statusText,e.body,s.get("responseRule"),r==null?void 0:r.responseRule);if(!C(o)){const y=Oe({url:e.url,method:e.method,status:o,code:i,message:u,body:e.body,headers:a,error:e.rawError});(s.get("errorHandler")||ve)({url:t,method:n,status:o,code:i,message:u,headers:a,rawError:e.rawError,responseBody:e.body,...y})}if(o<0)return S({ok:!1,status:o,code:e.statusText,headers:{},message:"",data:null},`${n} ${t} ${e.statusText}`,n,t,s,r);const l={ok:c,data:f,code:i,message:u,status:o,headers:a};(g=s.get("responseHandler"))==null||g({...l},n,t);const d=c?u:u||e.statusText;return S(l,d,n,t,s,r)}function S(e,t,s,r,o,n){const a=o.get("message"),c=a===!1||(n==null?void 0:n.message)===!1?!1:(n==null?void 0:n.message)||a;if(c!==!1){const i=typeof c=="function"?c(e,s,r,t):t;i instanceof Error?o.showMessage(!0,i.message,e.code,e.status):i&&typeof i=="object"&&"message"in i?o.showMessage(!1,i.message,e.code,e.status):o.showMessage(!e.ok,i,e.code,e.status)}return e}function ve(e){const t={};for(const s in e)s.startsWith("sentry")||(t[s]=e[s]);console.error("RequestError",t)}async function I(e,t,s,r,o){const n=o||0,a=Math.max(0,Math.min(10,(r==null?void 0:r.maxRetry)??s.get("maxRetry")??0)),c=(r==null?void 0:r.retryResolve)??s.get("retryResolve"),i=s.get("logHandler")||Y;i({type:"prepear",url:t,method:(r==null?void 0:r.method)||"GET",retry:n,maxRetry:a,message:n===0?"start":`retry ${n}/${a} start`,headers:r==null?void 0:r.headers,options:r});const f=Date.now(),u=await e(t,s,r),l=u.status,d=Date.now()-f,g=`[cost ${d}][${l}] ${l<0?u.body:""}`;i({type:"finished",url:t,method:u.method,retry:n,maxRetry:a,message:n===0?`finish ${g}`:`retry ${n}/${a} finish ${g}`,response:u,headers:u.headers,cost:d});const y=C(l);if(!a||c==="network"&&l>0||c==="status"&&y||Array.isArray(c)&&!c.includes(l)||typeof c=="function"&&c(u,n)!==!0||n>=a)return u;const m=(r==null?void 0:r.retryInterval)??s.get("retryInterval")??1e3;return await W(Math.max(100,m==="2EB"?Math.pow(2,n)*1e3:typeof m=="function"?m(n+1)||0:m)),await I(e,t,s,r,n+1)}var G=(e=>(e.Aborted="Aborted",e.Unknown="Unknown",e.Timeout="Timeout",e.NotSupport="NotSupport",e.URLFormatError="URLFormatError",e))(G||{});exports.Dt=ce;exports.Kt=R;exports.Me=se;exports.NetRequestHandler=he;exports.RequestGlobalConfig=H;exports.RequestInteralError=G;exports.Y=k;exports.convertOptions=fe;exports.fromEntries=N;exports.getResponseRulesDescription=ye;exports.handleResponse=ke;exports.retryRequest=I;

package/types/inc/detect.d.ts

@@ -1,13 +0,0 @@
-export declare const Support: {
-    fetch: boolean;
-    window: boolean;
-    FormData: boolean;
-    Blob: boolean;
-    wx: boolean;
-    TextDecoder: boolean;
-    AbortController: boolean;
-};
-/**
- * 简版 Object.fromEntries 以处理某些低版本浏览器和 webview 的问题
- */
-export declare function fromEntries(kv: [string, string | undefined][]): Record<string, string>;

package/types/version.d.ts

@@ -1 +0,0 @@
-export declare const version = "2.0.7";