diff --git a/src/FileCursor.js b/src/FileCursor.js index 7f4414972..6b9f0c487 100644 --- a/src/FileCursor.js +++ b/src/FileCursor.js @@ -1,5 +1,5 @@ -function newFileCursor() { +function newFileCursor () { const MODULE_NAME = 'File Cursor' const INFO_LOG = false const ERROR_LOG = true @@ -37,7 +37,7 @@ function newFileCursor() { return thisObject - function finalize() { + function finalize () { try { if (INFO_LOG === true) { logger.write('[INFO] finalize -> Entering function.') } @@ -54,7 +54,7 @@ function newFileCursor() { } } - function initialize(pFileCloud, pDevTeam, pBot, pSet, pExchange, pMarket, pPeriodName, pTimePeriod, pCursorDate, pCurrentTimePeriod, pBeginDateRange, pEndDateRange, callBackFunction) { + function initialize (pFileCloud, pDevTeam, pBot, pSet, pExchange, pMarket, pPeriodName, pTimePeriod, pCursorDate, pCurrentTimePeriod, pBeginDateRange, pEndDateRange, callBackFunction) { try { if (INFO_LOG === true) { logger.write('[INFO] initialize -> Entering function.') } if (INFO_LOG === true) { logger.write('[INFO] initialize -> key = ' + pDevTeam.codeName + '-' + pBot.codeName + '-' + pSet.codeName + '-' + pPeriodName) } @@ -88,7 +88,7 @@ function newFileCursor() { } } - function updateFiles() { + function updateFiles () { try { if (finalized === true) { return } if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> Entering function.') } @@ -114,8 +114,6 @@ function newFileCursor() { 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) return @@ -132,31 +130,25 @@ function newFileCursor() { dateString = targetDate.getUTCFullYear() + '-' + pad(targetDate.getUTCMonth() + 1, 2) + '-' + pad(targetDate.getUTCDate(), 2) if (file !== undefined) { - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> Previous day file found at the cursor, proceeding to add current date.') } - fileCloud.getFile(devTeam, bot, thisSet, exchange, market, periodName, targetDate, undefined, undefined, onFileReceived) return } - function onFileReceived(err, file) { + function onFileReceived (err, file) { try { if (finalized === true) { return } - 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 } } @@ -178,10 +170,9 @@ function newFileCursor() { } } - function setTimePeriod(pTimePeriod, pDatetime) { + function setTimePeriod (pTimePeriod, pDatetime) { try { if (finalized === true) { return } - if (INFO_LOG === true) { logger.write('[INFO] setTimePeriod -> Entering function.') } /* @@ -224,7 +215,7 @@ function newFileCursor() { enterSavingMode() } - function enterSavingMode() { + function enterSavingMode () { try { if (INFO_LOG === true) { logger.write('[INFO] setTimePeriod -> enterSavingMode -> Entering function.') } @@ -303,7 +294,7 @@ function newFileCursor() { } } - function exitSavingMode() { + function exitSavingMode () { try { if (INFO_LOG === true) { logger.write('[INFO] setTimePeriod -> exitSavingMode -> Entering function.') } @@ -386,7 +377,7 @@ function newFileCursor() { } } - function setDatetime(pDatetime) { + function setDatetime (pDatetime) { try { if (finalized === true) { return } if (INFO_LOG === true) { logger.write('[INFO] setDatetime -> Entering function.') } @@ -402,7 +393,7 @@ function newFileCursor() { } } - function reload(callBackFunction) { + function reload (callBackFunction) { try { if (finalized === true) { return } if (INFO_LOG === true) { logger.write('[INFO] reload -> Entering function.') } @@ -416,7 +407,7 @@ function newFileCursor() { } } - function getFiles(callBackFunction) { + function getFiles (callBackFunction) { try { if (finalized === true) { return } if (INFO_LOG === true) { logger.write('[INFO] getFiles -> Entering function.') } @@ -428,7 +419,7 @@ function newFileCursor() { getNextFile() - function getNextFile() { + function getNextFile () { try { if (INFO_LOG === true) { logger.write('[INFO] getFiles -> getNextFile -> Entering function.') } @@ -487,7 +478,7 @@ function newFileCursor() { } } - function onFileReceived(err, file) { + function onFileReceived (err, file) { try { if (INFO_LOG === true) { logger.write('[INFO] getFiles -> onFileReceived -> Entering function.') } @@ -532,7 +523,7 @@ function newFileCursor() { } } - function controlLoop() { + function controlLoop () { try { if (INFO_LOG === true) { logger.write('[INFO] getFiles -> controlLoop -> Entering function.') } @@ -556,7 +547,7 @@ function newFileCursor() { } } - function collectGarbage(callBackFunction) { + function collectGarbage (callBackFunction) { try { if (finalized === true) { return } if (INFO_LOG === true) { logger.write('[INFO] collectGarbage -> Entering function.') } @@ -579,7 +570,7 @@ function newFileCursor() { } } - function getExpectedFiles() { + function getExpectedFiles () { if (finalized === true) { return } if (INFO_LOG === true) { logger.write('[INFO] getExpectedFiles -> Entering function.') } diff --git a/src/FileSequence.js b/src/FileSequence.js index a78a18625..24ebd4033 100644 --- a/src/FileSequence.js +++ b/src/FileSequence.js @@ -35,12 +35,6 @@ function newFileSequence () { function finalize () { try { - if (INFO_LOG === true) { logger.write('[INFO] finalize -> Entering function.') } - if (INFO_LOG === true) { logger.write('[INFO] finalize -> devTeam = ' + devTeam.codeName) } - if (INFO_LOG === true) { logger.write('[INFO] finalize -> bot = ' + bot.codeName) } - if (INFO_LOG === true) { logger.write('[INFO] finalize -> thisSet = ' + thisSet.codeName) } - if (INFO_LOG === true) { logger.write('[INFO] finalize -> intervalHandle = ' + intervalHandle) } - clearInterval(intervalHandle) filesLoaded = undefined @@ -55,18 +49,13 @@ function newFileSequence () { function initialize (pDevTeam, pBot, pProduct, pSet, pExchange, pMarket, callBackFunction) { try { - 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) } - exchange = ecosystem.getExchange(pProduct, pExchange) if (exchange === undefined) { throw 'Exchange not supoorted by this pProduct of the ecosystem! - pDevTeam.codeName = ' + pDevTeam.codeName + ', pBot.codeName = ' + pBot.codeName + ', pProduct.codeName = ' + pProduct.codeName + ', pExchange = ' + pExchange } - intervalHandle = setInterval(updateFiles(), _1_MINUTE_IN_MILISECONDS) - - if (INFO_LOG === true) { logger.write('[INFO] initialize -> intervalHandle = ' + intervalHandle) } + intervalHandle = setInterval(updateFiles, _1_MINUTE_IN_MILISECONDS) market = pMarket devTeam = pDevTeam @@ -83,41 +72,33 @@ function newFileSequence () { function onSequenceFileReceived (err, file) { try { - if (INFO_LOG === true) { logger.write('[INFO] initialize -> onSequenceFileReceived -> Entering function.') } - if (INFO_LOG === true) { logger.write('[INFO] initialize -> onSequenceFileReceived -> key = ' + devTeam.codeName + '-' + bot.codeName + '-' + product.codeName) } - initialized = true switch (err.result) { case GLOBAL.DEFAULT_OK_RESPONSE.result: { - if (INFO_LOG === true) { logger.write('[INFO] initialize -> onSequenceFileReceived -> Received OK Response.') } break } case GLOBAL.DEFAULT_FAIL_RESPONSE.result: { - if (INFO_LOG === true) { logger.write('[INFO] initialize -> onSequenceFileReceived -> Received FAIL Response.') } callBackFunction(GLOBAL.DEFAULT_FAIL_RESPONSE) return } case GLOBAL.CUSTOM_OK_RESPONSE.result: { - if (INFO_LOG === true) { logger.write('[INFO] initialize -> onSequenceFileReceived -> Received CUSTOM OK Response.') } - if (INFO_LOG === true) { logger.write('[INFO] initialize -> onSequenceFileReceived -> err.message = ' + err.message) } + if (ERROR_LOG === true) { logger.write('[INFO] initialize -> onSequenceFileReceived -> err.message = ' + err.message) } callBackFunction(err) return } case GLOBAL.CUSTOM_FAIL_RESPONSE.result: { - if (INFO_LOG === true) { logger.write('[INFO] initialize -> onSequenceFileReceived -> Received CUSTOM FAIL Response.') } - if (INFO_LOG === true) { logger.write('[INFO] initialize -> onSequenceFileReceived -> err.message = ' + err.message) } + if (ERROR_LOG === true) { logger.write('[INFO] initialize -> onSequenceFileReceived -> err.message = ' + err.message) } callBackFunction(err, thisObject) return } default: { - if (INFO_LOG === true) { logger.write('[INFO] initialize -> onSequenceFileReceived -> Received Unexpected Response.') } callBackFunction(err) return } @@ -125,8 +106,6 @@ function newFileSequence () { maxSequence = Number(file) - if (INFO_LOG === true) { logger.write('[INFO] initialize -> onSequenceFileReceived -> maxSequence = ' + maxSequence) } - /* Now we will get the sequence of files */ for (let i = 0; i <= maxSequence; i++) { @@ -136,26 +115,21 @@ function newFileSequence () { try { switch (err.result) { case GLOBAL.DEFAULT_OK_RESPONSE.result: { - if (INFO_LOG === true) { logger.write('[INFO] initialize -> onSequenceFileReceived -> onFileReceived -> Received OK Response.') } break } case GLOBAL.DEFAULT_FAIL_RESPONSE.result: { - if (INFO_LOG === true) { logger.write('[INFO] initialize -> onSequenceFileReceived -> onFileReceived -> Received FAIL Response.') } callBackFunction(GLOBAL.DEFAULT_FAIL_RESPONSE) return } case GLOBAL.CUSTOM_FAIL_RESPONSE.result: { - if (INFO_LOG === true) { logger.write('[INFO] initialize -> onSequenceFileReceived -> onFileReceived -> Received CUSTOM FAIL Response.') } - if (INFO_LOG === true) { logger.write('[INFO] initialize -> onSequenceFileReceived -> onFileReceived -> err.message = ' + err.message) } - + if (ERROR_LOG === true) { logger.write('[INFO] initialize -> onSequenceFileReceived -> onFileReceived -> err.message = ' + err.message) } callBackFunction(err) return } default: { - if (INFO_LOG === true) { logger.write('[INFO] initialize -> onSequenceFileReceived -> onFileReceived -> Received Unexpected Response.') } callBackFunction(err) return } @@ -187,9 +161,7 @@ function newFileSequence () { try { if (finalized === true || initialized === false) { return } - let updateFiles = 0 - - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> Entering function.') } + logger.write('[INFO] updateFiles -> Entering function.') /* @@ -203,100 +175,71 @@ function newFileSequence () { let currentMaxSequence = maxSequence - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> currentMaxSequence = ' + currentMaxSequence) } - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> intervalHandle = ' + intervalHandle) } - - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> devTeam = ' + devTeam.codeName) } - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> bot = ' + bot.codeName) } - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> thisSet = ' + thisSet.codeName) } - fileCloud.getFile(devTeam, bot, thisSet, exchange, market, undefined, undefined, 'Sequence', undefined, onSequenceFileReceived) function onSequenceFileReceived (err, file) { try { - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> onSequenceFileReceived -> Entering function.') } - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> onSequenceFileReceived -> key = ' + devTeam.codeName + '-' + bot.codeName + '-' + product.codeName) } - switch (err.result) { case GLOBAL.DEFAULT_OK_RESPONSE.result: { - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> onSequenceFileReceived -> Received OK Response.') } break } case GLOBAL.DEFAULT_FAIL_RESPONSE.result: { - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> onSequenceFileReceived -> Received FAIL Response.') } return } case GLOBAL.CUSTOM_OK_RESPONSE.result: { - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> onSequenceFileReceived -> Received CUSTOM OK Response.') } - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> onSequenceFileReceived -> err.message = ' + err.message) } + if (ERROR_LOG === true) { logger.write('[INFO] updateFiles -> onSequenceFileReceived -> err.message = ' + err.message) } return } case GLOBAL.CUSTOM_FAIL_RESPONSE.result: { - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> onSequenceFileReceived -> Received CUSTOM FAIL Response.') } - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> onSequenceFileReceived -> err.message = ' + err.message) } + if (ERROR_LOG === true) { logger.write('[INFO] updateFiles -> onSequenceFileReceived -> err.message = ' + err.message) } return } default: { - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> onSequenceFileReceived -> Received Unexpected Response.') } + if (ERROR_LOG === true) { logger.write('[INFO] updateFiles -> onSequenceFileReceived -> Received Unexpected Response.') } return } } maxSequence = Number(file) - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> onSequenceFileReceived -> maxSequence = ' + maxSequence) } - /* Now we will get the sequence of files, but in this case only from the currentMaxSequence and above. */ for (let i = currentMaxSequence; i <= maxSequence; i++) { - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> onSequenceFileReceived -> i = ' + i) } - fileCloud.getFile(devTeam, bot, thisSet, exchange, market, undefined, undefined, i, undefined, onFileReceived) function onFileReceived (err, file) { try { switch (err.result) { case GLOBAL.DEFAULT_OK_RESPONSE.result: { - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> onSequenceFileReceived -> onFileReceived -> Received OK Response.') } break } case GLOBAL.DEFAULT_FAIL_RESPONSE.result: { - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> onSequenceFileReceived -> onFileReceived -> Received FAIL Response.') } return } case GLOBAL.CUSTOM_FAIL_RESPONSE.result: { - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> onSequenceFileReceived -> onFileReceived -> Received CUSTOM FAIL Response.') } - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> onSequenceFileReceived -> onFileReceived -> err.message = ' + err.message) } + if (ERROR_LOG === true) { logger.write('[INFO] updateFiles -> onSequenceFileReceived -> onFileReceived -> err.message = ' + err.message) } return } default: { - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> onSequenceFileReceived -> onFileReceived -> Received Unexpected Response.') } return } } files.set(i, file) - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> onSequenceFileReceived -> onFileReceived -> File Updated.') } - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> onSequenceFileReceived -> onFileReceived -> i = ' + i) } - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> onSequenceFileReceived -> onFileReceived -> file.length = ' + file.length) } - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> onSequenceFileReceived -> onFileReceived -> filesLoaded = ' + filesLoaded) } - if (i !== currentMaxSequence) { filesLoaded++ - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> onSequenceFileReceived -> onFileReceived -> filesLoaded = ' + filesLoaded) } } if (filesLoaded === maxSequence + 1) { thisObject.eventHandler.raiseEvent('Files Updated', undefined) - if (INFO_LOG === true) { logger.write('[INFO] updateFiles -> onSequenceFileReceived -> onFileReceived -> Files Updated event Raised.') } } } catch (err) { if (ERROR_LOG === true) { logger.write('[ERROR] updateFiles -> onSequenceFileReceived -> onFileReceived -> err = ' + err.stack) } @@ -313,21 +256,14 @@ function newFileSequence () { } function getFile (pSequence) { - if (INFO_LOG === true) { logger.write('[INFO] getFile -> Entering function.') } - if (INFO_LOG === true) { logger.write('[INFO] getFile -> pSequence = ' + pSequence) } - return files.get(pSequence) } function getExpectedFiles () { - if (INFO_LOG === true) { logger.write('[INFO] getExpectedFiles -> Entering function.') } - return maxSequence + 1 } function getFilesLoaded () { - if (INFO_LOG === true) { logger.write('[INFO] getFilesLoaded -> Entering function.') } - return filesLoaded } } diff --git a/src/MarketFiles.js b/src/MarketFiles.js index b0496d89a..a682c491c 100644 --- a/src/MarketFiles.js +++ b/src/MarketFiles.js @@ -103,7 +103,7 @@ function newMarketFiles () { function updateFiles () { try { if (finalized === true) { return } - let updateFiles = 0 + let updatedFiles = 0 /* Now we will get the market files */ @@ -117,9 +117,9 @@ function newMarketFiles () { function onFileReceived (err, file) { try { files.set(periodTime, file) - updateFiles++ + updatedFiles++ - if (updateFiles === marketFilesPeriods.length) { + if (updatedFiles === marketFilesPeriods.length) { thisObject.eventHandler.raiseEvent('Files Updated', undefined) } } catch (err) {