@seayoo-web/request 3.4.0 → 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, W as R, a as w, P as H, V as C, N as E, Q as L } from "./retry-CdUkYrFw.js";
-import { g as z } from "./retry-CdUkYrFw.js";
-import { f as k } from "./request.fetch-B3ED8nRu.js";
-const P = 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 S(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: U(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 U(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 A(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 M = async function(e, o, t) {
-  return await S(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,22 +136,22 @@ const M = async function(e, o, t) {
     responseHandler: c.getConfig("responseHandler")
   });
 };
-function j(e) {
+function v(t) {
   if (!C())
     throw new Error("Default Module Only Support In Browser");
-  return L() ? new E(k, e) : new E(P, e);
+  return L() ? new E(j, t) : new E(k, t);
 }
-const c = j(), N = c.setConfig, B = c.request, X = c.head, F = c.get, G = c.post, I = c.del, Q = c.put, V = 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 {
-  j as NetRequest,
+  v as NetRequest,
   w as RequestInternalError,
   I as del,
   F as get,
   z as getResponseRulesDescription,
   X as head,
-  O as jsonp,
+  P as jsonp,
   A as jsonx,
-  V as patch,
+  Z as patch,
   G as post,
   Q as put,
   B as request,

package/dist/node.js

@@ -1,10 +1,10 @@
-import { h as b, r as q, c as w, e as g, a as d, f as E, N as f, Q as x } from "./retry-CdUkYrFw.js";
-import { g as z } from "./retry-CdUkYrFw.js";
-import { f as C } from "./request.fetch-B3ED8nRu.js";
+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 b(await q(L, o, a, u), 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))
@@ -31,7 +31,7 @@ const j = async function(o, a, u) {
         const p = [];
         e.on("data", (m) => p.push(m)), e.on("end", () => {
           const m = E(
-            Object.entries(e.headers).map(([y, h]) => [y.toLowerCase(), Array.isArray(h) ? h.join(",") : h])
+            Object.entries(e.headers).map(([b, h]) => [b.toLowerCase(), Array.isArray(h) ? h.join(",") : h])
           );
           r({
             url: n.toString(),
@@ -67,11 +67,11 @@ const j = async function(o, a, u) {
 function O(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, Q = 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,
   d as RequestInternalError,
-  Q as del,
+  Z as del,
   D as get,
   z as getResponseRulesDescription,
   B as head,

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

@@ -1,4 +1,4 @@
-import { h as w, r as y, c as E, o as T, f as R, a as c } from "./retry-CdUkYrFw.js";
+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) {