@seayoo-web/request 4.0.0 → 4.0.2

package/dist/index.js

@@ -1,10 +1,10 @@
-import { h, r as x, G as y, c as E, f as q, a as v, R as w, H as R, v as H, b as C, N as T, X as L } from "./retry-DRbCcUt8.js";
-import { g as V } from "./retry-DRbCcUt8.js";
-import { f as k } from "./request.fetch-BNCxK4Wq.js";
-const S = async function(n, a, t) {
-  return h(await x(m, n, a, t), n, a, t);
+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";
+const j = async function(n, a, t) {
+  return h(await E(m, n, a, t), n, a, t);
 };
-async function j(n, a, t, r) {
+async function B(n, a, t, r) {
   const o = t?.body, u = t?.method === "PUT" ? "PUT" : "POST";
   if (a instanceof Blob) {
     const l = new y(r), e = await m(n, l, {
@@ -30,7 +30,7 @@ async function j(n, a, t, r) {
   return h(p, n, f, t);
 }
 const m = async function(n, a, t) {
-  const r = await E(n, a, t), o = r.method, u = t?.onUploadProgress;
+  const r = await q(n, a, t), o = r.method, u = t?.onUploadProgress;
   return await new Promise((c) => {
     let d = null, f = !1;
     const p = function() {
@@ -53,19 +53,19 @@ const m = async function(n, a, t) {
       l();
       const s = e.responseType;
       c(
-        await q(
+        await v(
           {
             url: r.url,
             method: o,
             status: e.status,
             statusText: e.statusText,
-            headers: B(e),
+            headers: P(e),
             body: null
           },
           {
             asBuffer: r.asBuffer,
             text: () => s === "" || s === "text" || s === "json" || s === "document" ? e.responseText : "",
-            buffer: async () => s === "arraybuffer" ? e.response : s === "blob" ? await e.response.arrayBuffer() : await v(e.responseText)
+            buffer: async () => s === "arraybuffer" ? e.response : s === "blob" ? await e.response.arrayBuffer() : await C(e.responseText)
           }
         )
       );
@@ -101,7 +101,7 @@ const m = async function(n, a, t) {
     }, r.timeout));
   });
 };
-function B(n) {
+function P(n) {
   const a = {};
   if (!n)
     return a;
@@ -121,26 +121,26 @@ async function O(n, a, t = {}) {
   const o = t.callback + "";
   if (!n)
     return null;
-  const u = R(n, t, !0);
+  const u = R(n, H(t), !0);
   return new Promise((c) => {
     r[o] = function(d) {
       if (o in window && delete r[o], a(d))
         return d;
       console.warn("response type check failed", n, d), c(null);
-    }, H(u).catch(function() {
+    }, x(u).catch(function() {
       c(null), delete r[o];
     });
   });
 }
-async function P(n, a, t = {}) {
+async function A(n, a, t = {}) {
   const r = window;
-  return "var" in t || (t.var = "jsonxData" + Math.random().toString(16).slice(2)), n ? await H(R(n, t, !0)).then(() => {
+  return "var" in t || (t.var = "jsonxData" + Math.random().toString(16).slice(2)), n ? await x(R(n, H(t), !0)).then(() => {
     const o = r[t.var + ""];
     return a(o) ? o : (console.warn("response type check failed", n, o), null);
   }).catch(() => null) : null;
 }
-const A = async function(n, a, t) {
-  return await j(n, a, t, {
+const M = async function(n, a, t) {
+  return await B(n, a, t, {
     baseURL: i.getConfig("baseURL"),
     logHandler: i.getConfig("logHandler"),
     errorHandler: i.getConfig("errorHandler"),
@@ -151,24 +151,24 @@ const A = async function(n, a, t) {
 };
 // @__NO_SIDE_EFFECTS__
 function U(n) {
-  if (!C())
+  if (!L())
     throw new Error("Default Module Only Support In Browser");
-  return L() ? new T(k, n) : new T(S, n);
+  return k() ? new T(S, n) : new T(j, n);
 }
-const i = /* @__PURE__ */ U(), M = i.setConfig, X = i.request, G = i.head, F = i.get, I = i.post, $ = i.del, z = i.put, J = i.patch;
+const i = /* @__PURE__ */ U(), X = i.setConfig, G = i.request, F = i.head, I = i.get, $ = i.post, z = i.del, J = i.put, K = i.patch;
 export {
   U as NetRequest,
   w as RequestInternalError,
-  $ as del,
-  F as get,
-  V as getResponseRulesDescription,
-  G as head,
+  z as del,
+  I as get,
+  W as getResponseRulesDescription,
+  F as head,
   O as jsonp,
-  P as jsonx,
-  J as patch,
-  I as post,
-  z as put,
-  X as request,
-  M as setGlobalConfig,
-  A as upload
+  A as jsonx,
+  K as patch,
+  $ as post,
+  J as put,
+  G as request,
+  X as setGlobalConfig,
+  M as upload
 };

package/dist/node.js

@@ -1,6 +1,6 @@
-import { h as w, r as R, c as y, d as b, f as q, R as s, N as h, X as g } from "./retry-DRbCcUt8.js";
-import { g as S } from "./retry-DRbCcUt8.js";
-import { f as x } from "./request.fetch-BNCxK4Wq.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--akoKQtX.js";
+import { g as S } from "./retry--akoKQtX.js";
+import { f as x } from "./request.fetch-U42cahT4.js";
 import N from "node:http";
 import C from "node:https";
 const E = async function(o, n, a) {

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

@@ -1,4 +1,4 @@
-import { h as f, r as h, c as m, e as b, f as y, d as T, R as u } from "./retry-DRbCcUt8.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--akoKQtX.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-DRbCcUt8.js → retry--akoKQtX.js}

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

package/types/inc/type.d.ts

@@ -17,7 +17,7 @@ export declare const RequestInternalError: {
 };
 export type RequestInternalError = (typeof RequestInternalError)[keyof typeof RequestInternalError];
 export type RequestMethod = "GET" | "POST" | "PUT" | "DELETE" | "PATCH" | "HEAD";
-export type RequestQueryParams = Record<string, string | number | boolean>;
+export type RequestQueryParams = Record<string, string | number | boolean | null | undefined>;
 /** 通用网络请求工具的基本配置 */
 export interface BaseRequestOptions {
     /** 网络请求方法，默认 GET */

package/types/inc/utils.d.ts

@@ -1,6 +1,7 @@
-import { RetryResolve, RetryResolveFunc } from "./type";
+import { RetryResolve, RetryResolveFunc, RequestQueryParams } from "./type";
 /** 简版 Object.fromEntries 以处理某些低版本浏览器和 webview 的问题 */
 export declare function fromEntries(kv: [string, string | undefined][]): Record<string, string>;
+export declare function convertParams(params?: RequestQueryParams): Record<string, string>;
 export declare function toString(data: unknown): string;
 export declare function convertError(e: unknown): Error;
 export declare function convertStringToArrayBuffer(content: string): Promise<ArrayBuffer>;