@seayoo-web/request 3.1.3 → 3.1.5

package/dist/index.cjs

@@ -1,2 +1,2 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("./retry-8pExkGke.cjs"),q=require("./request.fetch-COXrFv2v.cjs"),y=async function(t,s,e){return o.handleResponse(await o.retryRequest(R,t,s,e),t,s,e)};async function m(t,s,e,n){const r=e==null?void 0:e.body,d=(e==null?void 0:e.method)==="PUT"?"PUT":"POST";if(s instanceof Blob){const u=new o.RequestGlobalConfig(n),g=await R(t,u,{...e,method:d,body:s});return o.handleResponse(g,t,u,e)}const c=new FormData,f={...s};r instanceof Object&&Object.entries(r).forEach(([u,g])=>{g instanceof Blob?f[u]=g:Array.isArray(g)?g.forEach((a,i)=>{c.append(`${u}[${i}]`,String(a))}):c.append(u,String(g))});for(const u in f)c.append(u,f[u]);const b=new o.RequestGlobalConfig(n),w=await R(t,b,{...e,method:d,body:c});return o.handleResponse(w,t,b,e)}const R=async function(t,s,e){const n=await o.convertOptions(t,s,e),r=n.method,d=e==null?void 0:e.onUploadProgress,c=o.ge(n.url,n.params);return await new Promise(f=>{let b=null,w=!1;const u=function(){w||(a.abort(),w=!0)};function g(){b!==null&&clearTimeout(b),n.abort&&n.abort.removeEventListener("abort",u)}const a=new XMLHttpRequest;if(a.open(r,c,!0),d){let i=1;a.upload.addEventListener("progress",h=>{i=h.total,d({total:h.total,loaded:h.loaded})}),a.addEventListener("load",()=>{d({loaded:i,total:i})})}a.addEventListener("load",()=>{const i=a.status;g(),f({url:c,method:r,status:i,statusText:a.statusText,headers:E(a),body:r==="HEAD"||i===204?"":a.responseText})}),a.addEventListener("error",i=>{g(),f({url:c,method:r,status:a.status||-1,statusText:a.statusText||o.RequestInternalError.NetworkError,body:"",rawError:i})},!0),a.addEventListener("abort",()=>{g(),f({url:c,method:r,status:0,statusText:o.RequestInternalError.Aborted,body:""})}),Object.entries(n.headers).forEach(([i,h])=>{a.setRequestHeader(i,h)}),n.credentials==="include"&&(a.withCredentials=!0),a.send(n.body||void 0),n.abort&&n.abort.addEventListener("abort",u),n.timeout>0&&(b=setTimeout(u,n.timeout))})};function E(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 d=r.split(":"),c=d[0].trim();c&&(s[c]=(d[1]||"").trim())}),s}async function H(t,s,e={}){const n=window;"callback"in e||(e.callback="jsonxData"+Math.random().toString(16).slice(2));const r=e.callback+"";if(!t)return null;const d=o.ge(t,e,!0);return new Promise(c=>{n[r]=function(f){if(r in window&&delete n[r],s(f))return f;console.warn("response type check failed",t,f),c(null)},o.ce(d).catch(function(){c(null),delete n[r]})})}async function T(t,s,e={}){const n=window;return"var"in e||(e.var="jsonxData"+Math.random().toString(16).slice(2)),t?await o.ce(o.ge(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 j=async function(t,s,e){return await m(t,s,e,{baseURL:l.getConfig("baseURL"),logHandler:l.getConfig("logHandler"),errorHandler:l.getConfig("errorHandler"),requestTransformer:l.getConfig("requestTransformer"),messageHandler:l.getConfig("messageHandler"),responseHandler:l.getConfig("responseHandler")})};function p(t){if(!o.jt.window)throw new Error("Default Module Only Support In Browser");return o.jt.fetch?new o.NetRequestHandler(q.fetchRequest,t):new o.NetRequestHandler(y,t)}const l=p(),x=l.setConfig,C=l.request,L=l.head,S=l.get,k=l.post,v=l.del,D=l.put,U=l.patch;exports.RequestInternalError=o.RequestInternalError;exports.getResponseRulesDescription=o.getResponseRulesDescription;exports.NetRequest=p;exports.del=v;exports.get=S;exports.head=L;exports.jsonp=H;exports.jsonx=T;exports.patch=U;exports.post=k;exports.put=D;exports.request=C;exports.setGlobalConfig=x;exports.upload=j;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("./retry-8pExkGke.cjs"),m=require("./request.fetch-hlpQxV81.cjs"),y=async function(t,s,e){return r.handleResponse(await r.retryRequest(p,t,s,e),t,s,e)};async function E(t,s,e,n){const o=e==null?void 0:e.body,i=(e==null?void 0:e.method)==="PUT"?"PUT":"POST";if(s instanceof Blob){const u=new r.RequestGlobalConfig(n),f=await p(t,u,{...e,method:i,body:s});return r.handleResponse(f,t,u,e)}const c=new FormData,d={...s};o instanceof Object&&Object.entries(o).forEach(([u,f])=>{f instanceof Blob?d[u]=f:Array.isArray(f)?f.forEach((a,h)=>{c.append(`${u}[${h}]`,String(a))}):c.append(u,String(f))});for(const u in d)c.append(u,d[u]);const b=new r.RequestGlobalConfig(n),R=await p(t,b,{...e,method:i,body:c});return r.handleResponse(R,t,b,e)}const p=async function(t,s,e){const n=await r.convertOptions(t,s,e),o=n.method,i=e==null?void 0:e.onUploadProgress,c=r.ge(n.url,n.params);return await new Promise(d=>{let b=null,R=!1;const u=function(){R||(a.abort(),R=!0)};function f(){b!==null&&clearTimeout(b),n.abort&&n.abort.removeEventListener("abort",u)}const a=new XMLHttpRequest;let h=!1;if(a.open(o,c,!0),i){let g=1;a.upload.addEventListener("progress",w=>{g=w.total,i({total:w.total,loaded:w.loaded})}),a.addEventListener("load",()=>{i({loaded:g,total:g})})}a.addEventListener("load",()=>{const g=a.status;f(),d({url:c,method:o,status:g,statusText:a.statusText,headers:T(a),body:o==="HEAD"||g===204?"":a.responseText})}),a.addEventListener("error",g=>{f(),d({url:c,method:o,status:a.status||-1,statusText:a.statusText||r.RequestInternalError.NetworkError,body:"",rawError:g})},!0),a.addEventListener("abort",()=>{f(),d({url:c,method:o,status:h?-1:0,statusText:h?r.RequestInternalError.Timeout:r.RequestInternalError.Aborted,body:""})}),Object.entries(n.headers).forEach(([g,w])=>{a.setRequestHeader(g,w)}),n.credentials==="include"&&(a.withCredentials=!0),a.send(n.body||void 0),n.abort&&n.abort.addEventListener("abort",u),n.timeout>0&&(b=setTimeout(function(){h=!0,u()},n.timeout))})};function T(t){const s={};if(!t)return s;const e=t.getAllResponseHeaders();return e&&e!=="null"&&e.replace(/\r/g,"").split(`
+`).forEach(n=>{const o=n.trim();if(!o)return;const i=o.split(":"),c=i[0].trim();c&&(s[c]=(i[1]||"").trim())}),s}async function H(t,s,e={}){const n=window;"callback"in e||(e.callback="jsonxData"+Math.random().toString(16).slice(2));const o=e.callback+"";if(!t)return null;const i=r.ge(t,e,!0);return new Promise(c=>{n[o]=function(d){if(o in window&&delete n[o],s(d))return d;console.warn("response type check failed",t,d),c(null)},r.ce(i).catch(function(){c(null),delete n[o]})})}async function j(t,s,e={}){const n=window;return"var"in e||(e.var="jsonxData"+Math.random().toString(16).slice(2)),t?await r.ce(r.ge(t,e,!0)).then(()=>{const o=n[e.var+""];return s(o)?o:(console.warn("response type check failed",t,o),null)}).catch(()=>null):null}const x=async function(t,s,e){return await E(t,s,e,{baseURL:l.getConfig("baseURL"),logHandler:l.getConfig("logHandler"),errorHandler:l.getConfig("errorHandler"),requestTransformer:l.getConfig("requestTransformer"),messageHandler:l.getConfig("messageHandler"),responseHandler:l.getConfig("responseHandler")})};function q(t){if(!r.jt.window)throw new Error("Default Module Only Support In Browser");return r.jt.fetch?new r.NetRequestHandler(m.fetchRequest,t):new r.NetRequestHandler(y,t)}const l=q(),C=l.setConfig,L=l.request,S=l.head,k=l.get,v=l.post,D=l.del,U=l.put,O=l.patch;exports.RequestInternalError=r.RequestInternalError;exports.getResponseRulesDescription=r.getResponseRulesDescription;exports.NetRequest=q;exports.del=D;exports.get=k;exports.head=S;exports.jsonp=H;exports.jsonx=j;exports.patch=O;exports.post=v;exports.put=U;exports.request=L;exports.setGlobalConfig=C;exports.upload=x;

package/dist/index.js

@@ -1,91 +1,94 @@
-import { h as w, r as T, R as y, c as x, g as p, a as R, b as q, j as E, N as H } from "./retry-_AqXIa5P.js";
-import { d as J } from "./retry-_AqXIa5P.js";
-import { f as C } from "./request.fetch-Cuk4gO1S.js";
-const L = async function(t, a, e) {
-  return w(await T(m, t, a, e), t, a, e);
+import { h as p, r as x, R as T, c as C, g as R, a as m, b as q, j as E, N as H } from "./retry-_AqXIa5P.js";
+import { d as K } from "./retry-_AqXIa5P.js";
+import { f as L } from "./request.fetch-1poQOlEV.js";
+const j = async function(t, a, e) {
+  return p(await x(y, t, a, e), t, a, e);
 };
-async function j(t, a, e, n) {
-  const r = e == null ? void 0 : e.body, d = (e == null ? void 0 : e.method) === "PUT" ? "PUT" : "POST";
+async function k(t, a, e, n) {
+  const r = e == null ? void 0 : e.body, i = (e == null ? void 0 : e.method) === "PUT" ? "PUT" : "POST";
   if (a instanceof Blob) {
-    const l = new y(n), f = await m(t, l, {
+    const l = new T(n), u = await y(t, l, {
       ...e,
-      method: d,
+      method: i,
       body: a
     });
-    return w(f, t, l, e);
+    return p(u, t, l, e);
   }
-  const s = new FormData(), u = { ...a };
-  r instanceof Object && Object.entries(r).forEach(([l, f]) => {
-    f instanceof Blob ? u[l] = f : Array.isArray(f) ? f.forEach((o, i) => {
-      s.append(`${l}[${i}]`, String(o));
-    }) : s.append(l, String(f));
+  const s = new FormData(), d = { ...a };
+  r instanceof Object && Object.entries(r).forEach(([l, u]) => {
+    u instanceof Blob ? d[l] = u : Array.isArray(u) ? u.forEach((o, g) => {
+      s.append(`${l}[${g}]`, String(o));
+    }) : s.append(l, String(u));
   });
-  for (const l in u)
-    s.append(l, u[l]);
-  const b = new y(n), h = await m(t, b, {
+  for (const l in d)
+    s.append(l, d[l]);
+  const b = new T(n), w = await y(t, b, {
     ...e,
-    method: d,
+    method: i,
     body: s
   });
-  return w(h, t, b, e);
+  return p(w, t, b, e);
 }
-const m = async function(t, a, e) {
-  const n = await x(t, a, e), r = n.method, d = e == null ? void 0 : e.onUploadProgress, s = p(n.url, n.params);
-  return await new Promise((u) => {
-    let b = null, h = !1;
+const y = async function(t, a, e) {
+  const n = await C(t, a, e), r = n.method, i = e == null ? void 0 : e.onUploadProgress, s = R(n.url, n.params);
+  return await new Promise((d) => {
+    let b = null, w = !1;
     const l = function() {
-      h || (o.abort(), h = !0);
+      w || (o.abort(), w = !0);
     };
-    function f() {
+    function u() {
       b !== null && clearTimeout(b), n.abort && n.abort.removeEventListener("abort", l);
     }
     const o = new XMLHttpRequest();
-    if (o.open(r, s, !0), d) {
-      let i = 1;
-      o.upload.addEventListener("progress", (g) => {
-        i = g.total, d({ total: g.total, loaded: g.loaded });
+    let g = !1;
+    if (o.open(r, s, !0), i) {
+      let f = 1;
+      o.upload.addEventListener("progress", (h) => {
+        f = h.total, i({ total: h.total, loaded: h.loaded });
       }), o.addEventListener("load", () => {
-        d({ loaded: i, total: i });
+        i({ loaded: f, total: f });
       });
     }
     o.addEventListener("load", () => {
-      const i = o.status;
-      f(), u({
+      const f = o.status;
+      u(), d({
         url: s,
         method: r,
-        status: i,
+        status: f,
         statusText: o.statusText,
-        headers: k(o),
-        body: r === "HEAD" || i === 204 ? "" : o.responseText
+        headers: S(o),
+        body: r === "HEAD" || f === 204 ? "" : o.responseText
       });
     }), o.addEventListener(
       "error",
-      (i) => {
-        f(), u({
+      (f) => {
+        u(), d({
           url: s,
           method: r,
           status: o.status || -1,
-          statusText: o.statusText || R.NetworkError,
+          statusText: o.statusText || m.NetworkError,
           body: "",
-          rawError: i
+          rawError: f
         });
       },
       !0
     ), o.addEventListener("abort", () => {
-      f(), u({
+      u(), d({
         url: s,
         method: r,
-        status: 0,
+        status: g ? -1 : 0,
         // 设置为 0 可以防止自动重试的默认策略
-        statusText: R.Aborted,
+        statusText: g ? m.Timeout : m.Aborted,
         body: ""
       });
-    }), Object.entries(n.headers).forEach(([i, g]) => {
-      o.setRequestHeader(i, g);
-    }), n.credentials === "include" && (o.withCredentials = !0), o.send(n.body || void 0), n.abort && n.abort.addEventListener("abort", l), n.timeout > 0 && (b = setTimeout(l, n.timeout));
+    }), Object.entries(n.headers).forEach(([f, h]) => {
+      o.setRequestHeader(f, h);
+    }), n.credentials === "include" && (o.withCredentials = !0), o.send(n.body || void 0), n.abort && n.abort.addEventListener("abort", l), n.timeout > 0 && (b = setTimeout(function() {
+      g = !0, l();
+    }, n.timeout));
   });
 };
-function k(t) {
+function S(t) {
   const a = {};
   if (!t)
     return a;
@@ -95,36 +98,36 @@ function k(t) {
     const r = n.trim();
     if (!r)
       return;
-    const d = r.split(":"), s = d[0].trim();
-    s && (a[s] = (d[1] || "").trim());
+    const i = r.split(":"), s = i[0].trim();
+    s && (a[s] = (i[1] || "").trim());
   }), a;
 }
-async function D(t, a, e = {}) {
+async function O(t, a, e = {}) {
   const n = window;
   "callback" in e || (e.callback = "jsonxData" + Math.random().toString(16).slice(2));
   const r = e.callback + "";
   if (!t)
     return null;
-  const d = p(t, e, !0);
+  const i = R(t, e, !0);
   return new Promise((s) => {
-    n[r] = function(u) {
-      if (r in window && delete n[r], a(u))
-        return u;
-      console.warn("response type check failed", t, u), s(null);
-    }, q(d).catch(function() {
+    n[r] = function(d) {
+      if (r in window && delete n[r], a(d))
+        return d;
+      console.warn("response type check failed", t, d), s(null);
+    }, q(i).catch(function() {
       s(null), delete n[r];
     });
   });
 }
-async function O(t, a, e = {}) {
+async function P(t, a, e = {}) {
   const n = window;
-  return "var" in e || (e.var = "jsonxData" + Math.random().toString(16).slice(2)), t ? await q(p(t, e, !0)).then(() => {
+  return "var" in e || (e.var = "jsonxData" + Math.random().toString(16).slice(2)), t ? await q(R(t, e, !0)).then(() => {
     const r = n[e.var + ""];
     return a(r) ? r : (console.warn("response type check failed", t, r), null);
   }).catch(() => null) : null;
 }
-const P = async function(t, a, e) {
-  return await j(t, a, e, {
+const A = async function(t, a, e) {
+  return await k(t, a, e, {
     baseURL: c.getConfig("baseURL"),
     logHandler: c.getConfig("logHandler"),
     errorHandler: c.getConfig("errorHandler"),
@@ -133,25 +136,25 @@ const P = async function(t, a, e) {
     responseHandler: c.getConfig("responseHandler")
   });
 };
-function S(t) {
+function U(t) {
   if (!E.window)
     throw new Error("Default Module Only Support In Browser");
-  return E.fetch ? new H(C, t) : new H(L, t);
+  return E.fetch ? new H(L, t) : new H(j, t);
 }
-const c = S(), A = c.setConfig, M = c.request, N = c.head, B = c.get, X = c.post, F = c.del, G = c.put, I = c.patch;
+const c = U(), M = c.setConfig, N = c.request, B = c.head, X = c.get, F = c.post, G = c.del, I = c.put, $ = c.patch;
 export {
-  S as NetRequest,
-  R as RequestInternalError,
-  F as del,
-  B as get,
-  J as getResponseRulesDescription,
-  N as head,
-  D as jsonp,
-  O as jsonx,
-  I as patch,
-  X as post,
-  G as put,
-  M as request,
-  A as setGlobalConfig,
-  P as upload
+  U as NetRequest,
+  m as RequestInternalError,
+  G as del,
+  X as get,
+  K as getResponseRulesDescription,
+  B as head,
+  O as jsonp,
+  P as jsonx,
+  $ as patch,
+  F as post,
+  I as put,
+  N as request,
+  M as setGlobalConfig,
+  A as upload
 };

package/dist/node.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./retry-8pExkGke.cjs"),y=require("./request.fetch-COXrFv2v.cjs"),b=require("node:http"),g=require("node:https"),E=async function(r,a,c){return e.handleResponse(await e.retryRequest(w,r,a,c),r,a,c)},w=async function(r,a,c){const t=await e.convertOptions(r,a,c);if(!e.At(t.url))return{url:t.url,method:t.method,status:-1,statusText:e.RequestInternalError.URLFormatError,headers:{},body:""};const R=/^https:\/\//i.test(t.url)?g:b,u=new URL(t.url),i=t.params;i instanceof Object&&Object.keys(i).forEach(n=>u.searchParams.set(n,i[n]));const q=t.method==="HEAD";return new Promise(n=>{const d=R.request(u,{headers:t.headers,method:t.method,timeout:t.timeout>0?t.timeout:void 0},function(o){const m=[];o.on("data",h=>m.push(h)),o.on("end",()=>{const h=e.fromEntries(Object.entries(o.headers).map(([f,l])=>[f.toLowerCase(),Array.isArray(l)?l.join(","):l]));n({url:u.toString(),method:t.method,status:o.statusCode||-1,statusText:o.statusMessage||e.RequestInternalError.Unknown,headers:h,body:q||o.statusCode===204?"":Buffer.concat(m).toString("utf-8")})})});d.on("error",o=>{n({url:u.toString(),method:t.method,status:-1,statusText:e.RequestInternalError.NetworkError,body:"",rawError:o})}),d.on("timeout",()=>{n({url:u.toString(),method:t.method,status:-1,statusText:e.RequestInternalError.Timeout,body:""})}),t.body&&d.write(t.body),d.end()})};function p(r){return e.jt.fetch?new e.NetRequestHandler(y.fetchRequest,r):new e.NetRequestHandler(E,r)}const s=p(),j=s.setConfig,C=s.head,I=s.get,N=s.post,S=s.del,T=s.put,O=s.patch;exports.RequestInternalError=e.RequestInternalError;exports.getResponseRulesDescription=e.getResponseRulesDescription;exports.NetRequest=p;exports.del=S;exports.get=I;exports.head=C;exports.patch=O;exports.post=N;exports.put=T;exports.setGlobalConfig=j;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./retry-8pExkGke.cjs"),y=require("./request.fetch-hlpQxV81.cjs"),b=require("node:http"),g=require("node:https"),E=async function(r,a,c){return e.handleResponse(await e.retryRequest(w,r,a,c),r,a,c)},w=async function(r,a,c){const t=await e.convertOptions(r,a,c);if(!e.At(t.url))return{url:t.url,method:t.method,status:-1,statusText:e.RequestInternalError.URLFormatError,headers:{},body:""};const R=/^https:\/\//i.test(t.url)?g:b,u=new URL(t.url),i=t.params;i instanceof Object&&Object.keys(i).forEach(n=>u.searchParams.set(n,i[n]));const q=t.method==="HEAD";return new Promise(n=>{const d=R.request(u,{headers:t.headers,method:t.method,timeout:t.timeout>0?t.timeout:void 0},function(o){const m=[];o.on("data",h=>m.push(h)),o.on("end",()=>{const h=e.fromEntries(Object.entries(o.headers).map(([f,l])=>[f.toLowerCase(),Array.isArray(l)?l.join(","):l]));n({url:u.toString(),method:t.method,status:o.statusCode||-1,statusText:o.statusMessage||e.RequestInternalError.Unknown,headers:h,body:q||o.statusCode===204?"":Buffer.concat(m).toString("utf-8")})})});d.on("error",o=>{n({url:u.toString(),method:t.method,status:-1,statusText:e.RequestInternalError.NetworkError,body:"",rawError:o})}),d.on("timeout",()=>{n({url:u.toString(),method:t.method,status:-1,statusText:e.RequestInternalError.Timeout,body:""})}),t.body&&d.write(t.body),d.end()})};function p(r){return e.jt.fetch?new e.NetRequestHandler(y.fetchRequest,r):new e.NetRequestHandler(E,r)}const s=p(),j=s.setConfig,C=s.head,I=s.get,N=s.post,S=s.del,T=s.put,O=s.patch;exports.RequestInternalError=e.RequestInternalError;exports.getResponseRulesDescription=e.getResponseRulesDescription;exports.NetRequest=p;exports.del=S;exports.get=I;exports.head=C;exports.patch=O;exports.post=N;exports.put=T;exports.setGlobalConfig=j;

package/dist/node.js

@@ -1,6 +1,6 @@
 import { h as b, r as q, c as w, A as g, a as d, f as E, N as f, j } from "./retry-_AqXIa5P.js";
 import { d as J } from "./retry-_AqXIa5P.js";
-import { f as x } from "./request.fetch-Cuk4gO1S.js";
+import { f as x } from "./request.fetch-1poQOlEV.js";
 import A from "node:http";
 import C from "node:https";
 const N = async function(o, a, u) {

package/dist/{request.fetch-Cuk4gO1S.js → request.fetch-1poQOlEV.js}

@@ -1,15 +1,18 @@
-import { h as m, r as w, c as y, j as E, f as R, a as b } from "./retry-_AqXIa5P.js";
+import { h as w, r as y, c as E, j as T, f as R, a as c } from "./retry-_AqXIa5P.js";
 const x = async function(s, o, n) {
-  return m(await w(g, s, o, n), s, o, n);
+  return w(await y(g, s, o, n), s, o, n);
 }, g = async function(s, o, n) {
-  const t = await y(s, o, n), i = new URL(t.url), c = t.params;
-  c instanceof Object && Object.keys(c).forEach((e) => i.searchParams.set(e, c[e]));
-  const r = E.AbortController ? new AbortController() : null;
+  const t = await E(s, o, 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.AbortController ? new AbortController() : null;
   function d() {
     r && !r.signal.aborted && r.abort();
   }
   t.abort && t.abort.addEventListener("abort", d);
-  const h = t.timeout > 0 ? setTimeout(d, t.timeout) : null, l = t.method === "HEAD";
+  let b = !1;
+  const l = t.timeout > 0 ? setTimeout(function() {
+    b = !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,
@@ -24,21 +27,21 @@ const x = async function(s, o, n) {
       status: e.status,
       statusText: e.statusText,
       headers: R([...e.headers.entries()])
-    }, u = l || e.status === 204 ? "" : await e.text().catch((f) => f);
-    return u instanceof Error ? { ...a, body: "", statusText: b.Unknown, rawError: u } : { ...a, body: u };
+    }, h = f || e.status === 204 ? "" : await e.text().catch((m) => m);
+    return h instanceof Error ? { ...a, body: "", statusText: c.Unknown, rawError: h } : { ...a, body: h };
   }).catch((e) => {
     const a = r == null ? void 0 : r.signal.aborted;
     return {
       url: i.toString(),
       method: t.method,
-      status: a ? 0 : -1,
+      status: a && !b ? 0 : -1,
       // 设置为 0 可以防止自动重试的默认策略
-      statusText: a ? b.Aborted : b.NetworkError,
+      statusText: b ? c.Timeout : a ? c.Aborted : c.NetworkError,
       body: "",
       rawError: e
     };
   }).finally(() => {
-    h !== null && clearTimeout(h), t.abort && t.abort.removeEventListener("abort", d);
+    l !== null && clearTimeout(l), t.abort && t.abort.removeEventListener("abort", d);
   });
 };
 export {

package/dist/request.fetch-hlpQxV81.cjs

@@ -0,0 +1 @@
+"use strict";const s=require("./retry-8pExkGke.cjs"),E=async function(n,a,i){return s.handleResponse(await s.retryRequest(w,n,a,i),n,a,i)},w=async function(n,a,i){const t=await s.convertOptions(n,a,i),u=new URL(t.url),c=t.params;c instanceof Object&&Object.keys(c).forEach(e=>u.searchParams.set(e,c[e]));const r=s.jt.AbortController?new AbortController:null;function d(){r&&!r.signal.aborted&&r.abort()}t.abort&&t.abort.addEventListener("abort",d);let l=!1;const h=t.timeout>0?setTimeout(function(){l=!0,d()},t.timeout):null,f=t.method==="HEAD";return await fetch(u,{method:t.method,headers:Object.keys(t.headers).length>0?new Headers(t.headers):void 0,body:t.body,credentials:t.credentials,signal:r==null?void 0:r.signal,redirect:"follow"}).then(async e=>{const o={url:u.toString(),method:t.method,status:e.status,statusText:e.statusText,headers:s.fromEntries([...e.headers.entries()])},b=f||e.status===204?"":await e.text().catch(m=>m);return b instanceof Error?{...o,body:"",statusText:s.RequestInternalError.Unknown,rawError:b}:{...o,body:b}}).catch(e=>{const o=r==null?void 0:r.signal.aborted;return{url:u.toString(),method:t.method,status:o&&!l?0:-1,statusText:l?s.RequestInternalError.Timeout:o?s.RequestInternalError.Aborted:s.RequestInternalError.NetworkError,body:"",rawError:e}}).finally(()=>{h!==null&&clearTimeout(h),t.abort&&t.abort.removeEventListener("abort",d)})};exports.fetchRequest=E;

package/package.json

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

package/types/inc/type.d.ts

@@ -17,6 +17,7 @@ export declare const RequestInternalError: {
     /** url 格式错误 */
     readonly URLFormatError: "URLFormatError";
 };
+export type RequestInternalError = (typeof RequestInternalError)[keyof typeof RequestInternalError];
 /** 通用网络请求工具的基本配置 */
 export interface IBaseRequestOptions {
     /** 网络请求方法，默认 GET */
@@ -44,7 +45,7 @@ export interface IBaseRequestOptions {
 }
 /** 重试请求的配置参数，暂不支持全局配置 */
 export interface IRetryRequestOptions {
-    /** 错误时重试的次数，不能超过 10 次 */
+    /** 错误时重试的次数，不能超过 10 次，默认不重试 */
     maxRetry?: number;
     /** 重试策略：默认 network，可选 status 或者指定特殊的 status 或自定义检查 */
     retryResolve?: IRetryResolve;

package/dist/request.fetch-COXrFv2v.cjs

@@ -1 +0,0 @@
-"use strict";const s=require("./retry-8pExkGke.cjs"),m=async function(a,n,i){return s.handleResponse(await s.retryRequest(w,a,n,i),a,n,i)},w=async function(a,n,i){const t=await s.convertOptions(a,n,i),c=new URL(t.url),u=t.params;u instanceof Object&&Object.keys(u).forEach(e=>c.searchParams.set(e,u[e]));const r=s.jt.AbortController?new AbortController:null;function d(){r&&!r.signal.aborted&&r.abort()}t.abort&&t.abort.addEventListener("abort",d);const h=t.timeout>0?setTimeout(d,t.timeout):null,l=t.method==="HEAD";return await fetch(c,{method:t.method,headers:Object.keys(t.headers).length>0?new Headers(t.headers):void 0,body:t.body,credentials:t.credentials,signal:r==null?void 0:r.signal,redirect:"follow"}).then(async e=>{const o={url:c.toString(),method:t.method,status:e.status,statusText:e.statusText,headers:s.fromEntries([...e.headers.entries()])},b=l||e.status===204?"":await e.text().catch(f=>f);return b instanceof Error?{...o,body:"",statusText:s.RequestInternalError.Unknown,rawError:b}:{...o,body:b}}).catch(e=>{const o=r==null?void 0:r.signal.aborted;return{url:c.toString(),method:t.method,status:o?0:-1,statusText:o?s.RequestInternalError.Aborted:s.RequestInternalError.NetworkError,body:"",rawError:e}}).finally(()=>{h!==null&&clearTimeout(h),t.abort&&t.abort.removeEventListener("abort",d)})};exports.fetchRequest=m;