@seayoo-web/request 1.7.0 → 1.7.2

package/README.md

@@ -261,9 +261,9 @@ status 表示网络错误或者http 状态码错误时重试；
 
 ### errorHandler
 
-类型：null | ((status: number, method: string, url: string) => void)
+类型：null | ((status: number, method: string, url: string, rawError?: Error | ProgressEvent) => void)
 
-说明：全局错误处理函数，仅仅在 http status 错误时触发，通常用于检查 401 未登录状态进行跳转登录
+说明：全局错误处理函数，仅仅在 http status 错误时触发，通常用于检查 401 未登录状态进行跳转登录，其中 rawError 为请求工具的原始错误，可用以进行 Sentry 信息上报；
 
 ### responseHandler
 
@@ -321,7 +321,7 @@ status 表示网络错误或者http 状态码错误时重试；
 
 - 当请求结束时无效；
 - 仅浏览器环境有效，
-- 不支持 AbortSignal 的浏览器可以引入 https://www.npmjs.com/package/abortcontroller-polyfill
+- 不支持 AbortSignal 的浏览器可以引入 https://www.npmjs.com/package/abortcontroller-polyfill 或 https://polyfill.io/v3/polyfill.min.js?features=AbortController
 
 ### message
 

package/dist/inc/request.fetch.d.ts

@@ -0,0 +1,7 @@
+import type { NetRequestAgent } from "./type";
+/**
+ * 基于 fetch 的网络请求包装函数，文件上传不支持进度，需要进度请使用 upload 方法
+ *
+ * 在浏览器或支持 fetch 的 Node 环境均可以使用
+ */
+export declare const fetchRequest: NetRequestAgent;

package/dist/inc/{request.browser.d.ts → request.xhr.d.ts}

@@ -1,11 +1,11 @@
-import { type XHRequestOptions } from "./core.xhr";
-import type { NetRequestAgent, IRequestGlobalConfig, IRequestOptions, IResponseResult, IRetryRequestOptions } from "./type";
-/**
- * 基于 fetch 的网络请求包装函数，文件上传不支持进度，需要进度请使用 upload 方法
- *
- * 该方法必定 resolve，限制在浏览器环境中使用
- */
-export declare const fetchRequest: NetRequestAgent;
+import type { NetRequestAgent, IRequestGlobalConfig, IRequestOptions, IResponseResult, IRetryRequestOptions, IBaseRequestOptions } from "./type";
+/** 进度回调函数配置 */
+interface XHRequestOptions extends IBaseRequestOptions {
+    onUploadProgress?: (progress: {
+        total: number;
+        loaded: number;
+    }) => void;
+}
 /**
  * 基于 xmlHttpRequest 的网络请求包装函数
  *
@@ -21,3 +21,4 @@ export declare function xhrUpload(url: string, files: Record<string, Blob> | Blo
 }, 
 /** 全局配置中独有的配置，以受全局配置控制 */
 config?: Omit<IRequestGlobalConfig, keyof IRequestOptions>): Promise<IResponseResult>;
+export {};

package/dist/inc/type.d.ts

@@ -59,6 +59,8 @@ export interface IOtherRequestOptions {
 }
 /** 对外工具接口的请求配置 */
 export type IRequestOptions = IBaseRequestOptions & IRetryRequestOptions & IOtherRequestOptions;
