@seayoo-web/request 4.0.2 → 4.0.4

package/README.md

@@ -12,11 +12,11 @@
 ## 特性
 
 1. 默认基于 fetch，请求和响应解析默认基于 json
-2. 支持重试配置 maxRetry / retryResolve / retryInterval
+2. 支持重试配置 maxRetry / retryResolve / retryInterval，并默认合理的重试策略
 3. 支持响应结果处理策略 responseRule 和通用提示配置
 4. 支持类型守卫 typeGuard
 5. 支持多实例，多端（浏览器，nodejs，微信小程序）
-6. get 请求支持并发缓存（默认缓存 500ms）
+6. 默认 get 请求支持并发缓存（默认缓存 500ms）亦可自定义缓存策略
 7. 函数永不抛错，返回固定解析结构 { ok, data, status, headers, code, message }
 8. 提供格式化良好的 sentry 信息用于错误上报
 9. 提供 jsonp / jsonx 函数，支持带上传进度的 upload 函数
@@ -232,7 +232,7 @@ defaultMessage: string
 
 - `default`: 在 `network` 基础之上，如果是 Tencent EO 响应的 552/522 错误码，则重试;
 
-- `network`: 表示仅仅当网络错误时（不含 aborted/timeout）才重试；
+- `network`: 表示仅仅当网络错误时（不含 aborted/timeout）重试；
 
 - `number[]`：当设置为 number[] 时，将检查 http 状态码，匹配则重试；
 
@@ -312,7 +312,7 @@ sentryExtra: Record<string, unknown>
 
 ### params
 
-类型：Record<string, string | number | boolean>
+类型：Record<string, string | number | boolean | null | undefined>
 
 ### headers
 

package/dist/index.js

@@ -1,6 +1,6 @@
-import { h, r as E, G as y, c as q, f as v, a as C, R as w, H as R, b as H, v as x, d as L, N as T, X as k } from "./retry--akoKQtX.js";
-import { g as W } from "./retry--akoKQtX.js";
-import { f as S } from "./request.fetch-U42cahT4.js";
+import { h, r as E, G as y, c as q, f as v, a as C, R as w, H as R, b as H, v as x, d as L, N as T, X as k } from "./retry-LYfsjIVg.js";
+import { g as W } from "./retry-LYfsjIVg.js";
+import { f as S } from "./request.fetch-zzHMZXfR.js";
 const j = async function(n, a, t) {
   return h(await E(m, n, a, t), n, a, t);
 };

package/dist/node.js

