From 7bfc4e279f312eae3cc45002ea9db77bafc19bba Mon Sep 17 00:00:00 2001 From: PhilKunz Date: Wed, 9 Nov 2016 18:01:31 +0100 Subject: [PATCH] prepare switch to le-acme-core --- dist/smartacme.classes.acmeclient.d.ts | 19 +- dist/smartacme.classes.acmeclient.js | 230 +++++++-------- test/test.ts | 2 +- ts/smartacme.classes.acmeclient.ts | 384 ++++++++++++------------- ts/smartacme.classes.smartacme.ts | 4 +- 5 files changed, 321 insertions(+), 318 deletions(-) diff --git a/dist/smartacme.classes.acmeclient.d.ts b/dist/smartacme.classes.acmeclient.d.ts index 2f8474d..ad862a4 100644 --- a/dist/smartacme.classes.acmeclient.d.ts +++ b/dist/smartacme.classes.acmeclient.d.ts @@ -1,5 +1,6 @@ /// import * as q from 'q'; +import { JWebClient } from './smartacme.classes.jwebclient'; import { IReqResArg } from './smartacme.classes.jwebclient'; /** * @class AcmeClient @@ -15,7 +16,7 @@ export declare class AcmeClient { directoryUrl: string; emailDefaultPrefix: string; emailOverride: string; - jWebClient: any; + jWebClient: JWebClient; regLink: string; tosLink: string; webroot: string; @@ -34,7 +35,7 @@ export declare class AcmeClient { * @param {Object} payload * @param {function} callback - first argument will be the answer object */ - newRegistration(payload: any, callback: any): void; + newRegistration(payload: any): q.Promise<{}>; /** * getRegistration * @description get information about registration @@ -49,14 +50,14 @@ export declare class AcmeClient { * @param {string} domain * @param {function} callback - first argument will be the answer object */ - authorizeDomain(domain: any, callback: any): void; + authorizeDomain(domain: any): q.Promise<{}>; /** * acceptChallenge * @description tell server which challenge will be accepted * @param {Object} challenge * @param {function} callback - first argument will be the answer object */ - acceptChallenge(challenge: any, callback: any): void; + acceptChallenge(challenge?: {}): q.Promise<{}>; /** * pollUntilValid * @description periodically (with exponential back-off) check status of challenge @@ -64,7 +65,7 @@ export declare class AcmeClient { * @param {function} callback - first argument will be the answer object * @param {number} retry - factor of delay */ - pollUntilValid(uri: any, callback: any, retry?: number): void; + pollUntilValid(uri: any, retry?: number): q.Promise<{}>; /** * pollUntilIssued * @description periodically (with exponential back-off) check status of CSR @@ -72,14 +73,14 @@ export declare class AcmeClient { * @param {function} callback - first argument will be the answer object * @param {number} retry - factor of delay */ - pollUntilIssued(uri: any, callback: any, retry?: number): void; + pollUntilIssued(uri: any, retry?: number): q.Promise<{}>; /** * requestSigning * @description send CSR * @param {string} domain - expected to be already sanitized * @param {function} callback - first argument will be the answer object */ - requestSigning(commonName: any, callback: any): q.Promise<{}>; + requestSigning(commonName: any): q.Promise<{}>; /** * retrieves profile of user (will make directory lookup and registration check) * @param {function} callback - first argument will be the answer object @@ -91,14 +92,14 @@ export declare class AcmeClient { * @param {string} email * @param {function} callback - first argument will be the registration URI */ - createAccount(email: any, callback: any): void; + createAccount(email: string): q.Promise<{}>; /** * agreeTos * @description agree with terms of service (update agreement status in profile) * @param {string} tosLink * @param {function} callback - first argument will be the answer object */ - agreeTos(tosLink: any, callback: any): void; + agreeTos(tosLink: any): q.Promise<{}>; /** * Entry-Point: Request certificate */ diff --git a/dist/smartacme.classes.acmeclient.js b/dist/smartacme.classes.acmeclient.js index c7eca4c..4113b4a 100644 --- a/dist/smartacme.classes.acmeclient.js +++ b/dist/smartacme.classes.acmeclient.js @@ -25,6 +25,7 @@ let json_to_utf8buffer = (obj) => { */ class AcmeClient { constructor(directoryUrlArg) { + this.jWebClient = new smartacme_classes_jwebclient_1.JWebClient(); /** * @member {Object} module:AcmeClient~AcmeClient#clientProfilePubKey * @desc Cached public key obtained from profile @@ -57,11 +58,6 @@ class AcmeClient { * @desc Email address to use */ this.emailOverride = null; // {string} - /** - * @member {module:JWebClient~JWebClient} module:AcmeClient~AcmeClient#jWebClient - * @desc Reference to JSON-Web-Client - */ - this.jWebClient = new smartacme_classes_jwebclient_1.JWebClient(); // {JWebClient} /** * @member {string} module:AcmeClient~AcmeClient#regLink * @desc Cached registration URI @@ -113,15 +109,14 @@ class AcmeClient { * @param {Object} payload * @param {function} callback - first argument will be the answer object */ - newRegistration(payload, callback) { + newRegistration(payload) { + let done = q.defer(); if (!(payload instanceof Object)) { payload = {}; // ensure payload is object } payload.resource = 'new-reg'; - this.jWebClient.post(this.directory['new-reg'], payload, callback, callback); - // dereference - callback = null; - payload = null; + this.jWebClient.post(this.directory['new-reg'], payload); + return done.promise; } /** * getRegistration @@ -133,11 +128,12 @@ class AcmeClient { getRegistration(uri, payload) { let done = q.defer(); payload['resource'] = 'reg'; - this.jWebClient.post(uri, payload, (ans, res) => { - if (ans instanceof Object) { - this.clientProfilePubKey = ans.key; // cache or reset returned public key - if ((res instanceof Object) && (res['headers'] instanceof Object)) { - let linkStr = res.headers['link']; + this.jWebClient.post(uri, payload) + .then((reqResArg) => { + if (reqResArg.ans instanceof Object) { + this.clientProfilePubKey = reqResArg.ans.key; // cache or reset returned public key + if ((reqResArg.res instanceof Object) && (reqResArg.res['headers'] instanceof Object)) { + let linkStr = reqResArg.res.headers['link']; if (typeof linkStr === 'string') { let tosLink = this.getTosLink(linkStr); if (typeof tosLink === 'string') { @@ -154,7 +150,7 @@ class AcmeClient { else { this.tosLink = null; // reset TOS link } - done.resolve({ ans: ans, res: res }); + done.resolve({ ans: reqResArg.ans, res: reqResArg.res }); } else { done.reject(new Error('some error')); @@ -168,66 +164,72 @@ class AcmeClient { * @param {string} domain * @param {function} callback - first argument will be the answer object */ - authorizeDomain(domain, callback) { - /*jshint -W069 */ - if (typeof callback !== 'function') { - callback = this.emptyCallback; // ensure callback is function - } + authorizeDomain(domain) { + let done = q.defer(); this.getProfile() .then(profile => { if (!(profile instanceof Object)) { - callback(false); // no profile returned + done.reject(new Error('no profile returned')); } else { - this.jWebClient.post(this.directory['new-authz'], this.makeDomainAuthorizationRequest(domain), (ans, res) => { - if ((res instanceof Object) && (res['statusCode'] === 403)) { - this.agreeTos(this.tosLink, (ans_, res_) => { - if ((res_ instanceof Object) - && (res_['statusCode'] >= 200) - && (res_['statusCode'] <= 400)) { - this.authorizeDomain(domain, callback); // try authorization again + this.jWebClient.post(this.directory['new-authz'], this.makeDomainAuthorizationRequest(domain)) + .then((reqResArg) => { + if ((reqResArg.res instanceof Object) && (reqResArg.res['statusCode'] === 403)) { + this.agreeTos(this.tosLink) + .then((reqResArg2) => { + if ((reqResArg.res instanceof Object) + && (reqResArg2.res['statusCode'] >= 200) + && (reqResArg2.res['statusCode'] <= 400)) { + this.authorizeDomain(domain).then(() => { + done.resolve(); + }); // try authorization again } else { - callback(false); // agreement failed + done.reject(false); // agreement failed } }); } else { - if ((res instanceof Object) - && (res['headers'] instanceof Object) - && (typeof res.headers['location'] === 'string') - && (ans instanceof Object)) { - let poll_uri = res.headers['location']; // status URI for polling - let challenge = this.selectChallenge(ans, 'http-01'); // select simple http challenge + if ((reqResArg.res instanceof Object) + && (reqResArg.res['headers'] instanceof Object) + && (typeof reqResArg.res.headers['location'] === 'string') + && (reqResArg.ans instanceof Object)) { + let poll_uri = reqResArg.res.headers['location']; // status URI for polling + let challenge = this.selectChallenge(reqResArg.ans, 'http-01'); // select simple http challenge if (challenge instanceof Object) { this.prepareChallenge(domain, challenge, () => { // reset - ans = null; - res = null; + reqResArg.ans = null; + reqResArg.res = null; // accept challenge - this.acceptChallenge(challenge, (ans, res) => { - if ((res instanceof Object) - && (res['statusCode'] < 400) // server confirms challenge acceptance + this.acceptChallenge(challenge) + .then((reqResArg2) => { + if ((reqResArg2.res instanceof Object) + && (reqResArg2.res['statusCode'] < 400) // server confirms challenge acceptance ) { - this.pollUntilValid(poll_uri, callback); // poll status until server states success + this.pollUntilValid(poll_uri) + .then(() => { + done.resolve(); + }); // poll status until server states success } else { - callback(false); // server did not confirm challenge acceptance + done.reject(false); // server did not confirm challenge acceptance } }); }); } else { - callback(false); // desired challenge is not in list + done.reject(false); // desired challenge is not in list } } else { - callback(false); // server did not respond with status URI + done.reject(false); // server did not respond with status URI } } }); } }); + return done.promise; } /** * acceptChallenge @@ -235,15 +237,13 @@ class AcmeClient { * @param {Object} challenge * @param {function} callback - first argument will be the answer object */ - acceptChallenge(challenge, callback) { - /*jshint -W069 */ - if (!(challenge instanceof Object)) { - challenge = {}; // ensure challenge is object - } - this.jWebClient.post(challenge['uri'], this.makeChallengeResponse(challenge), callback); - // dereference - callback = null; - challenge = null; + acceptChallenge(challenge = {}) { + let done = q.defer(); + this.jWebClient.post(challenge['uri'], this.makeChallengeResponse(challenge)) + .then(() => { + done.resolve(); + }); + return done.promise; } /** * pollUntilValid @@ -252,31 +252,30 @@ class AcmeClient { * @param {function} callback - first argument will be the answer object * @param {number} retry - factor of delay */ - pollUntilValid(uri, callback, retry = 1) { - /*jshint -W069 */ - if (typeof callback !== 'function') { - callback = this.emptyCallback; // ensure callback is function - } + pollUntilValid(uri, retry = 1) { + let done = q.defer(); if (retry > 128) { - callback(false); // stop if retry value exceeds maximum + done.reject(false); // stop if retry value exceeds maximum } else { - this.jWebClient.get(uri, (ans, res) => { - if (!(ans instanceof Object)) { - callback(false); // invalid answer + this.jWebClient.get(uri) + .then((reqResArg) => { + if (!(reqResArg.ans instanceof Object)) { + done.reject(false); // invalid answer } else { - if (ans['status'] === 'pending') { + if (reqResArg.ans['status'] === 'pending') { setTimeout(() => { - this.pollUntilValid(uri, callback, retry * 2); // retry + this.pollUntilValid(uri, retry * 2); // retry }, retry * 500); } else { - callback(ans, res); // challenge complete + done.resolve(); // challenge complete } } }); } + return done.promise; } /** * pollUntilIssued @@ -285,31 +284,30 @@ class AcmeClient { * @param {function} callback - first argument will be the answer object * @param {number} retry - factor of delay */ - pollUntilIssued(uri, callback, retry = 1) { - /*jshint -W069 */ - if (typeof callback !== 'function') { - callback = this.emptyCallback; // ensure callback is function - } + pollUntilIssued(uri, retry = 1) { + let done = q.defer(); if (retry > 128) { - callback(false); // stop if retry value exceeds maximum + done.reject(false); // stop if retry value exceeds maximum } else { - this.jWebClient.get(uri, (ans, res) => { - if ((ans instanceof Buffer) && (ans.length > 0)) { - callback(ans); // certificate was returned with answer + this.jWebClient.get(uri) + .then((reqResArg) => { + if ((reqResArg.ans instanceof Buffer) && (reqResArg.ans.length > 0)) { + done.resolve(reqResArg.ans); // certificate was returned with answer } else { - if ((res instanceof Object) && (res['statusCode'] < 400)) { + if ((reqResArg.res instanceof Object) && (reqResArg.res['statusCode'] < 400)) { setTimeout(() => { - this.pollUntilIssued(uri, callback, retry * 2); // retry + this.pollUntilIssued(uri, retry * 2); // retry }, retry * 500); } else { - callback(false); // CSR complete + done.reject(false); // CSR complete } } }); } + return done.promise; } /** * requestSigning @@ -317,38 +315,38 @@ class AcmeClient { * @param {string} domain - expected to be already sanitized * @param {function} callback - first argument will be the answer object */ - requestSigning(commonName, callback) { + requestSigning(commonName) { let done = q.defer(); fs.readFile(commonName + '.csr', (err, csrBuffer) => { if (err instanceof Object) { if (this.jWebClient.verbose) { console.error('Error : File system error', err['code'], 'while reading key from file'); } - callback(false); + done.reject(false); } else { let csr = csrBuffer.toString(); - this.jWebClient.post(this.directory['new-cert'], this.makeCertRequest(csr, this.daysValid), (ans, res) => { - if ((ans instanceof Buffer) && (ans.length > 0)) { - callback(ans); // certificate was returned with answer + this.jWebClient.post(this.directory['new-cert'], this.makeCertRequest(csr, this.daysValid)) + .then((reqResArg) => { + if ((reqResArg.ans instanceof Buffer) && (reqResArg.ans.length > 0)) { + done.resolve(reqResArg.ans); // certificate was returned with answer } else { - if (res instanceof Object) { - if ((res['statusCode'] < 400) && !ans) { - let headers = res['headers']; + if (reqResArg.res instanceof Object) { + if ((reqResArg.res['statusCode'] < 400) && !reqResArg.ans) { + let headers = reqResArg['headers']; if (!(headers instanceof Object)) { headers = {}; // ensure headers is object } - this.pollUntilIssued(headers['location'], callback); // poll provided status URI - // dereference - headers = null; + this.pollUntilIssued(headers['location']) + .then(x => { done.resolve(x); }); } else { - callback((res['statusCode'] < 400) ? ans : false); // answer may be provided as string or object + done.resolve((reqResArg.res['statusCode'] < 400) ? reqResArg.ans : false); // answer may be provided as string or object } } else { - callback(false); // invalid response + done.reject(false); // invalid response } } }); @@ -369,11 +367,12 @@ class AcmeClient { } else { this.directory = dir; // cache directory - this.newRegistration(null, (ans, res) => { - if ((res instanceof Object) - && (res['headers'] instanceof Object) - && (typeof res.headers['location'] === 'string')) { - this.regLink = res.headers['location']; + this.newRegistration(null) + .then((reqResArg) => { + if ((reqResArg.res instanceof Object) + && (reqResArg.res['headers'] instanceof Object) + && (typeof reqResArg.res.headers['location'] === 'string')) { + this.regLink = reqResArg.res.headers['location']; this.getRegistration(this.regLink, null) .then((reqResArg) => { done.resolve(); @@ -393,32 +392,31 @@ class AcmeClient { * @param {string} email * @param {function} callback - first argument will be the registration URI */ - createAccount(email, callback) { - /*jshint -W069 */ + createAccount(email) { + let done = q.defer(); if (typeof email === 'string') { - if (typeof callback !== 'function') { - callback = this.emptyCallback; // ensure callback is function - } this.newRegistration({ contact: [ 'mailto:' + email ] - }, (ans, res) => { - if ((res instanceof Object) - && (res['statusCode'] === 201) - && (res['headers'] instanceof Object) - && (typeof res.headers['location'] === 'string')) { - this.regLink = res.headers['location']; - callback(this.regLink); // registration URI + }) + .then((reqResArg) => { + if ((reqResArg.res instanceof Object) + && (reqResArg.res['statusCode'] === 201) + && (reqResArg.res['headers'] instanceof Object) + && (typeof reqResArg.res.headers['location'] === 'string')) { + this.regLink = reqResArg.res.headers['location']; + done.resolve(this.regLink); // registration URI } else { - callback(false); // registration failed + done.reject(new Error('could not register new account')); // registration failed } }); } else { - callback(false); // no email address provided + done.reject(new Error('no email address provided')); } + return done.promise; } /** * agreeTos @@ -426,11 +424,14 @@ class AcmeClient { * @param {string} tosLink * @param {function} callback - first argument will be the answer object */ - agreeTos(tosLink, callback) { + agreeTos(tosLink) { let done = q.defer(); this.getRegistration(this.regLink, { 'Agreement': tosLink // terms of service URI - }).then(() => { done.resolve(); }); + }).then(() => { + done.resolve(); + }); + return done.promise; } /** * Entry-Point: Request certificate @@ -453,7 +454,8 @@ class AcmeClient { emailAddress: email }) .then(() => { - this.requestSigning(domainArg, (cert) => { + this.requestSigning(domainArg) + .then((cert) => { if ((cert instanceof Buffer) || (typeof cert === 'string')) { fs.writeFile(domainArg + '.der', cert, (err) => { if (err instanceof Object) { @@ -712,4 +714,4 @@ class AcmeClient { } } exports.AcmeClient = AcmeClient; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartacme.classes.acmeclient.js","sourceRoot":"","sources":["../ts/smartacme.classes.acmeclient.ts"],"names":[],"mappings":";AAAA,+CAA8C;AAC9C,uBAAsB;AACtB,iCAAgC;AAChC,yBAAwB;AACxB,qCAAoC;AACpC,iFAA2D;AAG3D;;;;;;;GAOG;AACH,IAAI,kBAAkB,GAAG,CAAC,GAAG;IACzB,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAAA;AAClD,CAAC,CAAA;AAED;;;;;;GAMG;AACH;IAaI,YAAY,eAAe;QACvB;;;WAGG;QACH,IAAI,CAAC,mBAAmB,GAAG,EAAE,CAAA;QAC7B;;;;WAIG;QACH,IAAI,CAAC,SAAS,GAAG,CAAC,CAAA;QAElB;;;WAGG;QACH,IAAI,CAAC,SAAS,GAAG,EAAE,CAAA;QACnB;;;WAGG;QACH,IAAI,CAAC,YAAY,GAAG,eAAe,CAAA;QACnC;;;;WAIG;QACH,IAAI,CAAC,kBAAkB,GAAG,YAAY,CAAA,CAAC,WAAW;QAClD;;;WAGG;QACH,IAAI,CAAC,aAAa,GAAG,IAAI,CAAA,CAAC,WAAW;QACrC;;;WAGG;QACH,IAAI,CAAC,UAAU,GAAG,IAAI,yCAAU,EAAE,CAAA,CAAC,eAAe;QAClD;;;WAGG;QACH,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA,CAAC,WAAW;QAC/B;;;WAGG;QACH,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA,CAAC,WAAW;QAC/B;;;;WAIG;QACH,IAAI,CAAC,OAAO,GAAG,GAAG,CAAA,CAAC,WAAW;QAC9B;;;;WAIG;QACH,IAAI,CAAC,aAAa,GAAG,8BAA8B,CAAA,CAAC,WAAW;QAC/D;;;;WAIG;QACH,IAAI,CAAC,eAAe,GAAG,IAAI,CAAA,CAAC,YAAY;IAC5C,CAAC;IAED,gFAAgF;IAChF,kBAAkB;IAClB,gFAAgF;IAEhF;;;;OAIG;IACH,YAAY;QACR,IAAI,IAAI,GAAG,CAAC,CAAC,KAAK,EAAc,CAAA;QAChC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC;aACjC,IAAI,CAAC,CAAC,SAAqB;YACxB,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;QAC3B,CAAC,CAAC,CAAA;QACN,MAAM,CAAC,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAED;;;;;OAKG;IACH,eAAe,CAAC,OAAO,EAAE,QAAQ;QAC7B,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,YAAY,MAAM,CAAC,CAAC,CAAC,CAAC;YAC/B,OAAO,GAAG,EAAE,CAAA,CAAC,2BAA2B;QAC5C,CAAC;QACD,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAA;QAC5B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;QAC5E,cAAc;QACd,QAAQ,GAAG,IAAI,CAAA;QACf,OAAO,GAAG,IAAI,CAAA;IAClB,CAAC;IAED;;;;;;OAMG;IACH,eAAe,CAAC,GAAG,EAAE,OAAO;QACxB,IAAI,IAAI,GAAG,CAAC,CAAC,KAAK,EAAc,CAAA;QAChC,OAAO,CAAC,UAAU,CAAC,GAAG,KAAK,CAAA;QAC3B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,EAAE,CAAC,GAAG,EAAE,GAAG;YACxC,EAAE,CAAC,CAAC,GAAG,YAAY,MAAM,CAAC,CAAC,CAAC;gBACxB,IAAI,CAAC,mBAAmB,GAAG,GAAG,CAAC,GAAG,CAAA,CAAC,qCAAqC;gBACxE,EAAE,CAAC,CAAC,CAAC,GAAG,YAAY,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,MAAM,CAAC,CAAC,CAAC,CAAC;oBAChE,IAAI,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;oBACjC,EAAE,CAAC,CAAC,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC;wBAC9B,IAAI,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;wBACtC,EAAE,CAAC,CAAC,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC;4BAC9B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA,CAAC,iBAAiB;wBAC5C,CAAC;wBAAC,IAAI,CAAC,CAAC;4BACJ,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA,CAAC,iBAAiB;wBACzC,CAAC;oBACL,CAAC;oBAAC,IAAI,CAAC,CAAC;wBACJ,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA,CAAC,iBAAiB;oBACzC,CAAC;gBACL,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA,CAAC,iBAAiB;gBACzC,CAAC;gBACD,IAAI,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAA;YACxC,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC,CAAA;YACxC,CAAC;QACL,CAAC,CAAC,CAAA;QACF,MAAM,CAAC,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAED;;;;;OAKG;IACH,eAAe,CAAC,MAAM,EAAE,QAAQ;QAC5B,iBAAiB;QACjB,EAAE,CAAC,CAAC,OAAO,QAAQ,KAAK,UAAU,CAAC,CAAC,CAAC;YACjC,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAA,CAAC,8BAA8B;QAChE,CAAC;QACD,IAAI,CAAC,UAAU,EAAE;aACZ,IAAI,CAAC,OAAO;YACT,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,YAAY,MAAM,CAAC,CAAC,CAAC,CAAC;gBAC/B,QAAQ,CAAC,KAAK,CAAC,CAAA,CAAC,sBAAsB;YAC1C,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,IAAI,CAAC,8BAA8B,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG;oBACpG,EAAE,CAAC,CAAC,CAAC,GAAG,YAAY,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;wBACzD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,IAAI;4BACnC,EAAE,CAAC,CACC,CAAC,IAAI,YAAY,MAAM,CAAC;mCACrB,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,GAAG,CAAC;mCAC3B,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,GAAG,CACjC,CAAC,CAAC,CAAC;gCACC,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA,CAAE,0BAA0B;4BACtE,CAAC;4BAAC,IAAI,CAAC,CAAC;gCACJ,QAAQ,CAAC,KAAK,CAAC,CAAA,CAAC,mBAAmB;4BACvC,CAAC;wBACL,CAAC,CAAC,CAAA;oBACN,CAAC;oBAAC,IAAI,CAAC,CAAC;wBACJ,EAAE,CAAC,CACC,CAAC,GAAG,YAAY,MAAM,CAAC;+BACpB,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,MAAM,CAAC;+BAClC,CAAC,OAAO,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,QAAQ,CAAC;+BAC7C,CAAC,GAAG,YAAY,MAAM,CAC7B,CAAC,CAAC,CAAC;4BACC,IAAI,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA,CAAC,yBAAyB;4BAChE,IAAI,SAAS,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA,CAAC,+BAA+B;4BACpF,EAAE,CAAC,CAAC,SAAS,YAAY,MAAM,CAAC,CAAC,CAAC;gCAC9B,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,SAAS,EAAE;oCACrC,QAAQ;oCACR,GAAG,GAAG,IAAI,CAAA;oCACV,GAAG,GAAG,IAAI,CAAA;oCACV,mBAAmB;oCACnB,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG;wCACrC,EAAE,CAAC,CACC,CAAC,GAAG,YAAY,MAAM,CAAC;+CACpB,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,GAAG,CAAC,CAAC,uCAAuC;wCACxE,CAAC,CAAC,CAAC;4CACC,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA,CAAC,0CAA0C;wCACtF,CAAC;wCAAC,IAAI,CAAC,CAAC;4CACJ,QAAQ,CAAC,KAAK,CAAC,CAAA,CAAC,8CAA8C;wCAClE,CAAC;oCACL,CAAC,CAAC,CAAA;gCACN,CAAC,CAAC,CAAA;4BACN,CAAC;4BAAC,IAAI,CAAC,CAAC;gCACJ,QAAQ,CAAC,KAAK,CAAC,CAAA,CAAC,mCAAmC;4BACvD,CAAC;wBACL,CAAC;wBAAC,IAAI,CAAC,CAAC;4BACJ,QAAQ,CAAC,KAAK,CAAC,CAAA,CAAC,yCAAyC;wBAC7D,CAAC;oBACL,CAAC;gBACL,CAAC,CAAC,CAAA;YACN,CAAC;QACL,CAAC,CAAC,CAAA;IACV,CAAC;IAED;;;;;OAKG;IACH,eAAe,CAAC,SAAS,EAAE,QAAQ;QAC/B,iBAAiB;QACjB,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,YAAY,MAAM,CAAC,CAAC,CAAC,CAAC;YACjC,SAAS,GAAG,EAAE,CAAA,CAAC,6BAA6B;QAChD,CAAC;QACD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAC,CAAA;QACvF,cAAc;QACd,QAAQ,GAAG,IAAI,CAAA;QACf,SAAS,GAAG,IAAI,CAAA;IACpB,CAAC;IAED;;;;;;OAMG;IACH,cAAc,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,GAAG,CAAC;QACnC,iBAAiB;QACjB,EAAE,CAAC,CAAC,OAAO,QAAQ,KAAK,UAAU,CAAC,CAAC,CAAC;YACjC,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAA,CAAC,8BAA8B;QAChE,CAAC;QACD,EAAE,CAAC,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC;YACd,QAAQ,CAAC,KAAK,CAAC,CAAA,CAAC,sCAAsC;QAC1D,CAAC;QAAC,IAAI,CAAC,CAAC;YACJ,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG;gBAC9B,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,YAAY,MAAM,CAAC,CAAC,CAAC,CAAC;oBAC3B,QAAQ,CAAC,KAAK,CAAC,CAAA,CAAC,iBAAiB;gBACrC,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,EAAE,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC;wBAC9B,UAAU,CAAC;4BACP,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,GAAG,CAAC,CAAC,CAAA,CAAC,QAAQ;wBAC1D,CAAC,EAAE,KAAK,GAAG,GAAG,CAAC,CAAA;oBACnB,CAAC;oBAAC,IAAI,CAAC,CAAC;wBACJ,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA,CAAC,qBAAqB;oBAC5C,CAAC;gBACL,CAAC;YACL,CAAC,CAAC,CAAA;QACN,CAAC;IACL,CAAC;IAED;;;;;;OAMG;IACH,eAAe,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,GAAG,CAAC;QACpC,iBAAiB;QACjB,EAAE,CAAC,CAAC,OAAO,QAAQ,KAAK,UAAU,CAAC,CAAC,CAAC;YACjC,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAA,CAAC,8BAA8B;QAChE,CAAC;QACD,EAAE,CAAC,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC;YACd,QAAQ,CAAC,KAAK,CAAC,CAAA,CAAC,sCAAsC;QAC1D,CAAC;QAAC,IAAI,CAAC,CAAC;YACJ,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG;gBAC9B,EAAE,CAAC,CAAC,CAAC,GAAG,YAAY,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;oBAC9C,QAAQ,CAAC,GAAG,CAAC,CAAA,CAAC,uCAAuC;gBACzD,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,EAAE,CAAC,CAAC,CAAC,GAAG,YAAY,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;wBACvD,UAAU,CAAC;4BACP,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,GAAG,CAAC,CAAC,CAAA,CAAC,QAAQ;wBAC3D,CAAC,EAAE,KAAK,GAAG,GAAG,CAAC,CAAA;oBACnB,CAAC;oBAAC,IAAI,CAAC,CAAC;wBACJ,QAAQ,CAAC,KAAK,CAAC,CAAA,CAAC,eAAe;oBACnC,CAAC;gBACL,CAAC;YACL,CAAC,CAAC,CAAA;QACN,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACH,cAAc,CAAC,UAAU,EAAE,QAAQ;QAC/B,IAAI,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,CAAA;QACpB,EAAE,CAAC,QAAQ,CAAC,UAAU,GAAG,MAAM,EAAE,CAAC,GAAG,EAAE,SAAiB;YACpD,EAAE,CAAC,CAAC,GAAG,YAAY,MAAM,CAAC,CAAC,CAAC;gBACxB,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;oBAC1B,OAAO,CAAC,KAAK,CAAC,4BAA4B,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,6BAA6B,CAAC,CAAA;gBAC3F,CAAC;gBACD,QAAQ,CAAC,KAAK,CAAC,CAAA;YACnB,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,IAAI,GAAG,GAAG,SAAS,CAAC,QAAQ,EAAE,CAAA;gBAC9B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG;oBACjG,EAAE,CAAC,CAAC,CAAC,GAAG,YAAY,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;wBAC9C,QAAQ,CAAC,GAAG,CAAC,CAAA,CAAC,uCAAuC;oBACzD,CAAC;oBAAC,IAAI,CAAC,CAAC;wBACJ,EAAE,CAAC,CAAC,GAAG,YAAY,MAAM,CAAC,CAAC,CAAC;4BACxB,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;gCACpC,IAAI,OAAO,GAAG,GAAG,CAAC,SAAS,CAAC,CAAA;gCAC5B,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,YAAY,MAAM,CAAC,CAAC,CAAC,CAAC;oCAC/B,OAAO,GAAG,EAAE,CAAA,CAAE,2BAA2B;gCAC7C,CAAC;gCACD,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,QAAQ,CAAC,CAAA,CAAC,2BAA2B;gCAC/E,cAAc;gCACd,OAAO,GAAG,IAAI,CAAA;4BAClB,CAAC;4BAAC,IAAI,CAAC,CAAC;gCACJ,QAAQ,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,GAAG,KAAK,CAAC,CAAA,CAAC,6CAA6C;4BACnG,CAAC;wBACL,CAAC;wBAAC,IAAI,CAAC,CAAC;4BACJ,QAAQ,CAAC,KAAK,CAAC,CAAA,CAAC,mBAAmB;wBACvC,CAAC;oBACL,CAAC;gBACL,CAAC,CAAC,CAAA;YACN,CAAC;QACL,CAAC,CAAC,CAAA;QACF,MAAM,CAAC,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAED;;;OAGG;IACH,UAAU;QACN,IAAI,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,CAAA;QACpB,IAAI,CAAC,YAAY,EAAE;aACd,IAAI,CAAC,CAAC,GAAG;YACN,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,YAAY,MAAM,CAAC,CAAC,CAAC,CAAC;gBAC3B,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC,CAAA;YACnE,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,IAAI,CAAC,SAAS,GAAG,GAAG,CAAA,CAAC,kBAAkB;gBACvC,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG;oBAChC,EAAE,CAAC,CACC,CAAC,GAAG,YAAY,MAAM,CAAC;2BACpB,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,MAAM,CAAC;2BAClC,CAAC,OAAO,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,QAAQ,CACnD,CAAC,CAAC,CAAC;wBACC,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;wBACtC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC;6BACnC,IAAI,CAAC,CAAC,SAAqB;4BACxB,IAAI,CAAC,OAAO,EAAE,CAAA;wBAClB,CAAC,CAAC,CAAA,CAAC,kCAAkC;oBAC7C,CAAC;oBAAC,IAAI,CAAC,CAAC;wBACJ,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAA;oBACjD,CAAC;gBACL,CAAC,CAAC,CAAA;YACN,CAAC;QACL,CAAC,CAAC,CAAA;QACN,MAAM,CAAC,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAED;;;;;OAKG;IACH,aAAa,CAAC,KAAK,EAAE,QAAQ;QACzB,iBAAiB;QACjB,EAAE,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC;YAC5B,EAAE,CAAC,CAAC,OAAO,QAAQ,KAAK,UAAU,CAAC,CAAC,CAAC;gBACjC,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAA,CAAC,8BAA8B;YAChE,CAAC;YACD,IAAI,CAAC,eAAe,CAChB;gBACI,OAAO,EAAE;oBACL,SAAS,GAAG,KAAK;iBACpB;aACJ,EACD,CAAC,GAAG,EAAE,GAAG;gBACL,EAAE,CAAC,CACC,CAAC,GAAG,YAAY,MAAM,CAAC;uBACpB,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,GAAG,CAAC;uBAC3B,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,MAAM,CAAC;uBAClC,CAAC,OAAO,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,QAAQ,CACnD,CAAC,CAAC,CAAC;oBACC,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;oBACtC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA,CAAC,mBAAmB;gBAC9C,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,QAAQ,CAAC,KAAK,CAAC,CAAA,CAAC,sBAAsB;gBAC1C,CAAC;YACL,CAAC,CAAC,CAAA;QACV,CAAC;QAAC,IAAI,CAAC,CAAC;YACJ,QAAQ,CAAC,KAAK,CAAC,CAAA,CAAC,4BAA4B;QAChD,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACH,QAAQ,CAAC,OAAO,EAAE,QAAQ;QACtB,IAAI,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,CAAA;QACpB,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,EAAE;YAC/B,WAAW,EAAE,OAAO,CAAC,uBAAuB;SAC/C,CAAC,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,OAAO,EAAE,CAAA,CAAC,CAAC,CAAC,CAAA;IACrC,CAAC;IAED;;OAEG;IACH,kBAAkB,CAAC,SAAiB,EAAE,eAAuB,EAAE,cAAsB;QACjF,IAAI,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,CAAA;QACpB,IAAI,CAAC,UAAU,EAAE;aACZ,IAAI,CAAC,CAAC,OAAO;YACV,IAAI,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA,CAAC,8CAA8C;YACrF,cAAc,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAA;YACtD,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAA;YAC5C,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAA;YACpC,eAAe,GAAG,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAA;YACxD,kBAAkB;YAClB,IAAI,CAAC,aAAa,CAAC;gBACf,UAAU,EAAE,IAAI;gBAChB,WAAW,EAAE,cAAc;gBAC3B,YAAY,EAAE,eAAe;gBAC7B,UAAU,EAAE,SAAS;gBACrB,YAAY,EAAE,KAAK;aACtB,CAAC;iBACG,IAAI,CAAC;gBACF,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,CAAC,IAAI;oBAChC,EAAE,CAAC,CAAC,CAAC,IAAI,YAAY,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC;wBACzD,EAAE,CAAC,SAAS,CAAC,SAAS,GAAG,MAAM,EAAE,IAAI,EAAE,CAAC,GAAG;4BACvC,EAAE,CAAC,CAAC,GAAG,YAAY,MAAM,CAAC,CAAC,CAAC;gCACxB,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;oCAC1B,OAAO,CAAC,KAAK,CAAC,4BAA4B,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,mCAAmC,CAAC,CAAA;gCACjG,CAAC;gCACD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;4BACpB,CAAC;4BAAC,IAAI,CAAC,CAAC;gCACJ,IAAI,CAAC,OAAO,EAAE,CAAA,CAAE,sDAAsD;4BAC1E,CAAC;wBACL,CAAC,CAAC,CAAA;oBACN,CAAC;oBAAC,IAAI,CAAC,CAAC;wBACJ,IAAI,CAAC,MAAM,CAAC,0BAA0B,CAAC,CAAA;oBAC3C,CAAC;gBACL,CAAC,CAAC,CAAA;YAEN,CAAC,CAAC,CAAA;QACV,CAAC,CAAC,CAAA;QACN,MAAM,CAAC,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAED;;;;;;;;OAQG;IACH,aAAa,CAAC,UAMb;QACG,IAAI,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,CAAA;QACpB,IAAI,OAAO,GAAG,uCAAuC,UAAU,CAAC,UAAU,GAAG;cACvE,UAAU;cACV,aAAa,UAAU,CAAC,WAAW,MAAM,UAAU,CAAC,YAAY,OAAO,UAAU,CAAC,UAAU,iBAAiB,UAAU,CAAC,YAAY,IAAI;cACxI,aAAa,UAAU,CAAC,UAAU,8BAA8B,UAAU,CAAC,UAAU,QAAQ,CAAA;QACnG,OAAO,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAA;QAC3C,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;YAC1B,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;QACtC,CAAC;QACD,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,SAAS,EAAE,WAAW;YAC1D,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;gBACf,IAAI,CAAC,OAAO,EAAE,CAAA;YAClB,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;YAC5B,CAAC;QACL,CAAC,CAAC,CAAA;QACF,MAAM,CAAC,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAED;;OAEG;IACH,aAAa;QACT,MAAM;IACV,CAAC;IAED;;;;;OAKG;IACH,gBAAgB,CAAC,IAAI,EAAE,QAAQ,GAAG,KAAK;QACnC,EAAE,CAAC,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC;YAC3B,IAAI,GAAG,EAAE,CAAA;QACb,CAAC;QACD,oDAAoD;QACpD,IAAI,SAAS,GAAG,4DAA4D,CAAA;QAC5E,IAAI,SAAS,GAAG,2DAA2D,CAAA;QAC3E,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,QAAQ,GAAG,SAAS,GAAG,SAAS,EAAE,GAAG,CAAC,EAAE,CAAC,aAAa;YACjF,EAAE,CAAC,CAAC,OAAO,aAAa,KAAK,QAAQ,CAAC,CAAC,CAAC;gBACpC,MAAM,CAAC,GAAG,GAAG,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,iBAAiB,EAAE,CAAA;YAC7E,CAAC;YACD,MAAM,CAAC,KAAK,CAAA;QAChB,CAAC,CAAC,CAAA;IACN,CAAC;IAED;;;;;OAKG;IACH,gBAAgB,CAAC,MAAM,EAAE,SAAS,EAAE,QAAQ;QACxC,8BAA8B;QAC9B,EAAE,CAAC,CAAC,OAAO,QAAQ,KAAK,UAAU,CAAC,CAAC,CAAC;YACjC,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAA,CAAC,8BAA8B;QAChE,CAAC;QACD,EAAE,CAAC,CAAC,SAAS,YAAY,MAAM,CAAC,CAAC,CAAC;YAC9B,EAAE,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC;gBAClC,IAAI,IAAI,GAAG,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC,OAAO,CAAC,CAAA,CAAC,mEAAmE;gBACrI,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,EAAE,CAAC,GAAG;oBACzD,EAAE,CAAC,CAAC,GAAG,YAAY,MAAM,CAAC,CAAC,CAAC;wBACxB,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;4BAC1B,OAAO,CAAC,KAAK,CACT,4BAA4B,EAC5B,GAAG,CAAC,MAAM,CAAC,EAAE,sCAAsC,CACtD,CAAA;wBACL,CAAC;wBACD,QAAQ,EAAE,CAAA;oBACd,CAAC;oBAAC,IAAI,CAAC,CAAC;wBACJ,2EAA2E;wBAC3E,IAAI,EAAE,GAAG,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,CAAA;wBAChE,EAAE,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC;4BACvB,EAAE,CAAC,QAAQ,CAAC,wBAAwB,EAAE,CAAC,MAAM;gCACzC,EAAE,CAAC,KAAK,EAAE,CAAA;gCACV,QAAQ,EAAE,CAAA;4BACd,CAAC,CAAC,CAAA;wBACN,CAAC;wBAAC,IAAI,CAAC,CAAC;4BACJ,EAAE,CAAC,KAAK,EAAE,CAAA;4BACV,QAAQ,EAAE,CAAA,CAAC,qCAAqC;wBACpD,CAAC;oBACL,CAAC;gBACL,CAAC,CAAC,CAAA;YACN,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,OAAO,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAA;gBACjD,QAAQ,EAAE,CAAA;YACd,CAAC;QACL,CAAC;QAAC,IAAI,CAAC,CAAC;YACJ,OAAO,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAA;YACpD,QAAQ,EAAE,CAAA;QACd,CAAC;IACL,CAAC;IAED;;;;OAIG;IACH,UAAU,CAAC,OAAO;QACd,IAAI,KAAK,GAAG,uCAAuC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACjE,EAAE,CAAC,CAAC,CAAC,KAAK,YAAY,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YACjD,IAAI,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;YACrB,cAAc;YACd,KAAK,GAAG,IAAI,CAAA;YACZ,MAAM,CAAC,MAAM,CAAA;QACjB,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACH,eAAe,CAAC,GAAG,EAAE,aAAqB;QACtC,iBAAiB;QACjB,EAAE,CAAC,CAAC,CAAC,GAAG,YAAY,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC;YAClE,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,KAAK;gBAC/B,IAAI,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,CAAA;gBACxB,cAAc;gBACd,KAAK,GAAG,IAAI,CAAA;gBACZ,EAAE,CAAC,CAAC,IAAI,KAAK,aAAa,CAAC,CAAC,CAAC;oBACzB,MAAM,CAAC,IAAI,CAAA;gBACf,CAAC;gBACD,MAAM,CAAC,KAAK,CAAA;YAChB,CAAC,CAAC,CAAC,GAAG,EAAE,CAAA;QACZ,CAAC,CAAC,kCAAkC;QACpC,cAAc;QACd,GAAG,GAAG,IAAI,CAAA;QACV,MAAM,CAAC,KAAK,CAAC,CAAA,CAAC,iDAAiD;IACnE,CAAC;IAED;;;;OAIG;IACH,YAAY,CAAC,OAAO;QAChB,IAAI,MAAM,GAAG,SAAS,CAAA;QACtB,IAAI,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK;YACrC,EAAE,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC;gBAC5B,MAAM,CAAC,KAAK,CAAA;YAChB,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,MAAM,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA,CAAC,wBAAwB;YAC1D,CAAC;QACL,CAAC,CACA,CAAC,GAAG,EAAE,CAAA;QACP,cAAc;QACd,OAAO,GAAG,IAAI,CAAA;QACd,EAAE,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC;YAC5B,MAAM,CAAC,KAAK,CAAC,CAAA;QACjB,CAAC,CAAC,iBAAiB;QACnB,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA,CAAC,oDAAoD;IAC3F,CAAC;IAED;;;;OAIG;IACH,8BAA8B,CAAC,MAAM;QACjC,MAAM,CAAC;YACH,UAAU,EAAE,WAAW;YACvB,YAAY,EAAE;gBACV,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE,MAAM;aAClB;SACJ,CAAA;IACL,CAAC;IAED;;;;OAIG;IACH,oBAAoB,CAAC,SAAS;QAC1B,iBAAiB;QACjB,EAAE,CAAC,CAAC,SAAS,YAAY,MAAM,CAAC,CAAC,CAAC;YAC9B,EAAE,CAAC,CAAC,IAAI,CAAC,mBAAmB,YAAY,MAAM,CAAC,CAAC,CAAC;gBAC7C,IAAI,GAAG,GAAG,kBAAkB,CAAC;oBACzB,CAAC,EAAE,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC;oBAChC,GAAG,EAAE,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC;oBACpC,CAAC,EAAE,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC;iBACnC,CACA,CAAA;gBACD,IAAI,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,MAAM,EAAE,CAAA;gBACpF,4CAA4C;gBAC5C,IAAI,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;gBACvE,IAAI,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC,CAAA;gBAC9B,MAAM,CAAC,KAAK,GAAG,GAAG,GAAG,WAAW,CAAA;YACpC,CAAC;QACL,CAAC;QAAC,IAAI,CAAC,CAAC;YACJ,MAAM,CAAC,EAAE,CAAA,CAAC,uCAAuC;QACrD,CAAC;IACL,CAAC;IAED;;;;OAIG;IACH,qBAAqB,CAAC,SAAS;QAC3B,MAAM,CAAC;YACH,UAAU,EAAE,WAAW;YACvB,kBAAkB,EAAE,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC;SAC3D,CAAA;IACL,CAAC;IAED;;;;;OAKG;IACH,eAAe,CAAC,GAAW,EAAE,UAAkB;QAC3C,EAAE,CAAC,CAAC,OAAO,GAAG,KAAK,QAAQ,IAAI,CAAC,CAAC,GAAG,YAAY,MAAM,CAAC,CAAC,CAAC,CAAC;YACtD,GAAG,GAAG,EAAE,CAAA,CAAC,yBAAyB;QACtC,CAAC;QACD,EAAE,CAAC,CAAC,CAAC,OAAO,UAAU,KAAK,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,UAAU,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAChF,UAAU,GAAG,CAAC,CAAA,CAAC,oCAAoC;QACvD,CAAC;QACD,IAAI,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA,CAAC,4BAA4B;QAC3F,IAAI,YAAY,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAA,CAAC,iCAAiC;QAE/E,4CAA4C;QAC5C,IAAI,aAAa,GAAG,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,GAAG,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAA;QACxG,MAAM,CAAC;YACH,UAAU,EAAE,UAAU;YACtB,KAAK,EAAE,cAAc;YACrB,WAAW,EAAE,YAAY;YACzB,UAAU,EAAE,aAAa;SAC5B,CAAA;IACL,CAAC;CACJ;AA3sBD,gCA2sBC"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartacme.classes.acmeclient.js","sourceRoot":"","sources":["../ts/smartacme.classes.acmeclient.ts"],"names":[],"mappings":";AAAA,+CAA8C;AAC9C,uBAAsB;AACtB,iCAAgC;AAChC,yBAAwB;AACxB,qCAAoC;AACpC,iFAA2D;AAG3D;;;;;;;GAOG;AACH,IAAI,kBAAkB,GAAG,CAAC,GAAG;IACzB,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAAA;AAClD,CAAC,CAAA;AAED;;;;;;GAMG;AACH;IAaI,YAAY,eAAe;QAN3B,eAAU,GAAG,IAAI,yCAAU,EAAE,CAAA;QAOzB;;;WAGG;QACH,IAAI,CAAC,mBAAmB,GAAG,EAAE,CAAA;QAC7B;;;;WAIG;QACH,IAAI,CAAC,SAAS,GAAG,CAAC,CAAA;QAElB;;;WAGG;QACH,IAAI,CAAC,SAAS,GAAG,EAAE,CAAA;QACnB;;;WAGG;QACH,IAAI,CAAC,YAAY,GAAG,eAAe,CAAA;QACnC;;;;WAIG;QACH,IAAI,CAAC,kBAAkB,GAAG,YAAY,CAAA,CAAC,WAAW;QAClD;;;WAGG;QACH,IAAI,CAAC,aAAa,GAAG,IAAI,CAAA,CAAC,WAAW;QACrC;;;WAGG;QACH,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA,CAAC,WAAW;QAC/B;;;WAGG;QACH,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA,CAAC,WAAW;QAC/B;;;;WAIG;QACH,IAAI,CAAC,OAAO,GAAG,GAAG,CAAA,CAAC,WAAW;QAC9B;;;;WAIG;QACH,IAAI,CAAC,aAAa,GAAG,8BAA8B,CAAA,CAAC,WAAW;QAC/D;;;;WAIG;QACH,IAAI,CAAC,eAAe,GAAG,IAAI,CAAA,CAAC,YAAY;IAC5C,CAAC;IAED,gFAAgF;IAChF,kBAAkB;IAClB,gFAAgF;IAEhF;;;;OAIG;IACH,YAAY;QACR,IAAI,IAAI,GAAG,CAAC,CAAC,KAAK,EAAc,CAAA;QAChC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC;aACjC,IAAI,CAAC,CAAC,SAAqB;YACxB,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;QAC3B,CAAC,CAAC,CAAA;QACN,MAAM,CAAC,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAED;;;;;OAKG;IACH,eAAe,CAAC,OAAO;QACnB,IAAI,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,CAAA;QACpB,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,YAAY,MAAM,CAAC,CAAC,CAAC,CAAC;YAC/B,OAAO,GAAG,EAAE,CAAA,CAAC,2BAA2B;QAC5C,CAAC;QACD,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAA;QAC5B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,CAAA;QACxD,MAAM,CAAC,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAED;;;;;;OAMG;IACH,eAAe,CAAC,GAAG,EAAE,OAAO;QACxB,IAAI,IAAI,GAAG,CAAC,CAAC,KAAK,EAAc,CAAA;QAChC,OAAO,CAAC,UAAU,CAAC,GAAG,KAAK,CAAA;QAC3B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC;aAC7B,IAAI,CAAC,CAAC,SAAqB;YACxB,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,YAAY,MAAM,CAAC,CAAC,CAAC;gBAClC,IAAI,CAAC,mBAAmB,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,CAAA,CAAC,qCAAqC;gBAClF,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,YAAY,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,MAAM,CAAC,CAAC,CAAC,CAAC;oBACpF,IAAI,OAAO,GAAG,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;oBAC3C,EAAE,CAAC,CAAC,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC;wBAC9B,IAAI,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;wBACtC,EAAE,CAAC,CAAC,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC;4BAC9B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA,CAAC,iBAAiB;wBAC5C,CAAC;wBAAC,IAAI,CAAC,CAAC;4BACJ,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA,CAAC,iBAAiB;wBACzC,CAAC;oBACL,CAAC;oBAAC,IAAI,CAAC,CAAC;wBACJ,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA,CAAC,iBAAiB;oBACzC,CAAC;gBACL,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA,CAAC,iBAAiB;gBACzC,CAAC;gBACD,IAAI,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,CAAC,GAAG,EAAE,CAAC,CAAA;YAC5D,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC,CAAA;YACxC,CAAC;QACL,CAAC,CAAC,CAAA;QACN,MAAM,CAAC,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAED;;;;;OAKG;IACH,eAAe,CAAC,MAAM;QAClB,IAAI,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,CAAA;QACpB,IAAI,CAAC,UAAU,EAAE;aACZ,IAAI,CAAC,OAAO;YACT,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,YAAY,MAAM,CAAC,CAAC,CAAC,CAAC;gBAC/B,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAA;YACjD,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,IAAI,CAAC,8BAA8B,CAAC,MAAM,CAAC,CAAC;qBACzF,IAAI,CAAC,CAAC,SAAqB;oBACxB,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,YAAY,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;wBAC7E,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC;6BACtB,IAAI,CAAC,CAAC,UAAsB;4BACzB,EAAE,CAAC,CACC,CAAC,SAAS,CAAC,GAAG,YAAY,MAAM,CAAC;mCAC9B,CAAC,UAAU,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,GAAG,CAAC;mCACrC,CAAC,UAAU,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,GAAG,CAC3C,CAAC,CAAC,CAAC;gCACC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC;oCAC9B,IAAI,CAAC,OAAO,EAAE,CAAA;gCAClB,CAAC,CAAC,CAAA,CAAC,0BAA0B;4BACjC,CAAC;4BAAC,IAAI,CAAC,CAAC;gCACJ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA,CAAC,mBAAmB;4BAC1C,CAAC;wBACL,CAAC,CAAC,CAAA;oBACV,CAAC;oBAAC,IAAI,CAAC,CAAC;wBACJ,EAAE,CAAC,CACC,CAAC,SAAS,CAAC,GAAG,YAAY,MAAM,CAAC;+BAC9B,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,MAAM,CAAC;+BAC5C,CAAC,OAAO,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,QAAQ,CAAC;+BACvD,CAAC,SAAS,CAAC,GAAG,YAAY,MAAM,CACvC,CAAC,CAAC,CAAC;4BACC,IAAI,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA,CAAC,yBAAyB;4BAC1E,IAAI,SAAS,GAAG,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA,CAAC,+BAA+B;4BAC9F,EAAE,CAAC,CAAC,SAAS,YAAY,MAAM,CAAC,CAAC,CAAC;gCAC9B,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,SAAS,EAAE;oCACrC,QAAQ;oCACR,SAAS,CAAC,GAAG,GAAG,IAAI,CAAA;oCACpB,SAAS,CAAC,GAAG,GAAG,IAAI,CAAA;oCACpB,mBAAmB;oCACnB,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC;yCAC1B,IAAI,CAAC,CAAC,UAAsB;wCACzB,EAAE,CAAC,CACC,CAAC,UAAU,CAAC,GAAG,YAAY,MAAM,CAAC;+CAC/B,CAAC,UAAU,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,GAAG,CAAC,CAAC,uCAAuC;wCACnF,CAAC,CAAC,CAAC;4CACC,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC;iDACxB,IAAI,CAAC;gDACF,IAAI,CAAC,OAAO,EAAE,CAAA;4CAClB,CAAC,CAAC,CAAA,CAAC,0CAA0C;wCACrD,CAAC;wCAAC,IAAI,CAAC,CAAC;4CACJ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA,CAAC,8CAA8C;wCACrE,CAAC;oCACL,CAAC,CAAC,CAAA;gCACV,CAAC,CAAC,CAAA;4BACN,CAAC;4BAAC,IAAI,CAAC,CAAC;gCACJ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA,CAAC,mCAAmC;4BAC1D,CAAC;wBACL,CAAC;wBAAC,IAAI,CAAC,CAAC;4BACJ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA,CAAC,yCAAyC;wBAChE,CAAC;oBACL,CAAC;gBACL,CAAC,CAAC,CAAA;YACV,CAAC;QACL,CAAC,CAAC,CAAA;QACN,MAAM,CAAC,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAED;;;;;OAKG;IACH,eAAe,CAAC,SAAS,GAAG,EAAE;QAC1B,IAAI,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,CAAA;QACpB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;aACxE,IAAI,CAAC;YACF,IAAI,CAAC,OAAO,EAAE,CAAA;QAClB,CAAC,CAAC,CAAA;QACN,MAAM,CAAC,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAED;;;;;;OAMG;IACH,cAAc,CAAC,GAAG,EAAE,KAAK,GAAG,CAAC;QACzB,IAAI,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,CAAA;QACpB,EAAE,CAAC,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC;YACd,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA,CAAC,sCAAsC;QAC7D,CAAC;QAAC,IAAI,CAAC,CAAC;YACJ,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC;iBACnB,IAAI,CAAC,CAAC,SAAS;gBACZ,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,YAAY,MAAM,CAAC,CAAC,CAAC,CAAC;oBACrC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA,CAAC,iBAAiB;gBACxC,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC;wBACxC,UAAU,CAAC;4BACP,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,KAAK,GAAG,CAAC,CAAC,CAAA,CAAC,QAAQ;wBAChD,CAAC,EAAE,KAAK,GAAG,GAAG,CAAC,CAAA;oBACnB,CAAC;oBAAC,IAAI,CAAC,CAAC;wBACJ,IAAI,CAAC,OAAO,EAAE,CAAA,CAAC,qBAAqB;oBACxC,CAAC;gBACL,CAAC;YACL,CAAC,CAAC,CAAA;QACV,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAED;;;;;;OAMG;IACH,eAAe,CAAC,GAAG,EAAE,KAAK,GAAG,CAAC;QAC1B,IAAI,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,CAAA;QACpB,EAAE,CAAC,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC;YACd,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA,CAAC,sCAAsC;QAC7D,CAAC;QAAC,IAAI,CAAC,CAAC;YACJ,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC;iBACnB,IAAI,CAAC,CAAC,SAAqB;gBACxB,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,YAAY,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;oBAClE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA,CAAC,uCAAuC;gBACvE,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,YAAY,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;wBAC3E,UAAU,CAAC;4BACP,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,KAAK,GAAG,CAAC,CAAC,CAAA,CAAC,QAAQ;wBACjD,CAAC,EAAE,KAAK,GAAG,GAAG,CAAC,CAAA;oBACnB,CAAC;oBAAC,IAAI,CAAC,CAAC;wBACJ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA,CAAC,eAAe;oBACtC,CAAC;gBACL,CAAC;YACL,CAAC,CAAC,CAAA;QACV,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAED;;;;;OAKG;IACH,cAAc,CAAC,UAAU;QACrB,IAAI,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,CAAA;QACpB,EAAE,CAAC,QAAQ,CAAC,UAAU,GAAG,MAAM,EAAE,CAAC,GAAG,EAAE,SAAiB;YACpD,EAAE,CAAC,CAAC,GAAG,YAAY,MAAM,CAAC,CAAC,CAAC;gBACxB,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;oBAC1B,OAAO,CAAC,KAAK,CAAC,4BAA4B,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,6BAA6B,CAAC,CAAA;gBAC3F,CAAC;gBACD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YACtB,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,IAAI,GAAG,GAAG,SAAS,CAAC,QAAQ,EAAE,CAAA;gBAC9B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;qBACtF,IAAI,CAAC,CAAC,SAAqB;oBACxB,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,YAAY,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;wBAClE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA,CAAC,uCAAuC;oBACvE,CAAC;oBAAC,IAAI,CAAC,CAAC;wBACJ,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,YAAY,MAAM,CAAC,CAAC,CAAC;4BAClC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;gCACxD,IAAI,OAAO,GAAG,SAAS,CAAC,SAAS,CAAC,CAAA;gCAClC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,YAAY,MAAM,CAAC,CAAC,CAAC,CAAC;oCAC/B,OAAO,GAAG,EAAE,CAAA,CAAE,2BAA2B;gCAC7C,CAAC;gCACD,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;qCACpC,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC,CAAA;4BACvC,CAAC;4BAAC,IAAI,CAAC,CAAC;gCACJ,IAAI,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,GAAG,CAAC,GAAG,SAAS,CAAC,GAAG,GAAG,KAAK,CAAC,CAAA,CAAC,6CAA6C;4BAC3H,CAAC;wBACL,CAAC;wBAAC,IAAI,CAAC,CAAC;4BACJ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA,CAAC,mBAAmB;wBAC1C,CAAC;oBACL,CAAC;gBACL,CAAC,CAAC,CAAA;YACV,CAAC;QACL,CAAC,CAAC,CAAA;QACF,MAAM,CAAC,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAED;;;OAGG;IACH,UAAU;QACN,IAAI,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,CAAA;QACpB,IAAI,CAAC,YAAY,EAAE;aACd,IAAI,CAAC,CAAC,GAAG;YACN,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,YAAY,MAAM,CAAC,CAAC,CAAC,CAAC;gBAC3B,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC,CAAA;YACnE,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,IAAI,CAAC,SAAS,GAAG,GAAG,CAAA,CAAC,kBAAkB;gBACvC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC;qBACrB,IAAI,CAAC,CAAC,SAAqB;oBACxB,EAAE,CAAC,CACC,CAAC,SAAS,CAAC,GAAG,YAAY,MAAM,CAAC;2BAC9B,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,MAAM,CAAC;2BAC5C,CAAC,OAAO,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,QAAQ,CAC7D,CAAC,CAAC,CAAC;wBACC,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;wBAChD,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC;6BACnC,IAAI,CAAC,CAAC,SAAqB;4BACxB,IAAI,CAAC,OAAO,EAAE,CAAA;wBAClB,CAAC,CAAC,CAAA,CAAC,kCAAkC;oBAC7C,CAAC;oBAAC,IAAI,CAAC,CAAC;wBACJ,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAA;oBACjD,CAAC;gBACL,CAAC,CAAC,CAAA;YACV,CAAC;QACL,CAAC,CAAC,CAAA;QACN,MAAM,CAAC,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAED;;;;;OAKG;IACH,aAAa,CAAC,KAAa;QACvB,IAAI,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,CAAA;QACpB,EAAE,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC;YAC5B,IAAI,CAAC,eAAe,CAAC;gBACjB,OAAO,EAAE;oBACL,SAAS,GAAG,KAAK;iBACpB;aACJ,CAAC;iBACG,IAAI,CAAC,CAAC,SAAqB;gBACxB,EAAE,CAAC,CACC,CAAC,SAAS,CAAC,GAAG,YAAY,MAAM,CAAC;uBAC9B,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,GAAG,CAAC;uBACrC,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,MAAM,CAAC;uBAC5C,CAAC,OAAO,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,QAAQ,CAC7D,CAAC,CAAC,CAAC;oBACC,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;oBAChD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA,CAAC,mBAAmB;gBAClD,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACJ,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC,CAAA,CAAC,sBAAsB;gBACnF,CAAC;YACL,CAAC,CAAC,CAAA;QAEV,CAAC;QAAC,IAAI,CAAC,CAAC;YACJ,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC,CAAA;QACvD,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAED;;;;;OAKG;IACH,QAAQ,CAAC,OAAO;QACZ,IAAI,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,CAAA;QACpB,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,EAAE;YAC/B,WAAW,EAAE,OAAO,CAAC,uBAAuB;SAC/C,CAAC,CAAC,IAAI,CAAC;YACJ,IAAI,CAAC,OAAO,EAAE,CAAA;QAClB,CAAC,CAAC,CAAA;QACF,MAAM,CAAC,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAED;;OAEG;IACH,kBAAkB,CAAC,SAAiB,EAAE,eAAuB,EAAE,cAAsB;QACjF,IAAI,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,CAAA;QACpB,IAAI,CAAC,UAAU,EAAE;aACZ,IAAI,CAAC,CAAC,OAAO;YACV,IAAI,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA,CAAC,8CAA8C;YACrF,cAAc,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAA;YACtD,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAA;YAC5C,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAA;YACpC,eAAe,GAAG,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAA;YACxD,kBAAkB;YAClB,IAAI,CAAC,aAAa,CAAC;gBACf,UAAU,EAAE,IAAI;gBAChB,WAAW,EAAE,cAAc;gBAC3B,YAAY,EAAE,eAAe;gBAC7B,UAAU,EAAE,SAAS;gBACrB,YAAY,EAAE,KAAK;aACtB,CAAC;iBACG,IAAI,CAAC;gBACF,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC;qBACzB,IAAI,CAAC,CAAC,IAAI;oBACP,EAAE,CAAC,CAAC,CAAC,IAAI,YAAY,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC;wBACzD,EAAE,CAAC,SAAS,CAAC,SAAS,GAAG,MAAM,EAAE,IAAI,EAAE,CAAC,GAAG;4BACvC,EAAE,CAAC,CAAC,GAAG,YAAY,MAAM,CAAC,CAAC,CAAC;gCACxB,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;oCAC1B,OAAO,CAAC,KAAK,CAAC,4BAA4B,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,mCAAmC,CAAC,CAAA;gCACjG,CAAC;gCACD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;4BACpB,CAAC;4BAAC,IAAI,CAAC,CAAC;gCACJ,IAAI,CAAC,OAAO,EAAE,CAAA,CAAE,sDAAsD;4BAC1E,CAAC;wBACL,CAAC,CAAC,CAAA;oBACN,CAAC;oBAAC,IAAI,CAAC,CAAC;wBACJ,IAAI,CAAC,MAAM,CAAC,0BAA0B,CAAC,CAAA;oBAC3C,CAAC;gBACL,CAAC,CAAC,CAAA;YAEV,CAAC,CAAC,CAAA;QACV,CAAC,CAAC,CAAA;QACN,MAAM,CAAC,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAED;;;;;;;;OAQG;IACH,aAAa,CAAC,UAMb;QACG,IAAI,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,CAAA;QACpB,IAAI,OAAO,GAAG,uCAAuC,UAAU,CAAC,UAAU,GAAG;cACvE,UAAU;cACV,aAAa,UAAU,CAAC,WAAW,MAAM,UAAU,CAAC,YAAY,OAAO,UAAU,CAAC,UAAU,iBAAiB,UAAU,CAAC,YAAY,IAAI;cACxI,aAAa,UAAU,CAAC,UAAU,8BAA8B,UAAU,CAAC,UAAU,QAAQ,CAAA;QACnG,OAAO,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAA;QAC3C,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;YAC1B,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;QACtC,CAAC;QACD,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,SAAS,EAAE,WAAW;YAC1D,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;gBACf,IAAI,CAAC,OAAO,EAAE,CAAA;YAClB,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;YAC5B,CAAC;QACL,CAAC,CAAC,CAAA;QACF,MAAM,CAAC,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAED;;OAEG;IACH,aAAa;QACT,MAAM;IACV,CAAC;IAED;;;;;OAKG;IACH,gBAAgB,CAAC,IAAI,EAAE,QAAQ,GAAG,KAAK;QACnC,EAAE,CAAC,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC;YAC3B,IAAI,GAAG,EAAE,CAAA;QACb,CAAC;QACD,oDAAoD;QACpD,IAAI,SAAS,GAAG,4DAA4D,CAAA;QAC5E,IAAI,SAAS,GAAG,2DAA2D,CAAA;QAC3E,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,QAAQ,GAAG,SAAS,GAAG,SAAS,EAAE,GAAG,CAAC,EAAE,CAAC,aAAa;YACjF,EAAE,CAAC,CAAC,OAAO,aAAa,KAAK,QAAQ,CAAC,CAAC,CAAC;gBACpC,MAAM,CAAC,GAAG,GAAG,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,iBAAiB,EAAE,CAAA;YAC7E,CAAC;YACD,MAAM,CAAC,KAAK,CAAA;QAChB,CAAC,CAAC,CAAA;IACN,CAAC;IAED;;;;;OAKG;IACH,gBAAgB,CAAC,MAAM,EAAE,SAAS,EAAE,QAAQ;QACxC,8BAA8B;QAC9B,EAAE,CAAC,CAAC,OAAO,QAAQ,KAAK,UAAU,CAAC,CAAC,CAAC;YACjC,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAA,CAAC,8BAA8B;QAChE,CAAC;QACD,EAAE,CAAC,CAAC,SAAS,YAAY,MAAM,CAAC,CAAC,CAAC;YAC9B,EAAE,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC;gBAClC,IAAI,IAAI,GAAG,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC,OAAO,CAAC,CAAA,CAAC,mEAAmE;gBACrI,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,EAAE,CAAC,GAAG;oBACzD,EAAE,CAAC,CAAC,GAAG,YAAY,MAAM,CAAC,CAAC,CAAC;wBACxB,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;4BAC1B,OAAO,CAAC,KAAK,CACT,4BAA4B,EAC5B,GAAG,CAAC,MAAM,CAAC,EAAE,sCAAsC,CACtD,CAAA;wBACL,CAAC;wBACD,QAAQ,EAAE,CAAA;oBACd,CAAC;oBAAC,IAAI,CAAC,CAAC;wBACJ,2EAA2E;wBAC3E,IAAI,EAAE,GAAG,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,CAAA;wBAChE,EAAE,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC;4BACvB,EAAE,CAAC,QAAQ,CAAC,wBAAwB,EAAE,CAAC,MAAM;gCACzC,EAAE,CAAC,KAAK,EAAE,CAAA;gCACV,QAAQ,EAAE,CAAA;4BACd,CAAC,CAAC,CAAA;wBACN,CAAC;wBAAC,IAAI,CAAC,CAAC;4BACJ,EAAE,CAAC,KAAK,EAAE,CAAA;4BACV,QAAQ,EAAE,CAAA,CAAC,qCAAqC;wBACpD,CAAC;oBACL,CAAC;gBACL,CAAC,CAAC,CAAA;YACN,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,OAAO,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAA;gBACjD,QAAQ,EAAE,CAAA;YACd,CAAC;QACL,CAAC;QAAC,IAAI,CAAC,CAAC;YACJ,OAAO,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAA;YACpD,QAAQ,EAAE,CAAA;QACd,CAAC;IACL,CAAC;IAED;;;;OAIG;IACH,UAAU,CAAC,OAAO;QACd,IAAI,KAAK,GAAG,uCAAuC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACjE,EAAE,CAAC,CAAC,CAAC,KAAK,YAAY,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YACjD,IAAI,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;YACrB,cAAc;YACd,KAAK,GAAG,IAAI,CAAA;YACZ,MAAM,CAAC,MAAM,CAAA;QACjB,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACH,eAAe,CAAC,GAAG,EAAE,aAAqB;QACtC,iBAAiB;QACjB,EAAE,CAAC,CAAC,CAAC,GAAG,YAAY,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC;YAClE,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,KAAK;gBAC/B,IAAI,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,CAAA;gBACxB,cAAc;gBACd,KAAK,GAAG,IAAI,CAAA;gBACZ,EAAE,CAAC,CAAC,IAAI,KAAK,aAAa,CAAC,CAAC,CAAC;oBACzB,MAAM,CAAC,IAAI,CAAA;gBACf,CAAC;gBACD,MAAM,CAAC,KAAK,CAAA;YAChB,CAAC,CAAC,CAAC,GAAG,EAAE,CAAA;QACZ,CAAC,CAAC,kCAAkC;QACpC,cAAc;QACd,GAAG,GAAG,IAAI,CAAA;QACV,MAAM,CAAC,KAAK,CAAC,CAAA,CAAC,iDAAiD;IACnE,CAAC;IAED;;;;OAIG;IACH,YAAY,CAAC,OAAO;QAChB,IAAI,MAAM,GAAG,SAAS,CAAA;QACtB,IAAI,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK;YACrC,EAAE,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC;gBAC5B,MAAM,CAAC,KAAK,CAAA;YAChB,CAAC;YAAC,IAAI,CAAC,CAAC;gBACJ,MAAM,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA,CAAC,wBAAwB;YAC1D,CAAC;QACL,CAAC,CACA,CAAC,GAAG,EAAE,CAAA;QACP,cAAc;QACd,OAAO,GAAG,IAAI,CAAA;QACd,EAAE,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC;YAC5B,MAAM,CAAC,KAAK,CAAC,CAAA;QACjB,CAAC,CAAC,iBAAiB;QACnB,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA,CAAC,oDAAoD;IAC3F,CAAC;IAED;;;;OAIG;IACH,8BAA8B,CAAC,MAAM;QACjC,MAAM,CAAC;YACH,UAAU,EAAE,WAAW;YACvB,YAAY,EAAE;gBACV,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE,MAAM;aAClB;SACJ,CAAA;IACL,CAAC;IAED;;;;OAIG;IACH,oBAAoB,CAAC,SAAS;QAC1B,iBAAiB;QACjB,EAAE,CAAC,CAAC,SAAS,YAAY,MAAM,CAAC,CAAC,CAAC;YAC9B,EAAE,CAAC,CAAC,IAAI,CAAC,mBAAmB,YAAY,MAAM,CAAC,CAAC,CAAC;gBAC7C,IAAI,GAAG,GAAG,kBAAkB,CAAC;oBACzB,CAAC,EAAE,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC;oBAChC,GAAG,EAAE,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC;oBACpC,CAAC,EAAE,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC;iBACnC,CACA,CAAA;gBACD,IAAI,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,MAAM,EAAE,CAAA;gBACpF,4CAA4C;gBAC5C,IAAI,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;gBACvE,IAAI,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC,CAAA;gBAC9B,MAAM,CAAC,KAAK,GAAG,GAAG,GAAG,WAAW,CAAA;YACpC,CAAC;QACL,CAAC;QAAC,IAAI,CAAC,CAAC;YACJ,MAAM,CAAC,EAAE,CAAA,CAAC,uCAAuC;QACrD,CAAC;IACL,CAAC;IAED;;;;OAIG;IACH,qBAAqB,CAAC,SAAS;QAC3B,MAAM,CAAC;YACH,UAAU,EAAE,WAAW;YACvB,kBAAkB,EAAE,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC;SAC3D,CAAA;IACL,CAAC;IAED;;;;;OAKG;IACH,eAAe,CAAC,GAAW,EAAE,UAAkB;QAC3C,EAAE,CAAC,CAAC,OAAO,GAAG,KAAK,QAAQ,IAAI,CAAC,CAAC,GAAG,YAAY,MAAM,CAAC,CAAC,CAAC,CAAC;YACtD,GAAG,GAAG,EAAE,CAAA,CAAC,yBAAyB;QACtC,CAAC;QACD,EAAE,CAAC,CAAC,CAAC,OAAO,UAAU,KAAK,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,UAAU,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAChF,UAAU,GAAG,CAAC,CAAA,CAAC,oCAAoC;QACvD,CAAC;QACD,IAAI,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA,CAAC,4BAA4B;QAC3F,IAAI,YAAY,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAA,CAAC,iCAAiC;QAE/E,4CAA4C;QAC5C,IAAI,aAAa,GAAG,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,GAAG,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAA;QACxG,MAAM,CAAC;YACH,UAAU,EAAE,UAAU;YACtB,KAAK,EAAE,cAAc;YACrB,WAAW,EAAE,YAAY;YACzB,UAAU,EAAE,aAAa;SAC5B,CAAA;IACL,CAAC;CACJ;AA3sBD,gCA2sBC"} \ No newline at end of file diff --git a/test/test.ts b/test/test.ts index 25cd7f8..67ece67 100644 --- a/test/test.ts +++ b/test/test.ts @@ -14,6 +14,6 @@ describe('smartacme', function(){ }) it('should register a new account', function() { - testAcme.createAccount() + testAcme.createAccount().catch() }) }) diff --git a/ts/smartacme.classes.acmeclient.ts b/ts/smartacme.classes.acmeclient.ts index 42404a0..dccbcb2 100644 --- a/ts/smartacme.classes.acmeclient.ts +++ b/ts/smartacme.classes.acmeclient.ts @@ -32,7 +32,7 @@ export class AcmeClient { directoryUrl: string emailDefaultPrefix: string emailOverride: string - jWebClient: any + jWebClient = new JWebClient() regLink: string tosLink: string webroot: string @@ -72,11 +72,6 @@ export class AcmeClient { * @desc Email address to use */ this.emailOverride = null // {string} - /** - * @member {module:JWebClient~JWebClient} module:AcmeClient~AcmeClient#jWebClient - * @desc Reference to JSON-Web-Client - */ - this.jWebClient = new JWebClient() // {JWebClient} /** * @member {string} module:AcmeClient~AcmeClient#regLink * @desc Cached registration URI @@ -131,15 +126,14 @@ export class AcmeClient { * @param {Object} payload * @param {function} callback - first argument will be the answer object */ - newRegistration(payload, callback) { + newRegistration(payload) { + let done = q.defer() if (!(payload instanceof Object)) { payload = {} // ensure payload is object } payload.resource = 'new-reg' - this.jWebClient.post(this.directory['new-reg'], payload, callback, callback) - // dereference - callback = null - payload = null + this.jWebClient.post(this.directory['new-reg'], payload) + return done.promise } /** @@ -152,29 +146,30 @@ export class AcmeClient { getRegistration(uri, payload) { let done = q.defer() payload['resource'] = 'reg' - this.jWebClient.post(uri, payload, (ans, res) => { - if (ans instanceof Object) { - this.clientProfilePubKey = ans.key // cache or reset returned public key - if ((res instanceof Object) && (res['headers'] instanceof Object)) { - let linkStr = res.headers['link'] - if (typeof linkStr === 'string') { - let tosLink = this.getTosLink(linkStr) - if (typeof tosLink === 'string') { - this.tosLink = tosLink // cache TOS link + this.jWebClient.post(uri, payload) + .then((reqResArg: IReqResArg) => { + if (reqResArg.ans instanceof Object) { + this.clientProfilePubKey = reqResArg.ans.key // cache or reset returned public key + if ((reqResArg.res instanceof Object) && (reqResArg.res['headers'] instanceof Object)) { + let linkStr = reqResArg.res.headers['link'] + if (typeof linkStr === 'string') { + let tosLink = this.getTosLink(linkStr) + if (typeof tosLink === 'string') { + this.tosLink = tosLink // cache TOS link + } else { + this.tosLink = null // reset TOS link + } } else { this.tosLink = null // reset TOS link } } else { this.tosLink = null // reset TOS link } + done.resolve({ ans: reqResArg.ans, res: reqResArg.res }) } else { - this.tosLink = null // reset TOS link + done.reject(new Error('some error')) } - done.resolve({ ans: ans, res: res }) - } else { - done.reject(new Error('some error')) - } - }) + }) return done.promise } @@ -184,65 +179,71 @@ export class AcmeClient { * @param {string} domain * @param {function} callback - first argument will be the answer object */ - authorizeDomain(domain, callback) { - /*jshint -W069 */ - if (typeof callback !== 'function') { - callback = this.emptyCallback // ensure callback is function - } + authorizeDomain(domain) { + let done = q.defer() this.getProfile() .then(profile => { if (!(profile instanceof Object)) { - callback(false) // no profile returned + done.reject(new Error('no profile returned')) } else { - this.jWebClient.post(this.directory['new-authz'], this.makeDomainAuthorizationRequest(domain), (ans, res) => { - if ((res instanceof Object) && (res['statusCode'] === 403)) { // if unauthorized - this.agreeTos(this.tosLink, (ans_, res_) => { // agree to TOS - if ( // if TOS were agreed successfully - (res_ instanceof Object) - && (res_['statusCode'] >= 200) - && (res_['statusCode'] <= 400) - ) { - this.authorizeDomain(domain, callback) // try authorization again - } else { - callback(false) // agreement failed - } - }) - } else { - if ( - (res instanceof Object) - && (res['headers'] instanceof Object) - && (typeof res.headers['location'] === 'string') - && (ans instanceof Object) - ) { - let poll_uri = res.headers['location'] // status URI for polling - let challenge = this.selectChallenge(ans, 'http-01') // select simple http challenge - if (challenge instanceof Object) { // desired challenge is in list - this.prepareChallenge(domain, challenge, () => { // prepare all objects and files for challenge - // reset - ans = null - res = null - // accept challenge - this.acceptChallenge(challenge, (ans, res) => { - if ( - (res instanceof Object) - && (res['statusCode'] < 400) // server confirms challenge acceptance - ) { - this.pollUntilValid(poll_uri, callback) // poll status until server states success - } else { - callback(false) // server did not confirm challenge acceptance - } - }) + this.jWebClient.post(this.directory['new-authz'], this.makeDomainAuthorizationRequest(domain)) + .then((reqResArg: IReqResArg) => { + if ((reqResArg.res instanceof Object) && (reqResArg.res['statusCode'] === 403)) { // if unauthorized + this.agreeTos(this.tosLink) + .then((reqResArg2: IReqResArg) => { // agree to TOS + if ( // if TOS were agreed successfully + (reqResArg.res instanceof Object) + && (reqResArg2.res['statusCode'] >= 200) + && (reqResArg2.res['statusCode'] <= 400) + ) { + this.authorizeDomain(domain).then(() => { + done.resolve() + }) // try authorization again + } else { + done.reject(false) // agreement failed + } }) - } else { - callback(false) // desired challenge is not in list - } } else { - callback(false) // server did not respond with status URI + if ( + (reqResArg.res instanceof Object) + && (reqResArg.res['headers'] instanceof Object) + && (typeof reqResArg.res.headers['location'] === 'string') + && (reqResArg.ans instanceof Object) + ) { + let poll_uri = reqResArg.res.headers['location'] // status URI for polling + let challenge = this.selectChallenge(reqResArg.ans, 'http-01') // select simple http challenge + if (challenge instanceof Object) { // desired challenge is in list + this.prepareChallenge(domain, challenge, () => { // prepare all objects and files for challenge + // reset + reqResArg.ans = null + reqResArg.res = null + // accept challenge + this.acceptChallenge(challenge) + .then((reqResArg2: IReqResArg) => { + if ( + (reqResArg2.res instanceof Object) + && (reqResArg2.res['statusCode'] < 400) // server confirms challenge acceptance + ) { + this.pollUntilValid(poll_uri) + .then(() => { + done.resolve() + }) // poll status until server states success + } else { + done.reject(false) // server did not confirm challenge acceptance + } + }) + }) + } else { + done.reject(false) // desired challenge is not in list + } + } else { + done.reject(false) // server did not respond with status URI + } } - } - }) + }) } }) + return done.promise } /** @@ -251,15 +252,13 @@ export class AcmeClient { * @param {Object} challenge * @param {function} callback - first argument will be the answer object */ - acceptChallenge(challenge, callback) { - /*jshint -W069 */ - if (!(challenge instanceof Object)) { - challenge = {} // ensure challenge is object - } - this.jWebClient.post(challenge['uri'], this.makeChallengeResponse(challenge), callback) - // dereference - callback = null - challenge = null + acceptChallenge(challenge = {}) { + let done = q.defer() + this.jWebClient.post(challenge['uri'], this.makeChallengeResponse(challenge)) + .then(() => { + done.resolve() + }) + return done.promise } /** @@ -269,28 +268,27 @@ export class AcmeClient { * @param {function} callback - first argument will be the answer object * @param {number} retry - factor of delay */ - pollUntilValid(uri, callback, retry = 1) { - /*jshint -W069 */ - if (typeof callback !== 'function') { - callback = this.emptyCallback // ensure callback is function - } + pollUntilValid(uri, retry = 1) { + let done = q.defer() if (retry > 128) { - callback(false) // stop if retry value exceeds maximum + done.reject(false) // stop if retry value exceeds maximum } else { - this.jWebClient.get(uri, (ans, res) => { - if (!(ans instanceof Object)) { - callback(false) // invalid answer - } else { - if (ans['status'] === 'pending') { // still pending - setTimeout(() => { - this.pollUntilValid(uri, callback, retry * 2) // retry - }, retry * 500) + this.jWebClient.get(uri) + .then((reqResArg) => { + if (!(reqResArg.ans instanceof Object)) { + done.reject(false) // invalid answer } else { - callback(ans, res) // challenge complete + if (reqResArg.ans['status'] === 'pending') { // still pending + setTimeout(() => { + this.pollUntilValid(uri, retry * 2) // retry + }, retry * 500) + } else { + done.resolve() // challenge complete + } } - } - }) + }) } + return done.promise } /** @@ -300,28 +298,27 @@ export class AcmeClient { * @param {function} callback - first argument will be the answer object * @param {number} retry - factor of delay */ - pollUntilIssued(uri, callback, retry = 1) { - /*jshint -W069 */ - if (typeof callback !== 'function') { - callback = this.emptyCallback // ensure callback is function - } + pollUntilIssued(uri, retry = 1) { + let done = q.defer() if (retry > 128) { - callback(false) // stop if retry value exceeds maximum + done.reject(false) // stop if retry value exceeds maximum } else { - this.jWebClient.get(uri, (ans, res) => { - if ((ans instanceof Buffer) && (ans.length > 0)) { - callback(ans) // certificate was returned with answer - } else { - if ((res instanceof Object) && (res['statusCode'] < 400)) { // still pending - setTimeout(() => { - this.pollUntilIssued(uri, callback, retry * 2) // retry - }, retry * 500) + this.jWebClient.get(uri) + .then((reqResArg: IReqResArg) => { + if ((reqResArg.ans instanceof Buffer) && (reqResArg.ans.length > 0)) { + done.resolve(reqResArg.ans) // certificate was returned with answer } else { - callback(false) // CSR complete + if ((reqResArg.res instanceof Object) && (reqResArg.res['statusCode'] < 400)) { // still pending + setTimeout(() => { + this.pollUntilIssued(uri, retry * 2) // retry + }, retry * 500) + } else { + done.reject(false) // CSR complete + } } - } - }) + }) } + return done.promise } /** @@ -330,37 +327,37 @@ export class AcmeClient { * @param {string} domain - expected to be already sanitized * @param {function} callback - first argument will be the answer object */ - requestSigning(commonName, callback) { + requestSigning(commonName) { let done = q.defer() fs.readFile(commonName + '.csr', (err, csrBuffer: Buffer) => { if (err instanceof Object) { // file system error if (this.jWebClient.verbose) { console.error('Error : File system error', err['code'], 'while reading key from file') } - callback(false) + done.reject(false) } else { let csr = csrBuffer.toString() - this.jWebClient.post(this.directory['new-cert'], this.makeCertRequest(csr, this.daysValid), (ans, res) => { - if ((ans instanceof Buffer) && (ans.length > 0)) { // answer is buffer - callback(ans) // certificate was returned with answer - } else { - if (res instanceof Object) { - if ((res['statusCode'] < 400) && !ans) { // success response, but no answer was provided - let headers = res['headers'] - if (!(headers instanceof Object)) { - headers = {} // ensure headers is object - } - this.pollUntilIssued(headers['location'], callback) // poll provided status URI - // dereference - headers = null - } else { - callback((res['statusCode'] < 400) ? ans : false) // answer may be provided as string or object - } + this.jWebClient.post(this.directory['new-cert'], this.makeCertRequest(csr, this.daysValid)) + .then((reqResArg: IReqResArg) => { + if ((reqResArg.ans instanceof Buffer) && (reqResArg.ans.length > 0)) { // answer is buffer + done.resolve(reqResArg.ans) // certificate was returned with answer } else { - callback(false) // invalid response + if (reqResArg.res instanceof Object) { + if ((reqResArg.res['statusCode'] < 400) && !reqResArg.ans) { // success response, but no answer was provided + let headers = reqResArg['headers'] + if (!(headers instanceof Object)) { + headers = {} // ensure headers is object + } + this.pollUntilIssued(headers['location']) + .then(x => { done.resolve(x) }) + } else { + done.resolve((reqResArg.res['statusCode'] < 400) ? reqResArg.ans : false) // answer may be provided as string or object + } + } else { + done.reject(false) // invalid response + } } - } - }) + }) } }) return done.promise @@ -378,21 +375,22 @@ export class AcmeClient { done.reject(new Error('server did not respond with directory')) } else { this.directory = dir // cache directory - this.newRegistration(null, (ans, res) => { // try new registration to get registration link - if ( - (res instanceof Object) - && (res['headers'] instanceof Object) - && (typeof res.headers['location'] === 'string') - ) { - this.regLink = res.headers['location'] - this.getRegistration(this.regLink, null) - .then((reqResArg: IReqResArg) => { - done.resolve() - }) // get registration info from link - } else { - done.reject(new Error('registration failed')) - } - }) + this.newRegistration(null) + .then((reqResArg: IReqResArg) => { // try new registration to get registration link + if ( + (reqResArg.res instanceof Object) + && (reqResArg.res['headers'] instanceof Object) + && (typeof reqResArg.res.headers['location'] === 'string') + ) { + this.regLink = reqResArg.res.headers['location'] + this.getRegistration(this.regLink, null) + .then((reqResArg: IReqResArg) => { + done.resolve() + }) // get registration info from link + } else { + done.reject(new Error('registration failed')) + } + }) } }) return done.promise @@ -404,34 +402,32 @@ export class AcmeClient { * @param {string} email * @param {function} callback - first argument will be the registration URI */ - createAccount(email, callback) { - /*jshint -W069 */ + createAccount(email: string) { + let done = q.defer() if (typeof email === 'string') { - if (typeof callback !== 'function') { - callback = this.emptyCallback // ensure callback is function - } - this.newRegistration( - { - contact: [ - 'mailto:' + email - ] - }, - (ans, res) => { + this.newRegistration({ + contact: [ + 'mailto:' + email + ] + }) + .then((reqResArg: IReqResArg) => { if ( - (res instanceof Object) - && (res['statusCode'] === 201) - && (res['headers'] instanceof Object) - && (typeof res.headers['location'] === 'string') + (reqResArg.res instanceof Object) + && (reqResArg.res['statusCode'] === 201) + && (reqResArg.res['headers'] instanceof Object) + && (typeof reqResArg.res.headers['location'] === 'string') ) { - this.regLink = res.headers['location'] - callback(this.regLink) // registration URI + this.regLink = reqResArg.res.headers['location'] + done.resolve(this.regLink) // registration URI } else { - callback(false) // registration failed + done.reject(new Error('could not register new account')) // registration failed } }) + } else { - callback(false) // no email address provided + done.reject(new Error('no email address provided')) } + return done.promise } /** @@ -440,11 +436,14 @@ export class AcmeClient { * @param {string} tosLink * @param {function} callback - first argument will be the answer object */ - agreeTos(tosLink, callback) { + agreeTos(tosLink) { let done = q.defer() this.getRegistration(this.regLink, { 'Agreement': tosLink // terms of service URI - }).then(() => { done.resolve() }) + }).then(() => { + done.resolve() + }) + return done.promise } /** @@ -468,22 +467,23 @@ export class AcmeClient { emailAddress: email }) .then(() => { - this.requestSigning(domainArg, (cert) => { // send CSR - if ((cert instanceof Buffer) || (typeof cert === 'string')) { // valid certificate data - fs.writeFile(domainArg + '.der', cert, (err) => { // sanitize domain name for file path - if (err instanceof Object) { // file system error - if (this.jWebClient.verbose) { - console.error('Error : File system error', err['code'], 'while writing certificate to file') + this.requestSigning(domainArg) + .then((cert) => { // send CSR + if ((cert instanceof Buffer) || (typeof cert === 'string')) { // valid certificate data + fs.writeFile(domainArg + '.der', cert, (err) => { // sanitize domain name for file path + if (err instanceof Object) { // file system error + if (this.jWebClient.verbose) { + console.error('Error : File system error', err['code'], 'while writing certificate to file') + } + done.reject(err) + } else { + done.resolve() // CSR complete and certificate written to file system } - done.reject(err) - } else { - done.resolve() // CSR complete and certificate written to file system - } - }) - } else { - done.reject('invalid certificate data') - } - }) + }) + } else { + done.reject('invalid certificate data') + } + }) }) }) diff --git a/ts/smartacme.classes.smartacme.ts b/ts/smartacme.classes.smartacme.ts index df1fb73..3b23c14 100644 --- a/ts/smartacme.classes.smartacme.ts +++ b/ts/smartacme.classes.smartacme.ts @@ -12,9 +12,9 @@ export class SmartAcme { * creates an account */ createAccount() { - this.acmeClient.createAccount('test@bleu.de',(answer) => { + this.acmeClient.createAccount('test@bleu.de').then((answer) => { console.log(answer) - }) + }).catch(err => { console.log(err) }) } /**