@seayoo-web/request 3.5.0 → 3.5.1

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-U_igg1Ax.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);
 };
@@ -16,31 +16,31 @@ async function k(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) => {
@@ -76,15 +76,14 @@ 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));
   });
 };

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-U_igg1Ax.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) {

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
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seayoo-web/request",
-  "version": "3.5.0",
+  "version": "3.5.1",
   "description": "request tools for seayoo web",
   "type": "module",
   "source": "./src/index.ts",

package/dist/request.fetch-U_igg1Ax.js

@@ -1,49 +0,0 @@
-import { h as w, r as y, c as E, d as T, f as R, a as c } from "./retry-DodVI8cA.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() {
-    r && !r.signal.aborted && r.abort();
-  }
-  t.abort && t.abort.addEventListener("abort", d);
-  let l = !1;
-  const b = t.timeout > 0 ? setTimeout(function() {
-    l = !0, d();
-  }, 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,
-    body: t.body,
-    credentials: t.credentials,
-    signal: r?.signal,
-    redirect: "follow"
-  }).then(async (e) => {
-    const o = {
-      url: i.toString(),
-      method: t.method,
-      status: e.status,
-      statusText: e.statusText,
-      headers: R([...e.headers.entries()])
-    }, 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;
-    return {
-      url: i.toString(),
-      method: t.method,
-      status: o && !l ? 0 : -1,
-      // 设置为 0 可以防止自动重试的默认策略
-      statusText: l ? c.Timeout : o ? c.Aborted : c.NetworkError,
-      body: "",
-      rawError: e
-    };
-  }).finally(() => {
-    b !== null && clearTimeout(b), t.abort && t.abort.removeEventListener("abort", d);
-  });
-};
-export {
-  x as f
-};