From beaf8526b64a8d6b71b0c698724e434efe6d67a4 Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Tue, 13 Oct 2020 09:42:21 -0700 Subject: [PATCH] healthcheck 200 --- dist/src/controllers/confirmations.js | 6 +-- dist/src/controllers/confirmations.js.map | 2 +- dist/src/utils/res.js | 9 ++++ dist/src/utils/res.js.map | 2 +- src/controllers/confirmations.ts | 56 +++++++++++------------ src/utils/res.ts | 11 ++++- 6 files changed, 52 insertions(+), 34 deletions(-) diff --git a/dist/src/controllers/confirmations.js b/dist/src/controllers/confirmations.js index 163a9b5..5374c44 100644 --- a/dist/src/controllers/confirmations.js +++ b/dist/src/controllers/confirmations.js @@ -150,7 +150,7 @@ function healthcheck(req, res) { return __awaiter(this, void 0, void 0, function* () { const pubkey = req.query.pubkey; if (!(pubkey && pubkey.length === 66)) { - return res_1.failure(res, 'missing pubkey'); + return res_1.failure200(res, 'missing pubkey'); } const owner = yield models_1.models.Contact.findOne({ where: { isOwner: true } }); const amt = 10; @@ -169,7 +169,7 @@ function healthcheck(req, res) { yield network.signAndSend(opts); } catch (e) { - res_1.failure(res, e); + res_1.failure200(res, e); return; } let i = 0; @@ -177,7 +177,7 @@ function healthcheck(req, res) { if (i >= 15) { clearInterval(interval); delete heartbeats[pubkey]; - res_1.failure(res, 'no confimration received'); + res_1.failure200(res, 'no confimration received'); return; } if (heartbeats[pubkey]) { diff --git a/dist/src/controllers/confirmations.js.map b/dist/src/controllers/confirmations.js.map index dc34e34..8f66ead 100644 --- a/dist/src/controllers/confirmations.js.map +++ b/dist/src/controllers/confirmations.js.map @@ -1 +1 @@ -{"version":3,"file":"confirmations.js","sourceRoot":"","sources":["../../../src/controllers/confirmations.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"confirmations.js","sourceRoot":"","sources":["../../../src/controllers/confirmations.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/src/utils/res.js b/dist/src/utils/res.js index d479962..14c87ac 100644 --- a/dist/src/utils/res.js +++ b/dist/src/utils/res.js @@ -18,4 +18,13 @@ function failure(res, e) { res.end(); } exports.failure = failure; +function failure200(res, e) { + res.status(200); + res.json({ + success: false, + error: (e && e.message) || e, + }); + res.end(); +} +exports.failure200 = failure200; //# sourceMappingURL=res.js.map \ No newline at end of file diff --git a/dist/src/utils/res.js.map b/dist/src/utils/res.js.map index 9c20bd0..83cec3b 100644 --- a/dist/src/utils/res.js.map +++ b/dist/src/utils/res.js.map @@ -1 +1 @@ -{"version":3,"file":"res.js","sourceRoot":"","sources":["../../../src/utils/res.ts"],"names":[],"mappings":";;AAAA,SAAS,OAAO,CAAC,GAAG,EAAE,IAAI;IACxB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAChB,GAAG,CAAC,IAAI,CAAC;QACP,OAAO,EAAE,IAAI;QACb,QAAQ,EAAE,IAAI;KACf,CAAC,CAAC;IACH,GAAG,CAAC,GAAG,EAAE,CAAC;AACZ,CAAC;AAWO,0BAAO;AATf,SAAS,OAAO,CAAC,GAAG,EAAE,CAAC;IACrB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAChB,GAAG,CAAC,IAAI,CAAC;QACP,OAAO,EAAE,KAAK;QACd,KAAK,EAAE,CAAC,CAAC,IAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;KAC3B,CAAC,CAAC;IACH,GAAG,CAAC,GAAG,EAAE,CAAC;AACZ,CAAC;AAEgB,0BAAO"} \ No newline at end of file +{"version":3,"file":"res.js","sourceRoot":"","sources":["../../../src/utils/res.ts"],"names":[],"mappings":";;AAAA,SAAS,OAAO,CAAC,GAAG,EAAE,IAAI;IACxB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAChB,GAAG,CAAC,IAAI,CAAC;QACP,OAAO,EAAE,IAAI;QACb,QAAQ,EAAE,IAAI;KACf,CAAC,CAAC;IACH,GAAG,CAAC,GAAG,EAAE,CAAC;AACZ,CAAC;AAoBO,0BAAO;AAlBf,SAAS,OAAO,CAAC,GAAG,EAAE,CAAC;IACrB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAChB,GAAG,CAAC,IAAI,CAAC;QACP,OAAO,EAAE,KAAK;QACd,KAAK,EAAE,CAAC,CAAC,IAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;KAC3B,CAAC,CAAC;IACH,GAAG,CAAC,GAAG,EAAE,CAAC;AACZ,CAAC;AAWgB,0BAAO;AATxB,SAAS,UAAU,CAAC,GAAG,EAAE,CAAC;IACxB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAChB,GAAG,CAAC,IAAI,CAAC;QACP,OAAO,EAAE,KAAK;QACd,KAAK,EAAE,CAAC,CAAC,IAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;KAC3B,CAAC,CAAC;IACH,GAAG,CAAC,GAAG,EAAE,CAAC;AACZ,CAAC;AAEyB,gCAAU"} \ No newline at end of file diff --git a/src/controllers/confirmations.ts b/src/controllers/confirmations.ts index 8662218..d9b4811 100644 --- a/src/controllers/confirmations.ts +++ b/src/controllers/confirmations.ts @@ -4,7 +4,7 @@ import * as socket from '../utils/socket' import * as jsonUtils from '../utils/json' import * as network from '../network' import constants from '../constants' -import { failure, success } from '../utils/res' +import { success, failure200 } from '../utils/res' export function sendConfirmation({ chat, sender, msg_id }) { if (!msg_id) return @@ -112,7 +112,7 @@ export async function receiveHeartbeat(payload) { const owner = await models.Contact.findOne({ where: { isOwner: true } }) - const amount = Math.round(receivedAmount/2) + const amount = Math.round(receivedAmount / 2) const amt = Math.max(amount || constants.min_sat_amount) const opts = { amt, @@ -131,11 +131,11 @@ export async function receiveHeartbeat(payload) { } } -let heartbeats:{[k:string]:boolean} = {} +let heartbeats: { [k: string]: boolean } = {} export async function healthcheck(req, res) { - const pubkey:string = req.query.pubkey - if (!(pubkey&&pubkey.length===66)) { - return failure(res, 'missing pubkey') + const pubkey: string = req.query.pubkey + if (!(pubkey && pubkey.length === 66)) { + return failure200(res, 'missing pubkey') } const owner = await models.Contact.findOne({ where: { isOwner: true } }) @@ -155,34 +155,34 @@ export async function healthcheck(req, res) { try { await network.signAndSend(opts) } catch (e) { - failure(res, e) - return - } - - let i = 0 - let interval = setInterval(()=>{ - if(i>=15) { - clearInterval(interval) - delete heartbeats[pubkey] - failure(res, 'no confimration received') - return - } - if(heartbeats[pubkey]) { - success(res, 'success') - clearInterval(interval) - delete heartbeats[pubkey] - return - } - i ++ - }, 1000) + failure200(res, e) + return + } + + let i = 0 + let interval = setInterval(() => { + if (i >= 15) { + clearInterval(interval) + delete heartbeats[pubkey] + failure200(res, 'no confimration received') + return + } + if (heartbeats[pubkey]) { + success(res, 'success') + clearInterval(interval) + delete heartbeats[pubkey] + return + } + i++ + }, 1000) } export async function receiveHeartbeatConfirmation(payload) { - console.log('=> received heartbeat confirmation') + console.log('=> received heartbeat confirmation') const dat = payload.content || payload const sender_pub_key = dat.sender.pub_key - heartbeats[sender_pub_key] = true + heartbeats[sender_pub_key] = true } \ No newline at end of file diff --git a/src/utils/res.ts b/src/utils/res.ts index cd4cec8..fa79000 100644 --- a/src/utils/res.ts +++ b/src/utils/res.ts @@ -16,4 +16,13 @@ function failure(res, e) { res.end(); } -export {success, failure} \ No newline at end of file +function failure200(res, e) { + res.status(200); + res.json({ + success: false, + error: (e&&e.message) || e, + }); + res.end(); +} + +export {success, failure, failure200} \ No newline at end of file