diff --git a/dist/npm/ap.js b/dist/npm/ap.js index 29f2524..98b73ff 100644 --- a/dist/npm/ap.js +++ b/dist/npm/ap.js @@ -861,11 +861,10 @@ var con = { method: request.method, url: request.url, - dataType: request.dataType || undefined, + dataType: 'text', header: request.headers, data: request.body || {}, - responseType: request.responseType || 'text', - timeout: request.timeout || 3000, + timeout: request.timeout || 20000, success: function success(res) { responseCallback({ statusCode: res.status, @@ -878,19 +877,11 @@ statusCode: res.status || 0, responseText: res.data, statusHeaders: res.headers, - errMsg: statusList[res.status] - }); - }, - complete: function complete(res) { - responseCallback({ - statusCode: res.status, - responseText: res.data, - statusHeaders: res.headers, - errMsg: statusList[res.status] + errMsg: statusList[res.status] || "" }); } }; - my.request(con); + my.httpRequest(con); }; /***/ diff --git a/dist/umd/ap.umd.min.js b/dist/umd/ap.umd.min.js index 2800f06..42b2502 100644 --- a/dist/umd/ap.umd.min.js +++ b/dist/umd/ap.umd.min.js @@ -1 +1 @@ -!function(e,t){if("object"==typeof exports&&"object"==typeof module)module.exports=t();else if("function"==typeof define&&define.amd)define([],t);else{var n=t();for(var r in n)("object"==typeof exports?exports:e)[r]=n[r]}}(this,function(){return function(e){function t(r){if(n[r])return n[r].exports;var o=n[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}var n={};return t.m=e,t.c=n,t.i=function(e){return e},t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="",t(t.s=10)}([function(e,t,n){"use strict";var r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e};e.exports={type:function(e){return Object.prototype.toString.call(e).slice(8,-1).toLowerCase()},isObject:function(e,t){return t?"object"===this.type(e):e&&"object"===(void 0===e?"undefined":r(e))},isFormData:function(e){return"undefined"!=typeof FormData&&e instanceof FormData},trim:function(e){return e.replace(/(^\s*)|(\s*$)/g,"")},encode:function(e){return encodeURIComponent(e).replace(/%40/gi,"@").replace(/%3A/gi,":").replace(/%24/g,"$").replace(/%2C/gi,",").replace(/%20/g,"+").replace(/%5B/gi,"[").replace(/%5D/gi,"]")},formatParams:function(e){function t(e,s){var a=o.encode,i=o.type(e);if("array"==i)e.forEach(function(e,n){o.isObject(e)||(n=""),t(e,s+"%5B"+n+"%5D")});else if("object"==i)for(var u in e)s?t(e[u],s+"%5B"+a(u)+"%5D"):t(e[u],a(u));else r||(n+="&"),r=!1,n+=s+"="+a(e)}var n="",r=!0,o=this;return this.isObject(e)?(t(e,""),n):e},merge:function(e,t){for(var n in t)e.hasOwnProperty(n)?this.isObject(t[n],1)&&this.isObject(e[n],1)&&this.merge(e[n],t[n]):e[n]=t[n];return e}}},function(e,t,n){function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e){return function(){function t(){r(this,t),this.requestHeaders={},this.readyState=0,this.timeout=0,this.responseURL="",this.responseHeaders={}}return a(t,[{key:"_call",value:function(e){this[e]&&this[e].apply(this,[].splice.call(arguments,1))}},{key:"_changeReadyState",value:function(e){this.readyState=e,this._call("onreadystatechange")}},{key:"open",value:function(e,t){if(this.method=e,t){if(t=i.trim(t),0!==t.indexOf("http")&&u){var n=document.createElement("a");n.href=t,t=n.href}}else t=location.href;this.responseURL=t,this._changeReadyState(1)}},{key:"send",value:function(t){var n=this;t=t||null;var r=this;if(e){var o={method:r.method,url:r.responseURL,headers:r.requestHeaders||{},body:t};i.merge(o,r._options||{}),"GET"===o.method&&(o.body=null),r._changeReadyState(3);var a;r.timeout=r.timeout||0,r.timeout>0&&(a=setTimeout(function(){3===r.readyState&&(n._call("onloadend"),r._changeReadyState(0),r._call("ontimeout"))},r.timeout)),o.timeout=r.timeout,e(o,function(e){function t(t){var n=e[t];return delete e[t],n}if(3===r.readyState){clearTimeout(a),r.status=t("statusCode")-0;var n=t("responseText"),o=t("statusMessage");if(r.status){var i=t("headers"),c={};for(var f in i){var l=i[f],p=f.toLowerCase();"object"===(void 0===l?"undefined":s(l))?c[p]=l:(c[p]=c[p]||[],c[p].push(l))}var d=c["set-cookie"];u&&d&&d.forEach(function(e){document.cookie=e.replace(/;\s*httpOnly/gi,"")}),r.responseHeaders=c,r.statusText=o||"",r.response=r.responseText=n,r._response=e,r._changeReadyState(4),r._call("onload")}else r.statusText=n,r._call("onerror",{msg:o});r._call("onloadend")}})}else console.error("Ajax require adapter")}},{key:"setRequestHeader",value:function(e,t){this.requestHeaders[i.trim(e)]=t}},{key:"getResponseHeader",value:function(e){return(this.responseHeaders[e.toLowerCase()]||"").toString()||null}},{key:"getAllResponseHeaders",value:function(){var e="";for(var t in this.responseHeaders)e+=t+":"+this.getResponseHeader(t)+"\r\n";return e||null}},{key:"abort",value:function(e){this._changeReadyState(0),this._call("onerror",{msg:e}),this._call("onloadend")}}],[{key:"setAdapter",value:function(t){e=t}}]),t}()}var s="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},a=function(){function e(e,t){for(var n=0;n0&&(e+=(-1===e.indexOf("?")?"?":"&")+S.join("&")),o.open(n.method,e);try{o.withCredentials=!!n.withCredentials,o.timeout=n.timeout||0,"stream"!==x&&(o.responseType=x)}catch(e){}var O=n.headers[i]||n.headers[u],k="application/x-www-form-urlencoded";s.trim((O||"").toLowerCase())===k?t=s.formatParams(t):s.isFormData(t)||-1===["object","array"].indexOf(s.type(t))||(k="application/json;charset=utf-8",t=JSON.stringify(t)),O||w||(n.headers[i]=k);for(var H in n.headers)if(H===i&&s.isFormData(t))delete n.headers[H];else try{o.setRequestHeader(H,n.headers[H])}catch(e){}o.onload=function(){try{var e=o.response||o.responseText;e&&n.parseJson&&-1!==(o.getResponseHeader(i)||"").indexOf("json")&&!s.isObject(e)&&(e=JSON.parse(e));var t=o.responseHeaders;if(!t){t={};var a=(o.getAllResponseHeaders()||"").split("\r\n");a.pop(),a.forEach(function(e){if(e){var n=e.split(":")[0];t[n]=o.getResponseHeader(n)}})}var u=o.status,c=o.statusText,d={data:e,headers:t,status:u,statusText:c};if(s.merge(d,o._response),u>=200&&u<300||304===u)d.engine=o,d.request=n,r(l.handler,d,0);else{var h=new p(c,u);h.response=d,f(h)}}catch(h){f(new p(h.msg,o.status))}},o.onerror=function(e){f(new p(e.msg||"Network Error",0))},o.ontimeout=function(){f(new p("timeout [ "+o.timeout+"ms ]",1))},o._options=n,setTimeout(function(){o.send(w?null:t)},0)}s.isObject(e)&&(n=e,e=n.url),n=n||{},n.headers=n.headers||{},m(f.p,function(){s.merge(n,JSON.parse(JSON.stringify(r.config)));var o=n.headers;o[i]=o[i]||o[u]||"",delete o[u],n.body=t||n.body,e=s.trim(e||""),n.method=n.method.toUpperCase(),n.url=e;var a=n;p&&(a=p.call(f,n,Promise)||n),h(a)||(a=Promise.resolve(a)),a.then(function(e){e===n?y(e):c(e)},function(e){d(e)})})});return d.engine=o,d}},{key:"all",value:function(e){return Promise.all(e)}},{key:"spread",value:function(e){return function(t){return e.apply(null,t)}}}]),e}();i.default=i,["get","post","put","patch","head","delete"].forEach(function(e){i.prototype[e]=function(t,n,r){return this.request(t,n,s.merge({method:e},r))}}),["lock","unlock","clear"].forEach(function(e){i.prototype[e]=function(){this.interceptors.request[e]()}}),e.exports=i},,function(e,t,n){"use strict";var r={11:"无权跨域",12:"网络出错",13:"超时",14:"解码失败",19:"HTTP错误"};e.exports=function(e,t){var n={method:e.method,url:e.url,dataType:e.dataType||void 0,header:e.headers,data:e.body||{},responseType:e.responseType||"text",timeout:e.timeout||3e3,success:function(e){t({statusCode:e.status,responseText:e.data,statusHeaders:e.headers})},fail:function(e){t({statusCode:e.status||0,responseText:e.data,statusHeaders:e.headers,errMsg:r[e.status]})},complete:function(e){t({statusCode:e.status,responseText:e.data,statusHeaders:e.headers,errMsg:r[e.status]})}};my.request(n)}},,,,,,function(e,t,n){"use strict";var r=n(2),o=n(1),s=n(4),a=o(s);e.exports=function(e){return new r(e||a)}}])}); \ No newline at end of file +!function(e,t){if("object"==typeof exports&&"object"==typeof module)module.exports=t();else if("function"==typeof define&&define.amd)define([],t);else{var n=t();for(var r in n)("object"==typeof exports?exports:e)[r]=n[r]}}(this,function(){return function(e){function t(r){if(n[r])return n[r].exports;var o=n[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}var n={};return t.m=e,t.c=n,t.i=function(e){return e},t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="",t(t.s=10)}([function(e,t,n){"use strict";var r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e};e.exports={type:function(e){return Object.prototype.toString.call(e).slice(8,-1).toLowerCase()},isObject:function(e,t){return t?"object"===this.type(e):e&&"object"===(void 0===e?"undefined":r(e))},isFormData:function(e){return"undefined"!=typeof FormData&&e instanceof FormData},trim:function(e){return e.replace(/(^\s*)|(\s*$)/g,"")},encode:function(e){return encodeURIComponent(e).replace(/%40/gi,"@").replace(/%3A/gi,":").replace(/%24/g,"$").replace(/%2C/gi,",").replace(/%20/g,"+").replace(/%5B/gi,"[").replace(/%5D/gi,"]")},formatParams:function(e){function t(e,s){var a=o.encode,i=o.type(e);if("array"==i)e.forEach(function(e,n){o.isObject(e)||(n=""),t(e,s+"%5B"+n+"%5D")});else if("object"==i)for(var u in e)s?t(e[u],s+"%5B"+a(u)+"%5D"):t(e[u],a(u));else r||(n+="&"),r=!1,n+=s+"="+a(e)}var n="",r=!0,o=this;return this.isObject(e)?(t(e,""),n):e},merge:function(e,t){for(var n in t)e.hasOwnProperty(n)?this.isObject(t[n],1)&&this.isObject(e[n],1)&&this.merge(e[n],t[n]):e[n]=t[n];return e}}},function(e,t,n){function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e){return function(){function t(){r(this,t),this.requestHeaders={},this.readyState=0,this.timeout=0,this.responseURL="",this.responseHeaders={}}return a(t,[{key:"_call",value:function(e){this[e]&&this[e].apply(this,[].splice.call(arguments,1))}},{key:"_changeReadyState",value:function(e){this.readyState=e,this._call("onreadystatechange")}},{key:"open",value:function(e,t){if(this.method=e,t){if(t=i.trim(t),0!==t.indexOf("http")&&u){var n=document.createElement("a");n.href=t,t=n.href}}else t=location.href;this.responseURL=t,this._changeReadyState(1)}},{key:"send",value:function(t){var n=this;t=t||null;var r=this;if(e){var o={method:r.method,url:r.responseURL,headers:r.requestHeaders||{},body:t};i.merge(o,r._options||{}),"GET"===o.method&&(o.body=null),r._changeReadyState(3);var a;r.timeout=r.timeout||0,r.timeout>0&&(a=setTimeout(function(){3===r.readyState&&(n._call("onloadend"),r._changeReadyState(0),r._call("ontimeout"))},r.timeout)),o.timeout=r.timeout,e(o,function(e){function t(t){var n=e[t];return delete e[t],n}if(3===r.readyState){clearTimeout(a),r.status=t("statusCode")-0;var n=t("responseText"),o=t("statusMessage");if(r.status){var i=t("headers"),c={};for(var f in i){var l=i[f],p=f.toLowerCase();"object"===(void 0===l?"undefined":s(l))?c[p]=l:(c[p]=c[p]||[],c[p].push(l))}var d=c["set-cookie"];u&&d&&d.forEach(function(e){document.cookie=e.replace(/;\s*httpOnly/gi,"")}),r.responseHeaders=c,r.statusText=o||"",r.response=r.responseText=n,r._response=e,r._changeReadyState(4),r._call("onload")}else r.statusText=n,r._call("onerror",{msg:o});r._call("onloadend")}})}else console.error("Ajax require adapter")}},{key:"setRequestHeader",value:function(e,t){this.requestHeaders[i.trim(e)]=t}},{key:"getResponseHeader",value:function(e){return(this.responseHeaders[e.toLowerCase()]||"").toString()||null}},{key:"getAllResponseHeaders",value:function(){var e="";for(var t in this.responseHeaders)e+=t+":"+this.getResponseHeader(t)+"\r\n";return e||null}},{key:"abort",value:function(e){this._changeReadyState(0),this._call("onerror",{msg:e}),this._call("onloadend")}}],[{key:"setAdapter",value:function(t){e=t}}]),t}()}var s="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},a=function(){function e(e,t){for(var n=0;n0&&(e+=(-1===e.indexOf("?")?"?":"&")+O.join("&")),o.open(n.method,e);try{o.withCredentials=!!n.withCredentials,o.timeout=n.timeout||0,"stream"!==x&&(o.responseType=x)}catch(e){}var T=n.headers[i]||n.headers[u],R="application/x-www-form-urlencoded";s.trim((T||"").toLowerCase())===R?t=s.formatParams(t):s.isFormData(t)||-1===["object","array"].indexOf(s.type(t))||(R="application/json;charset=utf-8",t=JSON.stringify(t)),T||w||(n.headers[i]=R);for(var k in n.headers)if(k===i&&s.isFormData(t))delete n.headers[k];else try{o.setRequestHeader(k,n.headers[k])}catch(e){}o.onload=function(){try{var e=o.response||o.responseText;e&&n.parseJson&&-1!==(o.getResponseHeader(i)||"").indexOf("json")&&!s.isObject(e)&&(e=JSON.parse(e));var t=o.responseHeaders;if(!t){t={};var a=(o.getAllResponseHeaders()||"").split("\r\n");a.pop(),a.forEach(function(e){if(e){var n=e.split(":")[0];t[n]=o.getResponseHeader(n)}})}var u=o.status,c=o.statusText,d={data:e,headers:t,status:u,statusText:c};if(s.merge(d,o._response),u>=200&&u<300||304===u)d.engine=o,d.request=n,r(l.handler,d,0);else{var h=new p(c,u);h.response=d,f(h)}}catch(h){f(new p(h.msg,o.status))}},o.onerror=function(e){f(new p(e.msg||"Network Error",0))},o.ontimeout=function(){f(new p("timeout [ "+o.timeout+"ms ]",1))},o._options=n,setTimeout(function(){o.send(w?null:t)},0)}s.isObject(e)&&(n=e,e=n.url),n=n||{},n.headers=n.headers||{},m(f.p,function(){s.merge(n,JSON.parse(JSON.stringify(r.config)));var o=n.headers;o[i]=o[i]||o[u]||"",delete o[u],n.body=t||n.body,e=s.trim(e||""),n.method=n.method.toUpperCase(),n.url=e;var a=n;p&&(a=p.call(f,n,Promise)||n),h(a)||(a=Promise.resolve(a)),a.then(function(e){e===n?y(e):c(e)},function(e){d(e)})})});return d.engine=o,d}},{key:"all",value:function(e){return Promise.all(e)}},{key:"spread",value:function(e){return function(t){return e.apply(null,t)}}}]),e}();i.default=i,["get","post","put","patch","head","delete"].forEach(function(e){i.prototype[e]=function(t,n,r){return this.request(t,n,s.merge({method:e},r))}}),["lock","unlock","clear"].forEach(function(e){i.prototype[e]=function(){this.interceptors.request[e]()}}),e.exports=i},,function(e,t,n){"use strict";var r={11:"无权跨域",12:"网络出错",13:"超时",14:"解码失败",19:"HTTP错误"};e.exports=function(e,t){var n={method:e.method,url:e.url,dataType:"text",header:e.headers,data:e.body||{},timeout:e.timeout||2e4,success:function(e){t({statusCode:e.status,responseText:e.data,statusHeaders:e.headers})},fail:function(e){t({statusCode:e.status||0,responseText:e.data,statusHeaders:e.headers,errMsg:r[e.status]||""})}};my.httpRequest(n)}},,,,,,function(e,t,n){"use strict";var r=n(2),o=n(1),s=n(4),a=o(s);e.exports=function(e){return new r(e||a)}}])}); \ No newline at end of file diff --git a/package.json b/package.json index e095083..8d0624b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "flyio", - "version": "0.6.12", + "version": "0.6.13", "main": "node-index.js", "browser": "index.js", "weapp": "dist/npm/wx.js", diff --git a/src/adapter/ap.js b/src/adapter/ap.js index da02e10..b0cf3d7 100644 --- a/src/adapter/ap.js +++ b/src/adapter/ap.js @@ -10,11 +10,10 @@ module.exports = function (request, responseCallback) { var con = { method: request.method, url: request.url, - dataType: request.dataType || undefined, + dataType: 'text', header: request.headers, data: request.body || {}, - responseType: request.responseType || 'text', - timeout: request.timeout || 3000, + timeout: request.timeout || 20000, success(res) { responseCallback({ statusCode: res.status, @@ -27,17 +26,9 @@ module.exports = function (request, responseCallback) { statusCode: res.status || 0, responseText: res.data, statusHeaders: res.headers, - errMsg: statusList[res.status] - }) - }, - complete(res) { - responseCallback({ - statusCode: res.status, - responseText: res.data, - statusHeaders: res.headers, - errMsg: statusList[res.status] + errMsg: statusList[res.status] || "" }) } } - my.request(con) + my.httpRequest(con) }