@seayoo-web/request 1.5.4 → 1.5.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.cjs CHANGED
@@ -1,2 +1,2 @@
1
- "use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("./version-B09aAqk-.cjs"),H=async function(n,o,t){const e=await c.convertOptions(n,o,t),r=new URL(e.url),i=e.params;i instanceof Object&&Object.keys(i).forEach(s=>r.searchParams.set(s,i[s]));const a=new AbortController;function l(){a.signal.aborted||a.abort()}e.abort&&e.abort.addEventListener("abort",l);const b=e.timeout>0?setTimeout(l,e.timeout):null,f=new Request(r,{method:e.method,headers:new Headers(e.headers),body:e.body,credentials:e.credentials,signal:a.signal,redirect:"follow"});return await fetch(f).then(async s=>({url:r.toString(),method:e.method,status:s.status,statusText:s.statusText,headers:Object.fromEntries(s.headers.entries()),body:e.method==="HEAD"?"":await s.text()})).catch(s=>({url:r.toString(),method:e.method,status:-1,statusText:"NetworkError",body:String(s)})).finally(()=>{b!==null&&clearTimeout(b),e.abort&&e.abort.removeEventListener("abort",l)})},m=async function(n,o,t){const e={...await c.convertOptions(n,o,t),onUploadProgress:t==null?void 0:t.onUploadProgress},r=e.method,i=e.onUploadProgress||c.Ot,a=c.wt(e.url,e.params);return await new Promise(l=>{let b=1;function f(g){b=g.total,i({total:g.total,loaded:g.loaded})}let s=null,w=!1;const h=function(){w||(d.abort(),w=!0)};function p(){s!==null&&clearTimeout(s),e.abort&&e.abort.removeEventListener("abort",h)}const d=new XMLHttpRequest;d.open(r,a,!0),d.upload.addEventListener("progress",f),d.addEventListener("load",()=>{p(),i({loaded:b,total:b}),l({url:a,method:r,status:d.status,statusText:d.statusText,headers:T(d),body:r==="HEAD"?"":d.responseText})}),d.addEventListener("error",()=>{p(),l({url:a,method:r,status:-1,statusText:"Failed",body:""})}),d.addEventListener("abort",()=>{p(),l({url:a,method:r,status:-1,statusText:"Aborted",body:""})}),Object.entries(e.headers).forEach(([g,R])=>{d.setRequestHeader(g,R)}),e.credentials==="include"&&(d.withCredentials=!0),d.send(e.body||void 0),e.abort&&e.abort.addEventListener("abort",h),e.timeout>0&&(s=setTimeout(h,e.timeout))})};function T(n){const o={};if(!n)return o;const t=n.getAllResponseHeaders();return t&&t!=="null"&&t.replace(/\r/g,"").split(`
2
- `).forEach(e=>{const r=e.trim();if(!r)return;const i=r.split(":"),a=i[0].trim();a&&(o[a]=(i[1]||"").trim())}),o}const q=async function(n,o,t){return c.handleResponse(await c.retryRequest(H,n,o,t),n,o,t)},E=async function(n,o,t){return c.handleResponse(await c.retryRequest(m,n,o,t),n,o,t)};async function x(n,o,t,e){const r=new FormData,i=t==null?void 0:t.body,a={...o};i instanceof Object&&Object.entries(i).forEach(([f,s])=>{s instanceof Blob?a[f]=s:Array.isArray(s)?s.forEach((w,h)=>{r.append(`${f}[${h}]`,String(w))}):r.append(f,String(s))});for(const f in a)r.append(f,a[f]);const l=new c.RequestGlobalConfig(e),b=await m(n,l,{...t,method:"POST",body:r});return c.handleResponse(b,n,l,t)}async function v(n,o,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.wt(n,t,!0);return new Promise(a=>{e[r]=function(l){if(r in window&&delete e[r],o(l))return l;console.warn("response type check faild",n,l),a(null)},c.sn(i).catch(function(){a(null),delete e[r]})})}async function j(n,o,t={}){const e=window;return"var"in t||(t.var="jsonxData"+Math.random().toString(16).slice(2)),n?await c.sn(c.wt(n,t,!0)).then(()=>{const r=e[t.var+""];return o(r)?r:(console.warn("response type check faild",n,r),null)}).catch(()=>null):null}const L=async function(n,o,t){return await x(n,o,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 y(n){if("window"in globalThis)return"fetch"in window?new c.NetRequestHandler(q,n):new c.NetRequestHandler(E,n);throw new Error("Default Module Only Support In Browser")}const u=y(),S=u.setConfig,C=u.head,O=u.get,U=u.post,D=u.del,k=u.put,P=u.patch;exports.getResponseRulesDescription=c.getResponseRulesDescription;exports.version=c.version;exports.NetRequest=y;exports.del=D;exports.get=O;exports.head=C;exports.jsonp=v;exports.jsonx=j;exports.patch=P;exports.post=U;exports.put=k;exports.setGlobalConfig=S;exports.upload=L;
1
+ "use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("./version-nbk4F2gf.cjs"),H=async function(n,o,t){const e=await c.convertOptions(n,o,t),r=new URL(e.url),i=e.params;i instanceof Object&&Object.keys(i).forEach(a=>r.searchParams.set(a,i[a]));const s=new AbortController;function l(){s.signal.aborted||s.abort()}e.abort&&e.abort.addEventListener("abort",l);const b=e.timeout>0?setTimeout(l,e.timeout):null,f=new Request(r,{method:e.method,headers:new Headers(e.headers),body:e.body,credentials:e.credentials,signal:s.signal,redirect:"follow"});return await fetch(f).then(async a=>({url:r.toString(),method:e.method,status:a.status,statusText:a.statusText,headers:Object.fromEntries(a.headers.entries()),body:e.method==="HEAD"?"":await a.text()})).catch(a=>({url:r.toString(),method:e.method,status:-1,statusText:s.signal.aborted?"Aborted":"NetworkError",body:String(a)})).finally(()=>{b!==null&&clearTimeout(b),e.abort&&e.abort.removeEventListener("abort",l)})},m=async function(n,o,t){const e={...await c.convertOptions(n,o,t),onUploadProgress:t==null?void 0:t.onUploadProgress},r=e.method,i=e.onUploadProgress||c.Lt,s=c.Ct(e.url,e.params);return await new Promise(l=>{let b=1;function f(g){b=g.total,i({total:g.total,loaded:g.loaded})}let a=null,p=!1;const h=function(){p||(d.abort(),p=!0)};function w(){a!==null&&clearTimeout(a),e.abort&&e.abort.removeEventListener("abort",h)}const d=new XMLHttpRequest;d.open(r,s,!0),d.upload.addEventListener("progress",f),d.addEventListener("load",()=>{w(),i({loaded:b,total:b}),l({url:s,method:r,status:d.status,statusText:d.statusText,headers:T(d),body:r==="HEAD"?"":d.responseText})}),d.addEventListener("error",()=>{w(),l({url:s,method:r,status:-1,statusText:"Failed",body:""})}),d.addEventListener("abort",()=>{w(),l({url:s,method:r,status:-1,statusText:"Aborted",body:""})}),Object.entries(e.headers).forEach(([g,R])=>{d.setRequestHeader(g,R)}),e.credentials==="include"&&(d.withCredentials=!0),d.send(e.body||void 0),e.abort&&e.abort.addEventListener("abort",h),e.timeout>0&&(a=setTimeout(h,e.timeout))})};function T(n){const o={};if(!n)return o;const t=n.getAllResponseHeaders();return t&&t!=="null"&&t.replace(/\r/g,"").split(`
2
+ `).forEach(e=>{const r=e.trim();if(!r)return;const i=r.split(":"),s=i[0].trim();s&&(o[s]=(i[1]||"").trim())}),o}const q=async function(n,o,t){return c.handleResponse(await c.retryRequest(H,n,o,t),n,o,t)},E=async function(n,o,t){return c.handleResponse(await c.retryRequest(m,n,o,t),n,o,t)};async function x(n,o,t,e){const r=new FormData,i=t==null?void 0:t.body,s={...o};i instanceof Object&&Object.entries(i).forEach(([f,a])=>{a instanceof Blob?s[f]=a:Array.isArray(a)?a.forEach((p,h)=>{r.append(`${f}[${h}]`,String(p))}):r.append(f,String(a))});for(const f in s)r.append(f,s[f]);const l=new c.RequestGlobalConfig(e),b=await m(n,l,{...t,method:"POST",body:r});return c.handleResponse(b,n,l,t)}async function C(n,o,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.Ct(n,t,!0);return new Promise(s=>{e[r]=function(l){if(r in window&&delete e[r],o(l))return l;console.warn("response type check faild",n,l),s(null)},c.on(i).catch(function(){s(null),delete e[r]})})}async function v(n,o,t={}){const e=window;return"var"in t||(t.var="jsonxData"+Math.random().toString(16).slice(2)),n?await c.on(c.Ct(n,t,!0)).then(()=>{const r=e[t.var+""];return o(r)?r:(console.warn("response type check faild",n,r),null)}).catch(()=>null):null}const L=async function(n,o,t){return await x(n,o,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 y(n){if("window"in globalThis)return"fetch"in window?new c.NetRequestHandler(q,n):new c.NetRequestHandler(E,n);throw new Error("Default Module Only Support In Browser")}const u=y(),j=u.setConfig,S=u.head,O=u.get,U=u.post,D=u.del,k=u.put,A=u.patch;exports.getResponseRulesDescription=c.getResponseRulesDescription;exports.version=c.version;exports.NetRequest=y;exports.del=D;exports.get=O;exports.head=S;exports.jsonp=C;exports.jsonx=v;exports.patch=A;exports.post=U;exports.put=k;exports.setGlobalConfig=j;exports.upload=L;
package/dist/index.js CHANGED
@@ -1,11 +1,11 @@
1
- import { c as R, w as m, O as q, h as p, r as E, R as L, s as H, N as y } from "./version-BXzKbsH3.js";
2
- import { g as J, v as K } from "./version-BXzKbsH3.js";
3
- const v = async function(n, o, e) {
1
+ import { c as R, C as w, L, h as p, r as E, R as q, o as H, N as y } from "./version-DCu7OI8o.js";
2
+ import { g as J, v as K } from "./version-DCu7OI8o.js";
3
+ const C = async function(n, o, e) {
4
4
  const t = await R(n, o, e), r = new URL(t.url), c = t.params;
5
- c instanceof Object && Object.keys(c).forEach((a) => r.searchParams.set(a, c[a]));
6
- const s = new AbortController();
5
+ c instanceof Object && Object.keys(c).forEach((s) => r.searchParams.set(s, c[s]));
6
+ const a = new AbortController();
7
7
  function i() {
8
- s.signal.aborted || s.abort();
8
+ a.signal.aborted || a.abort();
9
9
  }
10
10
  t.abort && t.abort.addEventListener("abort", i);
11
11
  const f = t.timeout > 0 ? setTimeout(i, t.timeout) : null, u = new Request(r, {
@@ -13,22 +13,22 @@ const v = async function(n, o, e) {
13
13
  headers: new Headers(t.headers),
14
14
  body: t.body,
15
15
  credentials: t.credentials,
16
- signal: s.signal,
16
+ signal: a.signal,
17
17
  redirect: "follow"
18
18
  });
19
- return await fetch(u).then(async (a) => ({
19
+ return await fetch(u).then(async (s) => ({
20
20
  url: r.toString(),
21
21
  method: t.method,
22
- status: a.status,
23
- statusText: a.statusText,
24
- headers: Object.fromEntries(a.headers.entries()),
25
- body: t.method === "HEAD" ? "" : await a.text()
26
- })).catch((a) => ({
22
+ status: s.status,
23
+ statusText: s.statusText,
24
+ headers: Object.fromEntries(s.headers.entries()),
25
+ body: t.method === "HEAD" ? "" : await s.text()
26
+ })).catch((s) => ({
27
27
  url: r.toString(),
28
28
  method: t.method,
29
29
  status: -1,
30
- statusText: "NetworkError",
31
- body: String(a)
30
+ statusText: a.signal.aborted ? "Aborted" : "NetworkError",
31
+ body: String(s)
32
32
  })).finally(() => {
33
33
  f !== null && clearTimeout(f), t.abort && t.abort.removeEventListener("abort", i);
34
34
  });
@@ -36,40 +36,40 @@ const v = async function(n, o, e) {
36
36
  const t = {
37
37
  ...await R(n, o, e),
38
38
  onUploadProgress: e == null ? void 0 : e.onUploadProgress
39
- }, r = t.method, c = t.onUploadProgress || q, s = m(t.url, t.params);
39
+ }, r = t.method, c = t.onUploadProgress || L, a = w(t.url, t.params);
40
40
  return await new Promise((i) => {
41
41
  let f = 1;
42
42
  function u(h) {
43
43
  f = h.total, c({ total: h.total, loaded: h.loaded });
44
44
  }
45
- let a = null, g = !1;
45
+ let s = null, g = !1;
46
46
  const b = function() {
47
47
  g || (l.abort(), g = !0);
48
48
  };
49
- function w() {
50
- a !== null && clearTimeout(a), t.abort && t.abort.removeEventListener("abort", b);
49
+ function m() {
50
+ s !== null && clearTimeout(s), t.abort && t.abort.removeEventListener("abort", b);
51
51
  }
52
52
  const l = new XMLHttpRequest();
53
- l.open(r, s, !0), l.upload.addEventListener("progress", u), l.addEventListener("load", () => {
54
- w(), c({ loaded: f, total: f }), i({
55
- url: s,
53
+ l.open(r, a, !0), l.upload.addEventListener("progress", u), l.addEventListener("load", () => {
54
+ m(), c({ loaded: f, total: f }), i({
55
+ url: a,
56
56
  method: r,
57
57
  status: l.status,
58
58
  statusText: l.statusText,
59
- headers: C(l),
59
+ headers: v(l),
60
60
  body: r === "HEAD" ? "" : l.responseText
61
61
  });
62
62
  }), l.addEventListener("error", () => {
63
- w(), i({
64
- url: s,
63
+ m(), i({
64
+ url: a,
65
65
  method: r,
66
66
  status: -1,
67
67
  statusText: "Failed",
68
68
  body: ""
69
69
  });
70
70
  }), l.addEventListener("abort", () => {
71
- w(), i({
72
- url: s,
71
+ m(), i({
72
+ url: a,
73
73
  method: r,
74
74
  status: -1,
75
75
  statusText: "Aborted",
@@ -77,10 +77,10 @@ const v = async function(n, o, e) {
77
77
  });
78
78
  }), Object.entries(t.headers).forEach(([h, x]) => {
79
79
  l.setRequestHeader(h, x);
80
- }), t.credentials === "include" && (l.withCredentials = !0), l.send(t.body || void 0), t.abort && t.abort.addEventListener("abort", b), t.timeout > 0 && (a = setTimeout(b, t.timeout));
80
+ }), t.credentials === "include" && (l.withCredentials = !0), l.send(t.body || void 0), t.abort && t.abort.addEventListener("abort", b), t.timeout > 0 && (s = setTimeout(b, t.timeout));
81
81
  });
82
82
  };
83
- function C(n) {
83
+ function v(n) {
84
84
  const o = {};
85
85
  if (!n)
86
86
  return o;
@@ -90,57 +90,57 @@ function C(n) {
90
90
  const r = t.trim();
91
91
  if (!r)
92
92
  return;
93
- const c = r.split(":"), s = c[0].trim();
94
- s && (o[s] = (c[1] || "").trim());
93
+ const c = r.split(":"), a = c[0].trim();
94
+ a && (o[a] = (c[1] || "").trim());
95
95
  }), o;
96
96
  }
97
- const O = async function(n, o, e) {
98
- return p(await E(v, n, o, e), n, o, e);
99
- }, S = async function(n, o, e) {
97
+ const S = async function(n, o, e) {
98
+ return p(await E(C, n, o, e), n, o, e);
99
+ }, j = async function(n, o, e) {
100
100
  return p(await E(T, n, o, e), n, o, e);
101
101
  };
102
- async function j(n, o, e, t) {
103
- const r = new FormData(), c = e == null ? void 0 : e.body, s = { ...o };
104
- c instanceof Object && Object.entries(c).forEach(([u, a]) => {
105
- a instanceof Blob ? s[u] = a : Array.isArray(a) ? a.forEach((g, b) => {
102
+ async function U(n, o, e, t) {
103
+ const r = new FormData(), c = e == null ? void 0 : e.body, a = { ...o };
104
+ c instanceof Object && Object.entries(c).forEach(([u, s]) => {
105
+ s instanceof Blob ? a[u] = s : Array.isArray(s) ? s.forEach((g, b) => {
106
106
  r.append(`${u}[${b}]`, String(g));
107
- }) : r.append(u, String(a));
107
+ }) : r.append(u, String(s));
108
108
  });
109
- for (const u in s)
110
- r.append(u, s[u]);
111
- const i = new L(t), f = await T(n, i, {
109
+ for (const u in a)
110
+ r.append(u, a[u]);
111
+ const i = new q(t), f = await T(n, i, {
112
112
  ...e,
113
113
  method: "POST",
114
114
  body: r
115
115
  });
116
116
  return p(f, n, i, e);
117
117
  }
118
- async function D(n, o, e = {}) {
118
+ async function A(n, o, e = {}) {
119
119
  const t = window;
120
120
  "callback" in e || (e.callback = "jsonxData" + Math.random().toString(16).slice(2));
121
121
  const r = e.callback + "";
122
122
  if (!n)
123
123
  return null;
124
- const c = m(n, e, !0);
125
- return new Promise((s) => {
124
+ const c = w(n, e, !0);
125
+ return new Promise((a) => {
126
126
  t[r] = function(i) {
127
127
  if (r in window && delete t[r], o(i))
128
128
  return i;
129
- console.warn("response type check faild", n, i), s(null);
129
+ console.warn("response type check faild", n, i), a(null);
130
130
  }, H(c).catch(function() {
131
- s(null), delete t[r];
131
+ a(null), delete t[r];
132
132
  });
133
133
  });
134
134
  }
135
- async function A(n, o, e = {}) {
135
+ async function D(n, o, e = {}) {
136
136
  const t = window;
137
- return "var" in e || (e.var = "jsonxData" + Math.random().toString(16).slice(2)), n ? await H(m(n, e, !0)).then(() => {
137
+ return "var" in e || (e.var = "jsonxData" + Math.random().toString(16).slice(2)), n ? await H(w(n, e, !0)).then(() => {
138
138
  const r = t[e.var + ""];
139
139
  return o(r) ? r : (console.warn("response type check faild", n, r), null);
140
140
  }).catch(() => null) : null;
141
141
  }
142
142
  const P = async function(n, o, e) {
143
- return await j(n, o, e, {
143
+ return await U(n, o, e, {
144
144
  baseURL: d.getConfig("baseURL"),
145
145
  logHandler: d.getConfig("logHandler"),
146
146
  errorHandler: d.getConfig("errorHandler"),
@@ -149,20 +149,20 @@ const P = async function(n, o, e) {
149
149
  responseHandler: d.getConfig("responseHandler")
150
150
  });
151
151
  };
152
- function U(n) {
152
+ function O(n) {
153
153
  if ("window" in globalThis)
154
- return "fetch" in window ? new y(O, n) : new y(S, n);
154
+ return "fetch" in window ? new y(S, n) : new y(j, n);
155
155
  throw new Error("Default Module Only Support In Browser");
156
156
  }
157
- const d = U(), M = d.setConfig, N = d.head, F = d.get, X = d.post, B = d.del, G = d.put, I = d.patch;
157
+ const d = O(), M = d.setConfig, N = d.head, F = d.get, X = d.post, B = d.del, G = d.put, I = d.patch;
158
158
  export {
159
- U as NetRequest,
159
+ O as NetRequest,
160
160
  B as del,
161
161
  F as get,
162
162
  J as getResponseRulesDescription,
163
163
  N as head,
164
- D as jsonp,
165
- A as jsonx,
164
+ A as jsonp,
165
+ D as jsonx,
166
166
  I as patch,
167
167
  X as post,
168
168
  G as put,
package/dist/node.cjs CHANGED
@@ -1 +1 @@
1
- "use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("./version-B09aAqk-.cjs"),p={},R=async function(s,u,c){return r.handleResponse(await r.retryRequest(q,s,u,c),s,u,c)},q=async function(s,u,c){const t=await r.convertOptions(s,u,c);if(!r.R(t.url))return{url:t.url,method:t.method,status:-1,statusText:"URLFormatError",headers:{},body:""};const f=(/^https:\/\//i.test(t.url),p),a=new URL(t.url),i=t.params;i instanceof Object&&Object.keys(i).forEach(n=>a.searchParams.set(n,i[n]));const g=t.method==="HEAD";return new Promise(n=>{const d=f.request(a,{headers:t.headers,method:t.method,timeout:t.timeout>0?t.timeout:void 0},function(e){const l=[];e.on("data",h=>l.push(h)),e.on("end",()=>{const h=Object.fromEntries(Object.entries(e.headers).map(([y,m])=>[y.toLowerCase(),Array.isArray(m)?m.join(","):m]));n({url:a.toString(),method:t.method,status:e.statusCode||-1,statusText:e.statusMessage||"Unknown",headers:h,body:g?"":Buffer.concat(l).toString("utf-8")})})});d.on("error",e=>{n({url:a.toString(),method:t.method,status:-1,statusText:e.name||"Unknown",body:e.message})}),d.on("timeout",()=>{n({url:a.toString(),method:t.method,status:-1,statusText:"Timeout",body:""})}),t.body&&d.write(t.body),d.end()})};function b(s){return new r.NetRequestHandler(R,s)}const o=b(),w=o.setConfig,j=o.head,O=o.get,S=o.post,T=o.del,C=o.put,U=o.patch;exports.version=r.version;exports.NetRequest=b;exports.del=T;exports.get=O;exports.head=j;exports.patch=U;exports.post=S;exports.put=C;exports.setGlobalConfig=w;
1
+ "use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const y=require("node:http"),q=require("node:https"),r=require("./version-nbk4F2gf.cjs"),R=async function(s,u,c){return r.handleResponse(await r.retryRequest(w,s,u,c),s,u,c)},w=async function(s,u,c){const t=await r.convertOptions(s,u,c);if(!r.R(t.url))return{url:t.url,method:t.method,status:-1,statusText:"URLFormatError",headers:{},body:""};const b=/^https:\/\//i.test(t.url)?q:y,a=new URL(t.url),i=t.params;i instanceof Object&&Object.keys(i).forEach(n=>a.searchParams.set(n,i[n]));const f=t.method==="HEAD";return new Promise(n=>{const d=b.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=Object.fromEntries(Object.entries(e.headers).map(([g,m])=>[g.toLowerCase(),Array.isArray(m)?m.join(","):m]));n({url:a.toString(),method:t.method,status:e.statusCode||-1,statusText:e.statusMessage||"Unknown",headers:h,body:f?"":Buffer.concat(p).toString("utf-8")})})});d.on("error",e=>{n({url:a.toString(),method:t.method,status:-1,statusText:e.name||"Unknown",body:e.message})}),d.on("timeout",()=>{n({url:a.toString(),method:t.method,status:-1,statusText:"Timeout",body:""})}),t.body&&d.write(t.body),d.end()})};function l(s){return new r.NetRequestHandler(R,s)}const o=l(),j=o.setConfig,O=o.head,S=o.get,T=o.post,C=o.del,U=o.put,x=o.patch;exports.version=r.version;exports.NetRequest=l;exports.del=C;exports.get=S;exports.head=O;exports.patch=x;exports.post=T;exports.put=U;exports.setGlobalConfig=j;
package/dist/node.js CHANGED
@@ -1,10 +1,12 @@
1
- import { h as y, r as R, c as g, a as q, N as w } from "./version-BXzKbsH3.js";
2
- import { v as P } from "./version-BXzKbsH3.js";
3
- const p = {}, x = async function(s, a, u) {
4
- return y(await R(j, s, a, u), s, a, u);
5
- }, j = async function(s, a, u) {
6
- const t = await g(s, a, u);
7
- if (!q(t.url))
1
+ import l from "node:http";
2
+ import y from "node:https";
3
+ import { h as R, r as g, c as q, a as w, N as x } from "./version-DCu7OI8o.js";
4
+ import { v as F } from "./version-DCu7OI8o.js";
5
+ const j = async function(s, a, u) {
6
+ return R(await g(O, s, a, u), s, a, u);
7
+ }, O = async function(s, a, u) {
8
+ const t = await q(s, a, u);
9
+ if (!w(t.url))
8
10
  return {
9
11
  url: t.url,
10
12
  method: t.method,
@@ -13,11 +15,11 @@ const p = {}, x = async function(s, a, u) {
13
15
  headers: {},
14
16
  body: ""
15
17
  };
16
- const f = (/^https:\/\//i.test(t.url), p), r = new URL(t.url), d = t.params;
18
+ const p = /^https:\/\//i.test(t.url) ? y : l, r = new URL(t.url), d = t.params;
17
19
  d instanceof Object && Object.keys(d).forEach((n) => r.searchParams.set(n, d[n]));
18
- const b = t.method === "HEAD";
20
+ const f = t.method === "HEAD";
19
21
  return new Promise((n) => {
20
- const c = f.request(
22
+ const c = p.request(
21
23
  r,
22
24
  {
23
25
  headers: t.headers,
@@ -28,7 +30,7 @@ const p = {}, x = async function(s, a, u) {
28
30
  const h = [];
29
31
  e.on("data", (i) => h.push(i)), e.on("end", () => {
30
32
  const i = Object.fromEntries(
31
- Object.entries(e.headers).map(([l, m]) => [l.toLowerCase(), Array.isArray(m) ? m.join(",") : m])
33
+ Object.entries(e.headers).map(([b, m]) => [b.toLowerCase(), Array.isArray(m) ? m.join(",") : m])
32
34
  );
33
35
  n({
34
36
  url: r.toString(),
@@ -36,7 +38,7 @@ const p = {}, x = async function(s, a, u) {
36
38
  status: e.statusCode || -1,
37
39
  statusText: e.statusMessage || "Unknown",
38
40
  headers: i,
39
- body: b ? "" : Buffer.concat(h).toString("utf-8")
41
+ body: f ? "" : Buffer.concat(h).toString("utf-8")
40
42
  });
41
43
  });
42
44
  }
@@ -60,18 +62,18 @@ const p = {}, x = async function(s, a, u) {
60
62
  }), t.body && c.write(t.body), c.end();
61
63
  });
62
64
  };
63
- function O(s) {
64
- return new w(x, s);
65
+ function T(s) {
66
+ return new x(j, s);
65
67
  }
66
- const o = O(), U = o.setConfig, C = o.head, E = o.get, L = o.post, N = o.del, S = o.put, A = o.patch;
68
+ const o = T(), L = o.setConfig, N = o.head, S = o.get, A = o.post, H = o.del, k = o.put, P = o.patch;
67
69
  export {
68
- O as NetRequest,
69
- N as del,
70
- E as get,
71
- C as head,
72
- A as patch,
73
- L as post,
74
- S as put,
75
- U as setGlobalConfig,
76
- P as version
70
+ T as NetRequest,
71
+ H as del,
72
+ S as get,
73
+ N as head,
74
+ P as patch,
75
+ A as post,
76
+ k as put,
77
+ L as setGlobalConfig,
78
+ F as version
77
79
  };
@@ -1,6 +1,6 @@
1
1
  var C = Object.defineProperty;
2
- var D = (t, e, a) => e in t ? C(t, e, { enumerable: !0, configurable: !0, writable: !0, value: a }) : t[e] = a;
3
- var f = (t, e, a) => (D(t, typeof e != "symbol" ? e + "" : e, a), a);
2
+ var L = (t, e, a) => e in t ? C(t, e, { enumerable: !0, configurable: !0, writable: !0, value: a }) : t[e] = a;
3
+ var f = (t, e, a) => (L(t, typeof e != "symbol" ? e + "" : e, a), a);
4
4
  async function te(t, e, a) {
5
5
  var b;
6
6
  const s = Object.assign({ method: "GET" }, a), r = "FormData" in globalThis ? s.body instanceof FormData : !1, n = r && s.method !== "POST" && s.method !== "PUT" ? "POST" : s.method;
@@ -12,9 +12,9 @@ async function te(t, e, a) {
12
12
  s.headers
13
13
  ), i = s.params || {}, c = {};
14
14
  Object.keys(i).forEach((h) => {
15
- i[h] !== void 0 && (c[h] = A(i[h]));
15
+ i[h] !== void 0 && (c[h] = D(i[h]));
16
16
  });
17
- const d = e.getFullUrl(t), l = L(s.body), u = s.timeout || e.get("timeout"), g = await async function() {
17
+ const d = e.getFullUrl(t), l = A(s.body), u = s.timeout || e.get("timeout"), g = await async function() {
18
18
  var O;
19
19
  const h = e.get("requestTransformer");
20
20
  return h ? await h({ headers: o, params: c, method: n, url: d, body: l }) : await ((O = e.get("requestHandler")) == null ? void 0 : O(o, c, n, t));
@@ -30,10 +30,10 @@ async function te(t, e, a) {
30
30
  credentials: s.credentials || e.get("credentials")
31
31
  };
32
32
  }
33
- function A(t) {
33
+ function D(t) {
34
34
  return typeof t == "string" ? t : Array.isArray(t) ? t.join(",") : t + "";
35
35
  }
36
- function L(t) {
36
+ function A(t) {
37
37
  if (t)
38
38
  return typeof t == "string" || t instanceof URLSearchParams || t instanceof ArrayBuffer || "Blob" in globalThis && t instanceof Blob || "FormData" in globalThis && t instanceof FormData ? t : JSON.stringify(t);
39
39
  }
@@ -51,11 +51,11 @@ function p(t, e) {
51
51
  }
52
52
  }
53
53
  "" + Math.random().toString(32).slice(2);
54
- const P = /^(?:https?:)?\/\/.+$/i, B = /^https?:\/\/.+$/i, H = /^\{[\d\D]*\}$/, K = /^\[[\d\D]*\]$/;
54
+ const P = /^(?:https?:)?\/\/.+$/i, B = /^https?:\/\/.+$/i, H = /^\{[\d\D]*\}$/, I = /^\[[\d\D]*\]$/;
55
55
  function R(t, e = !1) {
56
56
  return e ? P.test(t) : B.test(t);
57
57
  }
58
- function S(t) {
58
+ function K(t) {
59
59
  return t == null;
60
60
  }
61
61
  function k(t, ...e) {
@@ -65,7 +65,7 @@ function k(t, ...e) {
65
65
  return a !== Object.prototype && a !== null ? !1 : e.every((s) => s in t);
66
66
  }
67
67
  function M(t) {
68
- return H.test(t) || K.test(t);
68
+ return H.test(t) || I.test(t);
69
69
  }
70
70
  async function se(t) {
71
71
  return await new Promise(function(e) {
@@ -77,7 +77,7 @@ async function se(t) {
77
77
  }, s.setAttribute("src", t), a.appendChild(s);
78
78
  });
79
79
  }
80
- function I(t, e = "数据未能正确识别") {
80
+ function S(t, e = "数据未能正确识别") {
81
81
  return typeof t == "function" ? {
82
82
  guard: t,
83
83
  message: e
@@ -116,7 +116,7 @@ function ae(t, e, a = !1) {
116
116
  const E = "data", y = "message";
117
117
  function q(t, e, a, s, r) {
118
118
  const n = r || s;
119
- return j(t) ? X(n.ok || s.ok, t, e, a) : G(n.failed || s.failed, e, a);
119
+ return j(t) ? Y(n.ok || s.ok, t, e, a) : G(n.failed || s.failed, e, a);
120
120
  }
121
121
  const ne = function(t) {
122
122
  const e = [], a = t.failed || { resolve: "json" };
@@ -187,7 +187,7 @@ function F(t) {
187
187
  const a = t.match(W);
188
188
  return a ? a[1] : "";
189
189
  }
190
- function X(t, e, a, s) {
190
+ function Y(t, e, a, s) {
191
191
  const r = t || { resolve: "body" }, n = {
192
192
  ok: !0,
193
193
  code: a,
@@ -210,7 +210,7 @@ function X(t, e, a, s) {
210
210
  function j(t) {
211
211
  return t >= 200 && t < 400;
212
212
  }
213
- async function Y(t, e, a, s, r) {
213
+ async function X(t, e, a, s, r) {
214
214
  const n = r || 0, o = Math.max(0, Math.min(10, (s == null ? void 0 : s.maxRetry) ?? a.get("maxRetry") ?? 0)), i = (s == null ? void 0 : s.retryResolve) ?? a.get("retryResolve"), c = a.get("logHandler") || x;
215
215
  c({
216
216
  type: "prepear",
@@ -243,7 +243,7 @@ async function Y(t, e, a, s, r) {
243
243
  100,
244
244
  h === "2EB" ? Math.pow(2, n) * 1e3 : typeof h == "function" ? h(n + 1) || 0 : h
245
245
  )
246
- ), await Y(t, e, a, s, n + 1);
246
+ ), await X(t, e, a, s, n + 1);
247
247
  }
248
248
  function re(t, e, a, s) {
249
249
  var o, i;
@@ -341,8 +341,8 @@ class Q {
341
341
  }
342
342
  }
343
343
  function Z(t, e, a, s) {
344
- if (e.ok && !S(e.data) && s) {
345
- const r = I(s, "响应数据未能正确识别");
344
+ if (e.ok && !K(e.data) && s) {
345
+ const r = S(s, "响应数据未能正确识别");
346
346
  return r.guard(e.data) || (console.error("ResponseCheckFaild", t, e.data), a.showMessage(!0, `${t} ${r.message}`), e.data = null), e;
347
347
  }
348
348
  return e;
@@ -411,17 +411,17 @@ class oe {
411
411
  return n.method = "PATCH", n.body = a, this.guard(e, await this.exec(e, n), s || null);
412
412
  }
413
413
  }
414
- const ie = "1.5.4";
414
+ const ie = "1.5.6";
415
415
  export {
416
+ ae as C,
417
+ x as L,
416
418
  oe as N,
417
- x as O,
418
419
  z as R,
419
420
  R as a,
420
421
  te as c,
421
422
  ne as g,
422
423
  re as h,
423
- Y as r,
424
- se as s,
425
- ie as v,
426
- ae as w
424
+ se as o,
425
+ X as r,
426
+ ie as v
427
427
  };
@@ -1,2 +1,2 @@
1
- "use strict";var L=Object.defineProperty;var U=(t,e,n)=>e in t?L(t,e,{enumerable:!0,configurable:!0,writable:!0,value:n}):t[e]=n;var f=(t,e,n)=>(U(t,typeof e!="symbol"?e+"":e,n),n);async function x(t,e,n){var b;const s=Object.assign({method:"GET"},n),r="FormData"in globalThis?s.body instanceof FormData:!1,a=r&&s.method!=="POST"&&s.method!=="PUT"?"POST":s.method;(a==="GET"||a==="HEAD"||a==="DELETE")&&s.body!==void 0&&(console.warn("request body is invalid with method get, head, delete"),delete s.body);const o=Object.assign(r?{}:{"Content-Type":"Blob"in globalThis&&s.body instanceof Blob?s.body.type||"application/octet-stream":"application/json;charset=utf-8"},s.headers),i=s.params||{},c={};Object.keys(i).forEach(h=>{i[h]!==void 0&&(c[h]=H(i[h]))});const d=e.getFullUrl(t),l=P(s.body),u=s.timeout||e.get("timeout"),g=await async function(){var O;const h=e.get("requestTransformer");return h?await h({headers:o,params:c,method:a,url:d,body:l}):await((O=e.get("requestHandler"))==null?void 0:O(o,c,a,t))}(),m=typeof g=="string"&&g?g:d;return(b=e.get("logHandler"))==null||b({type:"ready",url:m,method:a,headers:o,timeout:u,body:l}),{url:m,method:a,body:l,params:c,headers:o,timeout:u,abort:s.abort,credentials:s.credentials||e.get("credentials")}}function H(t){return typeof t=="string"?t:Array.isArray(t)?t.join(","):t+""}function P(t){if(t)return typeof t=="string"||t instanceof URLSearchParams||t instanceof ArrayBuffer||"Blob"in globalThis&&t instanceof Blob||"FormData"in globalThis&&t instanceof FormData?t:JSON.stringify(t)}function B(t){return new Promise(e=>setTimeout(e,Math.max(0,t)))}function k(){}function R(t,e){try{const n=JSON.parse(t);return e?e(n)?n:null:n}catch{return null}}""+Math.random().toString(32).slice(2);const q=/^(?:https?:)?\/\/.+$/i,K=/^https?:\/\/.+$/i,S=/^\{[\d\D]*\}$/,I=/^\[[\d\D]*\]$/;function p(t,e=!1){return e?q.test(t):K.test(t)}function N(t){return t==null}function M(t,...e){if(!t||typeof t!="object")return!1;const n=Object.getPrototypeOf(t);return n!==Object.prototype&&n!==null?!1:e.every(s=>s in t)}function E(t){return S.test(t)||I.test(t)}async function G(t){return await new Promise(function(e){const n=document.getElementsByTagName("head")[0],s=document.createElement("script");s.setAttribute("type","text/javascript"),s.setAttribute("charset","utf-8"),s.onload=function(){n.removeChild(s),e(!0)},s.onerror=function(){n.removeChild(s),e(!1)},s.setAttribute("src",t),n.appendChild(s)})}function J(t,e="数据未能正确识别"){return typeof t=="function"?{guard:t,message:e}:{guard:t.guard,message:t.message||e}}function $(t,e=""){return!e||p(t,!0)?v(t):(v(e)+"/"+t).replace(/\/{2,}/g,"/").replace(/:\//,"://")}function v(t){return p(t,!0)?t.startsWith("http")?t:("location"in globalThis?location.protocol:"https:")+t:("location"in globalThis?location.origin:"http://127.0.0.1")+"/"+t.replace(/^\/+/,"")}function _(t,e){if(e){if(e===!0)return t.replace(/\?[^#]*/,"")}else return t;const n=t.split("#"),s=n[0].split("?"),r=s[0],a=s.length>1?s[1]:"",o=n.length>1?"#"+n[1]:"",i=typeof e=="string"?[e]:Array.isArray(e)?e:[];return!i.length||!a?n[0]+o:(i.map(c=>c.replace(/([\\(){}[\]^$+\-*?|])/g,"\\$1")),(r+"?"+a.replace(new RegExp("(?:^|&)(?:"+i.join("|")+")=[^&$]+","g"),"").replace(/^&/,"")).replace(/\?$/,"")+o)}function V(t,e,n=!1){const s=typeof e=="string"?e:Object.keys(e).map(o=>`${o}=${encodeURIComponent(e[o])}`).join("&");if(!s)return t;const r=t.split("#");n&&(r[0]=_(r[0],(s.match(/([^=&#?]+)=[^&#]+/g)||[]).map(o=>o.replace(/=.+$/,""))));const a=r[0].indexOf("?")+1?"&":"?";return(r[0]+a+s+(r.length>1?"#"+r[1]:"")).replace(/\?&/,"?")}const C="data",y="message";function W(t,e,n,s,r){const a=r||s;return j(t)?te(a.ok||s.ok,t,e,n):Y(a.failed||s.failed,e,n)}const X=function(t){const e=[],n=t.failed||{resolve:"json"};switch(e.push("- 当http状态码 <200 或者 >=400 时"),n.resolve){case"body":e.push(" 将响应内容格式化为字符串并作为错误消息");break;case"json":e.push(" 将响应解析为json,并读取 "+(n.messageField||y)+" 作为错误消息");break}const s=t.ok||{resolve:"body"};switch(e.push("- 当http状态码 >=200 并且 <400 时"),s.resolve){case"body":e.push(" 将响应尝试解析为 json,并作为数据内容返回");break;case"json":e.push(" 将响应解析为 json,读取 "+(s.dataField||C)+" 作为响应数据,读取 "+(s.messageField||y)+" 作为提示消息"),s.statusField&&e.push(" 当 "+s.statusField+" 为 "+(s.statusOKValue||"空值")+" 时是成功提示,否则是错误消息"),s.ignoreMessage&&e.push(" 并忽略以下消息:"+s.ignoreMessage);break}return e.join(`
2
- `)};function Y(t,e,n){const s=t||{resolve:"json",messageField:y},r={ok:!1,code:e,message:n,data:null};switch(s.resolve){case"body":r.message=F(n)||n;break;case"json":const{code:a,message:o}=z(n,s.statusField,s.messageField);r.code=a||e,r.message=F(n)||o;break}return r}function z(t,e,n=y){if(!E(t))return{message:""};const s=R(t);return!s||!M(s)?{message:t}:{code:e?w(s,e):"",message:w(s,n)||t}}function w(t,e){const n=Array.isArray(e)?e:[e];for(const s of n)if(s in t)return Q(t[s]);return""}function Q(t){return t?typeof t=="string"?t:JSON.stringify(t):""}const Z=/<title>([^<]+)<\/title>/i,ee=/<message>([^<]+)<\/message>/i;function F(t){const e=t.match(Z);if(e)return e[1];const n=t.match(ee);return n?n[1]:""}function te(t,e,n,s){const r=t||{resolve:"body"},a={ok:!0,code:n,message:"",data:null};if(e===202||e===204||!s)return a;if(r.resolve==="body")return a.data=E(s)?R(s):s,a;const o=R(s);if(!o||!M(o))return a.ok=!1,a.code="ResponseFormatError",a.message="响应内容无法格式化为 Object",a;const i=r.statusField,c=r.statusOKValue||"",d=r.dataField||C,l=r.messageField||y,u=r.ignoreMessage||"";if(i&&!(i in o))return a.ok=!1,a.code="ResponseFieldMissing",a.message="响应内容找不到状态字段 "+i,a;const g=i?o[i]+"":"";return a.ok=i?g===c:!0,a.code=g||n,a.data=d===!0?o:d in o?o[d]:null,a.message=w(o,l),u&&a.message&&(Array.isArray(u)&&u.includes(a.message)||typeof u=="string"&&a.message===u)&&(a.message=""),a}function j(t){return t>=200&&t<400}async function D(t,e,n,s,r){const a=r||0,o=Math.max(0,Math.min(10,(s==null?void 0:s.maxRetry)??n.get("maxRetry")??0)),i=(s==null?void 0:s.retryResolve)??n.get("retryResolve"),c=n.get("logHandler")||k;c({type:"prepear",url:e,method:(s==null?void 0:s.method)||"GET",retry:a,maxRetry:o,message:a===0?"start":`retry ${a}/${o} start`,headers:s==null?void 0:s.headers,options:s});const d=Date.now(),l=await t(e,n,s),u=l.status,g=Date.now()-d,m=`[cost ${g}][${u}] ${u<0?l.body:""}`;c({type:"finished",url:e,method:l.method,retry:a,maxRetry:o,message:a===0?`finish ${m}`:`retry ${a}/${o} finish ${m}`,response:l,headers:l.headers,cost:g});const b=j(u);if(!o||i==="network"&&u>0||i==="status"&&b||Array.isArray(i)&&!i.includes(u)||typeof i=="function"&&i(l,a)!==!0||a>=o)return l;const h=(s==null?void 0:s.retryInterval)??n.get("retryInterval")??1e3;return await B(Math.max(100,h==="2EB"?Math.pow(2,a)*1e3:typeof h=="function"?h(a+1)||0:h)),await D(t,e,n,s,a+1)}function se(t,e,n,s){var o,i;if(t.status<0)return T({ok:!1,status:t.status,code:t.statusText,headers:{},message:"",data:null},`${t.method} ${e} ${t.statusText}`,t.method,e,n,s);j(t.status)||(o=n.get("errorHandler"))==null||o(t.status,t.method,e);const r={...W(t.status,t.statusText,t.body,n.get("responseRule"),s==null?void 0:s.responseRule),status:t.status,headers:Object.fromEntries(Object.entries(t.headers||{}).map(([c,d])=>[c.toLowerCase(),d]))};(i=n.get("responseHandler"))==null||i({...r},t.method,e);const a=r.ok?r.message:`${t.method} ${e} [${r.code||t.statusText}] ${r.message||t.statusText}`;return T(r,a,t.method,e,n,s)}function T(t,e,n,s,r,a){const o=r.get("message"),i=o===!1||(a==null?void 0:a.message)===!1?!1:(a==null?void 0:a.message)||o;if(i!==!1){const c=typeof i=="function"?i(t,n,s,e):e;c instanceof Error?r.showMessage(!0,c.message):c&&typeof c=="object"&&"message"in c?r.showMessage(!1,c.message):r.showMessage(!t.ok,c)}return t}class A{constructor(e){f(this,"config",{baseURL:"",maxRetry:0,retryInterval:1e3,retryResolve:"network",timeout:5e3,cacheTTL:500,credentials:"same-origin",responseRule:{ok:{resolve:"body"},failed:{resolve:"json",messageField:"message"}}});e&&this.set(e)}set(e){if(e.baseURL&&!/^\/.+/.test(e.baseURL)&&!p(e.baseURL))throw console.warn("baseURL 需要以 / 开头,或者是完整的 url 地址"),new Error("BaseURLError");Object.assign(this.config,e)}get(e){return this.config[e]}getFullUrl(e){return e.startsWith("/")?$(e):$(e,this.config.baseURL)}showMessage(e,n){this.config.messageHandler&&n&&this.config.messageHandler(e,n)}}class ne{constructor(e=500){f(this,"ttl");f(this,"cache");this.cache={},this.ttl=Math.max(e,0)}getKey(e,n){const s=Object.keys(n||{}).sort().map(r=>`${r}#${n==null?void 0:n[r]}`);return e+s.join(",")}updateTTL(e){this.ttl=Math.max(e,0)}get(e){if(this.ttl===0)return null;const n=this.cache[e];return n?n.ttl<Date.now()?(delete this.cache[e],null):n.res:null}set(e,n){this.ttl!==0&&(this.cache[e]={ttl:Date.now()+this.ttl,res:n})}}function ae(t,e,n,s){if(e.ok&&!N(e.data)&&s){const r=J(s,"响应数据未能正确识别");return r.guard(e.data)||(console.error("ResponseCheckFaild",t,e.data),n.showMessage(!0,`${t} ${r.message}`),e.data=null),e}return e}class re{constructor(e,n){f(this,"agent");f(this,"config");f(this,"cache");this.config=new A(n),this.agent=e,this.cache=new ne(this.config.get("cacheTTL")),this.setConfig=this.setConfig.bind(this),this.getConfig=this.getConfig.bind(this),this.get=this.get.bind(this),this.post=this.post.bind(this),this.del=this.del.bind(this),this.patch=this.patch.bind(this),this.put=this.put.bind(this),this.head=this.head.bind(this)}async exec(e,n){return await this.agent(e,this.config,n)}async guard(e,n,s){return ae(e,n,this.config,s)}setConfig(e){this.config.set(e),this.cache.updateTTL(this.config.get("cacheTTL"))}getConfig(e){return this.config.get(e)}async head(e,n){const s=Object.assign({},n||null);return s.method="HEAD",this.guard(e,await this.exec(e,s),null)}async get(e,n,s){const r=Object.assign({},s||null);r.method="GET";const a=this.cache.getKey(e,r.params),o=this.cache.get(a);if(o)return this.guard(e,await o,n||null);const i=this.exec(e,r);return this.cache.set(a,i),this.guard(e,await i,n||null)}async post(e,n,s,r){const a=Object.assign({},r||null);return a.method="POST",a.body=n,this.guard(e,await this.exec(e,a),s||null)}async del(e,n,s){const r=Object.assign({},s||null);return r.method="DELETE",this.guard(e,await this.exec(e,r),n||null)}async put(e,n,s,r){const a=Object.assign({},r||null);return a.method="PUT",a.body=n,this.guard(e,await this.exec(e,a),s||null)}async patch(e,n,s,r){const a=Object.assign({},r||null);return a.method="PATCH",a.body=n,this.guard(e,await this.exec(e,a),s||null)}}const oe="1.5.4";exports.NetRequestHandler=re;exports.Ot=k;exports.R=p;exports.RequestGlobalConfig=A;exports.convertOptions=x;exports.getResponseRulesDescription=X;exports.handleResponse=se;exports.retryRequest=D;exports.sn=G;exports.version=oe;exports.wt=V;
1
+ "use strict";var A=Object.defineProperty;var U=(t,e,n)=>e in t?A(t,e,{enumerable:!0,configurable:!0,writable:!0,value:n}):t[e]=n;var f=(t,e,n)=>(U(t,typeof e!="symbol"?e+"":e,n),n);async function x(t,e,n){var b;const s=Object.assign({method:"GET"},n),r="FormData"in globalThis?s.body instanceof FormData:!1,a=r&&s.method!=="POST"&&s.method!=="PUT"?"POST":s.method;(a==="GET"||a==="HEAD"||a==="DELETE")&&s.body!==void 0&&(console.warn("request body is invalid with method get, head, delete"),delete s.body);const o=Object.assign(r?{}:{"Content-Type":"Blob"in globalThis&&s.body instanceof Blob?s.body.type||"application/octet-stream":"application/json;charset=utf-8"},s.headers),i=s.params||{},c={};Object.keys(i).forEach(h=>{i[h]!==void 0&&(c[h]=P(i[h]))});const d=e.getFullUrl(t),l=H(s.body),u=s.timeout||e.get("timeout"),g=await async function(){var O;const h=e.get("requestTransformer");return h?await h({headers:o,params:c,method:a,url:d,body:l}):await((O=e.get("requestHandler"))==null?void 0:O(o,c,a,t))}(),m=typeof g=="string"&&g?g:d;return(b=e.get("logHandler"))==null||b({type:"ready",url:m,method:a,headers:o,timeout:u,body:l}),{url:m,method:a,body:l,params:c,headers:o,timeout:u,abort:s.abort,credentials:s.credentials||e.get("credentials")}}function P(t){return typeof t=="string"?t:Array.isArray(t)?t.join(","):t+""}function H(t){if(t)return typeof t=="string"||t instanceof URLSearchParams||t instanceof ArrayBuffer||"Blob"in globalThis&&t instanceof Blob||"FormData"in globalThis&&t instanceof FormData?t:JSON.stringify(t)}function B(t){return new Promise(e=>setTimeout(e,Math.max(0,t)))}function k(){}function R(t,e){try{const n=JSON.parse(t);return e?e(n)?n:null:n}catch{return null}}""+Math.random().toString(32).slice(2);const q=/^(?:https?:)?\/\/.+$/i,I=/^https?:\/\/.+$/i,K=/^\{[\d\D]*\}$/,S=/^\[[\d\D]*\]$/;function p(t,e=!1){return e?q.test(t):I.test(t)}function N(t){return t==null}function M(t,...e){if(!t||typeof t!="object")return!1;const n=Object.getPrototypeOf(t);return n!==Object.prototype&&n!==null?!1:e.every(s=>s in t)}function C(t){return K.test(t)||S.test(t)}async function G(t){return await new Promise(function(e){const n=document.getElementsByTagName("head")[0],s=document.createElement("script");s.setAttribute("type","text/javascript"),s.setAttribute("charset","utf-8"),s.onload=function(){n.removeChild(s),e(!0)},s.onerror=function(){n.removeChild(s),e(!1)},s.setAttribute("src",t),n.appendChild(s)})}function J(t,e="数据未能正确识别"){return typeof t=="function"?{guard:t,message:e}:{guard:t.guard,message:t.message||e}}function $(t,e=""){return!e||p(t,!0)?v(t):(v(e)+"/"+t).replace(/\/{2,}/g,"/").replace(/:\//,"://")}function v(t){return p(t,!0)?t.startsWith("http")?t:("location"in globalThis?location.protocol:"https:")+t:("location"in globalThis?location.origin:"http://127.0.0.1")+"/"+t.replace(/^\/+/,"")}function _(t,e){if(e){if(e===!0)return t.replace(/\?[^#]*/,"")}else return t;const n=t.split("#"),s=n[0].split("?"),r=s[0],a=s.length>1?s[1]:"",o=n.length>1?"#"+n[1]:"",i=typeof e=="string"?[e]:Array.isArray(e)?e:[];return!i.length||!a?n[0]+o:(i.map(c=>c.replace(/([\\(){}[\]^$+\-*?|])/g,"\\$1")),(r+"?"+a.replace(new RegExp("(?:^|&)(?:"+i.join("|")+")=[^&$]+","g"),"").replace(/^&/,"")).replace(/\?$/,"")+o)}function V(t,e,n=!1){const s=typeof e=="string"?e:Object.keys(e).map(o=>`${o}=${encodeURIComponent(e[o])}`).join("&");if(!s)return t;const r=t.split("#");n&&(r[0]=_(r[0],(s.match(/([^=&#?]+)=[^&#]+/g)||[]).map(o=>o.replace(/=.+$/,""))));const a=r[0].indexOf("?")+1?"&":"?";return(r[0]+a+s+(r.length>1?"#"+r[1]:"")).replace(/\?&/,"?")}const E="data",y="message";function W(t,e,n,s,r){const a=r||s;return j(t)?te(a.ok||s.ok,t,e,n):X(a.failed||s.failed,e,n)}const Y=function(t){const e=[],n=t.failed||{resolve:"json"};switch(e.push("- 当http状态码 <200 或者 >=400 时"),n.resolve){case"body":e.push(" 将响应内容格式化为字符串并作为错误消息");break;case"json":e.push(" 将响应解析为json,并读取 "+(n.messageField||y)+" 作为错误消息");break}const s=t.ok||{resolve:"body"};switch(e.push("- 当http状态码 >=200 并且 <400 时"),s.resolve){case"body":e.push(" 将响应尝试解析为 json,并作为数据内容返回");break;case"json":e.push(" 将响应解析为 json,读取 "+(s.dataField||E)+" 作为响应数据,读取 "+(s.messageField||y)+" 作为提示消息"),s.statusField&&e.push(" 当 "+s.statusField+" 为 "+(s.statusOKValue||"空值")+" 时是成功提示,否则是错误消息"),s.ignoreMessage&&e.push(" 并忽略以下消息:"+s.ignoreMessage);break}return e.join(`
2
+ `)};function X(t,e,n){const s=t||{resolve:"json",messageField:y},r={ok:!1,code:e,message:n,data:null};switch(s.resolve){case"body":r.message=F(n)||n;break;case"json":const{code:a,message:o}=z(n,s.statusField,s.messageField);r.code=a||e,r.message=F(n)||o;break}return r}function z(t,e,n=y){if(!C(t))return{message:""};const s=R(t);return!s||!M(s)?{message:t}:{code:e?w(s,e):"",message:w(s,n)||t}}function w(t,e){const n=Array.isArray(e)?e:[e];for(const s of n)if(s in t)return Q(t[s]);return""}function Q(t){return t?typeof t=="string"?t:JSON.stringify(t):""}const Z=/<title>([^<]+)<\/title>/i,ee=/<message>([^<]+)<\/message>/i;function F(t){const e=t.match(Z);if(e)return e[1];const n=t.match(ee);return n?n[1]:""}function te(t,e,n,s){const r=t||{resolve:"body"},a={ok:!0,code:n,message:"",data:null};if(e===202||e===204||!s)return a;if(r.resolve==="body")return a.data=C(s)?R(s):s,a;const o=R(s);if(!o||!M(o))return a.ok=!1,a.code="ResponseFormatError",a.message="响应内容无法格式化为 Object",a;const i=r.statusField,c=r.statusOKValue||"",d=r.dataField||E,l=r.messageField||y,u=r.ignoreMessage||"";if(i&&!(i in o))return a.ok=!1,a.code="ResponseFieldMissing",a.message="响应内容找不到状态字段 "+i,a;const g=i?o[i]+"":"";return a.ok=i?g===c:!0,a.code=g||n,a.data=d===!0?o:d in o?o[d]:null,a.message=w(o,l),u&&a.message&&(Array.isArray(u)&&u.includes(a.message)||typeof u=="string"&&a.message===u)&&(a.message=""),a}function j(t){return t>=200&&t<400}async function D(t,e,n,s,r){const a=r||0,o=Math.max(0,Math.min(10,(s==null?void 0:s.maxRetry)??n.get("maxRetry")??0)),i=(s==null?void 0:s.retryResolve)??n.get("retryResolve"),c=n.get("logHandler")||k;c({type:"prepear",url:e,method:(s==null?void 0:s.method)||"GET",retry:a,maxRetry:o,message:a===0?"start":`retry ${a}/${o} start`,headers:s==null?void 0:s.headers,options:s});const d=Date.now(),l=await t(e,n,s),u=l.status,g=Date.now()-d,m=`[cost ${g}][${u}] ${u<0?l.body:""}`;c({type:"finished",url:e,method:l.method,retry:a,maxRetry:o,message:a===0?`finish ${m}`:`retry ${a}/${o} finish ${m}`,response:l,headers:l.headers,cost:g});const b=j(u);if(!o||i==="network"&&u>0||i==="status"&&b||Array.isArray(i)&&!i.includes(u)||typeof i=="function"&&i(l,a)!==!0||a>=o)return l;const h=(s==null?void 0:s.retryInterval)??n.get("retryInterval")??1e3;return await B(Math.max(100,h==="2EB"?Math.pow(2,a)*1e3:typeof h=="function"?h(a+1)||0:h)),await D(t,e,n,s,a+1)}function se(t,e,n,s){var o,i;if(t.status<0)return T({ok:!1,status:t.status,code:t.statusText,headers:{},message:"",data:null},`${t.method} ${e} ${t.statusText}`,t.method,e,n,s);j(t.status)||(o=n.get("errorHandler"))==null||o(t.status,t.method,e);const r={...W(t.status,t.statusText,t.body,n.get("responseRule"),s==null?void 0:s.responseRule),status:t.status,headers:Object.fromEntries(Object.entries(t.headers||{}).map(([c,d])=>[c.toLowerCase(),d]))};(i=n.get("responseHandler"))==null||i({...r},t.method,e);const a=r.ok?r.message:`${t.method} ${e} [${r.code||t.statusText}] ${r.message||t.statusText}`;return T(r,a,t.method,e,n,s)}function T(t,e,n,s,r,a){const o=r.get("message"),i=o===!1||(a==null?void 0:a.message)===!1?!1:(a==null?void 0:a.message)||o;if(i!==!1){const c=typeof i=="function"?i(t,n,s,e):e;c instanceof Error?r.showMessage(!0,c.message):c&&typeof c=="object"&&"message"in c?r.showMessage(!1,c.message):r.showMessage(!t.ok,c)}return t}class L{constructor(e){f(this,"config",{baseURL:"",maxRetry:0,retryInterval:1e3,retryResolve:"network",timeout:5e3,cacheTTL:500,credentials:"same-origin",responseRule:{ok:{resolve:"body"},failed:{resolve:"json",messageField:"message"}}});e&&this.set(e)}set(e){if(e.baseURL&&!/^\/.+/.test(e.baseURL)&&!p(e.baseURL))throw console.warn("baseURL 需要以 / 开头,或者是完整的 url 地址"),new Error("BaseURLError");Object.assign(this.config,e)}get(e){return this.config[e]}getFullUrl(e){return e.startsWith("/")?$(e):$(e,this.config.baseURL)}showMessage(e,n){this.config.messageHandler&&n&&this.config.messageHandler(e,n)}}class ne{constructor(e=500){f(this,"ttl");f(this,"cache");this.cache={},this.ttl=Math.max(e,0)}getKey(e,n){const s=Object.keys(n||{}).sort().map(r=>`${r}#${n==null?void 0:n[r]}`);return e+s.join(",")}updateTTL(e){this.ttl=Math.max(e,0)}get(e){if(this.ttl===0)return null;const n=this.cache[e];return n?n.ttl<Date.now()?(delete this.cache[e],null):n.res:null}set(e,n){this.ttl!==0&&(this.cache[e]={ttl:Date.now()+this.ttl,res:n})}}function ae(t,e,n,s){if(e.ok&&!N(e.data)&&s){const r=J(s,"响应数据未能正确识别");return r.guard(e.data)||(console.error("ResponseCheckFaild",t,e.data),n.showMessage(!0,`${t} ${r.message}`),e.data=null),e}return e}class re{constructor(e,n){f(this,"agent");f(this,"config");f(this,"cache");this.config=new L(n),this.agent=e,this.cache=new ne(this.config.get("cacheTTL")),this.setConfig=this.setConfig.bind(this),this.getConfig=this.getConfig.bind(this),this.get=this.get.bind(this),this.post=this.post.bind(this),this.del=this.del.bind(this),this.patch=this.patch.bind(this),this.put=this.put.bind(this),this.head=this.head.bind(this)}async exec(e,n){return await this.agent(e,this.config,n)}async guard(e,n,s){return ae(e,n,this.config,s)}setConfig(e){this.config.set(e),this.cache.updateTTL(this.config.get("cacheTTL"))}getConfig(e){return this.config.get(e)}async head(e,n){const s=Object.assign({},n||null);return s.method="HEAD",this.guard(e,await this.exec(e,s),null)}async get(e,n,s){const r=Object.assign({},s||null);r.method="GET";const a=this.cache.getKey(e,r.params),o=this.cache.get(a);if(o)return this.guard(e,await o,n||null);const i=this.exec(e,r);return this.cache.set(a,i),this.guard(e,await i,n||null)}async post(e,n,s,r){const a=Object.assign({},r||null);return a.method="POST",a.body=n,this.guard(e,await this.exec(e,a),s||null)}async del(e,n,s){const r=Object.assign({},s||null);return r.method="DELETE",this.guard(e,await this.exec(e,r),n||null)}async put(e,n,s,r){const a=Object.assign({},r||null);return a.method="PUT",a.body=n,this.guard(e,await this.exec(e,a),s||null)}async patch(e,n,s,r){const a=Object.assign({},r||null);return a.method="PATCH",a.body=n,this.guard(e,await this.exec(e,a),s||null)}}const oe="1.5.6";exports.Ct=V;exports.Lt=k;exports.NetRequestHandler=re;exports.R=p;exports.RequestGlobalConfig=L;exports.convertOptions=x;exports.getResponseRulesDescription=Y;exports.handleResponse=se;exports.on=G;exports.retryRequest=D;exports.version=oe;
package/dist/version.d.ts CHANGED
@@ -1 +1 @@
1
- export declare const version = "1.5.4";
1
+ export declare const version = "1.5.6";
package/dist/wx.cjs CHANGED
@@ -1 +1 @@
1
- "use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("./version-B09aAqk-.cjs"),l=async function(t,n,r){return s.handleResponse(await s.retryRequest(f,t,n,r),t,n,r)},f=async function(t,n,r){const e=await s.convertOptions(t,n,r),u=e.method==="PATCH"?"POST":e.method,a=s.wt(e.url,e.params);return globalThis.wx?new Promise(i=>{wx.request({url:a,data:e.body,header:e.headers,method:u,dataType:"string",responseType:"text",fail(){i({url:a,method:u,status:-1,statusText:"NetworkError",body:""})},success(c){i({url:a,method:u,status:c.statusCode,statusText:c.statusCode+"",headers:{...c.header},body:e.method==="HEAD"?"":p(c.data)})}})}):{url:a,method:u,status:-1,statusText:"NotSupport",body:"NotFound namespace of wx"}};function p(t){return typeof t=="string"?t:t instanceof ArrayBuffer&&"TextDecoder"in globalThis?new TextDecoder().decode(t):JSON.stringify(t)}function d(t){return new s.NetRequestHandler(l,t)}const o=d(),g=o.setConfig,h=o.head,y=o.get,T=o.post,b=o.del,w=o.put;exports.version=s.version;exports.NetRequest=d;exports.del=b;exports.get=y;exports.head=h;exports.post=T;exports.put=w;exports.setGlobalConfig=g;
1
+ "use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("./version-nbk4F2gf.cjs"),l=async function(t,n,r){return s.handleResponse(await s.retryRequest(f,t,n,r),t,n,r)},f=async function(t,n,r){const e=await s.convertOptions(t,n,r),u=e.method==="PATCH"?"POST":e.method,a=s.Ct(e.url,e.params);return globalThis.wx?new Promise(i=>{wx.request({url:a,data:e.body,header:e.headers,method:u,dataType:"string",responseType:"text",fail(){i({url:a,method:u,status:-1,statusText:"NetworkError",body:""})},success(c){i({url:a,method:u,status:c.statusCode,statusText:c.statusCode+"",headers:{...c.header},body:e.method==="HEAD"?"":p(c.data)})}})}):{url:a,method:u,status:-1,statusText:"NotSupport",body:"NotFound namespace of wx"}};function p(t){return typeof t=="string"?t:t instanceof ArrayBuffer&&"TextDecoder"in globalThis?new TextDecoder().decode(t):JSON.stringify(t)}function d(t){return new s.NetRequestHandler(l,t)}const o=d(),g=o.setConfig,h=o.head,y=o.get,T=o.post,b=o.del,x=o.put;exports.version=s.version;exports.NetRequest=d;exports.del=b;exports.get=y;exports.head=h;exports.post=T;exports.put=x;exports.setGlobalConfig=g;
package/dist/wx.js CHANGED
@@ -1,5 +1,5 @@
1
- import { h as d, r as i, c as f, w as l, N as p } from "./version-BXzKbsH3.js";
2
- import { v as A } from "./version-BXzKbsH3.js";
1
+ import { h as d, r as i, c as f, C as l, N as p } from "./version-DCu7OI8o.js";
2
+ import { v as A } from "./version-DCu7OI8o.js";
3
3
  const h = async function(t, o, r) {
4
4
  return d(await i(x, t, o, r), t, o, r);
5
5
  }, x = async function(t, o, r) {
@@ -28,7 +28,7 @@ const h = async function(t, o, r) {
28
28
  status: u.statusCode,
29
29
  statusText: u.statusCode + "",
30
30
  headers: { ...u.header },
31
- body: e.method === "HEAD" ? "" : w(u.data)
31
+ body: e.method === "HEAD" ? "" : y(u.data)
32
32
  });
33
33
  }
34
34
  });
