@seayoo-web/request 3.5.1 → 3.5.2

package/dist/index.js

@@ -1,6 +1,6 @@
-import { h as m, r as q, R as T, c as x, H as R, a as w, v as E, b as C, N as H, X as L } from "./retry-DodVI8cA.js";
-import { g as Q } from "./retry-DodVI8cA.js";
-import { f as v } from "./request.fetch-BHmmkAon.js";
+import { h as m, r as q, R as T, c as x, H as R, a as w, v as E, b as C, N as H, X as L } from "./retry-Cxkf8ke1.js";
+import { g as Q } from "./retry-Cxkf8ke1.js";
+import { f as v } from "./request.fetch-Jj3A4PnG.js";
 const j = async function(t, s, e) {
   return m(await q(y, t, s, e), t, s, e);
 };

package/dist/node.js

@@ -1,6 +1,6 @@
-import { h as b, r as q, c as w, n as g, a as d, f as E, N as f, X as x } from "./retry-DodVI8cA.js";
-import { g as z } from "./retry-DodVI8cA.js";
-import { f as C } from "./request.fetch-BHmmkAon.js";
+import { h as b, r as q, c as w, n as g, a as d, f as E, N as f, X as x } from "./retry-Cxkf8ke1.js";
+import { g as z } from "./retry-Cxkf8ke1.js";
+import { f as C } from "./request.fetch-Jj3A4PnG.js";
 import N from "node:http";
 import T from "node:https";
 const j = async function(o, a, u) {

package/dist/{request.fetch-BHmmkAon.js → request.fetch-Jj3A4PnG.js}

@@ -1,4 +1,4 @@
-import { h as w, r as y, c as E, d as T, f as g, a as c } from "./retry-DodVI8cA.js";
+import { h as w, r as y, c as E, d as T, f as g, a as c } from "./retry-Cxkf8ke1.js";
 const x = async function(o, a, s) {
   return w(await y(R, o, a, s), o, a, s);
 }, R = async function(o, a, s) {

package/dist/{retry-DodVI8cA.js → retry-Cxkf8ke1.js}

@@ -1,5 +1,5 @@
 const l = typeof globalThis < "u" ? globalThis : typeof self < "u" ? self : typeof window < "u" ? window : Function("return this")();
-function D() {
+function x() {
   return l;
 }
 function p(t) {
@@ -8,14 +8,14 @@ function p(t) {
 function F(t) {
   return typeof t == "object" && t !== null;
 }
-function P() {
+function D() {
   return "wx" in l && F(l.wx) && "getSystemInfo" in l.wx && p(l.wx.getSystemInfo);
 }
 function pe() {
   return "fetch" in l && p(l.fetch);
 }
 function ye() {
-  return "window" in l && F(l.window) && !P();
+  return "window" in l && F(l.window) && !D();
 }
 function M() {
   return "Blob" in l && p(l.Blob);
@@ -29,14 +29,14 @@ function be() {
 function we() {
   return "AbortController" in l && p(l.AbortController);
 }
-function q() {
+function P() {
   return "URLSearchParams" in l && p(l.URLSearchParams);
 }
-function H(t) {
+function q(t) {
   return new Promise((e) => setTimeout(e, Math.min(Number.MAX_SAFE_INTEGER, Math.max(0, t))));
 }
 // @__NO_SIDE_EFFECTS__
-function B(t) {
+function H(t) {
   const e = t || "CustomError";
   return class extends Error {
     constructor(s) {
@@ -48,22 +48,22 @@ function B(t) {
     }
   };
 }
-const I = /^(?:https?:)?\/\/.+$/i, N = /^https?:\/\/.+$/i, G = /^\{[\d\D]*\}$/, K = /^\[[\d\D]*\]$/;
-function T(t, e = !1) {
-  return e ? I.test(t) : N.test(t);
+const N = /^(?:https?:)?\/\/.+$/i, B = /^https?:\/\/.+$/i, I = /^\{[\d\D]*\}$/, G = /^\[[\d\D]*\]$/;
+function $(t, e = !1) {
+  return e ? N.test(t) : B.test(t);
 }
-function _(t) {
+function K(t) {
   return t == null;
 }
-function A(t, ...e) {
+function v(t, ...e) {
   if (!t || typeof t != "object") return !1;
   const s = Object.getPrototypeOf(t);
   return s !== Object.prototype && s !== null ? !1 : e.every((n) => n in t);
 }
-function v(t) {
-  return G.test(t) || K.test(t);
+function A(t) {
+  return I.test(t) || G.test(t);
 }
-function R(t, e) {
+function k(t, e) {
   try {
     const s = JSON.parse(t);
     return e ? e(s) ? s : null : s;
@@ -81,7 +81,7 @@ async function Ee(t) {
     }, n.setAttribute("src", t), s.appendChild(n);
   });
 }
-function J(t, e = "数据未能正确识别") {
+function _(t, e = "数据未能正确识别") {
   return typeof t == "function" ? {
     guard: t,
     message: e
@@ -90,21 +90,21 @@ function J(t, e = "数据未能正确识别") {
     message: t.message || e
   };
 }
-function V(t, e = "") {
-  return !e || T(t, !0) ? $(t) : ($(e) + "/" + t).replace(/\/{2,}/g, "/").replace(/:\//, "://");
+function J(t, e = "") {
+  return !e || $(t, !0) ? T(t) : (T(e) + "/" + t).replace(/\/{2,}/g, "/").replace(/:\//, "://");
 }
-function $(t) {
-  const e = D();
-  return T(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 T(t) {
+  const e = x();
+  return $(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 W(t, e) {
+function V(t, e) {
   const s = {};
   return (t.match(/([^=&#?]+)=[^&#]*/g) || []).forEach(function(n) {
     const r = n.split("="), o = r[0], a = decodeURIComponent(r[1] || "");
     s[o] !== void 0 ? s[o] += "," + a : s[o] = a;
   }), e !== !0 ? s[e] || "" : s;
 }
-function X(t, e) {
+function W(t, e) {
   if (e) {
     if (e === !0)
       return t.replace(/\?[^#]*/, "");
@@ -112,23 +112,23 @@ function X(t, e) {
   const s = t.split("#"), n = s[0].split("?"), r = n[0], o = n.length > 1 ? n[1] : "", a = s.length > 1 ? "#" + s[1] : "", i = typeof e == "string" ? [e] : Array.isArray(e) ? e : [];
   return !i.length || !o ? s[0] + a : (i.map((c) => c.replace(/([\\(){}[\]^$+\-*?|])/g, "\\$1")), (r + "?" + o.replace(new RegExp("(?:^|&)(?:" + i.join("|") + ")=[^&$]+", "g"), "").replace(/^&/, "")).replace(/\?$/, "") + a);
 }
-function Re(t, e, s = !1) {
+function ke(t, e, s = !1) {
   const n = typeof e == "string" ? e : Object.keys(e).map((a) => `${a}=${encodeURIComponent(e[a])}`).join("&");
   if (!n)
     return t;
   const r = t.split("#");
-  s && (r[0] = X(
+  s && (r[0] = W(
     r[0],
     (n.match(/([^=&#?]+)=[^&#]+/g) || []).map((a) => a.replace(/=.+$/, ""))
   ));
   const o = r[0].indexOf("?") + 1 ? "&" : "?";
   return (r[0] + o + n + (r.length > 1 ? "#" + r[1] : "")).replace(/\?&/, "?");
 }
-function z(t) {
+function X(t) {
   const e = t.match(/(?:\?|&)([^=]+)(?:&|$)/g);
   return e ? e.join("").replace(/(?:\?|^&+|&+$)/g, "").replace(/&{2}/g, "&").split("&").sort() : [];
 }
-class Q {
+class z {
   ttl;
   cache;
   timer = null;
@@ -156,7 +156,7 @@ class Q {
       } catch (h) {
         return console.warn("[RequestCache] cacheResolve error", s, n, h), "";
       }
-    const c = Object.assign(W(a, !0), n), g = z(a), u = Object.keys(c).sort().map((h) => `${h}#${c[h]}`);
+    const c = Object.assign(V(a, !0), n), g = X(a), u = Object.keys(c).sort().map((h) => `${h}#${c[h]}`);
     return `${i}_${o}_${u.join(",")}_${g.join(",")}`;
   }
   updateTTL(e) {
@@ -179,7 +179,7 @@ class Q {
     this.cache[e] && delete this.cache[e];
   }
 }
-class Y {
+class Q {
   // 保存的配置需要部分字段强制设置默认值
   config = {
     baseURL: "/",
@@ -204,7 +204,7 @@ class Y {
     e && this.set(e);
   }
   set(e) {
-    if (e.baseURL && !/^\/.+/.test(e.baseURL) && !T(e.baseURL))
+    if (e.baseURL && !/^\/.+/.test(e.baseURL) && !$(e.baseURL))
       throw console.warn("baseURL 需要以 / 开头，或者是完整的 url 地址"), new Error("BaseURLError");
     Object.assign(this.config, e);
   }
@@ -213,7 +213,7 @@ class Y {
   }
   /** 基于 baseURL 返回完整的 url 地址 */
   getFullUrl(e) {
-    return V(e, this.config.baseURL);
+    return J(e, this.config.baseURL);
   }
   /** 提示消息 */
   showMessage(e, s, n, r) {
@@ -236,19 +236,19 @@ const w = {
   /** url 格式错误 */
   URLFormatError: "URLFormatError"
 };
-function Z(t, e, s, n) {
-  if (e.ok && !_(e.data) && n) {
-    const r = J(n, s.get("defaultTypeGuardMessage"));
+function Y(t, e, s, n) {
+  if (e.ok && !K(e.data) && n) {
+    const r = _(n, s.get("defaultTypeGuardMessage"));
     return r.guard(e.data) || (e.code = w.UnexpectResponse, s.showMessage(!0, `${t} ${r.message}`, e.code, e.status), console.error(e.code, t, e.data), e.data = null, e.message = r.message), e;
   }
   return e;
 }
-class ke {
+class Re {
   agent;
   config;
   cache;
   constructor(e, s) {
-    this.config = new Y(s), this.agent = e, this.cache = new Q(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 Q(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);
   }
   /**
    * 执行网络请求
@@ -281,7 +281,7 @@ ${r.stack || ""}` : String(r),
    * 检查响应的数据类型
    */
   async guard(e, s, n) {
-    return Z(e, s, this.config, n);
+    return Y(e, s, this.config, n);
   }
   /**
    * 修改默认请求配置: baseURL / timeout / credentials / errorHandler / messageHandler / responseHandler / logHandler / responseRule
@@ -335,9 +335,9 @@ async function je(t, e, s) {
     n.headers
   ), c = n.params || {}, g = {};
   Object.keys(c).forEach((y) => {
-    c[y] !== void 0 && (g[y] = ee(c[y]));
+    c[y] !== void 0 && (g[y] = Z(c[y]));
   });
-  const u = e.getFullUrl(t), h = te(n.body), f = n.timeout || e.get("timeout"), d = await (async function() {
+  const u = e.getFullUrl(t), h = ee(n.body), f = n.timeout || e.get("timeout"), d = await (async function() {
     const y = e.get("requestTransformer");
     if (y)
       return await y({ headers: i, params: g, method: o, url: u, body: h });
@@ -353,21 +353,21 @@ async function je(t, e, s) {
     credentials: n.credentials || e.get("credentials")
   };
 }
-function ee(t) {
+function Z(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 te(t) {
+function ee(t) {
   if (t)
-    return typeof t == "string" || q() && t instanceof URLSearchParams || t instanceof ArrayBuffer || M() && t instanceof Blob || U() && t instanceof FormData ? t : JSON.stringify(t);
+    return typeof t == "string" || P() && t instanceof URLSearchParams || t instanceof ArrayBuffer || M() && t instanceof Blob || U() && t instanceof FormData ? t : JSON.stringify(t);
 }
-const x = "data", b = "message";
-function se(t, e, s, n, r) {
+const L = "data", b = "message";
+function te(t, e, s, n, r) {
   const o = r || n;
-  return L(t) ? ie(o.ok || n.ok, t, e, s) : ne(o.failed || n.failed, e, s);
+  return S(t) ? ce(o.ok || n.ok, t, e, s) : se(o.failed || n.failed, e, s);
 }
-const Te = function(t) {
+const $e = function(t) {
   const e = [], s = t.failed || { resolve: "json" };
   switch (e.push("- 当http状态码 <200 或者 >=400 时"), s.resolve) {
     case "body":
@@ -384,7 +384,7 @@ const Te = function(t) {
       break;
     case "json":
       e.push(
-        "  将响应解析为 json，读取 " + (n.dataField || x) + " 作为响应数据，读取 " + (n.messageField || b) + " 作为提示消息"
+        "  将响应解析为 json，读取 " + (n.dataField || L) + " 作为响应数据，读取 " + (n.messageField || b) + " 作为提示消息"
       ), n.statusField && e.push(
         "  当 " + n.statusField + " 为 " + (n.statusOKValue || "空值") + " 时是成功提示，否则是错误消息"
       ), n.ignoreMessage && e.push("  并忽略以下消息：" + n.ignoreMessage);
@@ -393,7 +393,7 @@ const Te = function(t) {
   return e.join(`
 `);
 };
-function ne(t, e, s) {
+function se(t, e, s) {
   const n = t || { resolve: "json", messageField: b }, r = {
     ok: !1,
     code: e,
@@ -405,40 +405,40 @@ function ne(t, e, s) {
       r.message = O(s) || s;
       break;
     case "json":
-      const { code: o, message: a } = re(s, n.converter, n.statusField, n.messageField);
+      const { code: o, message: a } = ne(s, n.converter, n.statusField, n.messageField);
       r.code = o || e, r.message = O(s) || a;
       break;
   }
   return r;
 }
-function re(t, e, s, n = b) {
-  if (!v(t))
+function ne(t, e, s, n = b) {
+  if (!A(t))
     return { message: "" };
-  const r = j(R(t), e);
-  return !r || !A(r) ? { message: t } : {
-    code: s ? k(r, s) : "",
-    message: k(r, n) || t
+  const r = j(k(t), e);
+  return !r || !v(r) ? { message: t } : {
+    code: s ? R(r, s) : "",
+    message: R(r, n) || t
   };
 }
-function k(t, e) {
+function R(t, e) {
   const s = Array.isArray(e) ? e : [e];
   for (const n of s)
     if (n in t)
-      return oe(t[n]);
+      return re(t[n]);
   return "";
 }
-function oe(t) {
+function re(t) {
   return t ? typeof t == "string" ? t : JSON.stringify(t) : "";
 }
-const ae = /<title>([^<]+)<\/title>/i, ce = /<message>([^<]+)<\/message>/i;
+const oe = /<title>([^<]+)<\/title>/i, ae = /<message>([^<]+)<\/message>/i;
 function O(t) {
-  const e = t.match(ae);
+  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, n) {
+function ce(t, e, s, n) {
   const r = t || { resolve: "body" }, o = {
     ok: !0,
     code: s,
@@ -448,33 +448,33 @@ function ie(t, e, s, n) {
   if (e === 204 || !n)
     return o;
   if (r.resolve === "body")
-    return o.data = v(n) ? j(R(n), t.converter) : n, o;
-  const a = R(n);
+    return o.data = A(n) ? j(k(n), t.converter) : n, o;
+  const a = k(n);
   if (!a)
     return o.ok = !1, o.code = "ResponseFormatError", o.message = "响应内容无法安全解析", o;
   const i = j(a, t.converter);
-  if (!i || !A(i))
+  if (!i || !v(i))
     return o.ok = !1, o.code = "ResponseFormatError", o.message = "响应内容无法格式化为 Object", o;
-  const c = r.statusField, g = r.statusOKValue || "", u = r.dataField || x, h = r.messageField || b, f = r.ignoreMessage || "";
+  const c = r.statusField, g = r.statusOKValue || "", u = r.dataField || L, h = r.messageField || b, f = r.ignoreMessage || "";
   if (c && !(c in i))
     return o.ok = !1, o.code = "ResponseFieldMissing", o.message = "响应内容找不到状态字段 " + c, o;
-  const d = c ? i[c] + "" : "";
-  return o.ok = c ? d === g : !0, o.code = d || s, o.data = u === !0 ? i : u in i ? i[u] : null, o.message = k(i, h), f && o.message && (Array.isArray(f) && f.includes(o.message) || typeof f == "string" && o.message === f) && (o.message = ""), o;
+  const d = c ? String(i[c] ?? "") : "";
+  return o.ok = c ? d === g : !0, o.code = d || s, o.data = u === !0 ? i : u in i ? i[u] : null, o.message = R(i, h), f && o.message && (Array.isArray(f) && f.includes(o.message) || typeof f == "string" && o.message === f) && (o.message = ""), o;
 }
-function L(t) {
+function S(t) {
   return t >= 200 && t < 400;
 }
 function j(t, e) {
   return e && typeof e == "function" ? e(t) : t;
 }
-const ue = /* @__PURE__ */ B("APIError");
-function he(t) {
+const ie = /* @__PURE__ */ H("APIError");
+function ue(t) {
   const e = {};
   for (const r in t.headers)
     (r.startsWith("x-") || r.includes("trace") || r.includes("server") || /\b(?:id|uuid)\b/.test(r)) && (e[r] = t.headers[r]);
   const s = t.url.replace(/^(?:https?:)?\/*/i, "").replace(/\?.+/, ""), n = t.status < 0 ? "unknown" : t.status;
   return {
-    sentryError: new ue(`${s} | ${n}${t.code ? ` | ${t.code}` : ""}`),
+    sentryError: new ie(`${s} | ${n}${t.code ? ` | ${t.code}` : ""}`),
     sentryTags: {
       ...e,
       status: n,
@@ -490,38 +490,35 @@ function he(t) {
     }
   };
 }
-function le(t) {
+function he(t) {
   const e = {};
   for (const [s, n] of t)
     s && typeof s == "string" && (e[s] = n || "");
   return e;
 }
-function fe(t) {
+function le(t) {
   return typeof t == "function" ? t : Array.isArray(t) && t.length > 0 ? function(e) {
     return t.includes(e.status);
-  } : t === "network" ? S : de;
+  } : t === "network" ? fe : de;
 }
-function S(t) {
-  return t.status < 0 && t.statusText !== w.Timeout && t.statusText !== w.Aborted;
+function fe({ statusText: t }) {
+  return t == w.NetworkError;
 }
-function de(t) {
-  if (S(t))
-    return !0;
-  const { status: e, headers: s } = t;
-  return s?.server === "TencentEdgeOne" ? e === 522 || e === 552 : !1;
+function de({ status: t, headers: e, statusText: s }) {
+  return s == w.NetworkError ? !0 : e?.server === "TencentEdgeOne" ? t === 522 || t === 552 : !1;
 }
-function $e(t, e, s, n) {
-  const r = t.status, o = t.method, a = le(
+function Te(t, e, s, n) {
+  const r = t.status, o = t.method, a = he(
     Object.entries(t.headers || {}).map(([d, m]) => [d.toLowerCase(), m])
-  ), { ok: i, code: c, data: g, message: u } = se(
+  ), { ok: i, code: c, data: g, message: u } = te(
     r,
     t.statusText,
     t.body,
     s.get("responseRule"),
     n?.responseRule
   );
-  if (!L(r)) {
-    const d = he({
+  if (!S(r)) {
+    const d = ue({
       url: t.url,
       method: t.method,
       status: r,
@@ -575,7 +572,7 @@ function E(t) {
   return t.replace(/<script[\s\S]*?>[\s\S]*?<\/script>/gi, "").replace(/<[^>]+>/g, "").trim();
 }
 async function me(t, e, s, n, r) {
-  const o = r || 0, a = Math.max(0, Math.min(10, n?.maxRetry ?? s.get("maxRetry") ?? 0)), i = fe(n?.retryResolve ?? s.get("retryResolve")), c = s.get("logHandler");
+  const o = r || 0, a = Math.max(0, Math.min(10, n?.maxRetry ?? s.get("maxRetry") ?? 0)), i = le(n?.retryResolve ?? s.get("retryResolve")), c = s.get("logHandler");
   c?.({
     type: "prepare",
     url: e,
@@ -600,7 +597,7 @@ async function me(t, e, s, n, r) {
   }), !a || o >= a || i(u, o) !== !0)
     return u;
   const m = n?.retryInterval ?? s.get("retryInterval") ?? 100;
-  return await H(
+  return await q(
     Math.max(
       100,
       m === "2EB" ? Math.pow(2, o) * 100 : typeof m == "function" ? m(o + 1, { url: e, status: h, method: u.method }) || 0 : m
@@ -608,20 +605,20 @@ async function me(t, e, s, n, r) {
   ), await me(t, e, s, n, o + 1);
 }
 export {
-  P as E,
-  Re as H,
-  ke as N,
-  Y as R,
+  D as E,
+  ke as H,
+  Re as N,
+  Q as R,
   pe as X,
   w as a,
   ye as b,
   je as c,
   we as d,
-  le as f,
-  Te as g,
-  $e as h,
+  he as f,
+  $e as g,
+  Te as h,
   be as i,
-  T as n,
+  $ as n,
   me as r,
   Ee as v
 };

package/dist/wx.js

@@ -1,5 +1,5 @@
-import { h as i, r as p, c as f, H as l, E as h, a as d, i as y, N as g } from "./retry-DodVI8cA.js";
-import { g as E } from "./retry-DodVI8cA.js";
+import { h as i, r as p, c as f, H as l, E as h, a as d, i as y, N as g } from "./retry-Cxkf8ke1.js";
+import { g as E } from "./retry-Cxkf8ke1.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.5.1",
+  "version": "3.5.2",
   "description": "request tools for seayoo web",
   "type": "module",
   "source": "./src/index.ts",