httpquick 1.1.8 → 1.1.9

package/dist/HttpQuickBase-Bebs7K6z.cjs

@@ -0,0 +1 @@
+"use strict";class d{config={};requestId=0;middlewares=[];constructor(e={}){Object.assign(this.config,e)}updateConfig(e={}){Object.assign(this.config,e)}addMiddleware(e){this.middlewares.push(e.bind(this))}getDefaultRequest(){return{id:0,baseUrl:"",method:"GET",url:"/",headers:{},query:null,json:null,body:null,responseType:"text",dataType:"json",timeout:6e4,fullUrl:""}}getDefaultResponse(){return{status:-1,statusText:"NONE",headers:{},body:null}}obj2query(e){return typeof URLSearchParams<"u"?new URLSearchParams(e).toString():Object.entries(e).map(([t,s])=>encodeURIComponent(t)+"="+encodeURIComponent(s)).join("&")}fillUrl(e){e.fullUrl=(/^https?:\/\//.test(e.url)?e.url:e.baseUrl+e.url)+(e.query?"?"+this.obj2query(e.query):"")}fillHeaders(e){e.responseType=="text"&&e.dataType=="json"&&(e.headers.Accept="application/json")}fillBody(e){(e.method=="POST"||e.method=="PUT")&&(e.filePath||(e.body!==null&&typeof FormData<"u"&&e.body instanceof FormData?typeof process<"u"&&(process?.versions?.node||"0.0.0")!=="0.0.0"&&(e.headers["content-type"]=e.body.getContentType(),e.body=e.body.toStream()):e.body!==null&&typeof URLSearchParams<"u"&&e.body instanceof URLSearchParams?(e.headers["content-type"]="application/x-www-form-urlencoded; charset=utf-8",e.body=e.body.toString()):e.body!==null&&Array.isArray(e.body)?(e.headers["content-type"]="application/x-www-form-urlencoded; charset=utf-8",e.body=e.body.map(t=>encodeURIComponent(t.key)+"="+encodeURIComponent(t.val)).join("&")):e.body!==null&&Object.isObject(e.body)?(e.headers["content-type"]="application/x-www-form-urlencoded; charset=utf-8",e.body=this.obj2query(e.body)):e.json!==null?(e.headers["content-type"]="application/json; charset=utf-8",e.body=JSON.stringify(e.json)):(e.headers["content-type"]="application/x-www-form-urlencoded; charset=utf-8",e.body="")))}get(e){return this.request({...e,method:"GET"})}post(e){return this.request({...e,method:"POST"})}put(e){return this.request({...e,method:"PUT"})}del(e){return this.request({...e,method:"DELETE"})}upload(e){return new Error("unreachable")}download(e){return new Error("unreachable")}onTimeoutError=function(e,t,s=null){console.error("http timeout",s),t.status=-4,t.statusText="TIMEOUT",e.responseType=="text"&&e.dataType=="json"?t.body={errno:-1,errmsg:(t.response.status??t.status)+", 网络请求超时!"}:t.body="网络请求超时!"};onNetworkError(e,t,s=null){console.error("http error",s),t.status=-1,t.statusText="NETWORK FAIL",e.responseType=="text"&&e.dataType=="json"?t.body={errno:-2,errmsg:(t.response.status??t.status)+", 网络请求错误!"}:t.body="网络请求错误!"}async request(e){const t=Object.assign(this.getDefaultRequest(),this.config,e);let s=this.getDefaultResponse();t.method=t.method.toUpperCase(),Object.defineProperties(t,{response:{value:s,enumerable:!1,configurable:!0,writable:!0}}),Object.defineProperties(s,{request:{value:t,enumerable:!1,configurable:!0,writable:!0},response:{value:null,enumerable:!1,configurable:!0,writable:!0},parent:{value:null,enumerable:!1,configurable:!0,writable:!0}}),this.fillUrl(t),this.fillHeaders(t),this.fillBody(t);let n=async(o,a)=>await this.send(o,a);for(let o=this.middlewares.length-1;o>=0;o--){const a=n,l=this.middlewares[o].bind(this);n=async(i,r)=>await l(i,r,a)}return await n(t,s),s}send(e,t){}install(e,t={}){e.config.globalProperties.$http=this;for(const s in t)this[s]=t[s]}globalMethods(){globalThis.httpGet=this.get.bind(this),globalThis.httpPost=this.post.bind(this),globalThis.httpPut=this.put.bind(this),globalThis.httpDelete=this.del.bind(this),globalThis.httpUpload=this.upload.bind(this),globalThis.httpDownload=this.download.bind(this)}}exports.HttpQuickBase=d;

package/dist/{HttpQuickBase-YasFsQ_r.js → HttpQuickBase-Bwjk70F3.js}

@@ -1,19 +1,12 @@
-var h = Object.defineProperty;
-var p = (o, e, t) => e in o ? h(o, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : o[e] = t;
-var a = (o, e, t) => p(o, typeof e != "symbol" ? e + "" : e, t);
-class b {
+class u {
+  // 默认请求
+  config = {};
+  // 请求编号 debug使用的
+  requestId = 0;
+  // 请求中间件
+  middlewares = [];
   // 构造函数
   constructor(e = {}) {
-    // 默认请求
-    a(this, "config", {});
-    // 请求编号 debug使用的
-    a(this, "requestId", 0);
-    // 请求中间件
-    a(this, "middlewares", []);
-    // 超时错误处理
-    a(this, "onTimeoutError", function(e, t, s) {
-      console.error("http timeout", s), t.status = -4, t.statusText = "TIMEOUT", e.responseType == "text" && e.dataType == "json" ? t.body = { errno: -1, errmsg: (t.response.status ?? t.status) + ", 网络请求超时!" } : t.body = "网络请求超时!";
-    });
     Object.assign(this.config, e);
   }
   // 更新配置
@@ -64,8 +57,7 @@ class b {
   }
   // 填充请求体
   fillBody(e) {
-    var t;
-    (e.method == "POST" || e.method == "PUT") && (e.filePath || (e.body !== null && typeof FormData < "u" && e.body instanceof FormData ? typeof process < "u" && (((t = process == null ? void 0 : process.versions) == null ? void 0 : t.node) || "0.0.0") !== "0.0.0" && (e.headers["content-type"] = e.body.getContentType(), e.body = e.body.toStream()) : e.body !== null && typeof URLSearchParams < "u" && e.body instanceof URLSearchParams ? (e.headers["content-type"] = "application/x-www-form-urlencoded; charset=utf-8", e.body = e.body.toString()) : e.body !== null && Array.isArray(e.body) ? (e.headers["content-type"] = "application/x-www-form-urlencoded; charset=utf-8", e.body = e.body.map((s) => encodeURIComponent(s.key) + "=" + encodeURIComponent(s.val)).join("&")) : e.body !== null && Object.isObject(e.body) ? (e.headers["content-type"] = "application/x-www-form-urlencoded; charset=utf-8", e.body = this.obj2query(e.body)) : e.json !== null ? (e.headers["content-type"] = "application/json; charset=utf-8", e.body = JSON.stringify(e.json)) : (e.headers["content-type"] = "application/x-www-form-urlencoded; charset=utf-8", e.body = "")));
+    (e.method == "POST" || e.method == "PUT") && (e.filePath || (e.body !== null && typeof FormData < "u" && e.body instanceof FormData ? typeof process < "u" && (process?.versions?.node || "0.0.0") !== "0.0.0" && (e.headers["content-type"] = e.body.getContentType(), e.body = e.body.toStream()) : e.body !== null && typeof URLSearchParams < "u" && e.body instanceof URLSearchParams ? (e.headers["content-type"] = "application/x-www-form-urlencoded; charset=utf-8", e.body = e.body.toString()) : e.body !== null && Array.isArray(e.body) ? (e.headers["content-type"] = "application/x-www-form-urlencoded; charset=utf-8", e.body = e.body.map((t) => encodeURIComponent(t.key) + "=" + encodeURIComponent(t.val)).join("&")) : e.body !== null && Object.isObject(e.body) ? (e.headers["content-type"] = "application/x-www-form-urlencoded; charset=utf-8", e.body = this.obj2query(e.body)) : e.json !== null ? (e.headers["content-type"] = "application/json; charset=utf-8", e.body = JSON.stringify(e.json)) : (e.headers["content-type"] = "application/x-www-form-urlencoded; charset=utf-8", e.body = "")));
   }
   // get请求
   get(e) {
@@ -91,6 +83,10 @@ class b {
   download(e) {
     return new Error("unreachable");
   }
+  // 超时错误处理
+  onTimeoutError = function(e, t, s = null) {
+    console.error("http timeout", s), t.status = -4, t.statusText = "TIMEOUT", e.responseType == "text" && e.dataType == "json" ? t.body = { errno: -1, errmsg: (t.response.status ?? t.status) + ", 网络请求超时!" } : t.body = "网络请求超时!";
+  };
   // 网络错误处理
   onNetworkError(e, t, s = null) {
     console.error("http error", s), t.status = -1, t.statusText = "NETWORK FAIL", e.responseType == "text" && e.dataType == "json" ? t.body = { errno: -2, errmsg: (t.response.status ?? t.status) + ", 网络请求错误!" } : t.body = "网络请求错误!";
@@ -106,12 +102,12 @@ class b {
       response: { value: null, enumerable: !1, configurable: !0, writable: !0 },
       parent: { value: null, enumerable: !1, configurable: !0, writable: !0 }
     }), this.fillUrl(t), this.fillHeaders(t), this.fillBody(t);
-    let l = async (n, i) => await this.send(n, i);
-    for (let n = this.middlewares.length - 1; n >= 0; n--) {
-      const i = l, r = this.middlewares[n].bind(this);
-      l = async (d, u) => await r(d, u, i);
+    let n = async (o, a) => await this.send(o, a);
+    for (let o = this.middlewares.length - 1; o >= 0; o--) {
+      const a = n, l = this.middlewares[o].bind(this);
+      n = async (i, r) => await l(i, r, a);
     }
-    return await l(t, s), s;
+    return await n(t, s), s;
   }
   // 发送发送请求 abstract方法 需要子类实现
   send(e, t) {
@@ -126,5 +122,5 @@ class b {
   }
 }
 export {
-  b as H
+  u as H
 };

package/dist/ajax.js

@@ -1,27 +1,31 @@
-import { H as p } from "./HttpQuickBase-YasFsQ_r.js";
-class u extends p {
+import { H as a } from "./HttpQuickBase-Bwjk70F3.js";
+class l extends a {
   // 发送请求
   send(t, o) {
     let n = null, r = new Promise((s) => n = s);
     const e = o.response = new XMLHttpRequest();
     e.open(t.method, t.fullUrl, !0), e.timeout = t.timeout, e.withCredentials = t.withCredentials || !1, e.responseType = t.responseType;
-    for (const [s, a] of Object.entries(t.headers))
-      e.setRequestHeader(s, a);
+    for (const [s, p] of Object.entries(t.headers))
+      e.setRequestHeader(s, p);
     return e.ontimeout = (s) => {
       this.onTimeoutError(t, o, s), n();
     }, e.onerror = (s) => {
       this.onNetworkError(t, o, s), n();
     }, t.onprocess && e.upload.addEventListener("progress", t.onprocess), e.onreadystatechange = () => {
       if (!(e.readyState !== 4 || e.status == 0)) {
-        if (e.status != 200)
-          return this.onNetworkError(t, o, null), n();
         o.status = e.status, o.statusText = e.statusText, o.headers = Object.fromEntries(e.getAllResponseHeaders().trim().replaceAll("\r", "").split(`
-`).map((s) => [decodeURIComponent(s.substring(0, s.indexOf(": ")).toLowerCase()), decodeURIComponent(s.substring(s.indexOf(": ") + 2))])), t.responseType == "text" && t.dataType == "json" ? o.body = (JSON.parse0 || JSON.parse)(e.responseText) : t.responseType == "text" ? o.body = e.responseText : o.body = e.response, n();
+`).map((s) => [decodeURIComponent(s.substring(0, s.indexOf(": ")).toLowerCase()), decodeURIComponent(s.substring(s.indexOf(": ") + 2))]));
+        try {
+          t.responseType == "text" && t.dataType == "json" ? o.body = JSON.parse(e.responseText) : t.responseType == "text" ? o.body = e.responseText : o.body = e.response;
+        } catch {
+          o.body = e.response;
+        }
+        n();
       }
     }, t.method == "POST" || t.method == "PUT" ? e.send(t.body) : e.send(), r;
   }
 }
 export {
-  u as HttpQuick,
-  p as HttpQuickBase
+  l as HttpQuick,
+  a as HttpQuickBase
 };

package/dist/fetch.js

@@ -1,5 +1,5 @@
-import { H as u } from "./HttpQuickBase-YasFsQ_r.js";
-class h extends u {
+import { H as l } from "./HttpQuickBase-Bwjk70F3.js";
+class h extends l {
   // 发送请求
   async send(t, o) {
     try {
@@ -10,15 +10,17 @@ class h extends u {
         signal: s.signal,
         body: t.method == "POST" || t.method == "PUT" ? t.body : null
       }, e = o.response = await fetch(t.fullUrl, i);
-      if (clearTimeout(n), e.status != 200)
-        return this.onNetworkError(t, o, null);
-      o.status = e.status, o.statusText = e.statusText;
-      for (let [a, l] of e.headers.entries()) {
+      clearTimeout(n), o.status = e.status, o.statusText = e.statusText;
+      for (let [a, c] of e.headers.entries()) {
         a = a.toLowerCase();
-        for (const r of l.split(", "))
-          o.headers[a] = r;
+        for (const d of c.split(", "))
+          o.headers[a] = d;
+      }
+      try {
+        t.responseType == "text" && t.dataType == "json" ? o.body = await e.json() : t.responseType == "text" ? o.body = await e.text() : o.body = e.body;
+      } catch {
+        o.body = e.body;
       }
-      t.responseType == "text" && t.dataType == "json" ? o.body = await e.json() : t.responseType == "text" ? o.body = await e.text() : o.body = e.body;
     } catch (s) {
       return s.code == 20 ? this.onTimeoutError(t, o, s) : this.onNetworkError(t, o, s);
     }
@@ -26,5 +28,5 @@ class h extends u {
 }
 export {
   h as HttpQuick,
-  u as HttpQuickBase
+  l as HttpQuickBase
 };

package/dist/fibjs.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("./HttpQuickBase-Djux5ry4.cjs"),n=require("http"),d=require("util");class i extends o.HttpQuickBase{send(e,s){try{const t=n.request(e.method,e.fullUrl,{headers:e.headers,body:e.body||""});if(t.status!==200)return this.onNetworkError(e,s,null);s.status=t.statusCode,s.statusText=t.statusMessage;for(let a of t.headers.keys()){const r=t.headers.all(a);a=a.toLowerCase();for(const u of r)s.headers[a]=u}e.responseType=="text"&&e.dataType=="json"?s.body=Buffer.isBuffer(t.data)?JSON.parse(t.data.toString("utf8")):typeof t.data=="string"?JSON.parse(t.data):t.data:e.responseType=="text"?s.body=t.data.toString("utf8"):s.body=t.data}catch(t){return this.onTimeoutError(e,s,t)}}request(e){return d.sync(async s=>await super.request(s))(e)}}exports.HttpQuickBase=o.HttpQuickBase;exports.HttpQuick=i;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("./HttpQuickBase-Bebs7K6z.cjs"),d=require("http"),i=require("util");class n extends o.HttpQuickBase{send(e,a){try{const t=d.request(e.method,e.fullUrl,{headers:e.headers,body:e.body||""});a.status=t.statusCode,a.statusText=t.statusMessage;for(let s of t.headers.keys()){const r=t.headers.all(s);s=s.toLowerCase();for(const u of r)a.headers[s]=u}try{e.responseType=="text"&&e.dataType=="json"?a.body=Buffer.isBuffer(t.data)?JSON.parse(t.data.toString("utf8")):typeof t.data=="string"?JSON.parse(t.data):t.data:e.responseType=="text"?a.body=Buffer.isBuffer(t.data)?t.data.toString("utf8"):(typeof t.data=="string",t.data):a.body=t.data}catch{a.body=t.data}}catch(t){return this.onTimeoutError(e,a,t)}}request(e){return i.sync(async a=>await super.request(a))(e)}}exports.HttpQuickBase=o.HttpQuickBase;exports.HttpQuick=n;

package/dist/fibjs.js

@@ -1,34 +1,36 @@
-import { H as u } from "./HttpQuickBase-YasFsQ_r.js";
-import d from "http";
-import n from "util";
-class y extends u {
+import { H as d } from "./HttpQuickBase-Bwjk70F3.js";
+import u from "http";
+import f from "util";
+class c extends d {
   // 发送请求
-  send(e, s) {
+  send(a, e) {
     try {
-      const t = d.request(e.method, e.fullUrl, {
-        headers: e.headers,
-        body: e.body || ""
+      const t = u.request(a.method, a.fullUrl, {
+        headers: a.headers,
+        body: a.body || ""
       });
-      if (t.status !== 200)
-        return this.onNetworkError(e, s, null);
-      s.status = t.statusCode, s.statusText = t.statusMessage;
-      for (let a of t.headers.keys()) {
-        const o = t.headers.all(a);
-        a = a.toLowerCase();
+      e.status = t.statusCode, e.statusText = t.statusMessage;
+      for (let s of t.headers.keys()) {
+        const o = t.headers.all(s);
+        s = s.toLowerCase();
         for (const r of o)
-          s.headers[a] = r;
+          e.headers[s] = r;
+      }
+      try {
+        a.responseType == "text" && a.dataType == "json" ? e.body = Buffer.isBuffer(t.data) ? JSON.parse(t.data.toString("utf8")) : typeof t.data == "string" ? JSON.parse(t.data) : t.data : a.responseType == "text" ? e.body = Buffer.isBuffer(t.data) ? t.data.toString("utf8") : (typeof t.data == "string", t.data) : e.body = t.data;
+      } catch {
+        e.body = t.data;
       }
-      e.responseType == "text" && e.dataType == "json" ? s.body = Buffer.isBuffer(t.data) ? JSON.parse(t.data.toString("utf8")) : typeof t.data == "string" ? JSON.parse(t.data) : t.data : e.responseType == "text" ? s.body = t.data.toString("utf8") : s.body = t.data;
     } catch (t) {
-      return this.onTimeoutError(e, s, t);
+      return this.onTimeoutError(a, e, t);
     }
   }
   // 同步请求
-  request(e) {
-    return n.sync(async (s) => await super.request(s))(e);
+  request(a) {
+    return f.sync(async (e) => await super.request(e))(a);
   }
 }
 export {
-  y as HttpQuick,
-  u as HttpQuickBase
+  c as HttpQuick,
+  d as HttpQuickBase
 };

package/dist/httpquick.umd.cjs

@@ -1,2 +1,2 @@
-(function(a,i){typeof exports=="object"&&typeof module<"u"?i(exports):typeof define=="function"&&define.amd?define(["exports"],i):(a=typeof globalThis<"u"?globalThis:a||self,i(a.httpquick={}))})(this,function(a){"use strict";var f=Object.defineProperty;var b=(a,i,l)=>i in a?f(a,i,{enumerable:!0,configurable:!0,writable:!0,value:l}):a[i]=l;var d=(a,i,l)=>b(a,typeof i!="symbol"?i+"":i,l);class i{constructor(e={}){d(this,"config",{});d(this,"requestId",0);d(this,"middlewares",[]);d(this,"onTimeoutError",function(e,t,o){console.error("http timeout",o),t.status=-4,t.statusText="TIMEOUT",e.responseType=="text"&&e.dataType=="json"?t.body={errno:-1,errmsg:(t.response.status??t.status)+", 网络请求超时!"}:t.body="网络请求超时!"});Object.assign(this.config,e)}updateConfig(e={}){Object.assign(this.config,e)}addMiddleware(e){this.middlewares.push(e.bind(this))}getDefaultRequest(){return{id:0,baseUrl:"",method:"GET",url:"/",headers:{},query:null,json:null,body:null,responseType:"text",dataType:"json",timeout:6e4,fullUrl:""}}getDefaultResponse(){return{status:-1,statusText:"NONE",headers:{},body:null}}obj2query(e){return typeof URLSearchParams<"u"?new URLSearchParams(e).toString():Object.entries(e).map(([t,o])=>encodeURIComponent(t)+"="+encodeURIComponent(o)).join("&")}fillUrl(e){e.fullUrl=(/^https?:\/\//.test(e.url)?e.url:e.baseUrl+e.url)+(e.query?"?"+this.obj2query(e.query):"")}fillHeaders(e){e.responseType=="text"&&e.dataType=="json"&&(e.headers.Accept="application/json")}fillBody(e){var t;(e.method=="POST"||e.method=="PUT")&&(e.filePath||(e.body!==null&&typeof FormData<"u"&&e.body instanceof FormData?typeof process<"u"&&(((t=process==null?void 0:process.versions)==null?void 0:t.node)||"0.0.0")!=="0.0.0"&&(e.headers["content-type"]=e.body.getContentType(),e.body=e.body.toStream()):e.body!==null&&typeof URLSearchParams<"u"&&e.body instanceof URLSearchParams?(e.headers["content-type"]="application/x-www-form-urlencoded; charset=utf-8",e.body=e.body.toString()):e.body!==null&&Array.isArray(e.body)?(e.headers["content-type"]="application/x-www-form-urlencoded; charset=utf-8",e.body=e.body.map(o=>encodeURIComponent(o.key)+"="+encodeURIComponent(o.val)).join("&")):e.body!==null&&Object.isObject(e.body)?(e.headers["content-type"]="application/x-www-form-urlencoded; charset=utf-8",e.body=this.obj2query(e.body)):e.json!==null?(e.headers["content-type"]="application/json; charset=utf-8",e.body=JSON.stringify(e.json)):(e.headers["content-type"]="application/x-www-form-urlencoded; charset=utf-8",e.body="")))}get(e){return this.request({...e,method:"GET"})}post(e){return this.request({...e,method:"POST"})}put(e){return this.request({...e,method:"PUT"})}del(e){return this.request({...e,method:"DELETE"})}upload(e){return new Error("unreachable")}download(e){return new Error("unreachable")}onNetworkError(e,t,o=null){console.error("http error",o),t.status=-1,t.statusText="NETWORK FAIL",e.responseType=="text"&&e.dataType=="json"?t.body={errno:-2,errmsg:(t.response.status??t.status)+", 网络请求错误!"}:t.body="网络请求错误!"}async request(e){const t=Object.assign(this.getDefaultRequest(),this.config,e);let o=this.getDefaultResponse();t.method=t.method.toUpperCase(),Object.defineProperties(t,{response:{value:o,enumerable:!1,configurable:!0,writable:!0}}),Object.defineProperties(o,{request:{value:t,enumerable:!1,configurable:!0,writable:!0},response:{value:null,enumerable:!1,configurable:!0,writable:!0},parent:{value:null,enumerable:!1,configurable:!0,writable:!0}}),this.fillUrl(t),this.fillHeaders(t),this.fillBody(t);let r=async(s,n)=>await this.send(s,n);for(let s=this.middlewares.length-1;s>=0;s--){const n=r,u=this.middlewares[s].bind(this);r=async(h,c)=>await u(h,c,n)}return await r(t,o),o}send(e,t){}install(e,t={}){e.config.globalProperties.$http=this;for(const o in t)this[o]=t[o]}globalMethods(){globalThis.httpGet=this.get.bind(this),globalThis.httpPost=this.post.bind(this),globalThis.httpPut=this.put.bind(this),globalThis.httpDelete=this.del.bind(this),globalThis.httpUpload=this.upload.bind(this),globalThis.httpDownload=this.download.bind(this)}}class l extends i{send(e,t){let o=null,r=new Promise(n=>o=n);const s=t.response=new XMLHttpRequest;s.open(e.method,e.fullUrl,!0),s.timeout=e.timeout,s.withCredentials=e.withCredentials||!1,s.responseType=e.responseType;for(const[n,u]of Object.entries(e.headers))s.setRequestHeader(n,u);return s.ontimeout=n=>{this.onTimeoutError(e,t,n),o()},s.onerror=n=>{this.onNetworkError(e,t,n),o()},e.onprocess&&s.upload.addEventListener("progress",e.onprocess),s.onreadystatechange=()=>{if(!(s.readyState!==4||s.status==0)){if(s.status!=200)return this.onNetworkError(e,t,null),o();t.status=s.status,t.statusText=s.statusText,t.headers=Object.fromEntries(s.getAllResponseHeaders().trim().replaceAll("\r","").split(`
-`).map(n=>[decodeURIComponent(n.substring(0,n.indexOf(": ")).toLowerCase()),decodeURIComponent(n.substring(n.indexOf(": ")+2))])),e.responseType=="text"&&e.dataType=="json"?t.body=(JSON.parse0||JSON.parse)(s.responseText):e.responseType=="text"?t.body=s.responseText:t.body=s.response,o()}},e.method=="POST"||e.method=="PUT"?s.send(e.body):s.send(),r}}a.HttpQuick=l,a.HttpQuickBase=i,Object.defineProperty(a,Symbol.toStringTag,{value:"Module"})});
+(function(i,a){typeof exports=="object"&&typeof module<"u"?a(exports):typeof define=="function"&&define.amd?define(["exports"],a):(i=typeof globalThis<"u"?globalThis:i||self,a(i.httpquick={}))})(this,(function(i){"use strict";class a{config={};requestId=0;middlewares=[];constructor(e={}){Object.assign(this.config,e)}updateConfig(e={}){Object.assign(this.config,e)}addMiddleware(e){this.middlewares.push(e.bind(this))}getDefaultRequest(){return{id:0,baseUrl:"",method:"GET",url:"/",headers:{},query:null,json:null,body:null,responseType:"text",dataType:"json",timeout:6e4,fullUrl:""}}getDefaultResponse(){return{status:-1,statusText:"NONE",headers:{},body:null}}obj2query(e){return typeof URLSearchParams<"u"?new URLSearchParams(e).toString():Object.entries(e).map(([t,o])=>encodeURIComponent(t)+"="+encodeURIComponent(o)).join("&")}fillUrl(e){e.fullUrl=(/^https?:\/\//.test(e.url)?e.url:e.baseUrl+e.url)+(e.query?"?"+this.obj2query(e.query):"")}fillHeaders(e){e.responseType=="text"&&e.dataType=="json"&&(e.headers.Accept="application/json")}fillBody(e){(e.method=="POST"||e.method=="PUT")&&(e.filePath||(e.body!==null&&typeof FormData<"u"&&e.body instanceof FormData?typeof process<"u"&&(process?.versions?.node||"0.0.0")!=="0.0.0"&&(e.headers["content-type"]=e.body.getContentType(),e.body=e.body.toStream()):e.body!==null&&typeof URLSearchParams<"u"&&e.body instanceof URLSearchParams?(e.headers["content-type"]="application/x-www-form-urlencoded; charset=utf-8",e.body=e.body.toString()):e.body!==null&&Array.isArray(e.body)?(e.headers["content-type"]="application/x-www-form-urlencoded; charset=utf-8",e.body=e.body.map(t=>encodeURIComponent(t.key)+"="+encodeURIComponent(t.val)).join("&")):e.body!==null&&Object.isObject(e.body)?(e.headers["content-type"]="application/x-www-form-urlencoded; charset=utf-8",e.body=this.obj2query(e.body)):e.json!==null?(e.headers["content-type"]="application/json; charset=utf-8",e.body=JSON.stringify(e.json)):(e.headers["content-type"]="application/x-www-form-urlencoded; charset=utf-8",e.body="")))}get(e){return this.request({...e,method:"GET"})}post(e){return this.request({...e,method:"POST"})}put(e){return this.request({...e,method:"PUT"})}del(e){return this.request({...e,method:"DELETE"})}upload(e){return new Error("unreachable")}download(e){return new Error("unreachable")}onTimeoutError=function(e,t,o=null){console.error("http timeout",o),t.status=-4,t.statusText="TIMEOUT",e.responseType=="text"&&e.dataType=="json"?t.body={errno:-1,errmsg:(t.response.status??t.status)+", 网络请求超时!"}:t.body="网络请求超时!"};onNetworkError(e,t,o=null){console.error("http error",o),t.status=-1,t.statusText="NETWORK FAIL",e.responseType=="text"&&e.dataType=="json"?t.body={errno:-2,errmsg:(t.response.status??t.status)+", 网络请求错误!"}:t.body="网络请求错误!"}async request(e){const t=Object.assign(this.getDefaultRequest(),this.config,e);let o=this.getDefaultResponse();t.method=t.method.toUpperCase(),Object.defineProperties(t,{response:{value:o,enumerable:!1,configurable:!0,writable:!0}}),Object.defineProperties(o,{request:{value:t,enumerable:!1,configurable:!0,writable:!0},response:{value:null,enumerable:!1,configurable:!0,writable:!0},parent:{value:null,enumerable:!1,configurable:!0,writable:!0}}),this.fillUrl(t),this.fillHeaders(t),this.fillBody(t);let l=async(s,n)=>await this.send(s,n);for(let s=this.middlewares.length-1;s>=0;s--){const n=l,r=this.middlewares[s].bind(this);l=async(p,h)=>await r(p,h,n)}return await l(t,o),o}send(e,t){}install(e,t={}){e.config.globalProperties.$http=this;for(const o in t)this[o]=t[o]}globalMethods(){globalThis.httpGet=this.get.bind(this),globalThis.httpPost=this.post.bind(this),globalThis.httpPut=this.put.bind(this),globalThis.httpDelete=this.del.bind(this),globalThis.httpUpload=this.upload.bind(this),globalThis.httpDownload=this.download.bind(this)}}class d extends a{send(e,t){let o=null,l=new Promise(n=>o=n);const s=t.response=new XMLHttpRequest;s.open(e.method,e.fullUrl,!0),s.timeout=e.timeout,s.withCredentials=e.withCredentials||!1,s.responseType=e.responseType;for(const[n,r]of Object.entries(e.headers))s.setRequestHeader(n,r);return s.ontimeout=n=>{this.onTimeoutError(e,t,n),o()},s.onerror=n=>{this.onNetworkError(e,t,n),o()},e.onprocess&&s.upload.addEventListener("progress",e.onprocess),s.onreadystatechange=()=>{if(!(s.readyState!==4||s.status==0)){t.status=s.status,t.statusText=s.statusText,t.headers=Object.fromEntries(s.getAllResponseHeaders().trim().replaceAll("\r","").split(`
+`).map(n=>[decodeURIComponent(n.substring(0,n.indexOf(": ")).toLowerCase()),decodeURIComponent(n.substring(n.indexOf(": ")+2))]));try{e.responseType=="text"&&e.dataType=="json"?t.body=JSON.parse(s.responseText):e.responseType=="text"?t.body=s.responseText:t.body=s.response}catch{t.body=s.response}o()}},e.method=="POST"||e.method=="PUT"?s.send(e.body):s.send(),l}}i.HttpQuick=d,i.HttpQuickBase=a,Object.defineProperty(i,Symbol.toStringTag,{value:"Module"})}));

package/dist/node.cjs

@@ -1,2 +1,2 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=require("./HttpQuickBase-Djux5ry4.cjs");class u extends i.HttpQuickBase{send(t,o){let n=null,r=new Promise(s=>n=s);const e=o.response=new XMLHttpRequest;e.open(t.method,t.fullUrl,!0),e.timeout=t.timeout,e.withCredentials=t.withCredentials||!1,e.responseType=t.responseType;for(const[s,a]of Object.entries(t.headers))e.setRequestHeader(s,a);return e.ontimeout=s=>{this.onTimeoutError(t,o,s),n()},e.onerror=s=>{this.onNetworkError(t,o,s),n()},e.onreadystatechange=()=>{if(!(e.readyState!==4||e.status==0)){if(e.status!=200)return this.onNetworkError(t,o,null),n();o.status=e.status,o.statusText=e.statusText,o.headers=Object.fromEntries(e.getAllResponseHeaders().trim().replaceAll("\r","").split(`
-`).map(s=>[decodeURIComponent(s.substring(0,s.indexOf(": ")).toLowerCase()),decodeURIComponent(s.substring(s.indexOf(": ")+2))])),t.responseType=="text"&&t.dataType=="json"?o.body=JSON.parse(e.responseText):t.responseType=="text"?o.body=e.responseText:o.body=e.response,n()}},t.method=="POST"||t.method=="PUT"?e.send(t.body):e.send(),r}}exports.HttpQuickBase=i.HttpQuickBase;exports.HttpQuick=u;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("./HttpQuickBase-Bebs7K6z.cjs");class p extends r.HttpQuickBase{send(t,o){let n=null,a=new Promise(s=>n=s);const e=o.response=new XMLHttpRequest;e.open(t.method,t.fullUrl,!0),e.timeout=t.timeout,e.withCredentials=t.withCredentials||!1,e.responseType=t.responseType;for(const[s,i]of Object.entries(t.headers))e.setRequestHeader(s,i);return e.ontimeout=s=>{this.onTimeoutError(t,o,s),n()},e.onerror=s=>{this.onNetworkError(t,o,s),n()},t.onprocess&&e.upload.addEventListener("progress",t.onprocess),e.onreadystatechange=()=>{if(!(e.readyState!==4||e.status==0)){o.status=e.status,o.statusText=e.statusText,o.headers=Object.fromEntries(e.getAllResponseHeaders().trim().replaceAll("\r","").split(`
+`).map(s=>[decodeURIComponent(s.substring(0,s.indexOf(": ")).toLowerCase()),decodeURIComponent(s.substring(s.indexOf(": ")+2))]));try{t.responseType=="text"&&t.dataType=="json"?o.body=JSON.parse(e.responseText):t.responseType=="text"?o.body=e.responseText:o.body=e.response}catch{o.body=e.response}n()}},t.method=="POST"||t.method=="PUT"?e.send(t.body):e.send(),a}}exports.HttpQuickBase=r.HttpQuickBase;exports.HttpQuick=p;

package/dist/node.js

@@ -1,27 +1,31 @@
-import { H as i } from "./HttpQuickBase-YasFsQ_r.js";
-class u extends i {
+import { H as a } from "./HttpQuickBase-Bwjk70F3.js";
+class l extends a {
   // 发送请求
   send(t, o) {
     let n = null, r = new Promise((s) => n = s);
     const e = o.response = new XMLHttpRequest();
     e.open(t.method, t.fullUrl, !0), e.timeout = t.timeout, e.withCredentials = t.withCredentials || !1, e.responseType = t.responseType;
-    for (const [s, a] of Object.entries(t.headers))
-      e.setRequestHeader(s, a);
+    for (const [s, p] of Object.entries(t.headers))
+      e.setRequestHeader(s, p);
     return e.ontimeout = (s) => {
       this.onTimeoutError(t, o, s), n();
     }, e.onerror = (s) => {
       this.onNetworkError(t, o, s), n();
-    }, e.onreadystatechange = () => {
+    }, t.onprocess && e.upload.addEventListener("progress", t.onprocess), e.onreadystatechange = () => {
       if (!(e.readyState !== 4 || e.status == 0)) {
-        if (e.status != 200)
-          return this.onNetworkError(t, o, null), n();
         o.status = e.status, o.statusText = e.statusText, o.headers = Object.fromEntries(e.getAllResponseHeaders().trim().replaceAll("\r", "").split(`
-`).map((s) => [decodeURIComponent(s.substring(0, s.indexOf(": ")).toLowerCase()), decodeURIComponent(s.substring(s.indexOf(": ") + 2))])), t.responseType == "text" && t.dataType == "json" ? o.body = JSON.parse(e.responseText) : t.responseType == "text" ? o.body = e.responseText : o.body = e.response, n();
+`).map((s) => [decodeURIComponent(s.substring(0, s.indexOf(": ")).toLowerCase()), decodeURIComponent(s.substring(s.indexOf(": ") + 2))]));
+        try {
+          t.responseType == "text" && t.dataType == "json" ? o.body = JSON.parse(e.responseText) : t.responseType == "text" ? o.body = e.responseText : o.body = e.response;
+        } catch {
+          o.body = e.response;
+        }
+        n();
       }
     }, t.method == "POST" || t.method == "PUT" ? e.send(t.body) : e.send(), r;
   }
 }
 export {
-  u as HttpQuick,
-  i as HttpQuickBase
+  l as HttpQuick,
+  a as HttpQuickBase
 };

package/dist/uniapp.js

@@ -1,12 +1,5 @@
-var p = Object.defineProperty;
-var l = (d, o, e) => o in d ? p(d, o, { enumerable: !0, configurable: !0, writable: !0, value: e }) : d[o] = e;
-var i = (d, o, e) => l(d, typeof o != "symbol" ? o + "" : o, e);
-import { H as f } from "./HttpQuickBase-YasFsQ_r.js";
-class y extends f {
-  constructor() {
-    super(...arguments);
-    i(this, "methods", {});
-  }
+import { H as i } from "./HttpQuickBase-Bwjk70F3.js";
+class u extends i {
   // 上传文件
   upload(e) {
     return this.request({ ...e, method: "POST", func: "uploadFile" });
@@ -17,9 +10,8 @@ class y extends f {
   }
   // 发送请求
   async send(e, a) {
-    var n;
-    let r = null, u = new Promise((s) => r = s);
-    this.methods[e.func || "request"]({
+    let s = null, n = new Promise((o) => s = o);
+    const d = {
       method: e.method,
       url: e.fullUrl,
       header: e.headers,
@@ -33,23 +25,26 @@ class y extends f {
       responseType: e.responseType,
       dataType: e.dataType,
       timeout: e.timeout,
-      success: (s) => r({ ...s, err: !1 }),
-      fail: (s) => r({ ...s, err: !0 })
-    });
-    const t = a.response = await u;
+      success: (o) => s({ ...o, err: !1 }),
+      fail: (o) => s({ ...o, err: !0 })
+    };
+    e.func == "uploadFile" ? uni.uploadFile(d) : e.func == "downloadFile" ? uni.downloadFile(d) : uni.request(d);
+    const t = a.response = await n;
     if (a.err = t.err, t.err && t.errMsg == "request:fail timeout")
-      return this.onTimeoutError(e, a);
+      return this.onTimeoutError(e, a, t.err);
     if (t.err)
-      return this.onNetworkError(e, a);
-    if (t.statusCode != 200)
-      return this.onNetworkError(e, a);
+      return this.onNetworkError(e, a, t.err);
     a.status = t.statusCode, a.statusText = "OK";
-    for (const s in t.header)
-      a.headers[s.toLowerCase()] = t.header[s];
-    e.responseType == "text" && e.dataType == "json" && typeof t.data == "string" ? a.body = (JSON.parse0 || JSON.parse)(t.data) : e.responseType == "text" && e.dataType == "json" && typeof t.data == "object" ? a.body = ((n = t.data) == null ? void 0 : n.object2model()) ?? t.data : (e.responseType == "text", a.body = t.data);
+    for (const o in t.header)
+      a.headers[o.toLowerCase()] = t.header[o];
+    try {
+      e.responseType == "text" && e.dataType == "json" && typeof t.data == "string" ? a.body = JSON.parse(t.data) : (e.responseType == "text" && e.dataType == "json" || e.responseType == "text", a.body = t.data);
+    } catch {
+      a.body = t.data;
+    }
   }
 }
 export {
-  y as HttpQuick,
-  f as HttpQuickBase
+  u as HttpQuick,
+  i as HttpQuickBase
 };

package/dist/xcx.js

@@ -1,67 +1,50 @@
-var l = Object.defineProperty;
-var d = (r, s, t) => s in r ? l(r, s, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[s] = t;
-var i = (r, s, t) => d(r, typeof s != "symbol" ? s + "" : s, t);
-import { H as f } from "./HttpQuickBase-YasFsQ_r.js";
-class c extends f {
-  // 构造函数
-  constructor(t = {}) {
-    super(t);
-    // 平台
-    i(this, "platform", null);
-    if (typeof uni < "u")
-      this.setPlatform(uni), this.setPlatform(uni.$h5);
-    else if (typeof wx < "u")
-      this.setPlatform(wx);
-    else
-      throw new Error("unknown platform");
-  }
-  // 设置平台
-  setPlatform(t = null) {
-    return this.platform = t, this;
-  }
+import { H as r } from "./HttpQuickBase-Bwjk70F3.js";
+class u extends r {
   // 上传文件
-  upload(t) {
-    return this.request({ ...t, method: "POST", func: "uploadFile" });
+  upload(e) {
+    return this.request({ ...e, method: "POST", func: "uploadFile" });
   }
   // 下载文件
-  download(t) {
-    return this.request({ ...t, method: "POST", func: "downloadFile" });
+  download(e) {
+    return this.request({ ...e, method: "POST", func: "downloadFile" });
   }
   // 发送请求
-  async send(t, e) {
-    const [u, n, p] = Promise.channel();
-    this.platform[t.func || "req"]({
-      method: t.method,
-      url: t.fullUrl,
-      header: t.headers,
-      data: t.body,
-      formData: t.formData,
+  async send(e, a) {
+    let s = null, n = new Promise((o) => s = o);
+    const d = {
+      method: e.method,
+      url: e.fullUrl,
+      header: e.headers,
+      data: e.body,
+      formData: e.formData,
       // upload fromData
-      name: t.name || "file",
+      name: e.name || "file",
       // upload file param name
-      filePath: t.filePath,
+      filePath: e.filePath,
       // upload file path
-      responseType: t.responseType,
-      dataType: "",
-      // req.dataType,
-      timeout: t.timeout,
-      success: (a) => n({ ...a, err: !1 }),
-      fail: (a) => n({ ...a, err: !0 })
-    });
-    const o = e.response = await u;
-    if (e.err = o.err, o.err && o.errMsg == "request:fail timeout")
-      return this.onTimeoutError(t, e);
-    if (o.err)
-      return this.onNetworkError(t, e);
-    if (o.statusCode != 200)
-      return this.onNetworkError(t, e, null);
-    e.status = o.statusCode, e.statusText = "OK";
-    for (const a in o.header)
-      e.headers[a.toLowerCase()] = o.header[a];
-    t.responseType == "text" && t.dataType == "json" ? e.body = JSON.parse(o.data) : (t.responseType == "text", e.body = o.data);
+      responseType: e.responseType,
+      dataType: e.dataType,
+      timeout: e.timeout,
+      success: (o) => s({ ...o, err: !1 }),
+      fail: (o) => s({ ...o, err: !0 })
+    };
+    e.func == "uploadFile" ? wx.uploadFile(d) : e.func == "downloadFile" ? wx.downloadFile(d) : wx.request(d);
+    const t = a.response = await n;
+    if (a.err = t.err, t.err && t.errMsg == "request:fail timeout")
+      return this.onTimeoutError(e, a, t.err);
+    if (t.err)
+      return this.onNetworkError(e, a, t.err);
+    a.status = t.statusCode, a.statusText = "OK";
+    for (const o in t.header)
+      a.headers[o.toLowerCase()] = t.header[o];
+    try {
+      e.responseType == "text" && e.dataType == "json" && typeof t.data == "string" ? a.body = JSON.parse(t.data) : (e.responseType == "text" && e.dataType == "json" || e.responseType == "text", a.body = t.data);
+    } catch {
+      a.body = t.data;
+    }
   }
 }
 export {
-  c as HttpQuick,
-  f as HttpQuickBase
+  u as HttpQuick,
+  r as HttpQuickBase
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "httpquick",
-  "version": "1.1.8",
+  "version": "1.1.9",
   "description": "js http quick request",
   "author": "dotcoo <dotcoo@163.com> (http://blog.dotcoo.com)",
   "homepage": "https://github.com/dotcoo/httpquick#readme",
@@ -51,10 +51,10 @@
     "preview": "vite preview"
   },
   "devDependencies": {
-    "@vitejs/plugin-vue": "^5.2.4",
-    "pinia": "^3.0.2",
-    "vite": "^6.3.5",
-    "vue": "^3.5.15",
+    "@vitejs/plugin-vue": "^6.0.1",
+    "pinia": "^3.0.3",
+    "vite": "^7.1.5",
+    "vue": "^3.5.21",
     "vue-router": "^4.5.1"
   }
 }

package/dist/HttpQuickBase-Djux5ry4.cjs

@@ -1 +0,0 @@
-"use strict";var h=Object.defineProperty;var p=(o,e,t)=>e in o?h(o,e,{enumerable:!0,configurable:!0,writable:!0,value:t}):o[e]=t;var a=(o,e,t)=>p(o,typeof e!="symbol"?e+"":e,t);class c{constructor(e={}){a(this,"config",{});a(this,"requestId",0);a(this,"middlewares",[]);a(this,"onTimeoutError",function(e,t,s){console.error("http timeout",s),t.status=-4,t.statusText="TIMEOUT",e.responseType=="text"&&e.dataType=="json"?t.body={errno:-1,errmsg:(t.response.status??t.status)+", 网络请求超时!"}:t.body="网络请求超时!"});Object.assign(this.config,e)}updateConfig(e={}){Object.assign(this.config,e)}addMiddleware(e){this.middlewares.push(e.bind(this))}getDefaultRequest(){return{id:0,baseUrl:"",method:"GET",url:"/",headers:{},query:null,json:null,body:null,responseType:"text",dataType:"json",timeout:6e4,fullUrl:""}}getDefaultResponse(){return{status:-1,statusText:"NONE",headers:{},body:null}}obj2query(e){return typeof URLSearchParams<"u"?new URLSearchParams(e).toString():Object.entries(e).map(([t,s])=>encodeURIComponent(t)+"="+encodeURIComponent(s)).join("&")}fillUrl(e){e.fullUrl=(/^https?:\/\//.test(e.url)?e.url:e.baseUrl+e.url)+(e.query?"?"+this.obj2query(e.query):"")}fillHeaders(e){e.responseType=="text"&&e.dataType=="json"&&(e.headers.Accept="application/json")}fillBody(e){var t;(e.method=="POST"||e.method=="PUT")&&(e.filePath||(e.body!==null&&typeof FormData<"u"&&e.body instanceof FormData?typeof process<"u"&&(((t=process==null?void 0:process.versions)==null?void 0:t.node)||"0.0.0")!=="0.0.0"&&(e.headers["content-type"]=e.body.getContentType(),e.body=e.body.toStream()):e.body!==null&&typeof URLSearchParams<"u"&&e.body instanceof URLSearchParams?(e.headers["content-type"]="application/x-www-form-urlencoded; charset=utf-8",e.body=e.body.toString()):e.body!==null&&Array.isArray(e.body)?(e.headers["content-type"]="application/x-www-form-urlencoded; charset=utf-8",e.body=e.body.map(s=>encodeURIComponent(s.key)+"="+encodeURIComponent(s.val)).join("&")):e.body!==null&&Object.isObject(e.body)?(e.headers["content-type"]="application/x-www-form-urlencoded; charset=utf-8",e.body=this.obj2query(e.body)):e.json!==null?(e.headers["content-type"]="application/json; charset=utf-8",e.body=JSON.stringify(e.json)):(e.headers["content-type"]="application/x-www-form-urlencoded; charset=utf-8",e.body="")))}get(e){return this.request({...e,method:"GET"})}post(e){return this.request({...e,method:"POST"})}put(e){return this.request({...e,method:"PUT"})}del(e){return this.request({...e,method:"DELETE"})}upload(e){return new Error("unreachable")}download(e){return new Error("unreachable")}onNetworkError(e,t,s=null){console.error("http error",s),t.status=-1,t.statusText="NETWORK FAIL",e.responseType=="text"&&e.dataType=="json"?t.body={errno:-2,errmsg:(t.response.status??t.status)+", 网络请求错误!"}:t.body="网络请求错误!"}async request(e){const t=Object.assign(this.getDefaultRequest(),this.config,e);let s=this.getDefaultResponse();t.method=t.method.toUpperCase(),Object.defineProperties(t,{response:{value:s,enumerable:!1,configurable:!0,writable:!0}}),Object.defineProperties(s,{request:{value:t,enumerable:!1,configurable:!0,writable:!0},response:{value:null,enumerable:!1,configurable:!0,writable:!0},parent:{value:null,enumerable:!1,configurable:!0,writable:!0}}),this.fillUrl(t),this.fillHeaders(t),this.fillBody(t);let l=async(n,i)=>await this.send(n,i);for(let n=this.middlewares.length-1;n>=0;n--){const i=l,r=this.middlewares[n].bind(this);l=async(d,u)=>await r(d,u,i)}return await l(t,s),s}send(e,t){}install(e,t={}){e.config.globalProperties.$http=this;for(const s in t)this[s]=t[s]}globalMethods(){globalThis.httpGet=this.get.bind(this),globalThis.httpPost=this.post.bind(this),globalThis.httpPut=this.put.bind(this),globalThis.httpDelete=this.del.bind(this),globalThis.httpUpload=this.upload.bind(this),globalThis.httpDownload=this.download.bind(this)}}exports.HttpQuickBase=c;