@@ -40,20 +40,20 @@ const h = async function(t, o, r) {
40
40
  body: "NotFound namespace of wx"
41
41
  };
42
42
  };
43
- function w(t) {
43
+ function y(t) {
44
44
  return typeof t == "string" ? t : t instanceof ArrayBuffer && "TextDecoder" in globalThis ? new TextDecoder().decode(t) : JSON.stringify(t);
45
45
  }
46
- function y(t) {
46
+ function m(t) {
47
47
  return new p(h, t);
48
48
  }
49
- const s = y(), T = s.setConfig, g = s.head, b = s.get, q = s.post, N = s.del, R = s.put;
49
+ const s = m(), g = s.setConfig, w = s.head, b = s.get, q = s.post, C = s.del, N = s.put;
50
50
  export {
51
- y as NetRequest,
52
- N as del,
51
+ m as NetRequest,
52
+ C as del,
53
53
  b as get,
54
- g as head,
54
+ w as head,
55
55
  q as post,
56
- R as put,
57
- T as setGlobalConfig,
56
+ N as put,
57
+ g as setGlobalConfig,
58
58
  A as version
59
59
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@seayoo-web/request",
3
- "version": "1.5.4",
3
+ "version": "1.5.6",
4
4
  "description": "requst tools for seayoo web",
5
5
  "type": "module",
6
6
  "main": "./dist/index.cjs",
@@ -82,6 +82,6 @@
82
82
  "vitest": "^1.3.1"
83
83
  },
84
84
  "dependencies": {
85
- "@seayoo-web/utils": "^1.15.2"
85
+ "@seayoo-web/utils": "^1.16.1"
86
86
  }
87
87
  }