From a259962a5542a6d9800bf13c0485a72ee3ed4cce Mon Sep 17 00:00:00 2001 From: Ivin Wu Date: Fri, 28 Jul 2023 10:19:21 +0800 Subject: [PATCH] fix: typing (#87) --- build/interface.d.ts | 2 +- build/weRequest.js | 4 ++-- build/weRequest.min.js | 4 ++-- package.json | 2 +- src/interface.ts | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build/interface.d.ts b/build/interface.d.ts index 8ab4ebd..3183a9a 100644 --- a/build/interface.d.ts +++ b/build/interface.d.ts @@ -28,7 +28,7 @@ export interface IInitOption { backupDomainList?: IAnyObject; backupDomainEnableCallback?: Function; domainChangeTrigger?: Function; - isFixSuccessCompleteTiming: boolean; + isFixSuccessCompleteTiming?: boolean; } export interface ICodeToSessionOptions { url: string; diff --git a/build/weRequest.js b/build/weRequest.js index 707355e..fafa637 100644 --- a/build/weRequest.js +++ b/build/weRequest.js @@ -1,5 +1,5 @@ /*! - * weRequest 1.8.0 + * weRequest 1.8.1 * https://github.com/IvinWu/weRequest */ module.exports = @@ -1425,7 +1425,7 @@ exports.default = { Object.defineProperty(exports, "__esModule", { value: true }); exports.version = void 0; -var version = "1.8.0"; +var version = "1.8.1"; exports.version = version; //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy92ZXJzaW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUVBLElBQU0sT0FBTyxHQUFHLFdBQVcsQ0FBQztBQUVuQiwwQkFBTyIsInNvdXJjZXNDb250ZW50IjpbImRlY2xhcmUgY29uc3QgX19WRVJTSU9OX186IHN0cmluZztcblxuY29uc3QgdmVyc2lvbiA9IF9fVkVSU0lPTl9fO1xuXG5leHBvcnQgeyB2ZXJzaW9uIH07XG4iXX0= diff --git a/build/weRequest.min.js b/build/weRequest.min.js index 87b78b6..2f3c904 100644 --- a/build/weRequest.min.js +++ b/build/weRequest.min.js @@ -1,5 +1,5 @@ /*! - * weRequest 1.8.0 + * weRequest 1.8.1 * https://github.com/IvinWu/weRequest */ -module.exports=function(e){var t={};function r(n){if(t[n])return t[n].exports;var o=t[n]={i:n,l:!1,exports:{}};return e[n].call(o.exports,o,o.exports,r),o.l=!0,o.exports}return r.m=e,r.c=t,r.d=function(e,t,n){r.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:n})},r.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},r.t=function(e,t){if(1&t&&(e=r(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(r.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)r.d(n,o,function(t){return e[t]}.bind(null,o));return n},r.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(t,"a",t),t},r.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},r.p="",r(r.s=9)}([function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});t.default={sessionName:"session",loginTrigger:function(){return!1},codeToSession:{url:"",success:function(){}},successTrigger:function(){return!0},setHeader:{},urlPerfix:"",doNotCheckSession:!1,errorTitle:"操作失败",errorContent:function(e){return e},errorRetryBtn:!1,reLoginLimit:3,errorCallback:null,reportCGI:!1,mockJson:!1,globalData:!1,sessionExpireKey:"sessionExpireKey",errorHandler:null,beforeSend:null,systemErrorHandler:null,domainChangeTrigger:function(e){var t,r;return(null===(t=null==e?void 0:e.errMsg)||void 0===t?void 0:t.indexOf("CONNECTION_REFUSED"))>=0||(null===(r=null==e?void 0:e.errMsg)||void 0===r?void 0:r.indexOf("ERR_CONNECTION_RESET"))>=0},isFixSuccessCompleteTiming:!1}},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default={session:"",sessionExpire:1/0,isEnableBackupDomain:!1}},function(e,t,r){"use strict";var n=this&&this.__assign||function(){return(n=Object.assign||function(e){for(var t,r=1,n=arguments.length;r0&&o[o.length-1])||6!==i[0]&&2!==i[0])){u=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]u.default.sessionExpire&&(m(),1)?(i.default.doNotCheckSession=!0,g().then((function(){return e()}),(function(e){return t(e)}))):e()}))}var y=null;function g(){return y||(y=new Promise((function(e,t){new Promise((function(e,t){var r=(new Date).getTime();wx.login({success:function(r){if(!r.code)return t({type:"system-error",res:r});(function e(t){return o(this,void 0,void 0,(function(){var r,o;return a(this,(function(a){switch(a.label){case 0:return"function"!=typeof i.default.codeToSession.data?[3,2]:[4,i.default.codeToSession.data(t)];case 1:return r=a.sent(),[3,3];case 2:r=i.default.codeToSession.data||{},a.label=3;case 3:return i.default.codeToSession.codeName?r[i.default.codeToSession.codeName]=t:r.code=t,o={url:f.default.format(i.default.codeToSession.url),data:r,method:i.default.codeToSession.method||"GET",header:"function"==typeof i.default.setHeader?i.default.setHeader():i.default.setHeader},"function"==typeof i.default.beforeSend&&(o=i.default.beforeSend(o)),o.url=c.default.replaceDomain(o.url),[2,new Promise((function(r,a){var u=(new Date).getTime();wx.request(n(n({},o),{success:function(e){if(200===e.statusCode){if(i.default.codeToSession.report){var t=(new Date).getTime();s.default.report(i.default.codeToSession.report,u,t)}var n=void 0;try{n=i.default.codeToSession.success(e.data,e)}catch(e){}return"string"==typeof n&&n?(h(n),r(n)):a({type:"logic-error",res:e})}return a({type:"http-error",res:e})},fail:function(n){return i.default.domainChangeTrigger&&i.default.domainChangeTrigger(n)&&c.default.isInBackupDomainList(o.url)?(f.default.enableBackupDomain(o.url),e(t).then((function(e){return r(e)}))):a({type:"system-error",res:n})}}))}))]}}))}))})(r.code).then((function(){return e()})).catch((function(e){return t(e)}))},complete:function(){var e=(new Date).getTime();s.default.report("wx_login",r,e)},fail:function(e){return t({type:"system-error",res:e})}})})).then((function(){return y=null,e()})).catch((function(e){return y=null,l.default.hide(),t(e)}))}))),y}function h(e){u.default.session=e,i.default.doNotCheckSession=!0,i.default.sessionExpireTime&&i.default.sessionExpireKey&&(u.default.sessionExpire=(new Date).getTime()+i.default.sessionExpireTime,wx.setStorage({key:i.default.sessionExpireKey,data:String(u.default.sessionExpire)})),wx.setStorage({key:i.default.sessionName,data:u.default.session})}function m(){u.default.session="",wx.removeStorage({key:i.default.sessionName}),i.default.sessionExpireTime&&i.default.sessionExpireKey&&(u.default.sessionExpire=1/0,wx.removeStorage({key:i.default.sessionExpireKey}))}t.default={main:function(){return new Promise((function(e,t){return p().then((function(){return i.default.doNotCheckSession?Promise.resolve():(d||(d=new Promise((function(e,t){var r=(new Date).getTime();wx.checkSession({success:function(){return e()},fail:function(){return m(),g().then((function(){return e()}),(function(e){return t(e)}))},complete:function(){var e=(new Date).getTime();s.default.report("wx_checkSession",r,e)}})}))),d)})).then((function(){return e()})).catch((function(e){return t(e)}))}))},setSession:h,delSession:m}},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n=r(2);t.default=function(e){return n.default.request(e)}},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default={show:function(e){wx.showToast({title:"boolean"==typeof e?"加载中":e,icon:"loading",mask:!0,duration:6e4})},hide:function(){wx.hideToast({})}}},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n=r(0),o=r(4);function a(e,t,r){"function"==typeof n.default.reportCGI&&n.default.reportCGI(e,t,r,o.default)}t.default={start:function(e){e._reportStartTime=(new Date).getTime()},end:function(e){e._reportEndTime=(new Date).getTime(),e.report&&e._reportStartTime&&a(e.report,e._reportStartTime,e._reportEndTime)},report:a}},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default={get:function(e){e.originUrl&&wx.getStorage({key:e.originUrl,success:function(t){(!0===e.cache||"function"==typeof e.cache&&e.cache(t.data))&&"function"==typeof e.success&&e.success(t.data,{isCache:!0}),"function"==typeof e.complete&&e.complete()}})},set:function(e,t){e.originUrl&&(!0===e.cache||"function"==typeof e.cache&&e.cache(t))&&wx.setStorage({key:e.originUrl,data:t})}}},function(e,t,r){"use strict";var n=this&&this.__assign||function(){return(n=Object.assign||function(e){for(var t,r=1,n=arguments.length;r=0){var a=e.substr(r+1).split("&");a.forEach((function(e,t){var r=a[t].split("=");o[r[0]]=r[1]}))}o=n(n({},o),t);var u=Object.keys(o).map((function(e){return"".concat(e,"=").concat(encodeURI(o[e]))})).join("&");return r>=0?e.substring(0,r+1)+u:e+"?"+u},replaceDomain:function(e){if(void 0===e&&(e=""),a.default.isEnableBackupDomain&&o.default.backupDomainList&&"object"==typeof o.default.backupDomainList)for(var t in o.default.backupDomainList)if(e.indexOf(t)>=0){e=e.replace(t,o.default.backupDomainList[t]);break}return e},isInBackupDomainList:function(e){void 0===e&&(e="");var t=!1;if(o.default.backupDomainList&&"object"==typeof o.default.backupDomainList)for(var r in o.default.backupDomainList)if(e.indexOf(r)>=0){t=!0;break}return t}}},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n=r(10),o=r(4),a=r(16),u=r(17),i=r(18),s=r(19),f=r(20),l=r(21),c={init:n.default,request:o.default,uploadFile:a.default,setSession:u.default,login:i.default,getSession:s.default,getConfig:f.default,version:l.version};t.default=c},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n=r(0),o=r(1);t.default=function(e){Object.assign(n.default,e);try{o.default.session=wx.getStorageSync(n.default.sessionName)||""}catch(e){}try{o.default.sessionExpire=wx.getStorageSync(n.default.sessionExpireKey||"sessionExpireKey")||1/0}catch(e){}}},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n=r(0),o=r(5);t.default={get:function(e){if(!(n.default.mockJson[e.url]||e.originUrl&&n.default.mockJson[e.originUrl]))return!1;var t=n.default.mockJson[e.url]||(e.originUrl?n.default.mockJson[e.originUrl]:""),r={data:t=JSON.parse(JSON.stringify(t)),statusCode:200};return o.default.hide(),r}}},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n=r(0),o=r(2),a=r(7),u=r(6),i=r(3),s=r(13);t.default={responseForRequest:function(e,t){if(200!==e.statusCode)throw{type:"http-error",res:e};if(u.default.end(t),"json"===t.dataType&&"string"==typeof e.data){e.data=(0,s.default)(e.data);try{e.data=JSON.parse(e.data)}catch(t){throw{type:"logic-error",res:e}}}if(n.default.loginTrigger(e.data)&&void 0!==t.reLoginCount&&t.reLoginCount=0||(null===(r=null==e?void 0:e.errMsg)||void 0===r?void 0:r.indexOf("ERR_CONNECTION_RESET"))>=0},isFixSuccessCompleteTiming:!1}},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default={session:"",sessionExpire:1/0,isEnableBackupDomain:!1}},function(e,t,r){"use strict";var n=this&&this.__assign||function(){return(n=Object.assign||function(e){for(var t,r=1,n=arguments.length;r0&&o[o.length-1])||6!==i[0]&&2!==i[0])){u=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]u.default.sessionExpire&&(m(),1)?(i.default.doNotCheckSession=!0,g().then((function(){return e()}),(function(e){return t(e)}))):e()}))}var y=null;function g(){return y||(y=new Promise((function(e,t){new Promise((function(e,t){var r=(new Date).getTime();wx.login({success:function(r){if(!r.code)return t({type:"system-error",res:r});(function e(t){return o(this,void 0,void 0,(function(){var r,o;return a(this,(function(a){switch(a.label){case 0:return"function"!=typeof i.default.codeToSession.data?[3,2]:[4,i.default.codeToSession.data(t)];case 1:return r=a.sent(),[3,3];case 2:r=i.default.codeToSession.data||{},a.label=3;case 3:return i.default.codeToSession.codeName?r[i.default.codeToSession.codeName]=t:r.code=t,o={url:f.default.format(i.default.codeToSession.url),data:r,method:i.default.codeToSession.method||"GET",header:"function"==typeof i.default.setHeader?i.default.setHeader():i.default.setHeader},"function"==typeof i.default.beforeSend&&(o=i.default.beforeSend(o)),o.url=c.default.replaceDomain(o.url),[2,new Promise((function(r,a){var u=(new Date).getTime();wx.request(n(n({},o),{success:function(e){if(200===e.statusCode){if(i.default.codeToSession.report){var t=(new Date).getTime();s.default.report(i.default.codeToSession.report,u,t)}var n=void 0;try{n=i.default.codeToSession.success(e.data,e)}catch(e){}return"string"==typeof n&&n?(h(n),r(n)):a({type:"logic-error",res:e})}return a({type:"http-error",res:e})},fail:function(n){return i.default.domainChangeTrigger&&i.default.domainChangeTrigger(n)&&c.default.isInBackupDomainList(o.url)?(f.default.enableBackupDomain(o.url),e(t).then((function(e){return r(e)}))):a({type:"system-error",res:n})}}))}))]}}))}))})(r.code).then((function(){return e()})).catch((function(e){return t(e)}))},complete:function(){var e=(new Date).getTime();s.default.report("wx_login",r,e)},fail:function(e){return t({type:"system-error",res:e})}})})).then((function(){return y=null,e()})).catch((function(e){return y=null,l.default.hide(),t(e)}))}))),y}function h(e){u.default.session=e,i.default.doNotCheckSession=!0,i.default.sessionExpireTime&&i.default.sessionExpireKey&&(u.default.sessionExpire=(new Date).getTime()+i.default.sessionExpireTime,wx.setStorage({key:i.default.sessionExpireKey,data:String(u.default.sessionExpire)})),wx.setStorage({key:i.default.sessionName,data:u.default.session})}function m(){u.default.session="",wx.removeStorage({key:i.default.sessionName}),i.default.sessionExpireTime&&i.default.sessionExpireKey&&(u.default.sessionExpire=1/0,wx.removeStorage({key:i.default.sessionExpireKey}))}t.default={main:function(){return new Promise((function(e,t){return p().then((function(){return i.default.doNotCheckSession?Promise.resolve():(d||(d=new Promise((function(e,t){var r=(new Date).getTime();wx.checkSession({success:function(){return e()},fail:function(){return m(),g().then((function(){return e()}),(function(e){return t(e)}))},complete:function(){var e=(new Date).getTime();s.default.report("wx_checkSession",r,e)}})}))),d)})).then((function(){return e()})).catch((function(e){return t(e)}))}))},setSession:h,delSession:m}},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n=r(2);t.default=function(e){return n.default.request(e)}},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default={show:function(e){wx.showToast({title:"boolean"==typeof e?"加载中":e,icon:"loading",mask:!0,duration:6e4})},hide:function(){wx.hideToast({})}}},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n=r(0),o=r(4);function a(e,t,r){"function"==typeof n.default.reportCGI&&n.default.reportCGI(e,t,r,o.default)}t.default={start:function(e){e._reportStartTime=(new Date).getTime()},end:function(e){e._reportEndTime=(new Date).getTime(),e.report&&e._reportStartTime&&a(e.report,e._reportStartTime,e._reportEndTime)},report:a}},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default={get:function(e){e.originUrl&&wx.getStorage({key:e.originUrl,success:function(t){(!0===e.cache||"function"==typeof e.cache&&e.cache(t.data))&&"function"==typeof e.success&&e.success(t.data,{isCache:!0}),"function"==typeof e.complete&&e.complete()}})},set:function(e,t){e.originUrl&&(!0===e.cache||"function"==typeof e.cache&&e.cache(t))&&wx.setStorage({key:e.originUrl,data:t})}}},function(e,t,r){"use strict";var n=this&&this.__assign||function(){return(n=Object.assign||function(e){for(var t,r=1,n=arguments.length;r=0){var a=e.substr(r+1).split("&");a.forEach((function(e,t){var r=a[t].split("=");o[r[0]]=r[1]}))}o=n(n({},o),t);var u=Object.keys(o).map((function(e){return"".concat(e,"=").concat(encodeURI(o[e]))})).join("&");return r>=0?e.substring(0,r+1)+u:e+"?"+u},replaceDomain:function(e){if(void 0===e&&(e=""),a.default.isEnableBackupDomain&&o.default.backupDomainList&&"object"==typeof o.default.backupDomainList)for(var t in o.default.backupDomainList)if(e.indexOf(t)>=0){e=e.replace(t,o.default.backupDomainList[t]);break}return e},isInBackupDomainList:function(e){void 0===e&&(e="");var t=!1;if(o.default.backupDomainList&&"object"==typeof o.default.backupDomainList)for(var r in o.default.backupDomainList)if(e.indexOf(r)>=0){t=!0;break}return t}}},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n=r(10),o=r(4),a=r(16),u=r(17),i=r(18),s=r(19),f=r(20),l=r(21),c={init:n.default,request:o.default,uploadFile:a.default,setSession:u.default,login:i.default,getSession:s.default,getConfig:f.default,version:l.version};t.default=c},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n=r(0),o=r(1);t.default=function(e){Object.assign(n.default,e);try{o.default.session=wx.getStorageSync(n.default.sessionName)||""}catch(e){}try{o.default.sessionExpire=wx.getStorageSync(n.default.sessionExpireKey||"sessionExpireKey")||1/0}catch(e){}}},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n=r(0),o=r(5);t.default={get:function(e){if(!(n.default.mockJson[e.url]||e.originUrl&&n.default.mockJson[e.originUrl]))return!1;var t=n.default.mockJson[e.url]||(e.originUrl?n.default.mockJson[e.originUrl]:""),r={data:t=JSON.parse(JSON.stringify(t)),statusCode:200};return o.default.hide(),r}}},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n=r(0),o=r(2),a=r(7),u=r(6),i=r(3),s=r(13);t.default={responseForRequest:function(e,t){if(200!==e.statusCode)throw{type:"http-error",res:e};if(u.default.end(t),"json"===t.dataType&&"string"==typeof e.data){e.data=(0,s.default)(e.data);try{e.data=JSON.parse(e.data)}catch(t){throw{type:"logic-error",res:e}}}if(n.default.loginTrigger(e.data)&&void 0!==t.reLoginCount&&t.reLoginCount