@seayoo-web/request 3.4.5 → 3.5.1

package/README.md

@@ -226,13 +226,13 @@ defaultMessage: string
 
 ### retryResolve
 
-类型："network" | "status" | number[] | ((result: IRequestBaseResponse, count: number) => boolean)
+类型："default" | "network" | number[] | ((result: IRequestBaseResponse, count: number) => boolean)
 
-说明：重试判断方法，默认是 network
+说明：重试判断方法，默认是 default
 
-network 表示仅仅当网络错误时才重试，如果请求被取消（aborted）则不重试；
+default 在 network 基础之上，如果是 Tencent EO 响应的 552/522 错误码，则重试;
 
-status 表示网络错误或者http 状态码错误时（<200 || >=400）重试；
+network 表示仅仅当网络错误时才重试，如果请求被取消或超时（aborted/timeout）则不重试；
 
 当设置为 number[] 时，将检查 http 状态码，匹配则重试；
 

package/dist/index.js

@@ -1,10 +1,10 @@
-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) {
+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";
+const j = async function(t, s, e) {
   return m(await q(y, t, s, e), t, s, e);
 };
-async function S(t, s, e, n) {
+async function k(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, {
@@ -16,31 +16,31 @@ async function S(t, s, e, n) {
   }
   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((o, g) => {
-      a.append(`${i}[${g}]`, String(o));
+    u instanceof Blob ? d[i] = u : Array.isArray(u) ? u.forEach((o, h) => {
+      a.append(`${i}[${h}]`, String(o));
     }) : a.append(i, String(u));
   });
   for (const i in d)
     a.append(i, d[i]);
-  const b = new T(n), h = await y(t, b, {
+  const b = new T(n), g = await y(t, b, {
     ...e,
     method: l,
     body: a
   });
-  return m(h, t, b, e);
+  return m(g, t, b, e);
 }
 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, h = !1;
+    let b = null, g = !1;
     const i = function() {
-      h || (o.abort(), h = !0);
+      g || (o.abort(), g = !0);
     };
     function u() {
       b !== null && clearTimeout(b), n.abort && n.abort.removeEventListener("abort", i);
     }
     const o = new XMLHttpRequest();
-    let g = !1;
+    let h = !1;
     if (o.open(r, a, !0), l) {
       let f = 1;
       o.upload.addEventListener("progress", (p) => {
@@ -56,7 +56,7 @@ const y = async function(t, s, e) {
         method: r,
         status: f,
         statusText: o.statusText,
-        headers: U(o),
+        headers: S(o),
         body: r === "HEAD" || f === 204 ? "" : p === "" || p === "text" || p === "json" || p === "document" ? o.responseText : ""
       });
     }), o.addEventListener(
@@ -76,19 +76,18 @@ const y = async function(t, s, e) {
       u(), d({
         url: a,
         method: r,
-        status: g ? -1 : 0,
-        // 设置为 0 可以防止自动重试的默认策略
-        statusText: g ? w.Timeout : w.Aborted,
+        status: -1,
+        statusText: h ? w.Timeout : w.Aborted,
         body: ""
       });
     }), 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();
+      h = !0, i();
     }, n.timeout));
   });
 };
