From 3d8f92ff3b53e2a2b2d117ad7fbe00991f5ffdb2 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 26 Feb 2020 14:40:04 +0100 Subject: [PATCH 1/9] Validations added --- src/DailyFiles.js | 8 ++++++++ src/MarketFiles.js | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/src/DailyFiles.js b/src/DailyFiles.js index 37b7c7464..3ea192514 100644 --- a/src/DailyFiles.js +++ b/src/DailyFiles.js @@ -54,6 +54,14 @@ function newDailyFiles () { fileCloud = newFileCloud() fileCloud.initialize(pBot) + /* Some Validations */ + if (pDataset.code.validTimeFrames === undefined) { + if (ERROR_LOG === true) { logger.write('[ERROR] initialize -> err = Can not initialize Market Files for bot ' + pBot.name) } + if (ERROR_LOG === true) { logger.write('[ERROR] initialize -> err = You need to define validTimeFrames at the Dataset config. ') } + callBackFunction(GLOBAL.DEFAULT_FAIL_RESPONSE) + return + } + /* First we will get the Data Range */ fileCloud.getFile(pDataMine, pBot, pSession, pDataset, exchange, pMarket, undefined, undefined, undefined, true, onDataRangeReceived) diff --git a/src/MarketFiles.js b/src/MarketFiles.js index 272f35476..dedf776c6 100644 --- a/src/MarketFiles.js +++ b/src/MarketFiles.js @@ -78,6 +78,14 @@ function newMarketFiles () { fileCloud = newFileCloud() fileCloud.initialize(pBot) + /* Some Validations */ + if (dataset.code.validTimeFrames === undefined) { + if (ERROR_LOG === true) { logger.write('[ERROR] initialize -> err = Can not initialize Market Files for bot ' + pBot.name) } + if (ERROR_LOG === true) { logger.write('[ERROR] initialize -> err = You need to define validTimeFrames at the Dataset config. ') } + callBackFunction(GLOBAL.DEFAULT_FAIL_RESPONSE) + return + } + /* Now we will get the market files */ for (let i = 0; i < marketFilesPeriods.length; i++) { From 9194f88bd20274466a48975c01a5e81de104e4c0 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Fri, 6 Mar 2020 12:28:58 +0100 Subject: [PATCH 2/9] Dataset Updated Bugs Fixed --- src/FileCursor.js | 6 ++++-- src/FileSequence.js | 2 +- src/MarketFiles.js | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/FileCursor.js b/src/FileCursor.js index 439ffe270..fa10dd904 100644 --- a/src/FileCursor.js +++ b/src/FileCursor.js @@ -89,12 +89,14 @@ function newFileCursor () { beginDateRange = pBeginDateRange endDateRange = pEndDateRange - let key = dataMine.code.codeName + '-' + bot.code.codeName + '-' + product.code.codeName + '-' + dataset.code.codeName + let key = dataMine.code.codeName + '-' + bot.code.codeName + '-' + product.code.codeName + '-' + dataset.code.codeName + '-' + exchange.code.codeName + '-' + market.baseAsset + '/' + market.quotedAsset systemEventHandler.listenToEvent(key, 'Dataset Updated', undefined, key + '-' + periodName, onResponseDataSet, updateFiles) - key = dataMine.code.codeName + '-' + bot.code.codeName + '-' + product.code.codeName + '-' + pPeriodName + key = dataMine.code.codeName + '-' + bot.code.codeName + '-' + product.code.codeName + '-' + exchange.code.codeName + '-' + market.baseAsset + '/' + market.quotedAsset systemEventHandler.listenToEvent(key, 'Data Range Updated', undefined, key, onResponseDataRange, updateDataRange) + console.log('Daily Files Data Range Updated Listening to Events at: ' + key) + callBackFunction(GLOBAL.DEFAULT_OK_RESPONSE) function onResponseDataSet (message) { diff --git a/src/FileSequence.js b/src/FileSequence.js index 3646cfcc1..52c546c27 100644 --- a/src/FileSequence.js +++ b/src/FileSequence.js @@ -74,7 +74,7 @@ function newFileSequence () { callerId = newUniqueId() - let key = dataMine.code.codeName + '-' + bot.code.codeName + '-' + product.code.codeName + '-' + dataset.code.codeName + let key = dataMine.code.codeName + '-' + bot.code.codeName + '-' + product.code.codeName + '-' + dataset.code.codeName + '-' + exchange.code.codeName + '-' + market.baseAsset + '/' + market.quotedAsset systemEventHandler.listenToEvent(key, 'Dataset Updated', undefined, callerId, onResponse, updateFiles) function onResponse (message) { diff --git a/src/MarketFiles.js b/src/MarketFiles.js index dedf776c6..27a132d3f 100644 --- a/src/MarketFiles.js +++ b/src/MarketFiles.js @@ -106,7 +106,7 @@ function newMarketFiles () { } if (filesLoaded + filesNotLoaded === marketFilesPeriods.length) { - let key = dataMine.code.codeName + '-' + bot.code.codeName + '-' + product.code.codeName + '-' + dataset.code.codeName + let key = dataMine.code.codeName + '-' + bot.code.codeName + '-' + product.code.codeName + '-' + dataset.code.codeName + '-' + exchange.code.codeName + '-' + market.baseAsset + '/' + market.quotedAsset systemEventHandler.listenToEvent(key, 'Dataset Updated', undefined, key + '-' + periodName, onResponse, updateFiles) callBackFunction(GLOBAL.DEFAULT_OK_RESPONSE, thisObject) From dc46f4e50d8ca07e24f3183b93f8daad0641e591 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Fri, 6 Mar 2020 12:31:55 +0100 Subject: [PATCH 3/9] Dataset Updated Bugs Fixed --- src/FileCursor.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/FileCursor.js b/src/FileCursor.js index fa10dd904..d2d3d902e 100644 --- a/src/FileCursor.js +++ b/src/FileCursor.js @@ -95,8 +95,6 @@ function newFileCursor () { key = dataMine.code.codeName + '-' + bot.code.codeName + '-' + product.code.codeName + '-' + exchange.code.codeName + '-' + market.baseAsset + '/' + market.quotedAsset systemEventHandler.listenToEvent(key, 'Data Range Updated', undefined, key, onResponseDataRange, updateDataRange) - console.log('Daily Files Data Range Updated Listening to Events at: ' + key) - callBackFunction(GLOBAL.DEFAULT_OK_RESPONSE) function onResponseDataSet (message) { From 92a4f5a50492d3c600e0f084caa2990a22026fc6 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 11 Mar 2020 14:20:44 +0100 Subject: [PATCH 4/9] Directory Structure Changed --- src/FileCloud.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/FileCloud.js b/src/FileCloud.js index 79caf7511..c951880ac 100644 --- a/src/FileCloud.js +++ b/src/FileCloud.js @@ -75,8 +75,8 @@ function newFileCloud () { } if (pMarket !== undefined) { - fileName = fileName.replace('@BaseAsset', pMarket.baseAsset) - fileName = fileName.replace('@QuotedAsset', pMarket.quotedAsset) + filePath = filePath.replace('@BaseAsset', pMarket.baseAsset) + filePath = filePath.replace('@QuotedAsset', pMarket.quotedAsset) } if (pDataMine !== undefined) { From 8e2cbbe6300a5af6db4cb5229ed2ece8020ad7d7 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 11 Mar 2020 17:56:34 +0100 Subject: [PATCH 5/9] Update FileCloud.js --- src/FileCloud.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FileCloud.js b/src/FileCloud.js index c951880ac..1b159317d 100644 --- a/src/FileCloud.js +++ b/src/FileCloud.js @@ -99,7 +99,7 @@ function newFileCloud () { } if (pExchange !== undefined) { - filePath = filePath.replace('@Exchange', pExchange.code.codeName) + filePath = filePath.replace('@Exchange', pExchange.name) } filePath = filePath.replace('@Period', pPeriodName) From 6fbb74d03c03a9248ccb2000b5695bac93916977 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Thu, 12 Mar 2020 11:09:41 +0100 Subject: [PATCH 6/9] bug fixed --- src/FileCursor.js | 4 ++-- src/FileSequence.js | 2 +- src/MarketFiles.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/FileCursor.js b/src/FileCursor.js index d2d3d902e..1608fc7c3 100644 --- a/src/FileCursor.js +++ b/src/FileCursor.js @@ -89,10 +89,10 @@ function newFileCursor () { beginDateRange = pBeginDateRange endDateRange = pEndDateRange - let key = dataMine.code.codeName + '-' + bot.code.codeName + '-' + product.code.codeName + '-' + dataset.code.codeName + '-' + exchange.code.codeName + '-' + market.baseAsset + '/' + market.quotedAsset + let key = dataMine.code.codeName + '-' + bot.code.codeName + '-' + product.code.codeName + '-' + dataset.code.codeName + '-' + exchange.name + '-' + market.baseAsset + '/' + market.quotedAsset systemEventHandler.listenToEvent(key, 'Dataset Updated', undefined, key + '-' + periodName, onResponseDataSet, updateFiles) - key = dataMine.code.codeName + '-' + bot.code.codeName + '-' + product.code.codeName + '-' + exchange.code.codeName + '-' + market.baseAsset + '/' + market.quotedAsset + key = dataMine.code.codeName + '-' + bot.code.codeName + '-' + product.code.codeName + '-' + exchange.name + '-' + market.baseAsset + '/' + market.quotedAsset systemEventHandler.listenToEvent(key, 'Data Range Updated', undefined, key, onResponseDataRange, updateDataRange) callBackFunction(GLOBAL.DEFAULT_OK_RESPONSE) diff --git a/src/FileSequence.js b/src/FileSequence.js index 52c546c27..759eab6d3 100644 --- a/src/FileSequence.js +++ b/src/FileSequence.js @@ -74,7 +74,7 @@ function newFileSequence () { callerId = newUniqueId() - let key = dataMine.code.codeName + '-' + bot.code.codeName + '-' + product.code.codeName + '-' + dataset.code.codeName + '-' + exchange.code.codeName + '-' + market.baseAsset + '/' + market.quotedAsset + let key = dataMine.code.codeName + '-' + bot.code.codeName + '-' + product.code.codeName + '-' + dataset.code.codeName + '-' + exchange.name + '-' + market.baseAsset + '/' + market.quotedAsset systemEventHandler.listenToEvent(key, 'Dataset Updated', undefined, callerId, onResponse, updateFiles) function onResponse (message) { diff --git a/src/MarketFiles.js b/src/MarketFiles.js index 27a132d3f..d028c5417 100644 --- a/src/MarketFiles.js +++ b/src/MarketFiles.js @@ -106,7 +106,7 @@ function newMarketFiles () { } if (filesLoaded + filesNotLoaded === marketFilesPeriods.length) { - let key = dataMine.code.codeName + '-' + bot.code.codeName + '-' + product.code.codeName + '-' + dataset.code.codeName + '-' + exchange.code.codeName + '-' + market.baseAsset + '/' + market.quotedAsset + let key = dataMine.code.codeName + '-' + bot.code.codeName + '-' + product.code.codeName + '-' + dataset.code.codeName + '-' + exchange.name + '-' + market.baseAsset + '/' + market.quotedAsset systemEventHandler.listenToEvent(key, 'Dataset Updated', undefined, key + '-' + periodName, onResponse, updateFiles) callBackFunction(GLOBAL.DEFAULT_OK_RESPONSE, thisObject) From 3549a34991b53a8b474cff2e9f8368e56c3bceb9 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Thu, 19 Mar 2020 11:27:08 +0100 Subject: [PATCH 7/9] Update MarketFiles.js --- src/MarketFiles.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/MarketFiles.js b/src/MarketFiles.js index d028c5417..e2fa6e665 100644 --- a/src/MarketFiles.js +++ b/src/MarketFiles.js @@ -36,13 +36,15 @@ function newMarketFiles () { let intervalHandle let finalized = false - let eventSubscriptionIdDatasetUpdated + let eventSubscriptionIdDatasetUpdated = [] return thisObject function finalize () { try { - systemEventHandler.stopListening('Dataset Updated', eventSubscriptionIdDatasetUpdated) + for (let i = 0; i < eventSubscriptionIdDatasetUpdated.length; i++) { + systemEventHandler.stopListening('Dataset Updated', eventSubscriptionIdDatasetUpdated[i]) + } thisObject.eventHandler.finalize() thisObject.eventHandler = undefined @@ -108,11 +110,11 @@ function newMarketFiles () { if (filesLoaded + filesNotLoaded === marketFilesPeriods.length) { let key = dataMine.code.codeName + '-' + bot.code.codeName + '-' + product.code.codeName + '-' + dataset.code.codeName + '-' + exchange.name + '-' + market.baseAsset + '/' + market.quotedAsset systemEventHandler.listenToEvent(key, 'Dataset Updated', undefined, key + '-' + periodName, onResponse, updateFiles) - + console.log('Dataset Updated:' + key + '-' + periodName) callBackFunction(GLOBAL.DEFAULT_OK_RESPONSE, thisObject) function onResponse (message) { - eventSubscriptionIdDatasetUpdated = message.eventSubscriptionId + eventSubscriptionIdDatasetUpdated.push(message.eventSubscriptionId) } } } catch (err) { @@ -132,7 +134,7 @@ function newMarketFiles () { try { if (finalized === true) { return } let updatedFiles = 0 - + console.log('updateFiles ' + periodName) /* Now we will get the market files */ for (let i = 0; i < marketFilesPeriods.length; i++) { From 2e56fa079bc572a7c5b45e90e70ec0f79150b09e Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Thu, 19 Mar 2020 11:47:00 +0100 Subject: [PATCH 8/9] Update MarketFiles.js --- src/MarketFiles.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MarketFiles.js b/src/MarketFiles.js index e2fa6e665..c370e205b 100644 --- a/src/MarketFiles.js +++ b/src/MarketFiles.js @@ -110,7 +110,7 @@ function newMarketFiles () { if (filesLoaded + filesNotLoaded === marketFilesPeriods.length) { let key = dataMine.code.codeName + '-' + bot.code.codeName + '-' + product.code.codeName + '-' + dataset.code.codeName + '-' + exchange.name + '-' + market.baseAsset + '/' + market.quotedAsset systemEventHandler.listenToEvent(key, 'Dataset Updated', undefined, key + '-' + periodName, onResponse, updateFiles) - console.log('Dataset Updated:' + key + '-' + periodName) + callBackFunction(GLOBAL.DEFAULT_OK_RESPONSE, thisObject) function onResponse (message) { From d6adb10664023eb3640123fb1a4e2f25e25eabab Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sat, 21 Mar 2020 10:36:16 +0100 Subject: [PATCH 9/9] Update MarketFiles.js --- src/MarketFiles.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MarketFiles.js b/src/MarketFiles.js index c370e205b..7dcda95d0 100644 --- a/src/MarketFiles.js +++ b/src/MarketFiles.js @@ -134,7 +134,7 @@ function newMarketFiles () { try { if (finalized === true) { return } let updatedFiles = 0 - console.log('updateFiles ' + periodName) + /* Now we will get the market files */ for (let i = 0; i < marketFilesPeriods.length; i++) {