From 306a31d6805041b80782d44b830e3efbddf98ea0 Mon Sep 17 00:00:00 2001 From: Joelchu Date: Tue, 13 Aug 2019 22:54:25 +0800 Subject: [PATCH 1/3] update the jsonql-jwt deps and need to rethink about how this package should be later --- packages/jwt/dist/jsonql-jwt.js | 2 +- packages/jwt/package.json | 32 ++++++++++++++++---------------- packages/koa/package.json | 4 ++-- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/packages/jwt/dist/jsonql-jwt.js b/packages/jwt/dist/jsonql-jwt.js index f4001aa5..092067b1 100644 --- a/packages/jwt/dist/jsonql-jwt.js +++ b/packages/jwt/dist/jsonql-jwt.js @@ -1 +1 @@ -!function(t,r){"object"==typeof exports&&"undefined"!=typeof module?r(exports):"function"==typeof define&&define.amd?define(["exports"],r):r((t=t||self).jsonqlJwt={})}(this,function(t){"use strict";function r(t,r,e){return void 0===e&&(e={}),t.connect(r,e)}var e="type",n="optional",o="enumv",u="args",i="checker",a="alias",c=5e3,f="token",s="roundtip",l="handshake";function p(){for(var t=[],e=arguments.length;e--;)t[e]=arguments[e];return Promise.resolve(Reflect.apply(r,null,t))}function v(t,e,n,o){void 0===o&&(o={});var u,i=o.timeout||c,a=r(t,e,Object.assign({},o,{query:[f,n].join("=")}));return new Promise(function(t,r){u=setTimeout(function(){r()},i),a.on("connect",function(){console.info("socketIoHandshakeLogin connected"),t(a),clearTimeout(u)})})}var h=function(t){function r(){for(var e=[],n=arguments.length;n--;)e[n]=arguments[n];t.apply(this,e),this.message=e[0],this.detail=e[1],this.className=r.name,t.captureStackTrace&&t.captureStackTrace(this,r)}t&&(r.__proto__=t),r.prototype=Object.create(t&&t.prototype),r.prototype.constructor=r;var e={name:{configurable:!0}};return e.name.get=function(){return"JsonqlEnumError"},Object.defineProperties(r,e),r}(Error),d=function(t){function r(){for(var e=[],n=arguments.length;n--;)e[n]=arguments[n];t.apply(this,e),this.message=e[0],this.detail=e[1],this.className=r.name,t.captureStackTrace&&t.captureStackTrace(this,r)}t&&(r.__proto__=t),r.prototype=Object.create(t&&t.prototype),r.prototype.constructor=r;var e={name:{configurable:!0}};return e.name.get=function(){return"JsonqlTypeError"},Object.defineProperties(r,e),r}(Error),y=function(t){function r(){for(var e=[],n=arguments.length;n--;)e[n]=arguments[n];t.apply(this,e),this.message=e[0],this.detail=e[1],this.className=r.name,t.captureStackTrace&&t.captureStackTrace(this,r)}t&&(r.__proto__=t),r.prototype=Object.create(t&&t.prototype),r.prototype.constructor=r;var e={name:{configurable:!0}};return e.name.get=function(){return"JsonqlCheckerError"},Object.defineProperties(r,e),r}(Error),b=function(t){function r(){for(var e=[],n=arguments.length;n--;)e[n]=arguments[n];t.apply(this,e),this.message=e[0],this.detail=e[1],this.className=r.name,t.captureStackTrace&&t.captureStackTrace(this,r)}t&&(r.__proto__=t),r.prototype=Object.create(t&&t.prototype),r.prototype.constructor=r;var e={name:{configurable:!0}};return e.name.get=function(){return"JsonqlValidationError"},Object.defineProperties(r,e),r}(Error),g=function(t){function r(){for(var e=[],n=arguments.length;n--;)e[n]=arguments[n];t.apply(this,e),this.message=e[0],this.detail=e[1],this.className=r.name,t.captureStackTrace&&t.captureStackTrace(this,r)}t&&(r.__proto__=t),r.prototype=Object.create(t&&t.prototype),r.prototype.constructor=r;var e={name:{configurable:!0},statusCode:{configurable:!0}};return e.name.get=function(){return"JsonqlError"},e.statusCode.get=function(){return-1},Object.defineProperties(r,e),r}(Error),_=function(t,r,e,n){t.emit("authenticate",{token:r}).on("authenticated",e).on("unauthorized",n)};function j(t,e,n,o){var u=r(t,e);return new Promise(function(t,r){_(u,n,function(){return t(u)},r)})}var m="undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{},w="object"==typeof m&&m&&m.Object===Object&&m,O="object"==typeof self&&self&&self.Object===Object&&self,k=w||O||Function("return this")(),S=k.Symbol,A=Object.prototype,P=A.hasOwnProperty,E=A.toString,T=S?S.toStringTag:void 0;var x=Object.prototype.toString;var z="[object Null]",C="[object Undefined]",I=S?S.toStringTag:void 0;function M(t){return null==t?void 0===t?C:z:I&&I in Object(t)?function(t){var r=P.call(t,T),e=t[T];try{t[T]=void 0;var n=!0}catch(t){}var o=E.call(t);return n&&(r?t[T]=e:delete t[T]),o}(t):function(t){return x.call(t)}(t)}function N(t){return null!=t&&"object"==typeof t}var R="[object Symbol]";function D(t){return"symbol"==typeof t||N(t)&&M(t)==R}function B(t,r){for(var e=-1,n=null==t?0:t.length,o=Array(n);++e0){if(++bt>=vt)return arguments[0]}else bt=0;return yt.apply(void 0,arguments)});function mt(t){return t!=t}function wt(t,r,e){return r==r?function(t,r,e){for(var n=e-1,o=t.length;++n-1&&t%1==0&&t-1&&t%1==0&&t<=Ct}function Mt(t){return null!=t&&It(t.length)&&!K(t)}var Nt=Object.prototype;function Rt(t){var r=t&&t.constructor;return t===("function"==typeof r&&r.prototype||Nt)}var Dt="[object Arguments]";function Bt(t){return N(t)&&M(t)==Dt}var Ft=Object.prototype,Ut=Ft.hasOwnProperty,Wt=Ft.propertyIsEnumerable,$t=Bt(function(){return arguments}())?Bt:function(t){return N(t)&&Ut.call(t,"callee")&&!Wt.call(t,"callee")};var qt="object"==typeof t&&t&&!t.nodeType&&t,Lt=qt&&"object"==typeof module&&module&&!module.nodeType&&module,Vt=Lt&&Lt.exports===qt?k.Buffer:void 0,Jt=(Vt?Vt.isBuffer:void 0)||function(){return!1},Ht={};Ht["[object Float32Array]"]=Ht["[object Float64Array]"]=Ht["[object Int8Array]"]=Ht["[object Int16Array]"]=Ht["[object Int32Array]"]=Ht["[object Uint8Array]"]=Ht["[object Uint8ClampedArray]"]=Ht["[object Uint16Array]"]=Ht["[object Uint32Array]"]=!0,Ht["[object Arguments]"]=Ht["[object Array]"]=Ht["[object ArrayBuffer]"]=Ht["[object Boolean]"]=Ht["[object DataView]"]=Ht["[object Date]"]=Ht["[object Error]"]=Ht["[object Function]"]=Ht["[object Map]"]=Ht["[object Number]"]=Ht["[object Object]"]=Ht["[object RegExp]"]=Ht["[object Set]"]=Ht["[object String]"]=Ht["[object WeakMap]"]=!1;var Gt="object"==typeof t&&t&&!t.nodeType&&t,Yt=Gt&&"object"==typeof module&&module&&!module.nodeType&&module,Kt=Yt&&Yt.exports===Gt&&w.process,Qt=function(){try{var t=Yt&&Yt.require&&Yt.require("util").types;return t||Kt&&Kt.binding&&Kt.binding("util")}catch(t){}}(),Xt=Qt&&Qt.isTypedArray,Zt=Xt?function(t){return function(r){return t(r)}}(Xt):function(t){return N(t)&&It(t.length)&&!!Ht[M(t)]},tr=Object.prototype.hasOwnProperty;function rr(t,r){var e=F(t),n=!e&&$t(t),o=!e&&!n&&Jt(t),u=!e&&!n&&!o&&Zt(t),i=e||n||o||u,a=i?function(t,r){for(var e=-1,n=Array(t);++e-1},jr.prototype.set=function(t,r){var e=this.__data__,n=gr(e,t);return n<0?(++this.size,e.push([t,r])):e[n][1]=r,this};var mr=ft(k,"Map");function wr(t,r){var e,n,o=t.__data__;return("string"==(n=typeof(e=r))||"number"==n||"symbol"==n||"boolean"==n?"__proto__"!==e:null===e)?o["string"==typeof r?"string":"hash"]:o.map}function Or(t){var r=-1,e=null==t?0:t.length;for(this.clear();++r=n?t:function(t,r,e){var n=-1,o=t.length;r<0&&(r=-r>o?0:o+r),(e=e>o?o:e)<0&&(e+=o),o=r>e?0:e-r>>>0,r>>>=0;for(var u=Array(o);++na))return!1;var f=u.get(t);if(f&&u.get(r))return f==r;var s=-1,l=!0,p=e&Ce?new Te:void 0;for(u.set(t,r),u.set(r,t);++s1?r[n-1]:void 0,u=n>2?r[2]:void 0;for(o=Mn.length>3&&"function"==typeof o?(n--,o):void 0,u&&function(t,r,e){if(!L(e))return!1;var n=typeof r;return!!("number"==n?Mt(e)&&St(r,e.length):"string"==n&&r in e)&&Pt(e[r],t)}(r[0],r[1],u)&&(o=n<3?void 0:o,n=1),t=Object(t);++e-1;);return e}(n,o),function(t,r){for(var e=t.length;e--&&wt(r,t[e],0)>-1;);return e}(n,o)+1).join("")}function $n(t){return!!F(t)||null!=t&&""!==Wn(t)}var qn=function(t){return!En(t)&&!zn(parseFloat(t))},Ln=function(t){return""!==Wn(t)&&En(t)},Vn=function(t){return function(t){return!0===t||!1===t||N(t)&&M(t)==Tn}(t)},Jn=function(t,r){return void 0===r&&(r=!0),!Cn(t)&&""!==t&&""!==Wn(t)&&(!1===r||!0===r&&!function(t){return null===t}(t))},Hn=e,Gn=n,Yn=o,Kn=u,Qn=i,Xn=a,Zn="continue",to=function(t){switch(t){case"number":return qn;case"string":return Ln;case"boolean":return Vn;default:return Jn}},ro=function(t,r){return void 0===r&&(r=""),!!F(t)&&(""===r||""===Wn(r)||!(t.filter(function(t){return!to(r)(t)}).length>0))},eo=function(t){if(t.indexOf("array.<")>-1&&t.indexOf(">")>-1){var r=t.replace("array.<","").replace(">","");return r.indexOf("|")?r.split("|"):[r]}return!1},no=function(t,r){var e=t.arg;return r.length>1?!e.filter(function(t){return!(r.length>r.filter(function(r){return!to(r)(t)}).length)}).length:r.length>r.filter(function(t){return!ro(e,t)}).length},oo=function(t,r){if(void 0===r&&(r=null),qr(t)){if(!r)return!0;if(ro(r))return!r.filter(function(r){var e=t[r.name];return!(r.type.length>r.type.filter(function(t){var r;return!!Cn(e)||(!1!==(r=eo(t))?!no({arg:e},r):!to(t)(e))}).length)}).length}return!1},uo=function(t,r){var e,n,o,u,i;switch(!0){case"object"===t:return o=(n=r).arg,u=n.param,i=[o],Array.isArray(u.keys)&&u.keys.length&&i.push(u.keys),!oo.apply(null,i);case"array"===t:return!ro(r.arg);case!1!==(e=eo(t)):return!no(r,e);default:return!to(t)(r.arg)}},io=function(t,r){return Cn(t)?!0!==r.optional||Cn(r.defaultvalue)?null:r.defaultvalue:t},ao=function(t,r){var e,n=Object.keys(t);return e=r,!!n.filter(function(t){return t===e}).length},co=function(t){return!$n(t)};function fo(t,r){var e,n,o,u=Fn(r,function(t,r){return!t[Xn]});return un(u,{})?t:(e=t,n=function(t,r){return function(t,r,e){var n;return e(t,function(t,e,o){if(r(t,e,o))return n=e,!1}),n}(u,gn(function(t){return t.alias===r}),mn)||r},o={},n=gn(n),mn(e,function(t,r,e){At(o,n(t,r,e),t)}),o)}function so(t,r){return In(r,function(r,e){var n,o;return Cn(t[e])||!0===r[Gn]&&co(t[e])?Nn({},r,((n={})[Zn]=!0,n)):((o={})[Kn]=t[e],o[Hn]=r[Hn],o[Gn]=r[Gn]||!1,o[Yn]=r[Yn]||!1,o[Qn]=r[Qn]||!1,o)})}function lo(t,r){var e=function(t,r){var e=fo(t,r);return{pristineValues:In(Fn(r,function(t,r){return ao(e,r)}),function(t){return t.args}),checkAgainstAppProps:Fn(r,function(t,r){return!ao(e,r)}),config:e}}(t,r),n=e.config,o=e.pristineValues;return[so(n,e.checkAgainstAppProps),o]}var po=function(t){return ro(t)?t:[t]};var vo=function(t,r){return!ro(r)||function(t,r){return!!t.filter(function(t){return t===r}).length}(r,t)},ho=function(t,r){try{return!!K(r)&&r.apply(null,[t])}catch(t){return!1}};function yo(t){return function(r,e){if(r[Zn])return r[Kn];var n=function(t,r){var e,n=[[t[Kn]],[(e={},e[Hn]=po(t[Hn]),e[Gn]=t[Gn],e)]];return Reflect.apply(r,null,n)}(r,t);if(n.length)throw new d(e,n);if(!1!==r[Yn]&&!vo(r[Kn],r[Yn]))throw new h(e);if(!1!==r[Qn]&&!ho(r[Kn],r[Qn]))throw new y(e);return r[Kn]}}function bo(t,r,e,n){return void 0===t&&(t={}),Nn(function(t,r){var e=t[0],n=t[1],o=In(e,yo(r));return Nn(o,n)}(lo(t,r),n),e)}var go=oo,_o=Ln,jo=function(t,r,c){void 0===c&&(c={});var f=c[n],s=c[o],l=c[i],p=c[a];return function(t,r,c,f,s,l){void 0===c&&(c=!1),void 0===f&&(f=!1),void 0===s&&(s=!1),void 0===l&&(l=!1);var p={};return p[u]=t,p[e]=r,!0===c&&(p[n]=!0),ro(f)&&(p[o]=f),K(s)&&(p[i]=s),En(l)&&(p[a]=l),p}.apply(null,[t,r,f,s,l,p])},mo=function(t){return function(r,e,n){return void 0===n&&(n={}),bo(r,e,n,t)}}(function(t,r,e){var n;void 0===e&&(e=!1);var o=function(t,r){if(!ro(r))throw new g("params is not an array! Did something gone wrong when you generate the contract.json?");if(0===r.length)return[];if(!ro(t))throw new g("args is not an array! You might want to do: ES6 Array.from(arguments) or ES5 Array.prototype.slice.call(arguments)");switch(!0){case t.length==r.length:return t.map(function(t,e){return{arg:t,index:e,param:r[e]}});case!0===r[0].variable:var e=r[0].type;return t.map(function(t,n){return{arg:t,index:n,param:r[n]||{type:e,name:"_"}}});case t.lengthr.length&&1===r.length:var n,o=["any"];return!1!==(n=eo(r[0].type[0]))&&(o=n),t.map(function(t,e){return{arg:t,index:e,param:r[e]||{type:o,name:"_"}}});default:throw new g("Could not understand your arguments and parameter structure!",{args:t,params:r})}}(t,r),u=o.filter(function(t){return!0===t.param.optional?function(t){var r=t.arg,e=t.param;return!(!$n(r)||e.type.length>e.type.filter(function(r){return uo(r,t)}).length)}(t):!(t.param.type.length>t.param.type.filter(function(r){return uo(r,t)}).length)});return e?((n={}).error=u,n.data=o.map(function(t){return t.arg}),n):u}),wo=ao;var Oo="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";function ko(t){this.message=t}ko.prototype=new Error,ko.prototype.name="InvalidCharacterError";var So="undefined"!=typeof window&&window.atob&&window.atob.bind(window)||function(t){var r=String(t).replace(/=+$/,"");if(r.length%4==1)throw new ko("'atob' failed: The string to be decoded is not correctly encoded.");for(var e,n,o=0,u=0,i="";n=r.charAt(u++);~n&&(e=o%4?64*e+n:n,o++%4)?i+=String.fromCharCode(255&e>>(-2*o&6)):0)n=Oo.indexOf(n);return i};var Ao=function(t){var r=t.replace(/-/g,"+").replace(/_/g,"/");switch(r.length%4){case 0:break;case 2:r+="==";break;case 3:r+="=";break;default:throw"Illegal base64url string!"}try{return function(t){return decodeURIComponent(So(t).replace(/(.)/g,function(t,r){var e=r.charCodeAt(0).toString(16).toUpperCase();return e.length<2&&(e="0"+e),"%"+e}))}(r)}catch(t){return So(r)}};function Po(t){this.message=t}Po.prototype=new Error,Po.prototype.name="InvalidTokenError";var Eo,To,xo,zo,Co,Io,Mo,No,Ro,Do=function(t,r){if("string"!=typeof t)throw new Po("Invalid token specified");var e=!0===(r=r||{}).header?0:1;try{return JSON.parse(Ao(t.split(".")[e]))}catch(t){throw new Po("Invalid token specified: "+t.message)}},Bo=Po;Do.InvalidTokenError=Bo;var Fo={algorithm:jo("HS256",["string"]),expiresIn:jo(!1,["boolean","number","string"],(Eo={},Eo[a]="exp",Eo[n]=!0,Eo)),notBefore:jo(!1,["boolean","number","string"],(To={},To[a]="nbf",To[n]=!0,To)),audience:jo(!1,["boolean","string"],(xo={},xo[a]="iss",xo[n]=!0,xo)),subject:jo(!1,["boolean","string"],(zo={},zo[a]="sub",zo[n]=!0,zo)),issuer:jo(!1,["boolean","string"],(Co={},Co[a]="iss",Co[n]=!0,Co)),noTimestamp:jo(!1,["boolean"],(Io={},Io[n]=!0,Io)),header:jo(!1,["boolean","string"],(Mo={},Mo[n]=!0,Mo)),keyid:jo(!1,["boolean","string"],(No={},No[n]=!0,No)),mutatePayload:jo(!1,["boolean"],(Ro={},Ro[n]=!0,Ro))};var Uo=function(){switch(!0){case"undefined"!=typeof WebSocket:return WebSocket;case"undefined"!=typeof MozWebSocket:return MozWebSocket;case"undefined"!=typeof window:return window.WebSocket||window.MozWebSocket;default:throw new b("WebSocket is NOT SUPPORTED!")}}();function Wo(t){return new Uo(t)}t.chainPromises=function(t){return t.reduce(function(t,r){return t.then(function(t){return r.then(function(r){return t.concat([r])})})},Promise.resolve([]))},t.decodeToken=function(t){if(_o(t))return function(t){var r=t.iat||Math.floor(Date.now()/1e3);if(t.exp&&r>=t.exp){var e=new Date(t.exp).toISOString();throw new g("Token has expired on "+e,t)}return t}(Do(t));throw new g("Token must be a string!")},t.groupByNamespace=function(t){var r,e=function(t){return wo(t,"socket")?t.socket:t}(t),n={},o=0;for(var u in e){var i=e[u],a=i.namespace;a&&(n[a]||(++o,n[a]={}),n[a][u]=i,r||i.public&&(r=a))}return{size:o,nspSet:n,publicNamespace:r}},t.socketIoChainConnect=function(t,r,e,n,o,u){return void 0===o&&(o=l),new Promise(function(u,i){var a=[r,e[0]].join("");Reflect.apply(function(t){switch(console.info("client type: ",t),t){case s:return j;case l:return v;default:throw new b("socketIoChainConnect",{message:"Unknown "+t+" of client!"})}}(o),null,[t,a,n]).then(function(n){var o=[r,e[1]].join("");Reflect.apply(p,null,[t,o]).then(function(t){u([n,t])}).catch(function(t){i({message:"failed on "+o,error:t})})}).catch(function(t){i({message:"failed on "+a,error:t})})})},t.socketIoClient=r,t.socketIoClientAsync=p,t.socketIoHandshakeLogin=v,t.socketIoRoundtripLogin=j,t.tokenValidator=function(t){if(!go(t))return{};var r={},e=mo(t,Fo);for(var n in e)e[n]&&(r[n]=e[n]);return r},t.wsAuthClient=function(t,r){return Wo(t+"?"+f+"="+r)},t.wsClient=Wo,Object.defineProperty(t,"__esModule",{value:!0})}); +!function(t,r){"object"==typeof exports&&"undefined"!=typeof module?r(exports):"function"==typeof define&&define.amd?define(["exports"],r):r((t=t||self).jsonqlJwt={})}(this,function(t){"use strict";function r(t,r,e){return void 0===e&&(e={}),t.connect(r,e)}var e="type",n="optional",o="enumv",u="args",i="checker",a="alias",c=5e3,f="token",s="roundtip",l="handshake";function p(){for(var t=[],e=arguments.length;e--;)t[e]=arguments[e];return Promise.resolve(Reflect.apply(r,null,t))}function v(t,e,n,o){void 0===o&&(o={});var u,i=o.timeout||c,a=r(t,e,Object.assign({},o,{query:[f,n].join("=")}));return new Promise(function(t,r){u=setTimeout(function(){r()},i),a.on("connect",function(){console.info("socketIoHandshakeLogin connected"),t(a),clearTimeout(u)})})}var h=function(t){function r(){for(var e=[],n=arguments.length;n--;)e[n]=arguments[n];t.apply(this,e),this.message=e[0],this.detail=e[1],this.className=r.name,t.captureStackTrace&&t.captureStackTrace(this,r)}t&&(r.__proto__=t),r.prototype=Object.create(t&&t.prototype),r.prototype.constructor=r;var e={name:{configurable:!0}};return e.name.get=function(){return"JsonqlEnumError"},Object.defineProperties(r,e),r}(Error),d=function(t){function r(){for(var e=[],n=arguments.length;n--;)e[n]=arguments[n];t.apply(this,e),this.message=e[0],this.detail=e[1],this.className=r.name,t.captureStackTrace&&t.captureStackTrace(this,r)}t&&(r.__proto__=t),r.prototype=Object.create(t&&t.prototype),r.prototype.constructor=r;var e={name:{configurable:!0}};return e.name.get=function(){return"JsonqlTypeError"},Object.defineProperties(r,e),r}(Error),y=function(t){function r(){for(var e=[],n=arguments.length;n--;)e[n]=arguments[n];t.apply(this,e),this.message=e[0],this.detail=e[1],this.className=r.name,t.captureStackTrace&&t.captureStackTrace(this,r)}t&&(r.__proto__=t),r.prototype=Object.create(t&&t.prototype),r.prototype.constructor=r;var e={name:{configurable:!0}};return e.name.get=function(){return"JsonqlCheckerError"},Object.defineProperties(r,e),r}(Error),b=function(t){function r(){for(var e=[],n=arguments.length;n--;)e[n]=arguments[n];t.apply(this,e),this.message=e[0],this.detail=e[1],this.className=r.name,t.captureStackTrace&&t.captureStackTrace(this,r)}t&&(r.__proto__=t),r.prototype=Object.create(t&&t.prototype),r.prototype.constructor=r;var e={name:{configurable:!0}};return e.name.get=function(){return"JsonqlValidationError"},Object.defineProperties(r,e),r}(Error),g=function(t){function r(){for(var e=[],n=arguments.length;n--;)e[n]=arguments[n];t.apply(this,e),this.message=e[0],this.detail=e[1],this.className=r.name,t.captureStackTrace&&t.captureStackTrace(this,r)}t&&(r.__proto__=t),r.prototype=Object.create(t&&t.prototype),r.prototype.constructor=r;var e={name:{configurable:!0},statusCode:{configurable:!0}};return e.name.get=function(){return"JsonqlError"},e.statusCode.get=function(){return-1},Object.defineProperties(r,e),r}(Error),_=function(t,r,e,n){t.emit("authenticate",{token:r}).on("authenticated",e).on("unauthorized",n)};function j(t,e,n,o){var u=r(t,e);return new Promise(function(t,r){_(u,n,function(){return t(u)},r)})}var m="undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{},w="object"==typeof m&&m&&m.Object===Object&&m,O="object"==typeof self&&self&&self.Object===Object&&self,k=w||O||Function("return this")(),S=k.Symbol,A=Object.prototype,P=A.hasOwnProperty,E=A.toString,T=S?S.toStringTag:void 0;var x=Object.prototype.toString;var z="[object Null]",C="[object Undefined]",I=S?S.toStringTag:void 0;function M(t){return null==t?void 0===t?C:z:I&&I in Object(t)?function(t){var r=P.call(t,T),e=t[T];try{t[T]=void 0;var n=!0}catch(t){}var o=E.call(t);return n&&(r?t[T]=e:delete t[T]),o}(t):function(t){return x.call(t)}(t)}function N(t){return null!=t&&"object"==typeof t}var R="[object Symbol]";function D(t){return"symbol"==typeof t||N(t)&&M(t)==R}function B(t,r){for(var e=-1,n=null==t?0:t.length,o=Array(n);++e0){if(++gt>=ht)return arguments[0]}else gt=0;return bt.apply(void 0,arguments)});function wt(t){return t!=t}function Ot(t,r,e){return r==r?function(t,r,e){for(var n=e-1,o=t.length;++n-1&&t%1==0&&t-1&&t%1==0&&t<=It}function Nt(t){return null!=t&&Mt(t.length)&&!K(t)}var Rt=Object.prototype;function Dt(t){var r=t&&t.constructor;return t===("function"==typeof r&&r.prototype||Rt)}var Bt="[object Arguments]";function Ft(t){return N(t)&&M(t)==Bt}var Ut=Object.prototype,Wt=Ut.hasOwnProperty,$t=Ut.propertyIsEnumerable,qt=Ft(function(){return arguments}())?Ft:function(t){return N(t)&&Wt.call(t,"callee")&&!$t.call(t,"callee")};var Lt="object"==typeof t&&t&&!t.nodeType&&t,Vt=Lt&&"object"==typeof module&&module&&!module.nodeType&&module,Jt=Vt&&Vt.exports===Lt?k.Buffer:void 0,Ht=(Jt?Jt.isBuffer:void 0)||function(){return!1},Gt={};Gt["[object Float32Array]"]=Gt["[object Float64Array]"]=Gt["[object Int8Array]"]=Gt["[object Int16Array]"]=Gt["[object Int32Array]"]=Gt["[object Uint8Array]"]=Gt["[object Uint8ClampedArray]"]=Gt["[object Uint16Array]"]=Gt["[object Uint32Array]"]=!0,Gt["[object Arguments]"]=Gt["[object Array]"]=Gt["[object ArrayBuffer]"]=Gt["[object Boolean]"]=Gt["[object DataView]"]=Gt["[object Date]"]=Gt["[object Error]"]=Gt["[object Function]"]=Gt["[object Map]"]=Gt["[object Number]"]=Gt["[object Object]"]=Gt["[object RegExp]"]=Gt["[object Set]"]=Gt["[object String]"]=Gt["[object WeakMap]"]=!1;var Yt="object"==typeof t&&t&&!t.nodeType&&t,Kt=Yt&&"object"==typeof module&&module&&!module.nodeType&&module,Qt=Kt&&Kt.exports===Yt&&w.process,Xt=function(){try{var t=Kt&&Kt.require&&Kt.require("util").types;return t||Qt&&Qt.binding&&Qt.binding("util")}catch(t){}}(),Zt=Xt&&Xt.isTypedArray,tr=Zt?function(t){return function(r){return t(r)}}(Zt):function(t){return N(t)&&Mt(t.length)&&!!Gt[M(t)]},rr=Object.prototype.hasOwnProperty;function er(t,r){var e=F(t),n=!e&&qt(t),o=!e&&!n&&Ht(t),u=!e&&!n&&!o&&tr(t),i=e||n||o||u,a=i?function(t,r){for(var e=-1,n=Array(t);++e-1},mr.prototype.set=function(t,r){var e=this.__data__,n=_r(e,t);return n<0?(++this.size,e.push([t,r])):e[n][1]=r,this};var wr=ft(k,"Map");function Or(t,r){var e,n,o=t.__data__;return("string"==(n=typeof(e=r))||"number"==n||"symbol"==n||"boolean"==n?"__proto__"!==e:null===e)?o["string"==typeof r?"string":"hash"]:o.map}function kr(t){var r=-1,e=null==t?0:t.length;for(this.clear();++r=n?t:function(t,r,e){var n=-1,o=t.length;r<0&&(r=-r>o?0:o+r),(e=e>o?o:e)<0&&(e+=o),o=r>e?0:e-r>>>0,r>>>=0;for(var u=Array(o);++na))return!1;var f=u.get(t);if(f&&u.get(r))return f==r;var s=-1,l=!0,p=e&Ie?new xe:void 0;for(u.set(t,r),u.set(r,t);++s1?r[n-1]:void 0,u=n>2?r[2]:void 0;for(o=Nn.length>3&&"function"==typeof o?(n--,o):void 0,u&&function(t,r,e){if(!L(e))return!1;var n=typeof r;return!!("number"==n?Nt(e)&&At(r,e.length):"string"==n&&r in e)&&Et(e[r],t)}(r[0],r[1],u)&&(o=n<3?void 0:o,n=1),t=Object(t);++e-1;);return e}(n,o),function(t,r){for(var e=t.length;e--&&Ot(r,t[e],0)>-1;);return e}(n,o)+1).join("")}function qn(t){return!!F(t)||null!=t&&""!==$n(t)}var Ln=function(t){return!Tn(t)&&!Cn(parseFloat(t))},Vn=function(t){return""!==$n(t)&&Tn(t)},Jn=function(t){return function(t){return!0===t||!1===t||N(t)&&M(t)==xn}(t)},Hn=function(t,r){return void 0===r&&(r=!0),!In(t)&&""!==t&&""!==$n(t)&&(!1===r||!0===r&&!function(t){return null===t}(t))},Gn=e,Yn=n,Kn=o,Qn=u,Xn=i,Zn=a,to="continue",ro=function(t){switch(t){case"number":return Ln;case"string":return Vn;case"boolean":return Jn;default:return Hn}},eo=function(t,r){return void 0===r&&(r=""),!!F(t)&&(""===r||""===$n(r)||!(t.filter(function(t){return!ro(r)(t)}).length>0))},no=function(t){if(t.indexOf("array.<")>-1&&t.indexOf(">")>-1){var r=t.replace("array.<","").replace(">","");return r.indexOf("|")?r.split("|"):[r]}return!1},oo=function(t,r){var e=t.arg;return r.length>1?!e.filter(function(t){return!(r.length>r.filter(function(r){return!ro(r)(t)}).length)}).length:r.length>r.filter(function(t){return!eo(e,t)}).length},uo=function(t,r){if(void 0===r&&(r=null),Lr(t)){if(!r)return!0;if(eo(r))return!r.filter(function(r){var e=t[r.name];return!(r.type.length>r.type.filter(function(t){var r;return!!In(e)||(!1!==(r=no(t))?!oo({arg:e},r):!ro(t)(e))}).length)}).length}return!1},io=function(t,r){var e,n,o,u,i;switch(!0){case"object"===t:return o=(n=r).arg,u=n.param,i=[o],Array.isArray(u.keys)&&u.keys.length&&i.push(u.keys),!uo.apply(null,i);case"array"===t:return!eo(r.arg);case!1!==(e=no(t)):return!oo(r,e);default:return!ro(t)(r.arg)}},ao=function(t,r){return In(t)?!0!==r.optional||In(r.defaultvalue)?null:r.defaultvalue:t},co=function(t,r){var e,n=Object.keys(t);return e=r,!!n.filter(function(t){return t===e}).length},fo=function(t){return!qn(t)};function so(t,r){var e=Un(r,function(t,r){return!t[Zn]});return an(e,{})?t:function(t,r){var e={};return r=_n(r),wn(t,function(t,n,o){Pt(e,r(t,n,o),t)}),e}(t,function(t,r){return function(t,r,e){var n;return e(t,function(t,e,o){if(r(t,e,o))return n=e,!1}),n}(e,_n(function(t){return t.alias===r}),wn)||r})}function lo(t,r){return Mn(r,function(r,e){var n,o;return In(t[e])||!0===r[Yn]&&fo(t[e])?Rn({},r,((n={})[to]=!0,n)):((o={})[Qn]=t[e],o[Gn]=r[Gn],o[Yn]=r[Yn]||!1,o[Kn]=r[Kn]||!1,o[Xn]=r[Xn]||!1,o)})}function po(t,r){var e=function(t,r){var e=so(t,r);return{pristineValues:Mn(Un(r,function(t,r){return co(e,r)}),function(t){return t.args}),checkAgainstAppProps:Un(r,function(t,r){return!co(e,r)}),config:e}}(t,r),n=e.config,o=e.pristineValues;return[lo(n,e.checkAgainstAppProps),o]}var vo=function(t){return eo(t)?t:[t]};var ho=function(t,r){return!eo(r)||function(t,r){return!!t.filter(function(t){return t===r}).length}(r,t)},yo=function(t,r){try{return!!K(r)&&r.apply(null,[t])}catch(t){return!1}};function bo(t){return function(r,e){if(r[to])return r[Qn];var n=function(t,r){var e,n=[[t[Qn]],[(e={},e[Gn]=vo(t[Gn]),e[Yn]=t[Yn],e)]];return Reflect.apply(r,null,n)}(r,t);if(n.length)throw new d(e,n);if(!1!==r[Kn]&&!ho(r[Qn],r[Kn]))throw new h(e);if(!1!==r[Xn]&&!yo(r[Qn],r[Xn]))throw new y(e);return r[Qn]}}function go(t,r,e,n){return void 0===t&&(t={}),Rn(function(t,r){var e=t[0],n=t[1],o=Mn(e,bo(r));return Rn(o,n)}(po(t,r),n),e)}var _o=uo,jo=Vn,mo=function(t,r,c){void 0===c&&(c={});var f=c[n],s=c[o],l=c[i],p=c[a];return function(t,r,c,f,s,l){void 0===c&&(c=!1),void 0===f&&(f=!1),void 0===s&&(s=!1),void 0===l&&(l=!1);var p={};return p[u]=t,p[e]=r,!0===c&&(p[n]=!0),eo(f)&&(p[o]=f),K(s)&&(p[i]=s),Tn(l)&&(p[a]=l),p}.apply(null,[t,r,f,s,l,p])},wo=function(t){return function(r,e,n){return void 0===n&&(n={}),go(r,e,n,t)}}(function(t,r,e){var n;void 0===e&&(e=!1);var o=function(t,r){if(!eo(r))throw new g("params is not an array! Did something gone wrong when you generate the contract.json?");if(0===r.length)return[];if(!eo(t))throw new g("args is not an array! You might want to do: ES6 Array.from(arguments) or ES5 Array.prototype.slice.call(arguments)");switch(!0){case t.length==r.length:return t.map(function(t,e){return{arg:t,index:e,param:r[e]}});case!0===r[0].variable:var e=r[0].type;return t.map(function(t,n){return{arg:t,index:n,param:r[n]||{type:e,name:"_"}}});case t.lengthr.length&&1===r.length:var n,o=["any"];return!1!==(n=no(r[0].type[0]))&&(o=n),t.map(function(t,e){return{arg:t,index:e,param:r[e]||{type:o,name:"_"}}});default:throw new g("Could not understand your arguments and parameter structure!",{args:t,params:r})}}(t,r),u=o.filter(function(t){return!0===t.param.optional?function(t){var r=t.arg,e=t.param;return!!qn(r)&&!(e.type.length>e.type.filter(function(r){return io(r,t)}).length)}(t):!(t.param.type.length>t.param.type.filter(function(r){return io(r,t)}).length)});return e?((n={}).error=u,n.data=o.map(function(t){return t.arg}),n):u}),Oo=co;var ko="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";function So(t){this.message=t}So.prototype=new Error,So.prototype.name="InvalidCharacterError";var Ao="undefined"!=typeof window&&window.atob&&window.atob.bind(window)||function(t){var r=String(t).replace(/=+$/,"");if(r.length%4==1)throw new So("'atob' failed: The string to be decoded is not correctly encoded.");for(var e,n,o=0,u=0,i="";n=r.charAt(u++);~n&&(e=o%4?64*e+n:n,o++%4)?i+=String.fromCharCode(255&e>>(-2*o&6)):0)n=ko.indexOf(n);return i};var Po=function(t){var r=t.replace(/-/g,"+").replace(/_/g,"/");switch(r.length%4){case 0:break;case 2:r+="==";break;case 3:r+="=";break;default:throw"Illegal base64url string!"}try{return function(t){return decodeURIComponent(Ao(t).replace(/(.)/g,function(t,r){var e=r.charCodeAt(0).toString(16).toUpperCase();return e.length<2&&(e="0"+e),"%"+e}))}(r)}catch(t){return Ao(r)}};function Eo(t){this.message=t}Eo.prototype=new Error,Eo.prototype.name="InvalidTokenError";var To,xo,zo,Co,Io,Mo,No,Ro,Do,Bo=function(t,r){if("string"!=typeof t)throw new Eo("Invalid token specified");var e=!0===(r=r||{}).header?0:1;try{return JSON.parse(Po(t.split(".")[e]))}catch(t){throw new Eo("Invalid token specified: "+t.message)}},Fo=Eo;Bo.InvalidTokenError=Fo;var Uo={algorithm:mo("HS256",["string"]),expiresIn:mo(!1,["boolean","number","string"],(To={},To[a]="exp",To[n]=!0,To)),notBefore:mo(!1,["boolean","number","string"],(xo={},xo[a]="nbf",xo[n]=!0,xo)),audience:mo(!1,["boolean","string"],(zo={},zo[a]="iss",zo[n]=!0,zo)),subject:mo(!1,["boolean","string"],(Co={},Co[a]="sub",Co[n]=!0,Co)),issuer:mo(!1,["boolean","string"],(Io={},Io[a]="iss",Io[n]=!0,Io)),noTimestamp:mo(!1,["boolean"],(Mo={},Mo[n]=!0,Mo)),header:mo(!1,["boolean","string"],(No={},No[n]=!0,No)),keyid:mo(!1,["boolean","string"],(Ro={},Ro[n]=!0,Ro)),mutatePayload:mo(!1,["boolean"],(Do={},Do[n]=!0,Do))};var Wo=function(){switch(!0){case"undefined"!=typeof WebSocket:return WebSocket;case"undefined"!=typeof MozWebSocket:return MozWebSocket;case"undefined"!=typeof window:return window.WebSocket||window.MozWebSocket;default:throw new b("WebSocket is NOT SUPPORTED!")}}();function $o(t){return new Wo(t)}t.chainPromises=function(t){return t.reduce(function(t,r){return t.then(function(t){return r.then(function(r){return t.concat([r])})})},Promise.resolve([]))},t.decodeToken=function(t){if(jo(t))return function(t){var r=t.iat||Math.floor(Date.now()/1e3);if(t.exp&&r>=t.exp){var e=new Date(t.exp).toISOString();throw new g("Token has expired on "+e,t)}return t}(Bo(t));throw new g("Token must be a string!")},t.groupByNamespace=function(t){var r,e=function(t){return Oo(t,"socket")?t.socket:t}(t),n={},o=0;for(var u in e){var i=e[u],a=i.namespace;a&&(n[a]||(++o,n[a]={}),n[a][u]=i,r||i.public&&(r=a))}return{size:o,nspSet:n,publicNamespace:r}},t.socketIoChainConnect=function(t,r,e,n,o,u){return void 0===o&&(o=l),new Promise(function(u,i){var a=[r,e[0]].join("");Reflect.apply(function(t){switch(console.info("client type: ",t),t){case s:return j;case l:return v;default:throw new b("socketIoChainConnect",{message:"Unknown "+t+" of client!"})}}(o),null,[t,a,n]).then(function(n){var o=[r,e[1]].join("");Reflect.apply(p,null,[t,o]).then(function(t){u([n,t])}).catch(function(t){i({message:"failed on "+o,error:t})})}).catch(function(t){i({message:"failed on "+a,error:t})})})},t.socketIoClient=r,t.socketIoClientAsync=p,t.socketIoHandshakeLogin=v,t.socketIoRoundtripLogin=j,t.tokenValidator=function(t){if(!_o(t))return{};var r={},e=wo(t,Uo);for(var n in e)e[n]&&(r[n]=e[n]);return r},t.wsAuthClient=function(t,r){return $o(t+"?"+f+"="+r)},t.wsClient=$o,Object.defineProperty(t,"__esModule",{value:!0})}); diff --git a/packages/jwt/package.json b/packages/jwt/package.json index cd9b200f..8b9f7114 100644 --- a/packages/jwt/package.json +++ b/packages/jwt/package.json @@ -1,6 +1,6 @@ { "name": "jsonql-jwt", - "version": "1.2.1", + "version": "1.2.2", "description": "jwt authentication and helpers library for jsonql", "main": "main.js", "module": "index.js", @@ -46,41 +46,41 @@ "license": "ISC", "dependencies": { "colors": "^1.3.3", - "fs-extra": "^8.0.1", - "jsonql-constants": "^1.7.4", + "fs-extra": "^8.1.0", + "jsonql-constants": "^1.7.9", "jsonql-errors": "^1.0.9", - "jsonql-params-validator": "^1.4.2", + "jsonql-params-validator": "^1.4.3", "jsonwebtoken": "^8.5.1", "jwt-decode": "^2.2.0", "socketio-jwt": "^4.5.0", - "yargs": "^13.2.4" + "yargs": "^13.3.0", + "socket.io": "^2.2.0", + "socket.io-client": "^2.2.0", + "ws": "^7.1.2" }, "bin": { "jsonql-jwt": "./cmd.js" }, "devDependencies": { - "ava": "^2.1.0", + "ava": "^2.2.0", "debug": "^4.1.1", "esm": "^3.2.25", "koa": "^2.7.0", - "rollup": "^1.16.2", + "rollup": "^1.19.4", "rollup-plugin-alias": "^1.5.2", "rollup-plugin-async": "^1.2.0", - "rollup-plugin-buble": "^0.19.6", + "rollup-plugin-buble": "^0.19.8", "rollup-plugin-bundle-size": "^1.0.3", - "rollup-plugin-commonjs": "^10.0.0", - "rollup-plugin-copy": "^3.0.0", + "rollup-plugin-commonjs": "^10.0.2", + "rollup-plugin-copy": "^3.1.0", "rollup-plugin-json": "^4.0.0", "rollup-plugin-node-builtins": "^2.1.2", "rollup-plugin-node-globals": "^1.4.0", - "rollup-plugin-node-resolve": "^5.1.0", + "rollup-plugin-node-resolve": "^5.2.0", "rollup-plugin-replace": "^2.2.0", "rollup-plugin-serve": "^1.0.1", - "rollup-plugin-terser": "^5.0.0", - "server-io-core": "^1.0.12", - "socket.io": "^2.2.0", - "socket.io-client": "^2.2.0", - "ws": "^7.0.1" + "rollup-plugin-terser": "^5.1.1", + "server-io-core": "^1.2.0" }, "ava": { "files": [ diff --git a/packages/koa/package.json b/packages/koa/package.json index 47283e27..006ee456 100755 --- a/packages/koa/package.json +++ b/packages/koa/package.json @@ -41,12 +41,12 @@ "esm": "^3.2.25", "fs-extra": "^8.1.0", "jsonql-constants": "^1.7.9", - "jsonql-contract": "^1.7.6", + "jsonql-contract": "^1.7.7", "jsonql-errors": "^1.0.9", "jsonql-jwt": "^1.2.1", "jsonql-node-client": "^1.1.3", "jsonql-params-validator": "^1.4.3", - "jsonql-web-console": "^0.4.2", + "jsonql-web-console": "^0.4.3", "koa": "^2.7.0", "koa-compose": "^4.1.0", "lodash": "^4.17.15", -- Gitee From 3017563b860a48e1b5b5abfe4d2e05f7ee1e1f26 Mon Sep 17 00:00:00 2001 From: Joelchu Date: Tue, 13 Aug 2019 22:58:52 +0800 Subject: [PATCH 2/3] reorganize the deps and pass the test --- packages/jwt/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/jwt/package.json b/packages/jwt/package.json index 8b9f7114..7d976b80 100644 --- a/packages/jwt/package.json +++ b/packages/jwt/package.json @@ -54,7 +54,6 @@ "jwt-decode": "^2.2.0", "socketio-jwt": "^4.5.0", "yargs": "^13.3.0", - "socket.io": "^2.2.0", "socket.io-client": "^2.2.0", "ws": "^7.1.2" }, @@ -80,7 +79,8 @@ "rollup-plugin-replace": "^2.2.0", "rollup-plugin-serve": "^1.0.1", "rollup-plugin-terser": "^5.1.1", - "server-io-core": "^1.2.0" + "server-io-core": "^1.2.0", + "socket.io": "^2.2.0" }, "ava": { "files": [ -- Gitee From 2ef0e83136a995466a68b39eacadd166cd025299 Mon Sep 17 00:00:00 2001 From: Joelchu Date: Tue, 13 Aug 2019 22:59:12 +0800 Subject: [PATCH 3/3] jsonql-jwt to version 1.2.3 --- packages/jwt/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/jwt/package.json b/packages/jwt/package.json index 7d976b80..10874469 100644 --- a/packages/jwt/package.json +++ b/packages/jwt/package.json @@ -1,6 +1,6 @@ { "name": "jsonql-jwt", - "version": "1.2.2", + "version": "1.2.3", "description": "jwt authentication and helpers library for jsonql", "main": "main.js", "module": "index.js", -- Gitee