-function U(t) {
+function S(t) {
   const s = {};
   if (!t)
     return s;
@@ -114,20 +113,20 @@ async function P(t, s, e = {}) {
       if (r in window && delete n[r], s(d))
         return d;
       console.warn("response type check failed", t, d), a(null);
-    }, H(l).catch(function() {
+    }, E(l).catch(function() {
       a(null), delete n[r];
     });
   });
 }
 async function A(t, s, e = {}) {
   const n = window;
-  return "var" in e || (e.var = "jsonxData" + Math.random().toString(16).slice(2)), t ? await H(R(t, e, !0)).then(() => {
+  return "var" in e || (e.var = "jsonxData" + Math.random().toString(16).slice(2)), t ? await E(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(t, s, e) {
-  return await S(t, s, e, {
+  return await k(t, s, e, {
     baseURL: c.getConfig("baseURL"),
     logHandler: c.getConfig("logHandler"),
     errorHandler: c.getConfig("errorHandler"),
@@ -137,25 +136,25 @@ const M = async function(t, s, e) {
   });
 };
 // @__NO_SIDE_EFFECTS__
-function v(t) {
+function U(t) {
   if (!C())
     throw new Error("Default Module Only Support In Browser");
-  return L() ? new E(j, t) : new E(k, t);
+  return L() ? new H(v, t) : new H(j, t);
 }
-const c = /* @__PURE__ */ 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;
+const c = /* @__PURE__ */ U(), N = c.setConfig, X = c.request, B = c.head, F = c.get, G = c.post, I = c.del, $ = c.put, z = c.patch;
 export {
-  v as NetRequest,
+  U as NetRequest,
   w as RequestInternalError,
   I as del,
   F as get,
-  z as getResponseRulesDescription,
-  X as head,
+  Q as getResponseRulesDescription,
+  B as head,
   P as jsonp,
   A as jsonx,
-  Z as patch,
+  z as patch,
   G as post,
-  Q as put,
-  B as request,
+  $ as put,
+  X as request,
   N as setGlobalConfig,
   M as upload
 };

package/dist/node.js

@@ -1,10 +1,10 @@
-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 { 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 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);
+  return b(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(([b, h]) => [b.toLowerCase(), Array.isArray(h) ? h.join(",") : h])
+            Object.entries(e.headers).map(([y, h]) => [y.toLowerCase(), Array.isArray(h) ? h.join(",") : h])
           );
           r({
             url: n.toString(),
@@ -68,11 +68,11 @@ const j = async function(o, a, u) {
 function O(o) {
   return x() ? new f(C, o) : new f(j, o);
 }
-const s = /* @__PURE__ */ O(), k = s.setConfig, B = s.head, D = s.get, P = s.post, Z = s.del, F = s.put, G = s.patch;
+const s = /* @__PURE__ */ O(), k = s.setConfig, B = s.head, D = s.get, P = s.post, X = s.del, F = s.put, G = s.patch;
 export {
   O as NetRequest,
   d as RequestInternalError,
-  Z as del,
+  X as del,
   D as get,
   z as getResponseRulesDescription,
   B as head,

package/dist/request.fetch-BHmmkAon.js

@@ -0,0 +1,48 @@
+import { h as w, r as y, c as E, d as T, f as g, a as c } from "./retry-DodVI8cA.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) {
+  const t = await E(o, a, s), n = new URL(t.url), u = t.params;
+  u instanceof Object && Object.keys(u).forEach((e) => n.searchParams.set(e, u[e]));
+  const r = T() ? new AbortController() : null;
+  function d(e) {
+    r && !r.signal.aborted && r.abort(e);
+  }
+  t.abort && t.abort.addEventListener("abort", d);
+  let h = !1;
+  const b = t.timeout > 0 ? setTimeout(function() {
+    h = !0, d("TimeoutTriggered");
+  }, t.timeout) : null, m = t.method === "HEAD";
+  return await fetch(n, {
+    method: t.method,
+    headers: Object.keys(t.headers).length > 0 ? new Headers(t.headers) : void 0,
+    body: t.body,
+    credentials: t.credentials,
+    signal: r?.signal,
+    redirect: "follow"
+  }).then(async (e) => {
+    const i = {
+      url: n.toString(),
+      method: t.method,
+      status: e.status,
+      statusText: e.statusText,
+      headers: g([...e.headers.entries()])
+    }, l = m || e.status === 204 ? "" : await e.text().catch((f) => f);
+    return l instanceof Error ? { ...i, body: "", statusText: c.Unknown, rawError: l } : { ...i, body: l };
+  }).catch((e) => {
+    const i = r?.signal.aborted;
+    return {
+      url: n.toString(),
+      method: t.method,
+      status: -1,
+      statusText: h ? c.Timeout : i ? c.Aborted : c.NetworkError,
+      body: "",
+      rawError: e
+    };
+  }).finally(() => {
+    b !== null && clearTimeout(b), t.abort && t.abort.removeEventListener("abort", d);
+  });
+};
+export {
+  x as f
+};