From e1e6b8798138c2fff7a63cf18d0a281ba199083b Mon Sep 17 00:00:00 2001 From: Daniel Lugo Date: Tue, 21 Jul 2020 13:34:53 -0400 Subject: [PATCH] wait for listeners to proccess one tick before fetching --- src/routes.js | 52 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 35 insertions(+), 17 deletions(-) diff --git a/src/routes.js b/src/routes.js index ecd8786a..e562c2b7 100644 --- a/src/routes.js +++ b/src/routes.js @@ -1720,9 +1720,12 @@ module.exports = async ( try { // spinup Events.onSimplerReceivedRequests(() => {})() - const data = Events.getCurrentReceivedReqs() - res.json({ - data, + // ensure event data gets updated before fetching it + process.nextTick(() => { + const data = Events.getCurrentReceivedReqs() + res.json({ + data, + }) }) } catch (err) { logger.info('Error in Received Requests poll:') @@ -1737,10 +1740,14 @@ module.exports = async ( try { // spinup Events.onSimplerSentRequests(() => {})() - const data = Events.getCurrentSentReqs() - logger.info(`Sent requests poll: ${JSON.stringify(data, null, 4)}`) - res.json({ - data, + + // ensure event data gets updated before fetching it + process.nextTick(() => { + const data = Events.getCurrentSentReqs() + logger.info(`Sent requests poll: ${JSON.stringify(data, null, 4)}`) + res.json({ + data, + }) }) } catch (err) { logger.info('Error in sentRequests poll:') @@ -1755,10 +1762,14 @@ module.exports = async ( try { // spinup Events.onChats(() => {})() - const data = Events.getChats() - logger.info(`Chats polled: ${data.length}`) - res.json({ - data + + // ensure event data gets updated before fetching it + process.nextTick(() => { + const data = Events.getChats() + logger.info(`Chats polled: ${data.length}`) + res.json({ + data, + }) }) } catch (err) { logger.info('Error in Chats poll:') @@ -2131,10 +2142,13 @@ module.exports = async ( try { // spinup Events.onSimplerReceivedRequests(() => {})() - const data = Events.getCurrentReceivedReqs() - return res.status(200).json({ - data + // ensure event data gets updated before fetching it + process.nextTick(() => { + const data = Events.getCurrentReceivedReqs() + res.json({ + data, + }) }) } catch (err) { logger.error(err) @@ -2151,10 +2165,14 @@ module.exports = async ( try { // spinup Events.onSimplerSentRequests(() => {})() - const data = Events.getCurrentSentReqs() + - return res.status(200).json({ - data + // ensure event data gets updated before fetching it + process.nextTick(() => { + const data = Events.getCurrentSentReqs() + res.json({ + data, + }) }) } catch (err) { logger.error(err)