diff --git a/Files/DailyFiles.js b/Files/DailyFiles.js index bd044b890..8c5601d71 100644 --- a/Files/DailyFiles.js +++ b/Files/DailyFiles.js @@ -13,7 +13,8 @@ function newDailyFiles() { setTimePeriod: setTimePeriod, getExpectedFiles: getExpectedFiles, getFilesLoaded: getFilesLoaded, - initialize: initialize + initialize: initialize, + finalize: finalize } let filesLoaded = 0; @@ -21,13 +22,37 @@ function newDailyFiles() { let fileCloud; - let marketFiles = new Map; let fileCursors = new Map; let callBackWhenFileReceived; return thisObject; + function finalize() { + + try { + + if (INFO_LOG === true) { logger.write("[INFO] finalize -> Entering function."); } + + filesLoaded = undefined; + expectedFiles = undefined; + fileCloud = undefined; + + fileCursors.forEach(finalizeEach); + + function finalizeEach(item, key, mapObj) { + + if (INFO_LOG === true) { logger.write("[INFO] finalize -> finalizeEach -> Entering function."); } + + item.finalize(); + } + + } catch (err) { + + if (ERROR_LOG === true) { logger.write("[ERROR] finalize -> err = " + err); } + } + } + function initialize(pDevTeam, pBot, pProduct, pSet, pExchange, pMarket, pDatetime, pTimePeriod, callBackFunction) { try { diff --git a/Files/FileCursor.js b/Files/FileCursor.js index 4a65ac2ad..d25ce9a6b 100644 --- a/Files/FileCursor.js +++ b/Files/FileCursor.js @@ -2,7 +2,7 @@ function newFileCursor() { const MODULE_NAME = "File Cursor"; - const INFO_LOG = false; + const INFO_LOG = true; const ERROR_LOG = true; const logger = newDebugLog(); logger.fileName = MODULE_NAME; @@ -15,7 +15,8 @@ function newFileCursor() { setTimePeriod: setTimePeriod, files: undefined, getExpectedFiles: getExpectedFiles, - initialize: initialize + initialize: initialize, + finalize: finalize } thisObject.files = files; @@ -34,8 +35,37 @@ function newFileCursor() { let beginDateRange; let endDateRange; + let intervalHandle; + return thisObject; + function finalize() { + + try { + + if (INFO_LOG === true) { logger.write("[INFO] finalize -> Entering function."); } + + clearInterval(intervalHandle); + + files = undefined; + cursorDate = undefined; + market = undefined; + exchange = undefined; + fileCloud = undefined; + devTeam = undefined; + bot = undefined; + thisSet = undefined; + periodName = undefined; + timePeriod = undefined; + beginDateRange = undefined; + endDateRange = undefined; + + } catch (err) { + + if (ERROR_LOG === true) { logger.write("[ERROR] finalize -> err = " + err); } + } + } + function initialize(pFileCloud, pDevTeam, pBot, pSet, pExchange, pMarket, pPeriodName, pTimePeriod, pCursorDate, pCurrentTimePeriod, pBeginDateRange, pEndDateRange, callBackFunction) { try { @@ -57,6 +87,8 @@ function newFileCursor() { setTimePeriod(pCurrentTimePeriod, pCursorDate, callBackFunction); + intervalHandle = setInterval(updateFiles , timePeriod); + } catch (err) { if (ERROR_LOG === true) { logger.write("[ERROR] initialize -> err = " + err); } @@ -64,6 +96,72 @@ function newFileCursor() { } } + function updateFiles() { + + try { + + if (INFO_LOG === true) { logger.write("[INFO] updateFiles -> Entering function."); } + + let targetDate = new Date(); + let dateString = targetDate.getUTCFullYear() + '-' + pad(targetDate.getUTCMonth() + 1, 2) + '-' + pad(targetDate.getUTCDate(), 2); + + let file = thisObject.files.get(dateString); + + if (file !== undefined) { + + if (INFO_LOG === true) { logger.write("[INFO] updateFiles -> File found at the cursor, proceeding to update."); } + + fileCloud.getFile(devTeam, bot, thisSet, exchange, market, periodName, targetDate, undefined, undefined, onFileReceived); + + } + + function onFileReceived(err, file) { + + try { + + if (INFO_LOG === true) { logger.write("[INFO] updateFiles -> onFileReceived -> Entering function."); } + + switch (err.result) { + case GLOBAL.DEFAULT_OK_RESPONSE.result: { + + if (INFO_LOG === true) { logger.write("[INFO] updateFiles -> onFileReceived -> Received OK Response."); } + break; + } + + case GLOBAL.DEFAULT_FAIL_RESPONSE.result: { + + if (INFO_LOG === true) { logger.write("[INFO] updateFiles -> onFileReceived -> Received FAIL Response."); } + return; + } + + default: { + + if (INFO_LOG === true) { logger.write("[INFO] updateFiles -> onFileReceived -> Received Unexpected Response."); } + return; + } + } + + 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); } + + + } catch (err) { + + if (ERROR_LOG === true) { logger.write("[ERROR] updateFiles -> onFileReceived -> err = " + err); } + callBackFunction(GLOBAL.DEFAULT_FAIL_RESPONSE); + } + } + } catch (err) { + + if (ERROR_LOG === true) { logger.write("[ERROR] updateFiles -> err = " + err); } + } + } + function setTimePeriod(pTimePeriod, pDatetime, callBackFunction) { try { @@ -449,7 +547,7 @@ function newFileCursor() { default: { - if (INFO_LOG === true) { logger.write("[INFO] initialize -> onFileReceived -> Received Unexpected Response."); } + if (INFO_LOG === true) { logger.write("[INFO] getFiles -> onFileReceived -> Received Unexpected Response."); } callBackFunction(err); return; } diff --git a/Files/MarketFiles.js b/Files/MarketFiles.js index cd8c20946..2e2a068a7 100644 --- a/Files/MarketFiles.js +++ b/Files/MarketFiles.js @@ -2,16 +2,18 @@ function newMarketFiles() { const MODULE_NAME = "Market Files"; - const INFO_LOG = false; + const INFO_LOG = true; const ERROR_LOG = true; const logger = newDebugLog(); logger.fileName = MODULE_NAME; let thisObject = { + eventHandler: undefined, getFile: getFile, getExpectedFiles: getExpectedFiles, getFilesLoaded: getFilesLoaded, - initialize: initialize + initialize: initialize, + finalize: finalize } let filesLoaded = 0; @@ -19,9 +21,42 @@ function newMarketFiles() { let fileCloud; let files = new Map; - + + let market; + let exchange; + let devTeam; + let bot; + let thisSet; + let periodName; + + thisObject.eventHandler = newEventHandler(); + + let intervalHandle; + return thisObject; + function finalize() { + + try { + + if (INFO_LOG === true) { logger.write("[INFO] finalize -> Entering function."); } + + clearInterval(intervalHandle); + + filesLoaded = undefined; + market = undefined; + exchange = undefined; + devTeam = undefined; + bot = undefined; + thisSet = undefined; + periodName = undefined; + + } catch (err) { + + if (ERROR_LOG === true) { logger.write("[ERROR] finalize -> err = " + err); } + } + } + function initialize(pDevTeam, pBot, pProduct, pSet, pExchange, pMarket, callBackFunction) { try { @@ -29,7 +64,7 @@ function newMarketFiles() { if (INFO_LOG === true) { logger.write("[INFO] initialize -> Entering function."); } if (INFO_LOG === true) { logger.write("[INFO] initialize -> key = " + pDevTeam.codeName + "-" + pBot.codeName + "-" + pProduct.codeName); } - let exchange = ecosystem.getExchange(pProduct, pExchange); + exchange = ecosystem.getExchange(pProduct, pExchange); if (exchange === undefined) { @@ -37,6 +72,13 @@ function newMarketFiles() { } + intervalHandle = setInterval(updateFiles, _10_MINUTES_IN_MILISECONDS); + + market = pMarket; + devTeam = pDevTeam; + bot = pBot; + thisSet = pSet; + fileCloud = newFileCloud(); fileCloud.initialize(pBot); @@ -47,9 +89,9 @@ function newMarketFiles() { let periodTime = marketFilesPeriods[i][0]; let periodName = marketFilesPeriods[i][1]; - if (pSet.validPeriods.includes(periodName) === true) { + if (thisSet.validPeriods.includes(periodName) === true) { - fileCloud.getFile(pDevTeam, pBot, pSet, exchange, pMarket, periodName, undefined, undefined, undefined, onFileReceived); + fileCloud.getFile(devTeam, bot, thisSet, exchange, market, periodName, undefined, undefined, undefined, onFileReceived); function onFileReceived(err, file) { @@ -110,7 +152,85 @@ function newMarketFiles() { callBackFunction(GLOBAL.DEFAULT_FAIL_RESPONSE); } } - + + function updateFiles() { + + try { + + let updateFiles = 0; + + if (INFO_LOG === true) { logger.write("[INFO] updateFiles -> Entering function."); } + + /* Now we will get the market files */ + + for (let i = 0; i < marketFilesPeriods.length; i++) { + + let periodTime = marketFilesPeriods[i][0]; + let periodName = marketFilesPeriods[i][1]; + + if (thisSet.validPeriods.includes(periodName) === true) { + + fileCloud.getFile(devTeam, bot, thisSet, exchange, market, periodName, undefined, undefined, undefined, onFileReceived); + + function onFileReceived(err, file) { + + try { + + if (INFO_LOG === true) { logger.write("[INFO] updateFiles -> onFileReceived -> Entering function."); } + + switch (err.result) { + case GLOBAL.DEFAULT_OK_RESPONSE.result: { + + if (INFO_LOG === true) { logger.write("[INFO] updateFiles -> onFileReceived -> Received OK Response."); } + break; + } + + case GLOBAL.DEFAULT_FAIL_RESPONSE.result: { + + if (INFO_LOG === true) { logger.write("[INFO] updateFiles -> onFileReceived -> Received FAIL Response."); } + return; + } + + case GLOBAL.CUSTOM_FAIL_RESPONSE.result: { + + if (INFO_LOG === true) { logger.write("[INFO] updateFiles -> onFileReceived -> Received CUSTOM FAIL Response."); } + if (INFO_LOG === true) { logger.write("[INFO] updateFiles -> onFileReceived -> err.message = " + err.message); } + return; + } + + default: { + + if (INFO_LOG === true) { logger.write("[INFO] updateFiles -> onFileReceived -> Received Unexpected Response."); } + return; + } + } + + files.set(periodTime, file); + updateFiles++; + + if (updateFiles === marketFilesPeriods.length) { + + if (INFO_LOG === true) { logger.write("[INFO] updateFiles -> onFileReceived -> All files received. "); } + 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); } + + thisObject.eventHandler.raiseEvent("Files Updated", undefined); + } + + } catch (err) { + + if (ERROR_LOG === true) { logger.write("[ERROR] updateFiles -> onFileReceived -> err = " + err); } + } + } + } + } + } catch (err) { + + if (ERROR_LOG === true) { logger.write("[ERROR] updateFiles -> err = " + err); } + } + } + function getFile(pPeriod) { if (INFO_LOG === true) { logger.write("[INFO] getFile -> Entering function."); } diff --git a/ProductStorage.js b/ProductStorage.js index 1893beffc..bf5d71d70 100644 --- a/ProductStorage.js +++ b/ProductStorage.js @@ -37,7 +37,8 @@ function newProductStorage(pName) { setTimePeriod: setTimePeriod, eventHandler: undefined, - initialize: initialize + initialize: initialize, + finalize: finalize } @@ -52,6 +53,34 @@ function newProductStorage(pName) { return thisObject; + function finalize() { + + try { + + if (INFO_LOG === true) { logger.write("[INFO] finalize -> Entering function."); } + + for (let i = 0; i < thisObject.marketFiles.length; i++) { + + let marketFile = thisObject.marketFiles[i]; + marketFile.finalize(); + } + + thisObject.marketFiles = undefined; + + for (let i = 0; i < thisObject.dailyFiles.length; i++) { + + let dailyFile = thisObject.dailyFiles[i]; + dailyFile.finalize(); + } + + thisObject.dailyFile = undefined; + + } catch (err) { + + if (ERROR_LOG === true) { logger.write("[ERROR] finalize -> err = " + err); } + } + } + function initialize(pDevTeam, pBot, pProduct, pExchange, pMarket, pDatetime, pTimePeriod, callBackFunction) { try { diff --git a/TimelineChart.js b/TimelineChart.js index 9ffd0bdc1..7e317abab 100644 --- a/TimelineChart.js +++ b/TimelineChart.js @@ -668,7 +668,7 @@ canvas.floatingSpace.noteSets.destroyNoteSet(productPlotters[i].noteSet); - /* Finally the panels. */ + /* Then the panels. */ for (let j = 0; j < productPlotters[i].panels.length; j++) { @@ -676,6 +676,10 @@ } + /* Finally the Storage Objects */ + + productPlotters[i].storage.finalize(); + productPlotters.splice(i, 1); // Delete item from array. }