diff --git a/src/DailyFiles.js b/src/DailyFiles.js index fe6eefe52..2bbda5c6a 100644 --- a/src/DailyFiles.js +++ b/src/DailyFiles.js @@ -6,6 +6,7 @@ function newDailyFiles () { logger.fileName = MODULE_NAME let thisObject = { + eventHandler: undefined, getFileCursor: getFileCursor, setDatetime: setDatetime, setTimePeriod: setTimePeriod, @@ -17,17 +18,19 @@ function newDailyFiles () { let filesLoaded = 0 let expectedFiles = 0 - let fileCloud - let fileCursors = new Map() - let callBackWhenFileReceived + thisObject.eventHandler = newEventHandler() + return thisObject function finalize () { try { + thisObject.eventHandler.finalize() + thisObject.eventHandler = undefined + filesLoaded = undefined expectedFiles = undefined fileCloud = undefined @@ -106,6 +109,7 @@ function newDailyFiles () { if (pSet.validPeriods.includes(periodName) === true) { let fileCursor = newFileCursor() + fileCursor.eventHandler = thisObject.eventHandler // We share our event handler with each file cursor, so that they can raise events there when files are changed.s fileCursor.initialize(fileCloud, pDevTeam, pBot, pSet, exchange, pMarket, periodName, periodTime, pDatetime, pTimePeriod, beginDateRange, endDateRange, onInitialized) function onInitialized (err) { try { diff --git a/src/FileCursor.js b/src/FileCursor.js index 6b9f0c487..caa066abf 100644 --- a/src/FileCursor.js +++ b/src/FileCursor.js @@ -9,6 +9,7 @@ function newFileCursor () { let cursorDate let thisObject = { + eventHandler: undefined, // received from parent reload: reload, setDatetime: setDatetime, setTimePeriod: setTimePeriod, @@ -41,6 +42,8 @@ function newFileCursor () { try { if (INFO_LOG === true) { logger.write('[INFO] finalize -> Entering function.') } + thisObject.eventHandler = undefined + clearInterval(intervalHandle) thisObject.files = undefined @@ -154,12 +157,7 @@ function newFileCursor () { } thisObject.files.set(dateString, file) - - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> onFileReceived -> File updated.') } - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> onFileReceived -> devTeam = ' + devTeam.codeName) } - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> onFileReceived -> bot = ' + bot.codeName) } - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> onFileReceived -> thisSet = ' + thisSet.codeName) } - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> onFileReceived -> dateString = ' + dateString) } + thisObject.eventHandler.raiseEvent('Files Updated') } catch (err) { if (ERROR_LOG === true) { logger.write('[ERROR] updateFiles -> onFileReceived -> err = ' + err.stack) } callBackFunction(GLOBAL.DEFAULT_FAIL_RESPONSE) diff --git a/src/MarketFiles.js b/src/MarketFiles.js index a682c491c..e574e3893 100644 --- a/src/MarketFiles.js +++ b/src/MarketFiles.js @@ -43,6 +43,9 @@ function newMarketFiles () { filesLoaded = undefined files = undefined finalized = true + + thisObject.eventHandler.finalize() + thisObject.eventHandler = undefined } catch (err) { if (ERROR_LOG === true) { logger.write('[ERROR] finalize -> err = ' + err.stack) } } @@ -120,7 +123,7 @@ function newMarketFiles () { updatedFiles++ if (updatedFiles === marketFilesPeriods.length) { - thisObject.eventHandler.raiseEvent('Files Updated', undefined) + thisObject.eventHandler.raiseEvent('Files Updated') } } catch (err) { if (ERROR_LOG === true) { logger.write('[ERROR] updateFiles -> onFileReceived -> err = ' + err.stack) }