@@ -1,6 +1,6 @@
-import { h as w, r as R, c as y, e as b, f as q, R as s, N as h, X as g } from "./retry--akoKQtX.js";
-import { g as S } from "./retry--akoKQtX.js";
-import { f as x } from "./request.fetch-U42cahT4.js";
+import { h as w, r as R, c as y, e as b, f as q, R as s, N as h, X as g } from "./retry-LYfsjIVg.js";
+import { g as S } from "./retry-LYfsjIVg.js";
+import { f as x } from "./request.fetch-zzHMZXfR.js";
 import N from "node:http";
 import C from "node:https";
 const E = async function(o, n, a) {

package/dist/{request.fetch-U42cahT4.js → request.fetch-zzHMZXfR.js}

@@ -1,4 +1,4 @@
-import { h as f, r as h, c as m, i as b, f as y, e as T, R as u } from "./retry--akoKQtX.js";
+import { h as f, r as h, c as m, i as b, f as y, e as T, R as u } from "./retry-LYfsjIVg.js";
 const x = async function(o, a, s) {
   return f(await h(w, o, a, s), o, a, s);
 }, w = async function(o, a, s) {

package/dist/{retry--akoKQtX.js → retry-LYfsjIVg.js}

@@ -2,35 +2,35 @@ const f = typeof globalThis < "u" ? globalThis : typeof self < "u" ? self : type
 function C() {
   return f;
 }
-function m(e) {
+function y(e) {
   return typeof e == "function";
 }
 function U(e) {
   return typeof e == "object" && e !== null;
 }
-function P() {
-  return "wx" in f && U(f.wx) && "getSystemInfo" in f.wx && m(f.wx.getSystemInfo);
+function O() {
+  return "wx" in f && U(f.wx) && "getSystemInfo" in f.wx && y(f.wx.getSystemInfo);
 }
 function we() {
-  return "fetch" in f && m(f.fetch);
+  return "fetch" in f && y(f.fetch);
 }
 function be() {
-  return "window" in f && U(f.window) && !P();
+  return "window" in f && U(f.window) && !O();
 }
 function R() {
-  return "Blob" in f && m(f.Blob);
+  return "Blob" in f && y(f.Blob);
 }
-function M() {
-  return "FormData" in f && m(f.FormData);
+function F() {
+  return "FormData" in f && y(f.FormData);
 }
-function O() {
-  return "TextDecoder" in f && m(f.TextDecoder);
+function M() {
+  return "TextDecoder" in f && y(f.TextDecoder);
 }
 function Ee() {
-  return "AbortController" in f && m(f.AbortController);
+  return "AbortController" in f && y(f.AbortController);
 }
 function q() {
-  return "URLSearchParams" in f && m(f.URLSearchParams);
+  return "URLSearchParams" in f && y(f.URLSearchParams);
 }
 function H(e) {
   return new Promise((t) => setTimeout(t, Math.min(Number.MAX_SAFE_INTEGER, Math.max(0, e))));
@@ -39,8 +39,8 @@ function H(e) {
 function N(e) {
   const t = e || "CustomError";
   return class extends Error {
-    constructor(n) {
-      super(n), Object.defineProperty(this, "name", {
+    constructor(r) {
+      super(r), Object.defineProperty(this, "name", {
         value: t,
         enumerable: !1,
         configurable: !0
@@ -52,33 +52,33 @@ const I = /^(?:https?:)?\/\/.+$/i, G = /^https?:\/\/.+$/i, K = /^\{[\d\D]*\}$/,
 function $(e, t = !1) {
   return t ? I.test(e) : G.test(e);
 }
-function F(e) {
+function A(e) {
   return e == null;
 }
-function A(e, ...t) {
+function S(e, ...t) {
   if (!e || typeof e != "object") return !1;
-  const n = Object.getPrototypeOf(e);
-  return n !== Object.prototype && n !== null ? !1 : t.every((s) => s in e);
+  const r = Object.getPrototypeOf(e);
+  return r !== Object.prototype && r !== null ? !1 : t.every((s) => s in e);
 }
-function S(e) {
+function L(e) {
   return K.test(e) || _.test(e);
 }
 function E(e, t) {
   try {
-    const n = JSON.parse(e);
-    return t ? t(n) ? n : null : n;
+    const r = JSON.parse(e);
+    return t ? t(r) ? r : null : r;
   } catch {
     return null;
   }
 }
-async function Te(e) {
+async function ke(e) {
   return await new Promise(function(t) {
-    const n = document.getElementsByTagName("head")[0], s = document.createElement("script");
+    const r = document.getElementsByTagName("head")[0], s = document.createElement("script");
     s.setAttribute("type", "text/javascript"), s.setAttribute("charset", "utf-8"), s.onload = function() {
-      n.removeChild(s), t(!0);
+      r.removeChild(s), t(!0);
     }, s.onerror = function() {
-      n.removeChild(s), t(!1);
-    }, s.setAttribute("src", e), n.appendChild(s);
+      r.removeChild(s), t(!1);
+    }, s.setAttribute("src", e), r.appendChild(s);
   });
 }
 function J(e, t = "数据未能正确识别") {
@@ -98,31 +98,31 @@ function x(e) {
   return $(e, !0) ? e.startsWith("http") ? e : ("location" in t ? location.protocol : "https:") + e : ("location" in t ? location.origin : "http://127.0.0.1") + "/" + e.replace(/^\/+/, "");
 }
 function W(e, t) {
-  const n = {};
+  const r = {};
   return (e.match(/([^=&#?]+)=[^&#]*/g) || []).forEach(function(s) {
-    const r = s.split("="), o = r[0], a = decodeURIComponent(r[1] || "");
-    n[o] !== void 0 ? n[o] += "," + a : n[o] = a;
-  }), t !== !0 ? n[t] || "" : n;
+    const n = s.split("="), o = n[0], a = decodeURIComponent(n[1] || "");
+    r[o] !== void 0 ? r[o] += "," + a : r[o] = a;
+  }), t !== !0 ? r[t] || "" : r;
 }
 function X(e, t) {
   if (t) {
     if (t === !0)
       return e.replace(/\?[^#]*/, "");
   } else return e;
-  const n = e.split("#"), s = n[0].split("?"), r = s[0], o = s.length > 1 ? s[1] : "", a = n.length > 1 ? "#" + n[1] : "", i = typeof t == "string" ? [t] : Array.isArray(t) ? t : [];
-  return !i.length || !o ? n[0] + a : (i.map((c) => c.replace(/([\\(){}[\]^$+\-*?|])/g, "\\$1")), (r + "?" + o.replace(new RegExp("(?:^|&)(?:" + i.join("|") + ")=[^&$]+", "g"), "").replace(/^&/, "")).replace(/\?$/, "") + a);
+  const r = e.split("#"), s = r[0].split("?"), n = s[0], o = s.length > 1 ? s[1] : "", a = r.length > 1 ? "#" + r[1] : "", u = typeof t == "string" ? [t] : Array.isArray(t) ? t : [];
+  return !u.length || !o ? r[0] + a : (u.map((c) => c.replace(/([\\(){}[\]^$+\-*?|])/g, "\\$1")), (n + "?" + o.replace(new RegExp("(?:^|&)(?:" + u.join("|") + ")=[^&$]+", "g"), "").replace(/^&/, "")).replace(/\?$/, "") + a);
 }
-function z(e, t, n = !1) {
+function z(e, t, r = !1) {
   const s = typeof t == "string" ? t : Object.keys(t).map((a) => `${a}=${encodeURIComponent(t[a])}`).join("&");
   if (!s)
     return e;
-  const r = e.split("#");
-  n && (r[0] = X(
-    r[0],
+  const n = e.split("#");
+  r && (n[0] = X(
+    n[0],
     (s.match(/([^=&#?]+)=[^&#]+/g) || []).map((a) => a.replace(/=.+$/, ""))
   ));
-  const o = r[0].indexOf("?") + 1 ? "&" : "?";
-  return (r[0] + o + s + (r.length > 1 ? "#" + r[1] : "")).replace(/\?&/, "?");
+  const o = n[0].indexOf("?") + 1 ? "&" : "?";
+  return (n[0] + o + s + (n.length > 1 ? "#" + n[1] : "")).replace(/\?&/, "?");
 }
 function Q(e) {
   const t = e.match(/(?:\?|&)([^=]+)(?:&|$)/g);
@@ -134,8 +134,8 @@ class Y {
   timer = null;
   // 定时循环以清理缓存
   loopCheck() {
-    if (Object.keys(this.cache).forEach((n) => {
-      this.cache[n].ttl < Date.now() && delete this.cache[n];
+    if (Object.keys(this.cache).forEach((r) => {
+      this.cache[r].ttl < Date.now() && delete this.cache[r];
     }), Object.keys(this.cache).length === 0) {
       this.timer = null;
       return;
@@ -145,34 +145,34 @@ class Y {
   constructor(t = 500) {
     this.cache = {}, this.ttl = Math.max(t, 0), this.loopCheck = this.loopCheck.bind(this);
   }
-  getKey(t, n, s, r) {
-    if (t.toLowerCase() !== "get" && !r)
+  getKey(t, r, s, n) {
+    if (t.toLowerCase() !== "get" && !n)
       return "";
-    const o = t.toLowerCase(), a = n.replace(/#.+/, ""), i = a.replace(/\?.+/g, "");
-    if (r)
+    const o = t.toLowerCase(), a = r.replace(/#.+/, ""), u = a.replace(/\?.+/g, "");
+    if (n)
       try {
-        const h = r() || "";
-        return h ? `${i}_${o}_${h}` : "";
+        const h = n() || "";
+        return h ? `${u}_${o}_${h}` : "";
       } catch (h) {
-        return console.warn("[RequestCache] cacheResolve error", n, s, h), "";
+        return console.warn("[RequestCache] cacheResolve error", r, s, h), "";
       }
-    const c = Object.assign(W(a, !0), s), l = Q(a), u = Object.keys(c).sort().map((h) => `${h}#${c[h]}`);
-    return `${i}_${o}_${u.join(",")}_${l.join(",")}`;
+    const c = Object.assign(W(a, !0), s), l = Q(a), i = Object.keys(c).sort().map((h) => `${h}#${c[h]}`);
+    return `${u}_${o}_${i.join(",")}_${l.join(",")}`;
   }
   updateTTL(t) {
     this.ttl = Math.max(t, 0);
   }
-  get(t, n) {
-    if (Math.max(n ?? this.ttl, 0) === 0)
+  get(t, r) {
+    if (Math.max(r ?? this.ttl, 0) === 0)
       return null;
-    const r = this.cache[t];
-    return r ? r.ttl < Date.now() ? (delete this.cache[t], null) : r.res : null;
-  }
-  set(t, n, s) {
-    const r = Math.max(s ?? this.ttl, 0);
-    r !== 0 && (this.cache[t] = {
-      ttl: Date.now() + r,
-      res: n
+    const n = this.cache[t];
+    return n ? n.ttl < Date.now() ? (delete this.cache[t], null) : n.res : null;
+  }
+  set(t, r, s) {
+    const n = Math.max(s ?? this.ttl, 0);
+    n !== 0 && (this.cache[t] = {
+      ttl: Date.now() + n,
+      res: r
     }, this.timer === null && (this.timer = setTimeout(this.loopCheck, 5e3)));
   }
   del(t) {
@@ -216,11 +216,11 @@ class Z {
     return V(t, this.config.baseURL);
   }
   /** 提示消息 */
-  showMessage(t, n, s, r) {
-    this.config.messageHandler && n && this.config.messageHandler(t, n, s, r);
+  showMessage(t, r, s, n) {
+    this.config.messageHandler && r && this.config.messageHandler(t, r, s, n);
   }
 }
-const y = {
+const g = {
   /** 响应数据校验失败 */
   UnexpectResponse: "UnexpectResponse",
   /** 请求被取消 */
@@ -234,53 +234,53 @@ const y = {
   /** 请求方法不被支持，在微信小程序环境下有效 */
   NotSupport: "NotSupport"
 };
-function ee(e, t, n, s) {
-  if (t.ok && !F(t.data) && s) {
-    const { guard: r, message: o } = J(s, n.get("defaultTypeGuardMessage"));
-    return r(t.data) || (t.code = y.UnexpectResponse, n.showMessage(!0, `${e} ${o}`, t.code, t.status), console.error(t.code, e, t.data), t.data = null, t.message = o), t;
+function ee(e, t, r, s) {
+  if (t.ok && !A(t.data) && s) {
+    const { guard: n, message: o } = J(s, r.get("defaultTypeGuardMessage"));
+    return n(t.data) || (t.code = g.UnexpectResponse, r.showMessage(!0, `${e} ${o}`, t.code, t.status), console.error(t.code, e, t.data), t.data = null, t.message = o), t;
   }
   return t;
 }
-class ke {
+class Te {
   agent;
   config;
   cache;
-  constructor(t, n) {
-    this.config = new Z(n), this.agent = t, this.cache = new Y(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);
+  constructor(t, r) {
+    this.config = new Z(r), this.agent = t, this.cache = new Y(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);
   }
   /** 发送网络请求，含有缓存控制逻辑，不含有 guard 逻辑 */
-  async send(t, n) {
-    const s = this.cache.getKey(n?.method || "GET", t, n?.params, n?.cacheResolve);
+  async send(t, r) {
+    const s = this.cache.getKey(r?.method || "GET", t, r?.params, r?.cacheResolve);
     if (s) {
-      const r = this.cache.get(s, n?.cacheTTL);
-      if (r)
-        return await r;
+      const n = this.cache.get(s, r?.cacheTTL);
+      if (n)
+        return await n;
     }
     try {
-      const r = this.agent(t, this.config, n);
-      s && this.cache.set(s, r, n?.cacheTTL);
-      const o = await r;
+      const n = this.agent(t, this.config, r);
+      s && this.cache.set(s, n, r?.cacheTTL);
+      const o = await n;
       return (!o.ok || o.status < 0) && this.cache.del(s), o;
-    } catch (r) {
-      return console.error("RequestError", r), {
+    } catch (n) {
+      return console.error("RequestError", n), {
         ok: !1,
         status: -1,
-        code: y.Unknown,
-        message: r instanceof Error ? r.message : String(r),
+        code: g.Unknown,
+        message: n instanceof Error ? n.message : String(n),
         headers: {},
         data: null
       };
     }
   }
   async request(t) {
-    const n = await this.send(t.url, t.options);
-    return ee(t.url, n, this.config, t.guard ?? null);
+    const r = await this.send(t.url, t.options);
+    return ee(t.url, r, this.config, t.guard ?? null);
   }
   /** 整理合并通用参数 */
-  gen(t, n, s, r, o) {
+  gen(t, r, s, n, o) {
     const a = Object.assign(
-      o ? { ...o, method: n } : { method: n },
-      r ? { body: r } : null,
+      o ? { ...o, method: r } : { method: r },
+      n ? { body: n } : null,
       s ? { params: s } : null
     );
     return typeof t == "object" ? (a.params = t.params, { options: a, url: t.url }) : { options: a, url: t };
@@ -300,60 +300,60 @@ class ke {
   /**
    * 发送一个 HEAD 请求，并且不处理响应 body
    */
-  async head(t, n, s) {
-    return this.request(this.gen(t, "HEAD", n, null, s));
+  async head(t, r, s) {
+    return this.request(this.gen(t, "HEAD", r, null, s));
   }
-  async get(t, n, s, r) {
-    const o = this.gen(t, "GET", n, null, r);
+  async get(t, r, s, n) {
+    const o = this.gen(t, "GET", r, null, n);
     return s ? this.request({ ...o, guard: s }) : this.request(o);
   }
-  async post(t, n, s, r) {
-    const o = this.gen(t, "POST", null, n || {}, r);
+  async post(t, r, s, n) {
+    const o = this.gen(t, "POST", null, r || {}, n);
     return s ? this.request({ ...o, guard: s }) : this.request(o);
   }
-  async del(t, n, s, r) {
-    const o = this.gen(t, "DELETE", n, null, r);
+  async del(t, r, s, n) {
+    const o = this.gen(t, "DELETE", r, null, n);
     return s ? this.request({ ...o, guard: s }) : this.request(o);
   }
-  async put(t, n, s, r) {
-    const o = this.gen(t, "PUT", null, n || {}, r);
+  async put(t, r, s, n) {
+    const o = this.gen(t, "PUT", null, r || {}, n);
     return s ? this.request({ ...o, guard: s }) : this.request(o);
   }
-  async patch(t, n, s, r) {
-    const o = this.gen(t, "PATCH", null, n || {}, r);
+  async patch(t, r, s, n) {
+    const o = this.gen(t, "PATCH", null, r || {}, n);
     return s ? this.request({ ...o, guard: s }) : this.request(o);
   }
 }
 function te(e) {
   const t = {};
-  for (const [n, s] of e)
-    n && typeof n == "string" && (t[n] = s || "");
+  for (const [r, s] of e)
+    r && typeof r == "string" && (t[r] = s || "");
   return t;
 }
 function se(e) {
   const t = {};
-  return e && Object.keys(e).forEach((n) => {
-    const s = e[n], r = s == null ? "" : typeof s == "boolean" || typeof s == "number" ? String(s) : s;
-    r && (t[n] = r);
+  return e && Object.keys(e).forEach((r) => {
+    const s = e[r], n = s == null ? "" : typeof s == "boolean" || typeof s == "number" ? String(s) : s;
+    n && (t[r] = n);
   }), t;
 }
-function L(e) {
-  return F(e) ? "" : typeof e == "string" ? e : e instanceof ArrayBuffer && O() ? new TextDecoder().decode(e) : JSON.stringify(e);
+function B(e) {
+  return A(e) ? "" : typeof e == "string" ? e : e instanceof ArrayBuffer && M() ? new TextDecoder().decode(e) : JSON.stringify(e);
 }
-function ne(e) {
-  return e instanceof Error ? e : new Error(L(e));
+function re(e) {
+  return e instanceof Error ? e : new Error(B(e));
 }
 async function Re(e) {
-  if (O())
+  if (M())
     return new TextEncoder().encode(e).buffer;
   if (R())
     return await new Blob([e]).arrayBuffer();
   throw new Error("cannot convert string to ArrayBuffer");
 }
-function re(e, t) {
-  if ("URL" in C()) {
+function ne(e, t) {
+  if ("URL" in C() && !O()) {
     const s = new URL(e);
-    return Object.keys(t).forEach((r) => s.searchParams.set(r, t[r])), s.toString();
+    return Object.keys(t).forEach((n) => s.searchParams.set(n, t[n])), s.toString();
   }
   return z(e, t);
 }
@@ -363,27 +363,27 @@ function oe(e) {
   } : e === "network" ? ae : ce;
 }
 function ae({ error: e }) {
-  return e === y.NetworkError;
+  return e === g.NetworkError;
 }
-function ce({ status: e, headers: t, error: n }) {
-  return n === y.NetworkError ? !0 : t?.server === "TencentEdgeOne" ? e === 522 || e === 552 : !1;
+function ce({ status: e, headers: t, error: r }) {
+  return r === g.NetworkError ? !0 : t?.server === "TencentEdgeOne" ? e === 522 || e === 552 : !1;
 }
-async function $e(e, t, n) {
-  const s = { ...n, method: n?.method || "GET" }, r = M() ? s.body instanceof FormData : !1, o = r && s.method !== "POST" && s.method !== "PUT" ? "POST" : s.method, a = o === "GET" || o === "HEAD" || o === "DELETE";
+async function $e(e, t, r) {
+  const s = { ...r, method: r?.method || "GET" }, n = F() ? s.body instanceof FormData : !1, o = n && s.method !== "POST" && s.method !== "PUT" ? "POST" : s.method, a = o === "GET" || o === "HEAD" || o === "DELETE";
   a && s.body !== void 0 && (console.warn("request body is invalid with method get, head, delete"), delete s.body);
-  const i = r || a ? { ...s.headers } : {
+  const u = n || a ? { ...s.headers } : {
     "Content-Type": R() && s.body instanceof Blob ? s.body.type || "application/octet-stream" : "application/json;charset=utf-8",
     ...s.headers
-  }, c = t.getFullUrl(e), l = se(s.params), u = ie(s.body), h = s.timeout || t.get("timeout"), p = await (async function() {
-    const g = t.get("requestTransformer");
-    if (g)
-      return await g({ headers: i, params: l, method: o, url: c, body: u });
-  })(), d = re(typeof p == "string" && p ? p : c, l);
-  return t.get("logHandler")?.({ type: "ready", url: d, method: o, headers: i, timeout: h, body: u }), {
-    url: d,
+  }, c = t.getFullUrl(e), l = se(s.params), i = ie(s.body), h = s.timeout || t.get("timeout"), d = await (async function() {
+    const p = t.get("requestTransformer");
+    if (p)
+      return await p({ headers: u, params: l, method: o, url: c, body: i });
+  })(), m = ne(typeof d == "string" && d ? d : c, l);
+  return t.get("logHandler")?.({ type: "ready", url: m, method: o, headers: u, timeout: h, body: i }), {
+    url: m,
     method: o,
-    body: u,
-    headers: i,
+    body: i,
+    headers: u,
     timeout: h,
     abort: s.abort,
     asBuffer: !!s.asBuffer,
@@ -392,69 +392,83 @@ async function $e(e, t, n) {
 }
 function ie(e) {
   if (e)
-    return typeof e == "string" || q() && e instanceof URLSearchParams || e instanceof ArrayBuffer || R() && e instanceof Blob || M() && e instanceof FormData ? e : JSON.stringify(e);
+    return typeof e == "string" || q() && e instanceof URLSearchParams || e instanceof ArrayBuffer || R() && e instanceof Blob || F() && e instanceof FormData ? e : JSON.stringify(e);
 }
-const B = "data", w = "message";
-function ue(e, t, n) {
-  return D(e.status) ? fe(n?.ok || t.ok, e) : he(n?.failed || t.failed, e);
+const D = "data", w = "message";
+function ue(e, t, r) {
+  return P(e.status) ? fe(r?.ok || t.ok, e) : he(r?.failed || t.failed, e);
 }
-function fe(e, { statusText: t, body: n }) {
+function fe(e, { statusText: t, body: r }) {
   const s = {
     ok: !0,
     code: t,
     message: "",
     data: null
   };
-  if (!n)
+  if (!r)
     return s;
-  if (typeof n != "string")
-    return s.data = n, s;
+  if (typeof r != "string")
+    return s.data = r, s;
   if (e.resolve === "body")
-    return s.data = S(n) ? T(E(n), e.converter) : n, s;
-  const r = E(n);
-  if (!r)
+    return s.data = L(r) ? k(E(r), e.converter) : r, s;
+  const n = E(r);
+  if (!n)
     return s.ok = !1, s.code = "ResponseFormatError", s.message = "响应内容无法解析为 json", s;
-  const o = T(r, e.converter);
-  if (!o || !A(o))
+  const o = k(n, e.converter);
+  if (!o || !S(o))
     return s.ok = !1, s.code = "ResponseFormatError", s.message = "响应内容无法格式化为 object", s;
   const a = e.statusField;
   if (a && !(a in o))
     return s.ok = !1, s.code = "ResponseFieldMissing", s.message = `响应内容找不到状态字段 ${a}`, s;
-  const i = e.statusOKValue || "", c = e.dataField || B, l = e.messageField || w, u = a ? String(o[a] ?? "") : "";
-  return s.ok = a ? u === i : !0, s.code = u || s.code, s.data = c === !0 ? o : c in o ? o[c] : null, s.message = k(o, l), e.ignoreMessage && s.message && (Array.isArray(e.ignoreMessage) ? e.ignoreMessage.includes(s.message) : e.ignoreMessage === s.message) && (s.message = ""), s;
+  const u = e.statusOKValue || "", c = e.dataField || D, l = e.messageField || w, i = a ? String(o[a] ?? "") : "";
+  return s.ok = a ? i === u : !0, s.code = i || s.code, s.data = c === !0 ? o : c in o ? o[c] : null, s.message = T(o, l), e.ignoreMessage && s.message && (Array.isArray(e.ignoreMessage) ? e.ignoreMessage.includes(s.message) : e.ignoreMessage === s.message) && (s.message = ""), s;
 }
-function he(e, { statusText: t, body: n, error: s }) {
-  const r = typeof n == "string" ? n : "", o = {
+function he(e, { statusText: t, body: r, error: s }) {
+  const n = typeof r == "string" ? r : "", o = {
     ok: !1,
     code: s || t,
-    message: r,
+    message: n,
     data: null
   };
+  switch (s) {
+    case g.NetworkError:
+      o.message = "网络错误";
+      break;
+    case g.Timeout:
+      o.message = "请求超时";
+      break;
+    case g.Aborted:
+      o.message = "请求被取消";
+      break;
+    case g.Unknown:
+      o.message = "发生未知错误";
+      break;
+  }
   switch (e.resolve) {
     case "body":
-      o.message = j(r) || r;
+      o.message = j(n) || n;
       break;
     case "json":
-      const { code: a, message: i } = le(r, e.converter, e.statusField, e.messageField);
-      o.code = a || s || t, o.message = j(r) || i;
+      const { code: a, message: u } = le(n, e.converter, e.statusField, e.messageField);
+      o.code = a || s || t, o.message = j(n) || u;
       break;
   }
   return o;
 }
-function D(e) {
+function P(e) {
   return e >= 200 && e < 400;
 }
-function T(e, t) {
+function k(e, t) {
   return t && typeof t == "function" ? t(e) : e;
 }
 const xe = function(e) {
-  const t = [], n = e.failed || { resolve: "json" };
-  switch (t.push("- 当http状态码 <200 或者 >=400 时"), n.resolve) {
+  const t = [], r = e.failed || { resolve: "json" };
+  switch (t.push("- 当http状态码 <200 或者 >=400 时"), r.resolve) {
     case "body":
       t.push("  将响应内容格式化为字符串并作为错误消息");
       break;
     case "json":
-      t.push("  将响应解析为json，并读取 " + (n.messageField || w) + " 作为错误消息");
+      t.push("  将响应解析为json，并读取 " + (r.messageField || w) + " 作为错误消息");
       break;
   }
   const s = e.ok || { resolve: "body" };
@@ -464,7 +478,7 @@ const xe = function(e) {
       break;
     case "json":
       t.push(
-        "  将响应解析为 json，读取 " + (s.dataField || B) + " 作为响应数据，读取 " + (s.messageField || w) + " 作为提示消息"
+        "  将响应解析为 json，读取 " + (s.dataField || D) + " 作为响应数据，读取 " + (s.messageField || w) + " 作为提示消息"
       ), s.statusField && t.push(
         "  当 " + s.statusField + " 为 " + (s.statusOKValue || "空值") + " 时是成功提示，否则是错误消息"
       ), s.ignoreMessage && t.push("  并忽略以下消息：" + s.ignoreMessage);
@@ -473,39 +487,39 @@ const xe = function(e) {
   return t.join(`
 `);
 };
-function le(e, t, n, s = w) {
-  if (!S(e))
+function le(e, t, r, s = w) {
+  if (!L(e))
     return { message: "" };
-  const r = T(E(e), t);
-  return !r || !A(r) ? { message: e } : {
-    code: n ? k(r, n) : "",
-    message: k(r, s) || e
+  const n = k(E(e), t);
+  return !n || !S(n) ? { message: e } : {
+    code: r ? T(n, r) : "",
+    message: T(n, s) || e
   };
 }
-function k(e, t) {
-  const n = Array.isArray(t) ? t : [t];
-  for (const s of n)
+function T(e, t) {
+  const r = Array.isArray(t) ? t : [t];
+  for (const s of r)
     if (s in e)
-      return L(e[s]);
+      return B(e[s]);
   return "";
 }
 const de = [/<title>([^<]+)<\/title>/i, /<message>([^<]+)<\/message>/i];
 function j(e) {
   for (const t of de) {
-    const n = e.match(t);
-    if (n)
-      return n[1];
+    const r = e.match(t);
+    if (r)
+      return r[1];
   }
   return "";
 }
 const ge = /* @__PURE__ */ N("APIError");
-function pe(e) {
+function me(e) {
   const t = {};
-  for (const r in e.headers)
-    (r.startsWith("x-") || r.includes("trace") || r.includes("server") || r.includes("status") || /\b(?:id|uuid)\b/.test(r)) && (t[r] = e.headers[r]);
-  const n = e.url.replace(/^(?:https?:)?\/*/i, "").replace(/\?.+/, ""), s = e.status < 0 ? "unknown" : e.status;
+  for (const n in e.headers)
+    (n.startsWith("x-") || n.includes("trace") || n.includes("server") || n.includes("status") || /\b(?:id|uuid)\b/.test(n)) && (t[n] = e.headers[n]);
+  const r = e.url.replace(/^(?:https?:)?\/*/i, "").replace(/\?.+/, ""), s = e.status < 0 ? "unknown" : e.status;
   return {
-    sentryError: new ge(`${n}${s === "unknown" ? "" : ` | ${s}`} | ${e.code}`),
+    sentryError: new ge(`${r}${s === "unknown" ? "" : ` | ${s}`} | ${e.code}`),
     sentryTags: {
       ...t,
       status: s,
@@ -526,70 +540,68 @@ async function je(e, t) {
     return e.body = null, e;
   try {
     e.body = t.asBuffer ? await t.buffer() : await t.text();
-  } catch (n) {
-    e.body = null, e.error = y.Unknown, e.rawError = ne(n);
+  } catch (r) {
+    e.body = null, e.error = g.Unknown, e.rawError = re(r);
   }
   return e;
 }
-function ve(e, t, n, s) {
-  const r = e.status, o = e.method, a = te(
-    Object.entries(e.headers || {}).map(([d, g]) => [d.toLowerCase(), g])
-  ), { ok: i, code: c, data: l, message: u } = ue(e, n.get("responseRule"), s?.responseRule);
-  if (!D(r)) {
-    const d = pe({
+function ve(e, t, r, s) {
+  const n = e.status, o = e.method, a = te(
+    Object.entries(e.headers || {}).map(([d, m]) => [d.toLowerCase(), m])
+  ), { ok: u, code: c, data: l, message: i } = ue(e, r.get("responseRule"), s?.responseRule);
+  if (!P(n)) {
+    const d = me({
       url: e.url,
       method: e.method,
-      status: r,
+      status: n,
       code: c,
-      message: u,
+      message: i,
       body: e.body,
       headers: a,
       error: e.rawError
     });
-    (n.get("errorHandler") || me)({
+    (r.get("errorHandler") || pe)({
       url: t,
       method: o,
-      status: r,
+      status: n,
       code: c,
-      message: u,
+      message: i,
       headers: a,
       rawError: e.rawError,
       ...d
     });
   }
-  if (r < 0)
+  if (n < 0)
     return v(
-      { ok: !1, status: r, code: e.statusText, headers: {}, message: "", data: null },
-      `${o} ${t} ${e.statusText}`,
+      { ok: !1, status: n, code: e.statusText, headers: {}, message: i, data: null },
+      `${o} ${t} ${i || e.statusText}`,
       o,
       t,
-      n,
+      r,
       s
     );
-  const h = { ok: i, data: l, code: c, message: u, status: r, headers: a };
-  n.get("responseHandler")?.({ ...h }, o, t);
-  const p = i ? u : u || e.statusText;
-  return v(h, p, o, t, n, s);
+  const h = { ok: u, data: l, code: c, message: i, status: n, headers: a };
+  return r.get("responseHandler")?.({ ...h }, o, t), v(h, u ? i : i || e.statusText, o, t, r, s);
 }
-function v(e, t, n, s, r, o) {
-  const a = r.get("message"), i = a === !1 || o?.message === !1 ? !1 : o?.message || a;
-  if (i !== !1) {
-    const c = typeof i == "function" ? i(e, n, s, t) : t;
-    c instanceof Error ? r.showMessage(!0, b(c.message), e.code, e.status) : c && typeof c == "object" && "message" in c && typeof c.message == "string" ? r.showMessage(!1, b(c.message), e.code, e.status) : c && r.showMessage(!e.ok, b(String(c)), e.code, e.status);
+function v(e, t, r, s, n, o) {
+  const a = n.get("message"), u = a === !1 || o?.message === !1 ? !1 : o?.message || a;
+  if (u !== !1) {
+    const c = typeof u == "function" ? u(e, r, s, t) : t;
+    c instanceof Error ? n.showMessage(!0, b(c.message), e.code, e.status) : c && typeof c == "object" && "message" in c && typeof c.message == "string" ? n.showMessage(!1, b(c.message), e.code, e.status) : c && n.showMessage(!e.ok, b(String(c)), e.code, e.status);
   }
   return e;
 }
-function me(e) {
+function pe(e) {
   const t = {};
-  for (const n in e)
-    n.startsWith("sentry") || (t[n] = e[n]);
+  for (const r in e)
+    r.startsWith("sentry") || (t[r] = e[r]);
   console.error("RequestError", t);
 }
 function b(e) {
   return e.replace(/<script[\s\S]*?>[\s\S]*?<\/script>/gi, "").replace(/<[^>]+>/g, "").trim();
 }
-async function ye(e, t, n, s, r) {
-  const o = r || 0, a = Math.max(0, Math.min(10, s?.maxRetry ?? n.get("maxRetry") ?? 0)), i = oe(s?.retryResolve ?? n.get("retryResolve")), c = n.get("logHandler");
+async function ye(e, t, r, s, n) {
+  const o = n || 0, a = Math.max(0, Math.min(10, s?.maxRetry ?? r.get("maxRetry") ?? 0)), u = oe(s?.retryResolve ?? r.get("retryResolve")), c = r.get("logHandler");
   c?.({
     type: "prepare",
     url: t,
@@ -600,33 +612,33 @@ async function ye(e, t, n, s, r) {
     headers: s?.headers,
     options: s
   });
-  const l = Date.now(), u = await e(t, n, s), h = u.status, p = Date.now() - l, d = `[cost ${p}][${h}] ${h < 0 ? u.body : ""}`;
+  const l = Date.now(), i = await e(t, r, s), h = i.status, d = Date.now() - l, m = `[cost ${d}][${h}] ${h < 0 ? i.body : ""}`;
   if (c?.({
     type: "finished",
     url: t,
-    method: u.method,
+    method: i.method,
     retry: o,
     maxRetry: a,
-    message: o === 0 ? `finish ${d}` : `retry ${o}/${a} finish ${d}`,
-    response: u,
-    headers: u.headers,
-    cost: p
-  }), !a || o >= a || i(u, o) !== !0)
-    return u;
-  const g = s?.retryInterval ?? n.get("retryInterval") ?? 100;
+    message: o === 0 ? `finish ${m}` : `retry ${o}/${a} finish ${m}`,
+    response: i,
+    headers: i.headers,
+    cost: d
+  }), !a || o >= a || u(i, o) !== !0)
+    return i;
+  const p = s?.retryInterval ?? r.get("retryInterval") ?? 100;
   return await H(
     Math.max(
       100,
-      g === "2EB" ? Math.pow(2, o) * 100 : typeof g == "function" ? g(o + 1, { url: t, status: h, method: u.method }) || 0 : g
+      p === "2EB" ? Math.pow(2, o) * 100 : typeof p == "function" ? p(o + 1, { url: t, status: h, method: i.method }) || 0 : p
     )
-  ), await ye(e, t, n, s, o + 1);
+  ), await ye(e, t, r, s, o + 1);
 }
 export {
-  P as E,
+  O as E,
   Z as G,
   z as H,
-  ke as N,
-  y as R,
+  Te as N,
+  g as R,
   we as X,
   Re as a,
   se as b,
@@ -638,6 +650,6 @@ export {
   ve as h,
   Ee as i,
   ye as r,
-  L as t,
-  Te as v
+  B as t,
+  ke as v
 };

package/dist/wx.js

@@ -1,5 +1,5 @@
-import { h as l, r as p, c as y, E as R, R as u, f as x, a as h, t as c, N as w } from "./retry--akoKQtX.js";
-import { g as O } from "./retry--akoKQtX.js";
+import { h as l, r as p, c as y, E as R, R as u, f as x, a as h, t as c, N as w } from "./retry-LYfsjIVg.js";
+import { g as O } from "./retry-LYfsjIVg.js";
 const m = async function(s, o, n) {
   return l(await p(q, s, o, n), s, o, n);
 }, q = async function(s, o, n) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seayoo-web/request",
-  "version": "4.0.2",
+  "version": "4.0.4",
   "description": "request tools for seayoo web",
   "type": "module",
   "source": "./src/index.ts",

package/types/inc/type.d.ts

@@ -51,7 +51,7 @@ export interface BaseRequestOptions {
 }
 /** 重试请求的配置参数，暂不支持全局配置 */
 export interface RetryRequestOptions {
-    /** 错误时重试的次数，不能超过 10 次，默认不重试 */
+    /** 错误时重试的次数，不能超过 10 次，默认重试 1 次 */
     maxRetry?: number;
     /**
      * 重试策略：默认 `default`
@@ -59,10 +59,16 @@ export interface RetryRequestOptions {
      * `default` 在 `network` 基础之上，当状态码为 Tencent EO 专属错误码 552 / 522 时重试；
      *
      * `network` 仅仅网络错误时重试，但忽略 aborted / timeout 状态；
+     *
+     * `number[]` 可以设置 http status，匹配时重试
+     *
+     * `function` 自定义函数来返回是否重试
      */
     retryResolve?: RetryResolve;
     /**
-     * 两次重试的间隔，如果设置时间，则单位 ms，或者设置函数返回等待的时间（单位ms），默认 100，最小 100，函数参数 retryIndex 从 1 开始
+     * 两次重试的间隔。
+     *
+     * 可设置为数字或返回数字的函数，表示等待的时间（单位ms），默认 200，最小 100，函数参数 retryIndex 从 1 开始
      *
      * 特殊值 2EB 表示以 2 为底的指数退避，首次延迟为 100ms，第二次为 200ms，第三次为 400ms，第四次为 800ms...
      *
@@ -151,17 +157,9 @@ export type RequestGlobalConfig = {
     /** 全局日志打印函数 */
     logHandler?: null | ((log: RequestLog) => void);
 } & Pick<BaseRequestOptions, "credentials" | "timeout"> & RetryRequestOptions & OtherRequestOptions;
-/**
- * 自定义重试检测方法
- */
+/** 自定义重试检测方法 */
 export type RetryResolveFunc = (response: RequestBaseResponse, count: number) => boolean;
-/**
- * 失败重试策略：
- *
- * `default` 在 `network` 基础之上，当状态码为 Tencent EO 专属错误码 521 / 522 时重试；
- *
- * `network` 仅仅网络错误时重试，但忽略 aborted / timeout 状态；
- */
+/** 失败重试策略 */
 export type RetryResolve = "default" | "network" | number[] | RetryResolveFunc;
 /** 响应内容转化器 */
 export type ResponseBodyConverter = (body: unknown) => unknown;
@@ -171,7 +169,7 @@ export interface ResponseRule {
     failed: {
         /** 解析方式，如果解析方式为 json，则可以进一步指定错误消息字段 */
         resolve: "json" | "body";
-        /** 将响应内容进行转化 */
+        /** 将响应内容进行转化，此过程优先于内部解析逻辑 */
         converter?: ResponseBodyConverter;
         /** 解析错误消息的状态字段，比如 error 或 code，仅在 resolve 为 json 时有效，有值的话会替换 response 的 code */
         statusField?: string;
@@ -188,7 +186,7 @@ export interface ResponseRule {
          * - `body` 此时 response body 被格式化为 json 并作为接口返回的数据使用，如果格式化失败，则返回 body 本身的字符串
          */
         resolve: "json" | "body";
-        /** 将响应内容进行转化 */
+        /** 将响应内容进行转化，此过程优先于内部解析逻辑 */
         converter?: ResponseBodyConverter;
         /** 表示自定义状态的字段名 */
         statusField?: string;
@@ -233,7 +231,7 @@ export interface ResponseResult<T = unknown> {
     code: string;
     /** 从响应体中分析出的提示信息 */
     message: string;
-    /** 响应的 headers 信息 */
+    /** 响应的 headers 信息，key 均被转为小写字母 */
     headers: Record<string, string | undefined>;
     /**
      * 成功时返回的数据，如果网络错误/服务器没有响应内容（比如 http status 202/204）/类型守卫检查失败则是 null