@seayoo-web/request 3.4.2 → 3.4.4

package/README.md

@@ -141,7 +141,7 @@ setConfig({ timeout: 10000 });
 
 类型：string
 
-说明：默认的类型守卫错误提示，仅支持全局配置，默认 “响应数据未能正确识别“，单个 api 可通过传入完整的类型守卫（{ guard, message }）来定制提示消息。
+说明：默认的类型守卫错误提示，仅支持全局配置，默认 “响应数据未能正确识别”，单个 api 可通过传入完整的类型守卫（{ guard, message }）来定制提示消息。
 
 ### message
 
@@ -180,11 +180,11 @@ defaultMessage: string
 
   **statusField**: string
 
-  解析错误消息的状态字段，仅在 resolve 为 json 时有效，有值的话会替换 response 的 code
+  解析状态的字段，仅在 resolve 为 json 时有效，有值的话会替换 response 的 code
 
   **messageField**: string | string[]
 
-  错误消息解析字段，仅在 resolve 为 json 时有效，默认值 "message"
+  解析错误消息的字段，仅在 resolve 为 json 时有效，默认值 "message"
 
 - **OKRule**: { resolve, converter?, statusField?, statusOKValue?, dataField?, messageField?, ignoreMessage? }
 

package/dist/index.js

@@ -1,78 +1,78 @@
-import { h as m, r as q, R as T, c as x, B as R, a as w, N as H, f as C, b as E, X as L } from "./retry-FiwuCZIu.js";
-import { g as Q } from "./retry-FiwuCZIu.js";
-import { f as k } from "./request.fetch-Cbt_az4v.js";
-const S = async function(e, o, t) {
-  return m(await q(y, e, o, t), e, o, t);
+import { h as m, r as q, R as T, c as x, Q as R, a as w, _ as H, l as C, N as E, Z as L } from "./retry-BjOxSyvC.js";
+import { g as z } from "./retry-BjOxSyvC.js";
+import { f as j } from "./request.fetch-6HUu6_l5.js";
+const k = async function(t, s, e) {
+  return m(await q(y, t, s, e), t, s, e);
 };
-async function U(e, o, t, n) {
-  const r = t?.body, l = t?.method === "PUT" ? "PUT" : "POST";
-  if (o instanceof Blob) {
-    const i = new T(n), u = await y(e, i, {
-      ...t,
+async function S(t, s, e, n) {
+  const r = e?.body, l = e?.method === "PUT" ? "PUT" : "POST";
+  if (s instanceof Blob) {
+    const i = new T(n), u = await y(t, i, {
+      ...e,
       method: l,
-      body: o
+      body: s
     });
-    return m(u, e, i, t);
+    return m(u, t, i, e);
   }
-  const a = new FormData(), d = { ...o };
+  const a = new FormData(), d = { ...s };
   r instanceof Object && Object.entries(r).forEach(([i, u]) => {
-    u instanceof Blob ? d[i] = u : Array.isArray(u) ? u.forEach((s, g) => {
-      a.append(`${i}[${g}]`, String(s));
+    u instanceof Blob ? d[i] = u : Array.isArray(u) ? u.forEach((o, g) => {
+      a.append(`${i}[${g}]`, String(o));
     }) : a.append(i, String(u));
   });
   for (const i in d)
     a.append(i, d[i]);
-  const b = new T(n), p = await y(e, b, {
-    ...t,
+  const b = new T(n), h = await y(t, b, {
+    ...e,
     method: l,
     body: a
   });
-  return m(p, e, b, t);
+  return m(h, t, b, e);
 }
-const y = async function(e, o, t) {
-  const n = await x(e, o, t), r = n.method, l = t?.onUploadProgress, a = R(n.url, n.params);
+const y = async function(t, s, e) {
+  const n = await x(t, s, e), r = n.method, l = e?.onUploadProgress, a = R(n.url, n.params);
   return await new Promise((d) => {
-    let b = null, p = !1;
+    let b = null, h = !1;
     const i = function() {
-      p || (s.abort(), p = !0);
+      h || (o.abort(), h = !0);
     };
     function u() {
       b !== null && clearTimeout(b), n.abort && n.abort.removeEventListener("abort", i);
     }
-    const s = new XMLHttpRequest();
+    const o = new XMLHttpRequest();
     let g = !1;
-    if (s.open(r, a, !0), l) {
+    if (o.open(r, a, !0), l) {
       let f = 1;
-      s.upload.addEventListener("progress", (h) => {
-        f = h.total, l({ total: h.total, loaded: h.loaded });
-      }), s.addEventListener("load", () => {
+      o.upload.addEventListener("progress", (p) => {
+        f = p.total, l({ total: p.total, loaded: p.loaded });
+      }), o.addEventListener("load", () => {
         l({ loaded: f, total: f });
       });
     }
-    s.addEventListener("load", () => {
-      const f = s.status;
+    o.addEventListener("load", () => {
+      const f = o.status, p = o.responseType;
       u(), d({
         url: a,
         method: r,
         status: f,
-        statusText: s.statusText,
-        headers: j(s),
-        body: r === "HEAD" || f === 204 ? "" : s.responseText
+        statusText: o.statusText,
+        headers: U(o),
+        body: r === "HEAD" || f === 204 ? "" : p === "" || p === "text" || p === "json" || p === "document" ? o.responseText : ""
       });
-    }), s.addEventListener(
+    }), o.addEventListener(
       "error",
       (f) => {
         u(), d({
           url: a,
           method: r,
-          status: s.status || -1,
-          statusText: s.statusText || w.NetworkError,
+          status: o.status || -1,
+          statusText: o.statusText || w.NetworkError,
           body: "",
           rawError: f
         });
       },
       !0
-    ), s.addEventListener("abort", () => {
+    ), o.addEventListener("abort", () => {
       u(), d({
         url: a,
         method: r,
@@ -81,53 +81,53 @@ const y = async function(e, o, t) {
         statusText: g ? w.Timeout : w.Aborted,
         body: ""
       });
-    }), Object.entries(n.headers).forEach(([f, h]) => {
-      s.setRequestHeader(f, h);
-    }), n.credentials === "include" && (s.withCredentials = !0), s.send(n.body || void 0), n.abort && n.abort.addEventListener("abort", i), n.timeout > 0 && (b = setTimeout(function() {
+    }), Object.entries(n.headers).forEach(([f, p]) => {
+      o.setRequestHeader(f, p);
+    }), n.credentials === "include" && (o.withCredentials = !0), o.send(n.body || void 0), n.abort && n.abort.addEventListener("abort", i), n.timeout > 0 && (b = setTimeout(function() {
       g = !0, i();
     }, n.timeout));
   });
 };
-function j(e) {
-  const o = {};
-  if (!e)
-    return o;
-  const t = e.getAllResponseHeaders();
-  return t && t !== "null" && t.replace(/\r/g, "").split(`
+function U(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 l = r.split(":"), a = l[0].trim();
-    a && (o[a] = (l[1] || "").trim());
-  }), o;
+    a && (s[a] = (l[1] || "").trim());
+  }), s;
 }
-async function O(e, o, t = {}) {
+async function P(t, s, e = {}) {
   const n = window;
-  "callback" in t || (t.callback = "jsonxData" + Math.random().toString(16).slice(2));
-  const r = t.callback + "";
-  if (!e)
+  "callback" in e || (e.callback = "jsonxData" + Math.random().toString(16).slice(2));
+  const r = e.callback + "";
+  if (!t)
     return null;
-  const l = R(e, t, !0);
+  const l = R(t, e, !0);
   return new Promise((a) => {
     n[r] = function(d) {
-      if (r in window && delete n[r], o(d))
+      if (r in window && delete n[r], s(d))
         return d;
-      console.warn("response type check failed", e, d), a(null);
+      console.warn("response type check failed", t, d), a(null);
     }, H(l).catch(function() {
       a(null), delete n[r];
     });
   });
 }
-async function P(e, o, t = {}) {
+async function A(t, s, e = {}) {
   const n = window;
-  return "var" in t || (t.var = "jsonxData" + Math.random().toString(16).slice(2)), e ? await H(R(e, t, !0)).then(() => {
-    const r = n[t.var + ""];
-    return o(r) ? r : (console.warn("response type check failed", e, r), null);
+  return "var" in e || (e.var = "jsonxData" + Math.random().toString(16).slice(2)), t ? await H(R(t, e, !0)).then(() => {
+    const r = n[e.var + ""];
+    return s(r) ? r : (console.warn("response type check failed", t, r), null);
   }).catch(() => null) : null;
 }
-const A = async function(e, o, t) {
-  return await U(e, o, t, {
+const M = async function(t, s, e) {
+  return await S(t, s, e, {
     baseURL: c.getConfig("baseURL"),
     logHandler: c.getConfig("logHandler"),
     errorHandler: c.getConfig("errorHandler"),
@@ -136,25 +136,25 @@ const A = async function(e, o, t) {
     responseHandler: c.getConfig("responseHandler")
   });
 };
-function v(e) {
+function v(t) {
   if (!C())
     throw new Error("Default Module Only Support In Browser");
-  return L() ? new E(k, e) : new E(S, e);
+  return L() ? new E(j, t) : new E(k, t);
 }
-const c = v(), B = c.setConfig, M = c.request, X = c.head, F = c.get, G = c.post, I = c.del, $ = c.put, z = c.patch;
+const c = v(), N = c.setConfig, B = c.request, X = c.head, F = c.get, G = c.post, I = c.del, Q = c.put, Z = c.patch;
 export {
   v as NetRequest,
   w as RequestInternalError,
   I as del,
   F as get,
-  Q as getResponseRulesDescription,
+  z as getResponseRulesDescription,
   X as head,
-  O as jsonp,
-  P as jsonx,
-  z as patch,
+  P as jsonp,
+  A as jsonx,
+  Z as patch,
   G as post,
-  $ as put,
-  M as request,
-  B as setGlobalConfig,
-  A as upload
+  Q as put,
+  B as request,
+  N as setGlobalConfig,
+  M as upload
 };

package/dist/node.js

@@ -1,26 +1,26 @@
-import { h as y, r as q, c as w, e as g, a as c, d as E, b as f, X as x } from "./retry-FiwuCZIu.js";
-import { g as z } from "./retry-FiwuCZIu.js";
-import { f as C } from "./request.fetch-Cbt_az4v.js";
-import T from "node:http";
-import j from "node:https";
-const L = async function(o, a, u) {
-  return y(await q(N, o, a, u), o, a, u);
-}, N = async function(o, a, u) {
+import { h as y, r as q, c as w, b as g, a as d, f as E, N as f, Z as x } from "./retry-BjOxSyvC.js";
+import { g as z } from "./retry-BjOxSyvC.js";
+import { f as C } from "./request.fetch-6HUu6_l5.js";
+import N from "node:http";
+import T from "node:https";
+const j = async function(o, a, u) {
+  return y(await q(L, o, a, u), o, a, u);
+}, L = async function(o, a, u) {
   const t = await w(o, a, u);
   if (!g(t.url))
     return {
       url: t.url,
       method: t.method,
       status: -1,
-      statusText: c.URLFormatError,
+      statusText: d.URLFormatError,
       headers: {},
       body: ""
     };
-  const R = /^https:\/\//i.test(t.url) ? j : T, n = new URL(t.url), i = t.params;
+  const R = /^https:\/\//i.test(t.url) ? T : N, n = new URL(t.url), i = t.params;
   i instanceof Object && Object.keys(i).forEach((r) => n.searchParams.set(r, i[r]));
   const l = t.method === "HEAD";
   return new Promise((r) => {
-    const d = R.request(
+    const c = R.request(
       n,
       {
         headers: t.headers,
@@ -37,41 +37,41 @@ const L = async function(o, a, u) {
             url: n.toString(),
             method: t.method,
             status: e.statusCode || -1,
-            statusText: e.statusMessage || c.Unknown,
+            statusText: e.statusMessage || d.Unknown,
             headers: m,
             body: l || e.statusCode === 204 ? "" : Buffer.concat(p).toString("utf-8")
           });
         });
       }
     );
-    d.on("error", (e) => {
+    c.on("error", (e) => {
       r({
         url: n.toString(),
         method: t.method,
         status: -1,
-        statusText: c.NetworkError,
+        statusText: d.NetworkError,
         body: "",
         rawError: e
       });
-    }), d.on("timeout", () => {
+    }), c.on("timeout", () => {
       r({
         url: n.toString(),
         method: t.method,
         status: -1,
-        statusText: c.Timeout,
+        statusText: d.Timeout,
         body: ""
       });
-    }), t.body && d.write(t.body), d.end();
+    }), t.body && c.write(t.body), c.end();
   });
 };
 function O(o) {
-  return x() ? new f(C, o) : new f(L, o);
+  return x() ? new f(C, o) : new f(j, o);
 }
-const s = O(), k = s.setConfig, B = s.head, D = s.get, P = s.post, X = s.del, F = s.put, G = s.patch;
+const s = O(), k = s.setConfig, B = s.head, D = s.get, P = s.post, Z = s.del, F = s.put, G = s.patch;
 export {
   O as NetRequest,
-  c as RequestInternalError,
-  X as del,
+  d as RequestInternalError,
+  Z as del,
   D as get,
   z as getResponseRulesDescription,
   B as head,

package/dist/{request.fetch-Cbt_az4v.js → request.fetch-6HUu6_l5.js}

@@ -1,8 +1,8 @@
-import { h as w, r as y, c as E, s as T, d as R, a as c } from "./retry-FiwuCZIu.js";
-const x = async function(s, a, n) {
-  return w(await y(g, s, a, n), s, a, n);
-}, g = async function(s, a, n) {
-  const t = await E(s, a, n), i = new URL(t.url), u = t.params;
+import { h as w, r as y, c as E, u as T, f as R, a as c } from "./retry-BjOxSyvC.js";
+const x = async function(a, s, n) {
+  return w(await y(g, a, s, n), a, s, n);
+}, g = async function(a, s, n) {
+  const t = await E(a, s, n), i = new URL(t.url), u = t.params;
   u instanceof Object && Object.keys(u).forEach((e) => i.searchParams.set(e, u[e]));
   const r = T() ? new AbortController() : null;
   function d() {
@@ -12,7 +12,7 @@ const x = async function(s, a, n) {
   let l = !1;
   const b = t.timeout > 0 ? setTimeout(function() {
     l = !0, d();
-  }, t.timeout) : null, m = t.method === "HEAD";
+  }, t.timeout) : null, f = t.method === "HEAD";
   return await fetch(i, {
     method: t.method,
     headers: Object.keys(t.headers).length > 0 ? new Headers(t.headers) : void 0,
@@ -27,7 +27,7 @@ const x = async function(s, a, n) {
       status: e.status,
       statusText: e.statusText,
       headers: R([...e.headers.entries()])
-    }, h = m || e.status === 204 ? "" : await e.text().catch((f) => f);
+    }, h = f || e.status === 204 ? "" : await e.text().catch((m) => m);
     return h instanceof Error ? { ...o, body: "", statusText: c.Unknown, rawError: h } : { ...o, body: h };
   }).catch((e) => {
     const o = r?.signal.aborted;

package/dist/{retry-FiwuCZIu.js → retry-BjOxSyvC.js}

@@ -1,41 +1,41 @@
 const h = typeof globalThis < "u" ? globalThis : typeof self < "u" ? self : typeof window < "u" ? window : Function("return this")();
-function x() {
+function S() {
   return h;
 }
-function m(t) {
+function p(t) {
   return typeof t == "function";
 }
 function C(t) {
   return typeof t == "object" && t !== null;
 }
-function P() {
-  return "wx" in h && C(h.wx) && "getSystemInfo" in h.wx && m(h.wx.getSystemInfo);
+function D() {
+  return "wx" in h && C(h.wx) && "getSystemInfo" in h.wx && p(h.wx.getSystemInfo);
 }
 function de() {
-  return "fetch" in h && m(h.fetch);
+  return "fetch" in h && p(h.fetch);
 }
 function ge() {
-  return "window" in h && C(h.window) && !P();
+  return "window" in h && C(h.window) && !D();
 }
 function M() {
-  return "Blob" in h && m(h.Blob);
+  return "Blob" in h && p(h.Blob);
 }
 function v() {
-  return "FormData" in h && m(h.FormData);
-}
-function pe() {
-  return "TextDecoder" in h && m(h.TextDecoder);
+  return "FormData" in h && p(h.FormData);
 }
 function me() {
-  return "AbortController" in h && m(h.AbortController);
+  return "TextDecoder" in h && p(h.TextDecoder);
 }
-function D() {
-  return "URLSearchParams" in h && m(h.URLSearchParams);
+function pe() {
+  return "AbortController" in h && p(h.AbortController);
 }
-function _(t) {
-  return new Promise((e) => setTimeout(e, Math.min(Number.MAX_SAFE_INTEGER, Math.max(0, t))));
+function P() {
+  return "URLSearchParams" in h && p(h.URLSearchParams);
 }
 function q(t) {
+  return new Promise((e) => setTimeout(e, Math.min(Number.MAX_SAFE_INTEGER, Math.max(0, t))));
+}
+function I(t) {
   const e = t || "CustomError";
   return class extends Error {
     constructor(s) {
@@ -47,20 +47,28 @@ function q(t) {
     }
   };
 }
-const N = /^(?:https?:)?\/\/.+$/i, B = /^https?:\/\/.+$/i, I = /^\{[\d\D]*\}$/, H = /^\[[\d\D]*\]$/;
+const B = /^(?:https?:)?\/\/.+$/i, H = /^https?:\/\/.+$/i, N = /^\{[\d\D]*\}$/, G = /^\[[\d\D]*\]$/;
 function j(t, e = !1) {
-  return e ? N.test(t) : B.test(t);
+  return e ? B.test(t) : H.test(t);
 }
-function G(t) {
+function _(t) {
   return t == null;
 }
-function A(t, ...e) {
+function U(t, ...e) {
   if (!t || typeof t != "object") return !1;
   const s = Object.getPrototypeOf(t);
   return s !== Object.prototype && s !== null ? !1 : e.every((r) => r in t);
 }
-function U(t) {
-  return I.test(t) || H.test(t);
+function A(t) {
+  return N.test(t) || G.test(t);
+}
+function R(t, e) {
+  try {
+    const s = JSON.parse(t);
+    return e ? e(s) ? s : null : s;
+  } catch {
+    return null;
+  }
 }
 async function ye(t) {
   return await new Promise(function(e) {
@@ -82,10 +90,10 @@ function K(t, e = "数据未能正确识别") {
   };
 }
 function J(t, e = "") {
-  return !e || j(t, !0) ? $(t) : ($(e) + "/" + t).replace(/\/{2,}/g, "/").replace(/:\//, "://");
+  return !e || j(t, !0) ? T(t) : (T(e) + "/" + t).replace(/\/{2,}/g, "/").replace(/:\//, "://");
 }
-function $(t) {
-  const e = x();
+function T(t) {
+  const e = S();
   return j(t, !0) ? t.startsWith("http") ? t : ("location" in e ? location.protocol : "https:") + t : ("location" in e ? location.origin : "http://127.0.0.1") + "/" + t.replace(/^\/+/, "");
 }
 function V(t, e) {
@@ -115,11 +123,11 @@ function be(t, e, s = !1) {
   const o = n[0].indexOf("?") + 1 ? "&" : "?";
   return (n[0] + o + r + (n.length > 1 ? "#" + n[1] : "")).replace(/\?&/, "?");
 }
-function X(t) {
+function Q(t) {
   const e = t.match(/(?:\?|&)([^=]+)(?:&|$)/g);
   return e ? e.join("").replace(/(?:\?|^&+|&+$)/g, "").replace(/&{2}/g, "&").split("&").sort() : [];
 }
-class z {
+class Z {
   ttl;
   cache;
   timer = null;
@@ -147,7 +155,7 @@ class z {
       } catch (l) {
         return console.warn("[RequestCache] cacheResolve error", s, r, l), "";
       }
-    const i = Object.assign(V(a, !0), r), g = X(a), u = Object.keys(i).sort().map((l) => `${l}#${i[l]}`);
+    const i = Object.assign(V(a, !0), r), g = Q(a), u = Object.keys(i).sort().map((l) => `${l}#${i[l]}`);
     return `${c}_${o}_${u.join(",")}_${g.join(",")}`;
   }
   updateTTL(e) {
@@ -170,7 +178,7 @@ class z {
     this.cache[e] && delete this.cache[e];
   }
 }
-class Y {
+class z {
   // 保存的配置需要部分字段强制设置默认值
   config = {
     baseURL: "/",
@@ -211,7 +219,7 @@ class Y {
     this.config.messageHandler && s && this.config.messageHandler(e, s, r, n);
   }
 }
-const S = {
+const L = {
   /** 响应数据校验失败 */
   UnexpectResponse: "UnexpectResponse",
   /** 请求被取消 */
@@ -227,10 +235,10 @@ const S = {
   /** url 格式错误 */
   URLFormatError: "URLFormatError"
 };
-function Q(t, e, s, r) {
-  if (e.ok && !G(e.data) && r) {
+function X(t, e, s, r) {
+  if (e.ok && !_(e.data) && r) {
     const n = K(r, s.get("defaultTypeGuardMessage"));
-    return n.guard(e.data) || (e.code = S.UnexpectResponse, s.showMessage(!0, `${t} ${n.message}`, e.code, e.status), console.error(e.code, t, e.data), e.data = null, e.message = n.message), e;
+    return n.guard(e.data) || (e.code = L.UnexpectResponse, s.showMessage(!0, `${t} ${n.message}`, e.code, e.status), console.error(e.code, t, e.data), e.data = null, e.message = n.message), e;
   }
   return e;
 }
@@ -239,7 +247,7 @@ class we {
   config;
   cache;
   constructor(e, s) {
-    this.config = new Y(s), this.agent = e, this.cache = new z(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);
+    this.config = new z(s), this.agent = e, this.cache = new Z(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);
   }
   /**
    * 执行网络请求
@@ -260,7 +268,7 @@ class we {
       return console.error("RequestError", n), {
         ok: !1,
         status: -9,
-        code: S.Unknown,
+        code: L.Unknown,
         message: n instanceof Error ? `${n.message}
 ${n.stack || ""}` : String(n),
         headers: {},
@@ -272,7 +280,7 @@ ${n.stack || ""}` : String(n),
    * 检查响应的数据类型
    */
   async guard(e, s, r) {
-    return Q(e, s, this.config, r);
+    return X(e, s, this.config, r);
   }
   /**
    * 修改默认请求配置: baseURL / timeout / credentials / errorHandler / messageHandler / responseHandler / logHandler / responseRule
@@ -325,14 +333,14 @@ async function Re(t, e, s) {
     },
     r.headers
   ), i = r.params || {}, g = {};
-  Object.keys(i).forEach((p) => {
-    i[p] !== void 0 && (g[p] = Z(i[p]));
+  Object.keys(i).forEach((m) => {
+    i[m] !== void 0 && (g[m] = Y(i[m]));
   });
-  const u = e.getFullUrl(t), l = ee(r.body), f = r.timeout || e.get("timeout"), d = await async function() {
-    const p = e.get("requestTransformer");
-    if (p)
-      return await p({ headers: c, params: g, method: o, url: u, body: l });
-  }(), y = typeof d == "string" && d ? d : u;
+  const u = e.getFullUrl(t), l = ee(r.body), f = r.timeout || e.get("timeout"), d = await (async function() {
+    const m = e.get("requestTransformer");
+    if (m)
+      return await m({ headers: c, params: g, method: o, url: u, body: l });
+  })(), y = typeof d == "string" && d ? d : u;
   return e.get("logHandler")?.({ type: "ready", url: y, method: o, headers: c, timeout: f, body: l }), {
     url: y,
     method: o,
@@ -344,49 +352,19 @@ async function Re(t, e, s) {
     credentials: r.credentials || e.get("credentials")
   };
 }
-function Z(t) {
+function Y(t) {
   return t == null ? "" : typeof t == "string" ? t : typeof t == "number" || typeof t == "boolean" ? String(t) : Array.isArray(t) ? t.filter(
     (s) => s != null && typeof s != "object" && typeof s != "function"
   ).join(",") : (console.warn("参数类型不支持，已被过滤", typeof t), "");
 }
 function ee(t) {
   if (t)
-    return typeof t == "string" || D() && t instanceof URLSearchParams || t instanceof ArrayBuffer || M() && t instanceof Blob || v() && t instanceof FormData ? t : JSON.stringify(t);
-}
-function te(t) {
-  const e = {};
-  for (const [s, r] of t)
-    if (s && typeof s == "string") {
-      if (s === "__proto__" || s === "constructor" || s === "prototype") {
-        console.warn("检测到危险的对象属性，已被过滤", s);
-        continue;
-      }
-      if (s.includes("\0") || s.includes("\r") || s.includes(`
-`)) {
-        console.warn("参数名中包含可疑字符，已被过滤", s);
-        continue;
-      }
-      e[s] = r || "";
-    }
-  return e;
-}
-function R(t) {
-  try {
-    const e = JSON.parse(t);
-    if (e && typeof e == "object" && !Array.isArray(e)) {
-      for (const s in e)
-        if (s === "__proto__" || s === "constructor" || s === "prototype" || Object.prototype.hasOwnProperty.call(e, "__proto__") || Object.prototype.hasOwnProperty.call(e, "constructor"))
-          return console.warn("JSON 数据包含危险属性，已拒绝解析", s), null;
-    }
-    return e;
-  } catch (e) {
-    return console.warn("JSON 解析失败", e), null;
-  }
+    return typeof t == "string" || P() && t instanceof URLSearchParams || t instanceof ArrayBuffer || M() && t instanceof Blob || v() && t instanceof FormData ? t : JSON.stringify(t);
 }
-const L = "data", b = "message";
-function se(t, e, s, r, n) {
+const x = "data", b = "message";
+function te(t, e, s, r, n) {
   const o = n || r;
-  return O(t) ? ie(o.ok || r.ok, t, e, s) : re(o.failed || r.failed, e, s);
+  return $(t) ? ce(o.ok || r.ok, t, e, s) : se(o.failed || r.failed, e, s);
 }
 const Ee = function(t) {
   const e = [], s = t.failed || { resolve: "json" };
@@ -405,7 +383,7 @@ const Ee = function(t) {
       break;
     case "json":
       e.push(
-        "  将响应解析为 json，读取 " + (r.dataField || L) + " 作为响应数据，读取 " + (r.messageField || b) + " 作为提示消息"
+        "  将响应解析为 json，读取 " + (r.dataField || x) + " 作为响应数据，读取 " + (r.messageField || b) + " 作为提示消息"
       ), r.statusField && e.push(
         "  当 " + r.statusField + " 为 " + (r.statusOKValue || "空值") + " 时是成功提示，否则是错误消息"
       ), r.ignoreMessage && e.push("  并忽略以下消息：" + r.ignoreMessage);
@@ -414,7 +392,7 @@ const Ee = function(t) {
   return e.join(`
 `);
 };
-function re(t, e, s) {
+function se(t, e, s) {
   const r = t || { resolve: "json", messageField: b }, n = {
     ok: !1,
     code: e,
@@ -423,20 +401,20 @@ function re(t, e, s) {
   };
   switch (r.resolve) {
     case "body":
-      n.message = T(s) || s;
+      n.message = O(s) || s;
       break;
     case "json":
-      const { code: o, message: a } = ne(s, r.converter, r.statusField, r.messageField);
-      n.code = o || e, n.message = T(s) || a;
+      const { code: o, message: a } = re(s, r.converter, r.statusField, r.messageField);
+      n.code = o || e, n.message = O(s) || a;
       break;
   }
   return n;
 }
-function ne(t, e, s, r = b) {
-  if (!U(t))
+function re(t, e, s, r = b) {
+  if (!A(t))
     return { message: "" };
   const n = k(R(t), e);
-  return !n || !A(n) ? { message: t } : {
+  return !n || !U(n) ? { message: t } : {
     code: s ? E(n, s) : "",
     message: E(n, r) || t
   };
@@ -445,21 +423,21 @@ function E(t, e) {
   const s = Array.isArray(e) ? e : [e];
   for (const r of s)
     if (r in t)
-      return oe(t[r]);
+      return ne(t[r]);
   return "";
 }
-function oe(t) {
+function ne(t) {
   return t ? typeof t == "string" ? t : JSON.stringify(t) : "";
 }
-const ae = /<title>([^<]+)<\/title>/i, ce = /<message>([^<]+)<\/message>/i;
-function T(t) {
-  const e = t.match(ae);
+const oe = /<title>([^<]+)<\/title>/i, ae = /<message>([^<]+)<\/message>/i;
+function O(t) {
+  const e = t.match(oe);
   if (e)
     return e[1];
-  const s = t.match(ce);
+  const s = t.match(ae);
   return s ? s[1] : "";
 }
-function ie(t, e, s, r) {
+function ce(t, e, s, r) {
   const n = t || { resolve: "body" }, o = {
     ok: !0,
     code: s,
@@ -469,33 +447,33 @@ function ie(t, e, s, r) {
   if (e === 204 || !r)
     return o;
   if (n.resolve === "body")
-    return o.data = U(r) ? k(R(r), t.converter) : r, o;
+    return o.data = A(r) ? k(R(r), t.converter) : r, o;
   const a = R(r);
   if (!a)
     return o.ok = !1, o.code = "ResponseFormatError", o.message = "响应内容无法安全解析", o;
   const c = k(a, t.converter);
-  if (!c || !A(c))
+  if (!c || !U(c))
     return o.ok = !1, o.code = "ResponseFormatError", o.message = "响应内容无法格式化为 Object", o;
-  const i = n.statusField, g = n.statusOKValue || "", u = n.dataField || L, l = n.messageField || b, f = n.ignoreMessage || "";
+  const i = n.statusField, g = n.statusOKValue || "", u = n.dataField || x, l = n.messageField || b, f = n.ignoreMessage || "";
   if (i && !(i in c))
     return o.ok = !1, o.code = "ResponseFieldMissing", o.message = "响应内容找不到状态字段 " + i, o;
   const d = i ? c[i] + "" : "";
   return o.ok = i ? d === g : !0, o.code = d || s, o.data = u === !0 ? c : u in c ? c[u] : null, o.message = E(c, l), f && o.message && (Array.isArray(f) && f.includes(o.message) || typeof f == "string" && o.message === f) && (o.message = ""), o;
 }
-function O(t) {
+function $(t) {
   return t >= 200 && t < 400;
 }
 function k(t, e) {
-  return e ? typeof e == "function" ? e(t) : (console.warn('工具不再支持 "camelize", "snakify" 参数，请自行提供函数来转化 body 内容'), t) : t;
+  return e && typeof e == "function" ? e(t) : t;
 }
-const ue = q("APIError");
-function le(t) {
+const ie = I("APIError");
+function ue(t) {
   const e = {};
   for (const n in t.headers)
     (n.startsWith("x-") || n.includes("trace") || n.includes("server") || /\b(?:id|uuid)\b/.test(n)) && (e[n] = t.headers[n]);
   const s = t.url.replace(/^(?:https?:)?\/*/i, "").replace(/\?.+/, ""), r = t.status < 0 ? "unknown" : t.status;
   return {
-    sentryError: new ue(`${s} | ${r}${t.code ? ` | ${t.code}` : ""}`),
+    sentryError: new ie(`${s} | ${r}${t.code ? ` | ${t.code}` : ""}`),
     sentryTags: {
       ...e,
       status: r,
@@ -511,18 +489,24 @@ function le(t) {
     }
   };
 }
+function le(t) {
+  const e = {};
+  for (const [s, r] of t)
+    s && typeof s == "string" && (e[s] = r || "");
+  return e;
+}
 function ke(t, e, s, r) {
-  const n = t.status, o = t.method, a = te(
+  const n = t.status, o = t.method, a = le(
     Object.entries(t.headers || {}).map(([d, y]) => [d.toLowerCase(), y])
-  ), { ok: c, code: i, data: g, message: u } = se(
+  ), { ok: c, code: i, data: g, message: u } = te(
     n,
     t.statusText,
     t.body,
     s.get("responseRule"),
     r?.responseRule
   );
-  if (!O(n)) {
-    const d = le({
+  if (!$(n)) {
+    const d = ue({
       url: t.url,
       method: t.method,
       status: n,
@@ -562,7 +546,7 @@ function F(t, e, s, r, n, o) {
   const a = n.get("message"), c = a === !1 || o?.message === !1 ? !1 : o?.message || a;
   if (c !== !1) {
     const i = typeof c == "function" ? c(t, s, r, e) : e;
-    i instanceof Error ? n.showMessage(!0, w(i.message), t.code, t.status) : i && typeof i == "object" && "message" in i && typeof i.message == "string" ? n.showMessage(!1, w(i.message), t.code, t.status) : n.showMessage(!t.ok, w(String(i)), t.code, t.status);
+    i instanceof Error ? n.showMessage(!0, w(i.message), t.code, t.status) : i && typeof i == "object" && "message" in i && typeof i.message == "string" ? n.showMessage(!1, w(i.message), t.code, t.status) : i && n.showMessage(!t.ok, w(String(i)), t.code, t.status);
   }
   return t;
 }
@@ -599,32 +583,32 @@ async function fe(t, e, s, r, n) {
     headers: u.headers,
     cost: f
   });
-  const y = O(l);
+  const y = $(l);
   if (!a || o >= a || c === "network" && l > 0 || c === "status" && y || Array.isArray(c) && !c.includes(l) || typeof c == "function" && c(u, o) !== !0)
     return u;
-  const p = r?.retryInterval ?? s.get("retryInterval") ?? 100;
-  return await _(
+  const m = r?.retryInterval ?? s.get("retryInterval") ?? 100;
+  return await q(
     Math.max(
       100,
-      p === "2EB" ? Math.pow(2, o) * 100 : typeof p == "function" ? p(o + 1, { url: e, status: l, method: u.method }) || 0 : p
+      m === "2EB" ? Math.pow(2, o) * 100 : typeof m == "function" ? m(o + 1, { url: e, status: l, method: u.method }) || 0 : m
     )
   ), await fe(t, e, s, r, o + 1);
 }
 export {
-  be as B,
-  ye as N,
-  Y as R,
-  de as X,
-  S as a,
-  we as b,
+  D as E,
+  we as N,
+  be as Q,
+  z as R,
+  de as Z,
+  ye as _,
+  L as a,
+  j as b,
   Re as c,
-  te as d,
-  j as e,
-  ge as f,
+  le as f,
   Ee as g,
   ke as h,
-  P as i,
-  pe as o,
+  ge as l,
   fe as r,
-  me as s
+  me as s,
+  pe as u
 };

package/dist/wx.js

@@ -1,5 +1,5 @@
-import { h as i, r as p, c as f, B as l, i as h, a as d, o as y, b as g } from "./retry-FiwuCZIu.js";
-import { g as H } from "./retry-FiwuCZIu.js";
+import { h as i, r as p, c as f, Q as l, E as h, a as d, s as y, N as g } from "./retry-BjOxSyvC.js";
+import { g as H } from "./retry-BjOxSyvC.js";
 const m = async function(t, n, r) {
   return i(await p(x, t, n, r), t, n, r);
 }, x = async function(t, n, r) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seayoo-web/request",
-  "version": "3.4.2",
+  "version": "3.4.4",
   "description": "request tools for seayoo web",
   "type": "module",
   "source": "./src/index.ts",
@@ -56,7 +56,7 @@
     "happy-dom": "^12.10.3",
     "msw": "^2.10.5",
     "vitest": "^3.2.4",
-    "@seayoo-web/utils": "^4.1.3"
+    "@seayoo-web/utils": "^4.4.0"
   },
   "scripts": {
     "prebuild": "pnpm --F utils build",

package/types/inc/utils.d.ts

@@ -2,8 +2,3 @@
  * 简版 Object.fromEntries 以处理某些低版本浏览器和 webview 的问题
  */
 export declare function fromEntries(kv: [string, string | undefined][]): Record<string, string>;
-/**
- * 安全解析 JSON
- * 防止原型污染和原型链攻击
- */
-export declare function safeJSONParse<T = unknown>(text: string): T | null;