@seayoo-web/request 4.0.3 → 4.0.5

package/dist/index.js

@@ -1,6 +1,6 @@
-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-CQEDKWe8.js";
-import { g as W } from "./retry-CQEDKWe8.js";
-import { f as S } from "./request.fetch-D-T4XbBr.js";
+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);
 };

package/dist/node.js

@@ -1,6 +1,6 @@
-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-CQEDKWe8.js";
-import { g as S } from "./retry-CQEDKWe8.js";
-import { f as x } from "./request.fetch-D-T4XbBr.js";
+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) {

package/dist/{request.fetch-D-T4XbBr.js → request.fetch-zzHMZXfR.js}

@@ -1,4 +1,4 @@
-import { h as f, r as h, c as m, i as b, f as y, e as T, R as u } from "./retry-CQEDKWe8.js";
+import { h as f, r as h, c as m, i as b, f as y, e as T, R as u } from "./retry-LYfsjIVg.js";
 const x = async function(o, a, s) {
   return f(await h(w, o, a, s), o, a, s);
 }, w = async function(o, a, s) {

package/dist/{retry-CQEDKWe8.js → retry-LYfsjIVg.js}

@@ -8,22 +8,22 @@ function y(e) {
 function U(e) {
   return typeof e == "object" && e !== null;
 }
-function P() {
+function O() {
   return "wx" in f && U(f.wx) && "getSystemInfo" in f.wx && y(f.wx.getSystemInfo);
 }
 function we() {
   return "fetch" in f && y(f.fetch);
 }
 function be() {
-  return "window" in f && U(f.window) && !P();
+  return "window" in f && U(f.window) && !O();
 }
 function R() {
   return "Blob" in f && y(f.Blob);
 }
-function O() {
+function F() {
   return "FormData" in f && y(f.FormData);
 }
-function F() {
+function M() {
   return "TextDecoder" in f && y(f.TextDecoder);
 }
 function Ee() {
@@ -52,15 +52,15 @@ const I = /^(?:https?:)?\/\/.+$/i, G = /^https?:\/\/.+$/i, K = /^\{[\d\D]*\}$/,
 function $(e, t = !1) {
   return t ? I.test(e) : G.test(e);
 }
-function M(e) {
+function A(e) {
   return e == null;
 }
-function A(e, ...t) {
+function S(e, ...t) {
   if (!e || typeof e != "object") return !1;
   const r = Object.getPrototypeOf(e);
   return r !== Object.prototype && r !== null ? !1 : t.every((s) => s in e);
 }
-function S(e) {
+function L(e) {
   return K.test(e) || _.test(e);
 }
 function E(e, t) {
@@ -235,7 +235,7 @@ const g = {
   NotSupport: "NotSupport"
 };
 function ee(e, t, r, s) {
-  if (t.ok && !M(t.data) && s) {
+  if (t.ok && !A(t.data) && s) {
     const { guard: n, message: o } = J(s, r.get("defaultTypeGuardMessage"));
     return n(t.data) || (t.code = g.UnexpectResponse, r.showMessage(!0, `${e} ${o}`, t.code, t.status), console.error(t.code, e, t.data), t.data = null, t.message = o), t;
   }
@@ -337,21 +337,21 @@ function se(e) {
     n && (t[r] = n);
   }), t;
 }
-function L(e) {
-  return M(e) ? "" : typeof e == "string" ? e : e instanceof ArrayBuffer && F() ? new TextDecoder().decode(e) : JSON.stringify(e);
+function B(e) {
+  return A(e) ? "" : typeof e == "string" ? e : e instanceof ArrayBuffer && M() ? new TextDecoder().decode(e) : JSON.stringify(e);
 }
 function re(e) {
-  return e instanceof Error ? e : new Error(L(e));
+  return e instanceof Error ? e : new Error(B(e));
 }
 async function Re(e) {
-  if (F())
+  if (M())
     return new TextEncoder().encode(e).buffer;
   if (R())
     return await new Blob([e]).arrayBuffer();
   throw new Error("cannot convert string to ArrayBuffer");
 }
 function ne(e, t) {
-  if ("URL" in C()) {
+  if ("URL" in C() && !O()) {
     const s = new URL(e);
     return Object.keys(t).forEach((n) => s.searchParams.set(n, t[n])), s.toString();
   }
@@ -369,7 +369,7 @@ function ce({ status: e, headers: t, error: r }) {
   return r === g.NetworkError ? !0 : t?.server === "TencentEdgeOne" ? e === 522 || e === 552 : !1;
 }
 async function $e(e, t, r) {
-  const s = { ...r, method: r?.method || "GET" }, n = O() ? s.body instanceof FormData : !1, o = n && s.method !== "POST" && s.method !== "PUT" ? "POST" : s.method, a = o === "GET" || o === "HEAD" || o === "DELETE";
+  const s = { ...r, method: r?.method || "GET" }, n = F() ? s.body instanceof FormData : !1, o = n && s.method !== "POST" && s.method !== "PUT" ? "POST" : s.method, a = o === "GET" || o === "HEAD" || o === "DELETE";
   a && s.body !== void 0 && (console.warn("request body is invalid with method get, head, delete"), delete s.body);
   const u = n || a ? { ...s.headers } : {
     "Content-Type": R() && s.body instanceof Blob ? s.body.type || "application/octet-stream" : "application/json;charset=utf-8",
@@ -392,11 +392,11 @@ async function $e(e, t, r) {
 }
 function ie(e) {
   if (e)
-    return typeof e == "string" || q() && e instanceof URLSearchParams || e instanceof ArrayBuffer || R() && e instanceof Blob || O() && e instanceof FormData ? e : JSON.stringify(e);
+    return typeof e == "string" || q() && e instanceof URLSearchParams || e instanceof ArrayBuffer || R() && e instanceof Blob || F() && e instanceof FormData ? e : JSON.stringify(e);
 }
-const B = "data", w = "message";
+const D = "data", w = "message";
 function ue(e, t, r) {
-  return D(e.status) ? fe(r?.ok || t.ok, e) : he(r?.failed || t.failed, e);
+  return P(e.status) ? fe(r?.ok || t.ok, e) : he(r?.failed || t.failed, e);
 }
 function fe(e, { statusText: t, body: r }) {
   const s = {
@@ -410,17 +410,17 @@ function fe(e, { statusText: t, body: r }) {
   if (typeof r != "string")
     return s.data = r, s;
   if (e.resolve === "body")
-    return s.data = S(r) ? k(E(r), e.converter) : r, s;
+    return s.data = L(r) ? k(E(r), e.converter) : r, s;
   const n = E(r);
   if (!n)
     return s.ok = !1, s.code = "ResponseFormatError", s.message = "响应内容无法解析为 json", s;
   const o = k(n, e.converter);
-  if (!o || !A(o))
+  if (!o || !S(o))
     return s.ok = !1, s.code = "ResponseFormatError", s.message = "响应内容无法格式化为 object", s;
   const a = e.statusField;
   if (a && !(a in o))
     return s.ok = !1, s.code = "ResponseFieldMissing", s.message = `响应内容找不到状态字段 ${a}`, s;
-  const u = e.statusOKValue || "", c = e.dataField || B, l = e.messageField || w, i = a ? String(o[a] ?? "") : "";
+  const u = e.statusOKValue || "", c = e.dataField || D, l = e.messageField || w, i = a ? String(o[a] ?? "") : "";
   return s.ok = a ? i === u : !0, s.code = i || s.code, s.data = c === !0 ? o : c in o ? o[c] : null, s.message = T(o, l), e.ignoreMessage && s.message && (Array.isArray(e.ignoreMessage) ? e.ignoreMessage.includes(s.message) : e.ignoreMessage === s.message) && (s.message = ""), s;
 }
 function he(e, { statusText: t, body: r, error: s }) {
@@ -455,7 +455,7 @@ function he(e, { statusText: t, body: r, error: s }) {
   }
   return o;
 }
-function D(e) {
+function P(e) {
   return e >= 200 && e < 400;
 }
 function k(e, t) {
@@ -478,7 +478,7 @@ const xe = function(e) {
       break;
     case "json":
       t.push(
-        "  将响应解析为 json，读取 " + (s.dataField || B) + " 作为响应数据，读取 " + (s.messageField || w) + " 作为提示消息"
+        "  将响应解析为 json，读取 " + (s.dataField || D) + " 作为响应数据，读取 " + (s.messageField || w) + " 作为提示消息"
       ), s.statusField && t.push(
         "  当 " + s.statusField + " 为 " + (s.statusOKValue || "空值") + " 时是成功提示，否则是错误消息"
       ), s.ignoreMessage && t.push("  并忽略以下消息：" + s.ignoreMessage);
@@ -488,10 +488,10 @@ const xe = function(e) {
 `);
 };
 function le(e, t, r, s = w) {
-  if (!S(e))
+  if (!L(e))
     return { message: "" };
   const n = k(E(e), t);
-  return !n || !A(n) ? { message: e } : {
+  return !n || !S(n) ? { message: e } : {
     code: r ? T(n, r) : "",
     message: T(n, s) || e
   };
@@ -500,7 +500,7 @@ function T(e, t) {
   const r = Array.isArray(t) ? t : [t];
   for (const s of r)
     if (s in e)
-      return L(e[s]);
+      return B(e[s]);
   return "";
 }
 const de = [/<title>([^<]+)<\/title>/i, /<message>([^<]+)<\/message>/i];
@@ -549,7 +549,7 @@ function ve(e, t, r, s) {
   const n = e.status, o = e.method, a = te(
     Object.entries(e.headers || {}).map(([d, m]) => [d.toLowerCase(), m])
   ), { ok: u, code: c, data: l, message: i } = ue(e, r.get("responseRule"), s?.responseRule);
-  if (!D(n)) {
+  if (!P(n)) {
     const d = me({
       url: e.url,
       method: e.method,
@@ -634,7 +634,7 @@ async function ye(e, t, r, s, n) {
   ), await ye(e, t, r, s, o + 1);
 }
 export {
-  P as E,
+  O as E,
   Z as G,
   z as H,
   Te as N,
@@ -650,6 +650,6 @@ export {
   ve as h,
   Ee as i,
   ye as r,
-  L as t,
+  B as t,
   ke as v
 };

package/dist/wx.js

@@ -1,5 +1,5 @@
-import { h as l, r as p, c as y, E as R, R as u, f as x, a as h, t as c, N as w } from "./retry-CQEDKWe8.js";
-import { g as O } from "./retry-CQEDKWe8.js";
+import { h as l, r as p, c as y, E as R, R as u, f as x, a as h, t as c, N as w } from "./retry-LYfsjIVg.js";
+import { g as O } from "./retry-LYfsjIVg.js";
 const m = async function(s, o, n) {
   return l(await p(q, s, o, n), s, o, n);
 }, q = async function(s, o, n) {

package/package.json

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

package/types/inc/main.d.ts

@@ -7,6 +7,7 @@ export type URLPlus = string | {
 export type BufferRequestOptions = RequestOptions & {
     asBuffer: true;
 };
+export type INetRequestHandler = Pick<NetRequestHandler, keyof NetRequestHandler>;
 /** 工具函数主类 */
 export declare class NetRequestHandler {
     private agent;

package/types/index.d.ts

@@ -1,10 +1,10 @@
-import { NetRequestHandler } from "./inc/main";
+import { INetRequestHandler } from "./inc/main";
 import { xhrUpload } from "./inc/request.xhr";
 import type { RequestGlobalConfig } from "./inc/type";
 export { jsonp, jsonx } from "./inc/jsonp";
 export { getResponseRulesDescription } from "./inc/rule";
 export { RequestInternalError } from "./inc/type";
-export type { NetRequestHandler, URLPlus, BufferRequestOptions } from "./inc/main";
+export type { NetRequestHandler, INetRequestHandler, URLPlus, BufferRequestOptions } from "./inc/main";
 export type { RequestOptions, RequestGlobalConfig, ResponseRule, ResponseResult, RequestLog, RequestMethod, RequestQueryParams, } from "./inc/type";
 /**
  * 基于 xhr 模块的上传工具，支持上传进度
@@ -15,7 +15,7 @@ export type NetRequestFactory = typeof NetRequest;
 /**
  * 创建新的实例空间，配置和缓存跟全局默认实例是隔离的，仅支持在浏览器环境使用
  */
-export declare function NetRequest(config?: RequestGlobalConfig): NetRequestHandler;
+export declare function NetRequest(config?: RequestGlobalConfig): INetRequestHandler;
 /**
  * 设置全局默认的 Request Config
  */

package/types/node.d.ts

@@ -1,13 +1,13 @@
-import { NetRequestHandler } from "./inc/main";
+import { INetRequestHandler } from "./inc/main";
 import type { RequestGlobalConfig } from "./inc/type";
 export { getResponseRulesDescription } from "./inc/rule";
 export { RequestInternalError } from "./inc/type";
-export type { NetRequestHandler, URLPlus, BufferRequestOptions } from "./inc/main";
+export type { NetRequestHandler, INetRequestHandler, URLPlus, BufferRequestOptions } from "./inc/main";
 export type { RequestOptions, RequestGlobalConfig, ResponseRule, ResponseResult, RequestLog, RequestMethod, RequestQueryParams, } from "./inc/type";
 /**
  * 创建新的实例空间，配置和缓存跟全局默认实例是隔离的
  */
-export declare function NetRequest(config?: RequestGlobalConfig): NetRequestHandler;
+export declare function NetRequest(config?: RequestGlobalConfig): INetRequestHandler;
 /**
  * 设置全局默认的 Request Config
  */

package/types/wx.d.ts

@@ -1,13 +1,13 @@
-import { NetRequestHandler } from "./inc/main";
+import { INetRequestHandler } from "./inc/main";
 import type { RequestGlobalConfig } from "./inc/type";
 export { getResponseRulesDescription } from "./inc/rule";
 export { RequestInternalError } from "./inc/type";
-export type { NetRequestHandler, URLPlus, BufferRequestOptions } from "./inc/main";
+export type { NetRequestHandler, INetRequestHandler, URLPlus, BufferRequestOptions } from "./inc/main";
 export type { RequestOptions, RequestGlobalConfig, ResponseRule, ResponseResult, RequestLog, RequestMethod, RequestQueryParams, } from "./inc/type";
 /**
  * 创建新的实例空间，配置和缓存跟全局默认实例是隔离的
  */
-export declare function NetRequest(config?: RequestGlobalConfig): NetRequestHandler;
+export declare function NetRequest(config?: RequestGlobalConfig): INetRequestHandler;
 /**
  * 设置全局默认的 Request Config
  */