@seayoo-web/request 4.0.4 → 4.1.0

package/dist/index.js

@@ -1,174 +1,151 @@
-import { h, r as E, G as y, c as q, f as v, a as C, R as w, H as R, b as H, v as x, d as L, N as T, X as k } from "./retry-LYfsjIVg.js";
-import { g as W } from "./retry-LYfsjIVg.js";
-import { f as S } from "./request.fetch-zzHMZXfR.js";
-const j = async function(n, a, t) {
-  return h(await E(m, n, a, t), n, a, t);
+import { _ as e, a as t, d as n, f as r, h as i, i as a, m as o, n as s, o as c, p as l, r as u, s as d, t as f, u as p } from "./retry-x0AqZ13h.js";
+import { t as m } from "./request.fetch-CY3SKtx7.js";
+//#region src/inc/request.xhr.ts
+var h = async function(e, t, n) {
+	return u(await f(_, e, t, n), e, t, n);
 };
-async function B(n, a, t, r) {
-  const o = t?.body, u = t?.method === "PUT" ? "PUT" : "POST";
-  if (a instanceof Blob) {
-    const l = new y(r), e = await m(n, l, {
-      ...t,
-      method: u,
-      body: a
-    });
-    return h(e, n, l, t);
-  }
-  const c = new FormData(), d = { ...a };
-  o instanceof Object && Object.entries(o).forEach(([l, e]) => {
-    e instanceof Blob ? d[l] = e : Array.isArray(e) ? e.forEach((g, s) => {
-      c.append(`${l}[${s}]`, String(g));
-    }) : c.append(l, String(e));
-  });
-  for (const l in d)
-    c.append(l, d[l]);
-  const f = new y(r), p = await m(n, f, {
-    ...t,
-    method: u,
-    body: c
-  });
-  return h(p, n, f, t);
+async function g(e, t, n, i) {
+	let a = n?.body, o = n?.method === "PUT" ? "PUT" : "POST";
+	if (t instanceof Blob) {
+		let a = new r(i);
+		return u(await _(e, a, {
+			...n,
+			method: o,
+			body: t
+		}), e, a, n);
+	}
+	let s = new FormData(), c = { ...t };
+	a instanceof Object && Object.entries(a).forEach(([e, t]) => {
+		t instanceof Blob ? c[e] = t : Array.isArray(t) ? t.forEach((t, n) => {
+			s.append(`${e}[${n}]`, String(t));
+		}) : s.append(e, String(t));
+	});
+	for (let e in c) s.append(e, c[e]);
+	let l = new r(i);
+	return u(await _(e, l, {
+		...n,
+		method: o,
+		body: s
+	}), e, l, n);
 }
-const m = async function(n, a, t) {
-  const r = await q(n, a, t), o = r.method, u = t?.onUploadProgress;
-  return await new Promise((c) => {
-    let d = null, f = !1;
-    const p = function() {
-      f || (e.abort(), f = !0);
-    };
-    function l() {
-      d !== null && clearTimeout(d), r.abort && r.abort.removeEventListener("abort", p);
-    }
-    const e = new XMLHttpRequest();
-    let g = !1;
-    if (e.open(o, r.url, !0), u) {
-      let s = 1;
-      e.upload.addEventListener("progress", (b) => {
-        s = b.total, u({ total: b.total, loaded: b.loaded });
-      }), e.addEventListener("load", () => {
-        u({ loaded: s, total: s });
-      });
-    }
-    e.addEventListener("load", async () => {
-      l();
-      const s = e.responseType;
-      c(
-        await v(
-          {
-            url: r.url,
-            method: o,
-            status: e.status,
-            statusText: e.statusText,
-            headers: P(e),
-            body: null
-          },
-          {
-            asBuffer: r.asBuffer,
-            text: () => s === "" || s === "text" || s === "json" || s === "document" ? e.responseText : "",
-            buffer: async () => s === "arraybuffer" ? e.response : s === "blob" ? await e.response.arrayBuffer() : await C(e.responseText)
-          }
-        )
-      );
-    }), e.addEventListener(
-      "error",
-      (s) => {
-        l(), c({
-          url: r.url,
-          method: o,
-          status: e.status || -1,
-          error: e.status ? void 0 : w.NetworkError,
-          statusText: e.statusText || w.NetworkError,
-          body: null,
-          rawError: s
-        });
-      },
-      !0
-    ), e.addEventListener("abort", () => {
-      l();
-      const s = g ? w.Timeout : w.Aborted;
-      c({
-        url: r.url,
-        method: o,
-        status: -1,
-        error: s,
-        statusText: s,
-        body: null
-      });
-    }), Object.entries(r.headers).forEach(([s, b]) => {
-      e.setRequestHeader(s, b);
-    }), r.credentials === "include" && (e.withCredentials = !0), e.send(r.body || void 0), r.abort && r.abort.addEventListener("abort", p), r.timeout > 0 && (d = setTimeout(function() {
-      g = !0, p();
-    }, r.timeout));
-  });
+var _ = async function(e, r, i) {
+	let a = await t(e, r, i), o = a.method, c = i?.onUploadProgress;
+	return await new Promise((e) => {
+		let t = null, r = !1, i = function() {
+			r ||= (u.abort(), !0);
+		};
+		function l() {
+			t !== null && clearTimeout(t), a.abort && a.abort.removeEventListener("abort", i);
+		}
+		let u = new XMLHttpRequest(), f = !1;
+		if (u.open(o, a.url, !0), c) {
+			let e = 1;
+			u.upload.addEventListener("progress", (t) => {
+				e = t.total, c({
+					total: t.total,
+					loaded: t.loaded
+				});
+			}), u.addEventListener("load", () => {
+				c({
+					loaded: e,
+					total: e
+				});
+			});
+		}
+		u.addEventListener("load", async () => {
+			l();
+			let t = u.responseType;
+			e(await s({
+				url: a.url,
+				method: o,
+				status: u.status,
+				statusText: u.statusText,
+				headers: v(u),
+				body: null
+			}, {
+				asBuffer: a.asBuffer,
+				text: () => t === "" || t === "text" || t === "json" || t === "document" ? u.responseText : "",
+				buffer: async () => t === "arraybuffer" ? u.response : t === "blob" ? await u.response.arrayBuffer() : await d(u.responseText)
+			}));
+		}), u.addEventListener("error", (t) => {
+			l(), e({
+				url: a.url,
+				method: o,
+				status: u.status || -1,
+				error: u.status ? void 0 : n.NetworkError,
+				statusText: u.statusText || n.NetworkError,
+				body: null,
+				rawError: t
+			});
+		}, !0), u.addEventListener("abort", () => {
+			l();
+			let t = f ? n.Timeout : n.Aborted;
+			e({
+				url: a.url,
+				method: o,
+				status: -1,
+				error: t,
+				statusText: t,
+				body: null
+			});
+		}), Object.entries(a.headers).forEach(([e, t]) => {
+			u.setRequestHeader(e, t);
+		}), a.credentials === "include" && (u.withCredentials = !0), u.send(a.body || void 0), a.abort && a.abort.addEventListener("abort", i), a.timeout > 0 && (t = setTimeout(function() {
+			f = !0, i();
+		}, a.timeout));
+	});
 };
-function P(n) {
-  const a = {};
-  if (!n)
-    return a;
-  const t = n.getAllResponseHeaders();
-  return t && t !== "null" && t.replace(/\r/g, "").split(`
-`).forEach((r) => {
-    const o = r.trim();
-    if (!o)
-      return;
-    const u = o.split(":"), c = u[0].trim();
-    c && (a[c] = (u[1] || "").trim());
-  }), a;
+function v(e) {
+	let t = {};
+	if (!e) return t;
+	let n = e.getAllResponseHeaders();
+	return n && n !== "null" && n.replace(/\r/g, "").split("\n").forEach((e) => {
+		let n = e.trim();
+		if (!n) return;
+		let r = n.split(":"), i = r[0].trim();
+		i && (t[i] = (r[1] || "").trim());
+	}), t;
 }
-async function O(n, a, t = {}) {
-  const r = window;
-  "callback" in t || (t.callback = "jsonxData" + Math.random().toString(16).slice(2));
-  const o = t.callback + "";
-  if (!n)
-    return null;
-  const u = R(n, H(t), !0);
-  return new Promise((c) => {
-    r[o] = function(d) {
-      if (o in window && delete r[o], a(d))
-        return d;
-      console.warn("response type check failed", n, d), c(null);
-    }, x(u).catch(function() {
-      c(null), delete r[o];
-    });
-  });
+//#endregion
+//#region src/inc/jsonp.ts
+async function y(e, t, n = {}) {
+	let r = window;
+	"callback" in n || (n.callback = "jsonxData" + Math.random().toString(16).slice(2));
+	let a = n.callback + "";
+	if (!e) return null;
+	let o = l(e, c(n), !0);
+	return new Promise((n) => {
+		r[a] = function(i) {
+			if (a in window && delete r[a], t(i)) return i;
+			console.warn("response type check failed", e, i), n(null);
+		}, i(o).catch(function() {
+			n(null), delete r[a];
+		});
+	});
 }
-async function A(n, a, t = {}) {
-  const r = window;
-  return "var" in t || (t.var = "jsonxData" + Math.random().toString(16).slice(2)), n ? await x(R(n, H(t), !0)).then(() => {
-    const o = r[t.var + ""];
-    return a(o) ? o : (console.warn("response type check failed", n, o), null);
-  }).catch(() => null) : null;
+async function b(e, t, n = {}) {
+	let r = window;
+	return "var" in n || (n.var = "jsonxData" + Math.random().toString(16).slice(2)), e ? await i(l(e, c(n), !0)).then(() => {
+		let i = r[n.var + ""];
+		return t(i) ? i : (console.warn("response type check failed", e, i), null);
+	}).catch(() => null) : null;
 }
-const M = async function(n, a, t) {
-  return await B(n, a, t, {
-    baseURL: i.getConfig("baseURL"),
-    logHandler: i.getConfig("logHandler"),
-    errorHandler: i.getConfig("errorHandler"),
-    requestTransformer: i.getConfig("requestTransformer"),
-    messageHandler: i.getConfig("messageHandler"),
-    responseHandler: i.getConfig("responseHandler")
-  });
+//#endregion
+//#region src/index.ts
+var x = async function(e, t, n) {
+	return await g(e, t, n, {
+		baseURL: C.getConfig("baseURL"),
+		logHandler: C.getConfig("logHandler"),
+		errorHandler: C.getConfig("errorHandler"),
+		requestTransformer: C.getConfig("requestTransformer"),
+		messageHandler: C.getConfig("messageHandler"),
+		responseHandler: C.getConfig("responseHandler")
+	});
 };
-// @__NO_SIDE_EFFECTS__
-function U(n) {
-  if (!L())
-    throw new Error("Default Module Only Support In Browser");
-  return k() ? new T(S, n) : new T(j, n);
+function S(t) {
+	if (!e()) throw Error("Default Module Only Support In Browser");
+	return o() ? new p(m, t) : new p(h, t);
 }
-const i = /* @__PURE__ */ U(), X = i.setConfig, G = i.request, F = i.head, I = i.get, $ = i.post, z = i.del, J = i.put, K = i.patch;
-export {
-  U as NetRequest,
-  w as RequestInternalError,
-  z as del,
-  I as get,
-  W as getResponseRulesDescription,
-  F as head,
-  O as jsonp,
-  A as jsonx,
-  K as patch,
-  $ as post,
-  J as put,
-  G as request,
-  X as setGlobalConfig,
-  M as upload
-};
+var C = S(), w = C.setConfig, T = C.request, E = C.head, D = C.get, O = C.post, k = C.del, A = C.put, j = C.patch;
+//#endregion
+export { S as NetRequest, n as RequestInternalError, k as del, D as get, a as getResponseRulesDescription, E as head, y as jsonp, b as jsonx, j as patch, O as post, A as put, T as request, w as setGlobalConfig, x as upload };

package/dist/node.js

@@ -1,83 +1,63 @@
-import { h as w, r as R, c as y, e as b, f as q, R as s, N as h, X as g } from "./retry-LYfsjIVg.js";
-import { g as S } from "./retry-LYfsjIVg.js";
-import { f as x } from "./request.fetch-zzHMZXfR.js";
-import N from "node:http";
-import C from "node:https";
-const E = async function(o, n, a) {
-  return w(await R(T, o, n, a), o, n, a);
-}, T = async function(o, n, a) {
-  const t = await y(o, n, a), p = /^https:\/\//i.test(t.url) ? C : N;
-  return new Promise((d) => {
-    const u = p.request(
-      t.url,
-      {
-        headers: t.headers,
-        method: t.method,
-        timeout: t.timeout > 0 ? t.timeout : void 0
-      },
-      function(e) {
-        const f = [];
-        e.on("data", (c) => f.push(c)), e.on("end", async () => {
-          const c = b(
-            Object.entries(e.headers).map(([l, i]) => [l.toLowerCase(), Array.isArray(i) ? i.join(",") : i])
-          ), m = Buffer.concat(f);
-          d(
-            await q(
-              {
-                url: t.url,
-                method: t.method,
-                status: e.statusCode || -1,
-                error: e.statusCode ? void 0 : s.Unknown,
-                statusText: e.statusMessage || s.Unknown,
-                headers: c,
-                body: null
-              },
-              {
-                asBuffer: t.asBuffer,
-                text: () => m.toString("utf-8"),
-                buffer: () => m.buffer
-              }
-            )
-          );
-        });
-      }
-    );
-    u.on("error", (e) => {
-      d({
-        url: t.url,
-        method: t.method,
-        status: -1,
-        error: s.NetworkError,
-        statusText: s.NetworkError,
-        body: null,
-        rawError: e
-      });
-    }), u.on("timeout", () => {
-      d({
-        url: t.url,
-        method: t.method,
-        status: -1,
-        error: s.Timeout,
-        statusText: s.Timeout,
-        body: null
-      });
-    }), t.body && u.write(t.body), u.end();
-  });
+import { a as e, c as t, d as n, i as r, m as i, n as a, r as o, t as s, u as c } from "./retry-x0AqZ13h.js";
+import { t as l } from "./request.fetch-CY3SKtx7.js";
+import u from "node:http";
+import d from "node:https";
+//#region src/inc/request.node.ts
+var f = async function(e, t, n) {
+	return o(await s(p, e, t, n), e, t, n);
+}, p = async function(r, i, o) {
+	let s = await e(r, i, o), c = /^https:\/\//i.test(s.url) ? d : u;
+	return new Promise((e) => {
+		let r = c.request(s.url, {
+			headers: s.headers,
+			method: s.method,
+			timeout: s.timeout > 0 ? s.timeout : void 0
+		}, function(r) {
+			let i = [];
+			r.on("data", (e) => i.push(e)), r.on("end", async () => {
+				let o = t(Object.entries(r.headers).map(([e, t]) => [e.toLowerCase(), Array.isArray(t) ? t.join(",") : t])), c = Buffer.concat(i);
+				e(await a({
+					url: s.url,
+					method: s.method,
+					status: r.statusCode || -1,
+					error: r.statusCode ? void 0 : n.Unknown,
+					statusText: r.statusMessage || n.Unknown,
+					headers: o,
+					body: null
+				}, {
+					asBuffer: s.asBuffer,
+					text: () => c.toString("utf-8"),
+					buffer: () => c.buffer
+				}));
+			});
+		});
+		r.on("error", (t) => {
+			e({
+				url: s.url,
+				method: s.method,
+				status: -1,
+				error: n.NetworkError,
+				statusText: n.NetworkError,
+				body: null,
+				rawError: t
+			});
+		}), r.on("timeout", () => {
+			e({
+				url: s.url,
+				method: s.method,
+				status: -1,
+				error: n.Timeout,
+				statusText: n.Timeout,
+				body: null
+			});
+		}), s.body && r.write(s.body), r.end();
+	});
 };
-// @__NO_SIDE_EFFECTS__
-function k(o) {
-  return g() ? new h(x, o) : new h(E, o);
+//#endregion
+//#region src/node.ts
+function m(e) {
+	return i() ? new c(l, e) : new c(f, e);
 }
-const r = /* @__PURE__ */ k(), U = r.setConfig, X = r.head, D = r.get, G = r.post, H = r.del, I = r.put, L = r.patch;
-export {
-  k as NetRequest,
-  s as RequestInternalError,
-  H as del,
-  D as get,
-  S as getResponseRulesDescription,
-  X as head,
-  L as patch,
-  G as post,
-  I as put,
-  U as setGlobalConfig
-};
+var h = m(), g = h.setConfig, _ = h.head, v = h.get, y = h.post, b = h.del, x = h.put, S = h.patch;
+//#endregion
+export { m as NetRequest, n as RequestInternalError, b as del, v as get, r as getResponseRulesDescription, _ as head, S as patch, y as post, x as put, g as setGlobalConfig };

package/dist/request.fetch-CY3SKtx7.js

@@ -0,0 +1,48 @@
+import { a as e, c as t, d as n, n as r, r as i, t as a, v as o } from "./retry-x0AqZ13h.js";
+//#region src/inc/request.fetch.ts
+var s = async function(e, t, n) {
+	return i(await a(c, e, t, n), e, t, n);
+}, c = async function(i, a, s) {
+	let c = await e(i, a, s), l = o() ? new AbortController() : null;
+	function u(e) {
+		l && !l.signal.aborted && l.abort(e);
+	}
+	c.abort?.addEventListener("abort", u);
+	let d = !1, f = c.timeout > 0 ? setTimeout(function() {
+		d = !0, u("TimeoutTriggered");
+	}, c.timeout) : null;
+	return await fetch(c.url, {
+		method: c.method,
+		headers: Object.keys(c.headers).length > 0 ? new Headers(c.headers) : void 0,
+		body: c.body,
+		credentials: c.credentials,
+		signal: l?.signal,
+		redirect: "follow"
+	}).then(async (e) => r({
+		url: c.url,
+		method: c.method,
+		status: e.status,
+		statusText: e.statusText,
+		headers: t([...e.headers.entries()]),
+		body: null
+	}, {
+		asBuffer: c.asBuffer,
+		text: () => e.text(),
+		buffer: () => e.arrayBuffer()
+	})).catch((e) => {
+		let t = l?.signal.aborted, r = d ? n.Timeout : t ? n.Aborted : n.NetworkError;
+		return {
+			url: c.url,
+			method: c.method,
+			status: -1,
+			error: r,
+			statusText: r,
+			body: null,
+			rawError: e
+		};
+	}).finally(() => {
+		f !== null && clearTimeout(f), c.abort && c.abort.removeEventListener("abort", u);
+	});
+};
+//#endregion
+export { s as t };