+/** 请求的原始错误信息 */
+type ERequestRawError = Error | ProgressEvent;
 /** 全局默认配置 */
 export type IRequestGlobalConfig = {
     /**
@@ -85,7 +87,7 @@ export type IRequestGlobalConfig = {
         body?: IBaseRequestBody;
     }) => MaybePromise<void | string>);
     /** 全局错误处理函数，仅仅在 statusCode 错误时触发 */
-    errorHandler?: null | ((status: number, method: string, url: string) => void);
+    errorHandler?: null | ((status: number, method: string, url: string, rawError?: ERequestRawError) => void);
     /** 全局响应处理函数，任意状态都会触发 */
     responseHandler?: null | ((result: IResponseResult, method: string, url: string) => void);
     /** 全局消息提示函数 */
@@ -156,6 +158,8 @@ export interface IRequestBaseResponse {
     headers?: Record<string, string | undefined>;
     /** 响应体，如果网络错误或 204/202，则返回空或错误信息 */
     body: string;
+    /** 原始的请求错误信息，仅当请求失败时有值，用以进行错误上报用 */
+    rawError?: ERequestRawError;
 }
 /** 对外工具接口的返回内容 */
 export interface IResponseResult<T = unknown> {

package/dist/index.cjs

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

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { xhrUpload } from "./inc/request.browser";
 import { NetRequestHandler } from "./inc/main";
+import { xhrUpload } from "./inc/request.xhr";
 import type { IRequestGlobalConfig } from "./inc/type";
 export * from "./version";
 export { jsonp, jsonx } from "./inc/jsonp";
@@ -10,7 +10,7 @@ export type { IRequestOptions, IRequestGlobalConfig, IResponseRule, IResponseRes
  */
 export declare const upload: (url: string, files: Parameters<typeof xhrUpload>[1], options?: Parameters<typeof xhrUpload>[2]) => ReturnType<typeof xhrUpload>;
 /**
- * 创建新的实例空间，配置和缓存跟全局默认实例是隔离的
+ * 创建新的实例空间，配置和缓存跟全局默认实例是隔离的，仅支持在浏览器环境使用
  */
 export declare function NetRequest(config?: IRequestGlobalConfig): NetRequestHandler;
 /**

package/dist/index.js

@@ -1,154 +1,126 @@
-import { c as E, S as w, f as q, U as p, h as m, r as H, R, A as x, N as T } from "./version-DOOsgzgL.js";
-import { g as z, v as J } from "./version-DOOsgzgL.js";
-const L = async function(n, o, e) {
-  const t = await E(n, o, e), r = new URL(t.url), c = t.params;
-  c instanceof Object && Object.keys(c).forEach((s) => r.searchParams.set(s, c[s]));
-  const a = w.AbortController ? new AbortController() : null;
-  function i() {
-    a && !a.signal.aborted && a.abort();
+import { h as w, r as E, R as y, c as q, U as p, A as T, S as R, N as H } from "./version-BLZ49ejb.js";
+import { g as z, v as I } from "./version-BLZ49ejb.js";
+import { f as x } from "./request.fetch-DlebtNMD.js";
+const C = async function(t, a, e) {
+  return w(await E(m, t, a, e), t, a, e);
+};
+async function S(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 c = new y(n), u = await m(t, c, {
+      ...e,
+      method: i,
+      body: a
+    });
+    return w(u, t, c, e);
   }
-  t.abort && t.abort.addEventListener("abort", i);
-  const f = t.timeout > 0 ? setTimeout(i, t.timeout) : null, h = new Request(r, {
-    method: t.method,
-    headers: Object.keys(t.headers).length > 0 ? new Headers(t.headers) : void 0,
-    body: t.body,
-    credentials: t.credentials,
-    signal: a == null ? void 0 : a.signal,
-    redirect: "follow"
+  const o = new FormData(), d = { ...a };
+  r instanceof Object && Object.entries(r).forEach(([c, u]) => {
+    u instanceof Blob ? d[c] = u : Array.isArray(u) ? u.forEach((s, f) => {
+      o.append(`${c}[${f}]`, String(s));
+    }) : o.append(c, String(u));
   });
-  return await fetch(h).then(async (s) => ({
-    url: r.toString(),
-    method: t.method,
-    status: s.status,
-    statusText: s.statusText,
-    headers: q([...s.headers.entries()]),
-    body: t.method === "HEAD" ? "" : await s.text()
-  })).catch((s) => ({
-    url: r.toString(),
-    method: t.method,
-    status: -1,
-    statusText: a != null && a.signal.aborted ? "Aborted" : "NetworkError",
-    body: String(s)
-  })).finally(() => {
-    f !== null && clearTimeout(f), t.abort && t.abort.removeEventListener("abort", i);
+  for (const c in d)
+    o.append(c, d[c]);
+  const b = new y(n), h = await m(t, b, {
+    ...e,
+    method: i,
+    body: o
   });
-}, y = async function(n, o, e) {
-  const t = await E(n, o, e), r = t.method, c = e == null ? void 0 : e.onUploadProgress, a = p(t.url, t.params);
-  return await new Promise((i) => {
-    let f = null, h = !1;
-    const s = function() {
-      h || (d.abort(), h = !0);
+  return w(h, t, b, e);
+}
+const m = async function(t, a, e) {
+  const n = await q(t, a, e), r = n.method, i = e == null ? void 0 : e.onUploadProgress, o = p(n.url, n.params);
+  return await new Promise((d) => {
+    let b = null, h = !1;
+    const c = function() {
+      h || (s.abort(), h = !0);
     };
     function u() {
-      f !== null && clearTimeout(f), t.abort && t.abort.removeEventListener("abort", s);
+      b !== null && clearTimeout(b), n.abort && n.abort.removeEventListener("abort", c);
     }
-    const d = new XMLHttpRequest();
-    if (d.open(r, a, !0), c) {
-      let b = 1;
-      d.upload.addEventListener("progress", (g) => {
-        b = g.total, c({ total: g.total, loaded: g.loaded });
-      }), d.addEventListener("load", () => {
-        u(), c({ loaded: b, total: b }), i({
-          url: a,
+    const s = new XMLHttpRequest();
+    if (s.open(r, o, !0), i) {
+      let f = 1;
+      s.upload.addEventListener("progress", (g) => {
+        f = g.total, i({ total: g.total, loaded: g.loaded });
+      }), s.addEventListener("load", () => {
+        u(), i({ loaded: f, total: f }), d({
+          url: o,
           method: r,
-          status: d.status,
-          statusText: d.statusText,
-          headers: S(d),
-          body: r === "HEAD" ? "" : d.responseText
+          status: s.status,
+          statusText: s.statusText,
+          headers: U(s),
+          body: r === "HEAD" ? "" : s.responseText
         });
       });
     }
-    d.addEventListener("error", () => {
-      u(), i({
-        url: a,
-        method: r,
-        status: -1,
-        statusText: "Failed",
-        body: ""
-      });
-    }), d.addEventListener("abort", () => {
-      u(), i({
-        url: a,
+    s.addEventListener(
+      "error",
+      (f) => {
+        u(), d({
+          url: o,
+          method: r,
+          status: -1,
+          statusText: "Failed",
+          body: "",
+          rawError: f
+        });
+      },
+      !0
+    ), s.addEventListener("abort", () => {
+      u(), d({
+        url: o,
         method: r,
         status: -1,
         statusText: "Aborted",
         body: ""
       });
-    }), Object.entries(t.headers).forEach(([b, g]) => {
-      d.setRequestHeader(b, g);
-    }), t.credentials === "include" && (d.withCredentials = !0), d.send(t.body || void 0), t.abort && t.abort.addEventListener("abort", s), t.timeout > 0 && (f = setTimeout(s, t.timeout));
+    }), Object.entries(n.headers).forEach(([f, g]) => {
+      s.setRequestHeader(f, g);
+    }), n.credentials === "include" && (s.withCredentials = !0), s.send(n.body || void 0), n.abort && n.abort.addEventListener("abort", c), n.timeout > 0 && (b = setTimeout(c, n.timeout));
   });
 };
-function S(n) {
-  const o = {};
-  if (!n)
-    return o;
-  const e = n.getAllResponseHeaders();
+function U(t) {
+  const a = {};
+  if (!t)
+    return a;
+  const e = t.getAllResponseHeaders();
   return e && e !== "null" && e.replace(/\r/g, "").split(`
-`).forEach((t) => {
-    const r = t.trim();
+`).forEach((n) => {
+    const r = n.trim();
     if (!r)
       return;
-    const c = r.split(":"), a = c[0].trim();
-    a && (o[a] = (c[1] || "").trim());
-  }), o;
-}
-const v = async function(n, o, e) {
-  return m(await H(L, n, o, e), n, o, e);
-}, C = async function(n, o, e) {
-  return m(await H(y, n, o, e), n, o, e);
-};
-async function U(n, o, e, t) {
-  const r = e == null ? void 0 : e.body, c = (e == null ? void 0 : e.method) === "PUT" ? "PUT" : "POST";
-  if (o instanceof Blob) {
-    const s = new R(t), u = await y(n, s, {
-      ...e,
-      method: c,
-      body: o
-    });
-    return m(u, n, s, e);
-  }
-  const a = new FormData(), i = { ...o };
-  r instanceof Object && Object.entries(r).forEach(([s, u]) => {
-    u instanceof Blob ? i[s] = u : Array.isArray(u) ? u.forEach((d, b) => {
-      a.append(`${s}[${b}]`, String(d));
-    }) : a.append(s, String(u));
-  });
-  for (const s in i)
-    a.append(s, i[s]);
-  const f = new R(t), h = await y(n, f, {
-    ...e,
-    method: c,
-    body: a
-  });
-  return m(h, n, f, e);
+    const i = r.split(":"), o = i[0].trim();
+    o && (a[o] = (i[1] || "").trim());
+  }), a;
 }
-async function k(n, o, e = {}) {
-  const t = window;
+async function k(t, a, e = {}) {
+  const n = window;
   "callback" in e || (e.callback = "jsonxData" + Math.random().toString(16).slice(2));
   const r = e.callback + "";
-  if (!n)
+  if (!t)
     return null;
-  const c = p(n, e, !0);
-  return new Promise((a) => {
-    t[r] = function(i) {
-      if (r in window && delete t[r], o(i))
-        return i;
-      console.warn("response type check faild", n, i), a(null);
-    }, x(c).catch(function() {
-      a(null), delete t[r];
+  const i = p(t, e, !0);
+  return new Promise((o) => {
+    n[r] = function(d) {
+      if (r in window && delete n[r], a(d))
+        return d;
+      console.warn("response type check faild", t, d), o(null);
+    }, T(i).catch(function() {
+      o(null), delete n[r];
     });
   });
 }
-async function O(n, o, e = {}) {
-  const t = window;
-  return "var" in e || (e.var = "jsonxData" + Math.random().toString(16).slice(2)), n ? await x(p(n, e, !0)).then(() => {
-    const r = t[e.var + ""];
-    return o(r) ? r : (console.warn("response type check faild", n, r), null);
+async function A(t, a, e = {}) {
+  const n = window;
+  return "var" in e || (e.var = "jsonxData" + Math.random().toString(16).slice(2)), t ? await T(p(t, e, !0)).then(() => {
+    const r = n[e.var + ""];
+    return a(r) ? r : (console.warn("response type check faild", t, r), null);
   }).catch(() => null) : null;
 }
-const D = async function(n, o, e) {
-  return await U(n, o, e, {
+const D = async function(t, a, e) {
+  return await S(t, a, e, {
     baseURL: l.getConfig("baseURL"),
     logHandler: l.getConfig("logHandler"),
     errorHandler: l.getConfig("errorHandler"),
@@ -157,24 +129,24 @@ const D = async function(n, o, e) {
     responseHandler: l.getConfig("responseHandler")
   });
 };
-function A(n) {
-  if (!w.window)
+function L(t) {
+  if (!R.window)
     throw new Error("Default Module Only Support In Browser");
-  return w.fetch ? new T(v, n) : new T(C, n);
+  return R.fetch ? new H(x, t) : new H(C, t);
 }
-const l = A(), P = l.setConfig, M = l.head, N = l.get, F = l.post, B = l.del, X = l.put, G = l.patch;
+const l = L(), O = l.setConfig, P = l.head, M = l.get, N = l.post, B = l.del, F = l.put, X = l.patch;
 export {
-  A as NetRequest,
+  L as NetRequest,
   B as del,
-  N as get,
+  M as get,
   z as getResponseRulesDescription,
-  M as head,
+  P as head,
   k as jsonp,
-  O as jsonx,
-  G as patch,
-  F as post,
-  X as put,
-  P as setGlobalConfig,
+  A as jsonx,
+  X as patch,
+  N as post,
+  F as put,
+  O as setGlobalConfig,
   D as upload,
-  J as version
+  I as version
 };

package/dist/node.cjs

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

package/dist/node.js

@@ -1,12 +1,13 @@
-import l from "node:http";
-import y from "node:https";
-import { h as R, r as g, c as q, D as w, f as x, N as T } from "./version-DOOsgzgL.js";
-import { v as G } from "./version-DOOsgzgL.js";
-const U = async function(s, a, u) {
-  return R(await g(j, s, a, u), s, a, u);
-}, j = async function(s, a, u) {
-  const t = await q(s, a, u);
-  if (!w(t.url))
+import y from "node:http";
+import R from "node:https";
+import { h as w, r as q, c as g, D as x, f as S, S as E, N as p } from "./version-BLZ49ejb.js";
+import { v as z } from "./version-BLZ49ejb.js";
+import { f as T } from "./request.fetch-DlebtNMD.js";
+const U = async function(o, a, u) {
+  return w(await q(j, o, a, u), o, a, u);
+}, j = async function(o, a, u) {
+  const t = await g(o, a, u);
+  if (!x(t.url))
     return {
       url: t.url,
       method: t.method,
@@ -15,12 +16,12 @@ const U = async function(s, a, u) {
       headers: {},
       body: ""
     };
-  const p = /^https:\/\//i.test(t.url) ? y : l, r = new URL(t.url), d = t.params;
-  d instanceof Object && Object.keys(d).forEach((n) => r.searchParams.set(n, d[n]));
-  const f = t.method === "HEAD";
-  return new Promise((n) => {
-    const c = p.request(
-      r,
+  const f = /^https:\/\//i.test(t.url) ? R : y, n = new URL(t.url), d = t.params;
+  d instanceof Object && Object.keys(d).forEach((r) => n.searchParams.set(r, d[r]));
+  const b = t.method === "HEAD";
+  return new Promise((r) => {
+    const c = f.request(
+      n,
       {
         headers: t.headers,
         method: t.method,
@@ -29,31 +30,32 @@ const U = async function(s, a, u) {
       function(e) {
         const h = [];
         e.on("data", (i) => h.push(i)), e.on("end", () => {
-          const i = x(
-            Object.entries(e.headers).map(([b, m]) => [b.toLowerCase(), Array.isArray(m) ? m.join(",") : m])
+          const i = S(
+            Object.entries(e.headers).map(([l, m]) => [l.toLowerCase(), Array.isArray(m) ? m.join(",") : m])
           );
-          n({
-            url: r.toString(),
+          r({
+            url: n.toString(),
             method: t.method,
             status: e.statusCode || -1,
             statusText: e.statusMessage || "Unknown",
             headers: i,
-            body: f ? "" : Buffer.concat(h).toString("utf-8")
+            body: b ? "" : Buffer.concat(h).toString("utf-8")
           });
         });
       }
     );
     c.on("error", (e) => {
-      n({
-        url: r.toString(),
+      r({
+        url: n.toString(),
         method: t.method,
         status: -1,
         statusText: e.name || "Unknown",
-        body: e.message
+        body: e.message,
+        rawError: e
       });
     }), c.on("timeout", () => {
-      n({
-        url: r.toString(),
+      r({
+        url: n.toString(),
         method: t.method,
         status: -1,
         statusText: "Timeout",
@@ -62,18 +64,18 @@ const U = async function(s, a, u) {
     }), t.body && c.write(t.body), c.end();
   });
 };
-function C(s) {
-  return new T(U, s);
+function C(o) {
+  return E.fetch ? new p(T, o) : new p(U, o);
 }
-const o = C(), O = o.setConfig, S = o.head, A = o.get, H = o.post, k = o.del, D = o.put, P = o.patch;
+const s = C(), H = s.setConfig, k = s.head, D = s.get, P = s.post, B = s.del, F = s.put, G = s.patch;
 export {
   C as NetRequest,
-  k as del,
-  A as get,
-  S as head,
-  P as patch,
-  H as post,
-  D as put,
-  O as setGlobalConfig,
-  G as version
+  B as del,
+  D as get,
+  k as head,
+  G as patch,
+  P as post,
+  F as put,
+  H as setGlobalConfig,
+  z as version
 };

package/dist/request.fetch-BtrGinni.cjs

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

package/dist/request.fetch-DlebtNMD.js

@@ -0,0 +1,40 @@
+import { h, r as b, c as m, S as l, f } from "./version-BLZ49ejb.js";
+const g = async function(s, r, o) {
+  return h(await b(w, s, r, o), s, r, o);
+}, w = async function(s, r, o) {
+  const t = await m(s, r, o), n = new URL(t.url), i = t.params;
+  i instanceof Object && Object.keys(i).forEach((a) => n.searchParams.set(a, i[a]));
+  const e = l.AbortController ? new AbortController() : null;
+  function d() {
+    e && !e.signal.aborted && e.abort();
+  }
+  t.abort && t.abort.addEventListener("abort", d);
+  const u = t.timeout > 0 ? setTimeout(d, t.timeout) : null, c = new Request(n, {
+    method: t.method,
+    headers: Object.keys(t.headers).length > 0 ? new Headers(t.headers) : void 0,
+    body: t.body,
+    credentials: t.credentials,
+    signal: e == null ? void 0 : e.signal,
+    redirect: "follow"
+  });
+  return await fetch(c).then(async (a) => ({
+    url: n.toString(),
+    method: t.method,
+    status: a.status,
+    statusText: a.statusText,
+    headers: f([...a.headers.entries()]),
+    body: t.method === "HEAD" ? "" : await a.text()
+  })).catch((a) => ({
+    url: n.toString(),
+    method: t.method,
+    status: -1,
+    statusText: e != null && e.signal.aborted ? "Aborted" : "NetworkError",
+    body: String(a),
+    rawError: e != null && e.signal.aborted ? void 0 : a
+  })).finally(() => {
+    u !== null && clearTimeout(u), t.abort && t.abort.removeEventListener("abort", d);
+  });
+};
+export {
+  g as f
+};