Huge Refactoring Multi-Perio into Multi Time Frame

This commit is contained in:
Luis Fernando Molina committed 2021-05-26 18:05:11 +02:00
1 parent 1b47e77a83
commit c77999c8e4
70 files changed
+246 -227

No files matched your search

+6 -6
View File
@@ -152,20 +152,20 @@ function newDailyFiles() {
/* Now we will get the daily files */
for (let i = 0; i < dailyTimeFramesArray.length; i++) {
let periodTime = dailyTimeFramesArray[i][0]
let periodName = dailyTimeFramesArray[i][1]
let timeFrameLabel = dailyTimeFramesArray[i][1]
if (pDataset.config.validTimeFrames.includes(periodName) === false) {
if (pDataset.config.validTimeFrames.includes(timeFrameLabel) === false) {
continue
}
if (timeFrames !== undefined) {
if (timeFrames.includes(periodName) === false) {
if (timeFrames.includes(timeFrameLabel) === false) {
continue
}
}
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, pMine, pBot, pSession, pProduct, pDataset, exchange, pMarket, periodName, periodTime, pDatetime, pTimeFrame, beginDateRange, endDateRange, pEventsServerClient, onInitialized)
fileCursor.initialize(fileCloud, pMine, pBot, pSession, pProduct, pDataset, exchange, pMarket, timeFrameLabel, periodTime, pDatetime, pTimeFrame, beginDateRange, endDateRange, pEventsServerClient, onInitialized)
function onInitialized(err) {
try {
switch (err.result) {
@@ -200,9 +200,9 @@ function newDailyFiles() {
try {
for (let i = 0; i < dailyTimeFramesArray.length; i++) {
let periodTime = dailyTimeFramesArray[i][0]
let periodName = dailyTimeFramesArray[i][1]
let timeFrameLabel = dailyTimeFramesArray[i][1]
if (pDataset.config.validTimeFrames.includes(periodName) === true) {
if (pDataset.config.validTimeFrames.includes(timeFrameLabel) === true) {
let fileCursor = fileCursors.get(periodTime)
if (fileCursor !== undefined) {
fileCursor.reload(onFileReceived)
+6 -6
View File
@@ -21,12 +21,12 @@ function newFileCloud () {
fileStorage = newFileStorage(pHost, pPort)
}
function getFile (pMine, pBot, pSession, pProduct, pDataset, pExchange, pMarket, pPeriodName, pDatetime, pSequence, pDataRange, pTimeFrames, callBackFunction) {
function getFile (pMine, pBot, pSession, pProduct, pDataset, pExchange, pMarket, ptimeFrameLabel, pDatetime, pSequence, pDataRange, pTimeFrames, callBackFunction) {
try {
const MAX_RETRIES = 3
getFileRecursively(0, pMine, pBot, pSession, pProduct, pDataset, pExchange, pMarket, pPeriodName, pDatetime, pSequence, pDataRange, pTimeFrames, callBackFunction)
getFileRecursively(0, pMine, pBot, pSession, pProduct, pDataset, pExchange, pMarket, ptimeFrameLabel, pDatetime, pSequence, pDataRange, pTimeFrames, callBackFunction)
function getFileRecursively (pRetryCounter, pMine, pBot, pSession, pProduct, pDataset, pExchange, pMarket, pPeriodName, pDatetime, pSequence, pDataRange, pTimeFrames, callBackFunction) {
function getFileRecursively (pRetryCounter, pMine, pBot, pSession, pProduct, pDataset, pExchange, pMarket, ptimeFrameLabel, pDatetime, pSequence, pDataRange, pTimeFrames, callBackFunction) {
try {
let fileName
let filePath
@@ -83,7 +83,7 @@ function newFileCloud () {
logger.write('[ERROR] getFile -> getFileRecursively -> pDataset = ' + JSON.stringify(pDataset))
logger.write('[ERROR] getFile -> getFileRecursively -> pExchange = ' + JSON.stringify(pExchange))
logger.write('[ERROR] getFile -> getFileRecursively -> pMarket = ' + JSON.stringify(pMarket))
logger.write('[ERROR] getFile -> getFileRecursively -> pPeriodName = ' + JSON.stringify(pPeriodName))
logger.write('[ERROR] getFile -> getFileRecursively -> ptimeFrameLabel = ' + JSON.stringify(ptimeFrameLabel))
throw ('Inconsistant data received.')
}
@@ -118,7 +118,7 @@ function newFileCloud () {
filePath = filePath.replace('@Exchange', pExchange.config.codeName)
}
filePath = filePath.replace('@Period', pPeriodName)
filePath = filePath.replace('@TimeFrame', ptimeFrameLabel)
filePath = filePath.replace('@Dataset', pDataset.config.codeName)
filePath = filePath.replace('@Product', pProduct.config.codeName)
@@ -163,7 +163,7 @@ function newFileCloud () {
if (ERROR_LOG === true) { logger.write('[ERROR] getFile -> getFileRecursively -> onFileReceived -> MAX_RETRIES = ' + MAX_RETRIES) }
if (ERROR_LOG === true) { logger.write('[ERROR] getFile -> getFileRecursively -> onFileReceived -> pRetryCounter = ' + pRetryCounter) }
getFileRecursively(pRetryCounter + 1, pMine, pBot, pDataset, pExchange, pMarket, pPeriodName, pDatetime, pSequence, pDataRange, callBackFunction)
getFileRecursively(pRetryCounter + 1, pMine, pBot, pDataset, pExchange, pMarket, ptimeFrameLabel, pDatetime, pSequence, pDataRange, callBackFunction)
return
} else {
if (ERROR_LOG === true) { logger.write('[ERROR] getFile -> getFileRecursively -> onFileReceived -> Could not get this file from storage. ') }
+9 -9
View File
@@ -30,7 +30,7 @@ function newFileCursor() {
let session
let product
let dataset
let periodName
let timeFrameLabel
let timeFrame
let beginDateRange
let endDateRange
@@ -58,7 +58,7 @@ function newFileCursor() {
session = undefined
product = undefined
dataset = undefined
periodName = undefined
timeFrameLabel = undefined
timeFrame = undefined
beginDateRange = undefined
endDateRange = undefined
@@ -67,7 +67,7 @@ function newFileCursor() {
thisObject.files = undefined
cursorDate = undefined
fileCloud = undefined
periodName = undefined
timeFrameLabel = undefined
timeFrame = undefined
finalized = true
} catch (err) {
@@ -84,7 +84,7 @@ function newFileCursor() {
pDataset,
pExchange,
pMarket,
pPeriodName,
ptimeFrameLabel,
pTimeFrame,
pCursorDate,
pCurrentTimeFrame,
@@ -101,7 +101,7 @@ function newFileCursor() {
session = pSession
product = pProduct
dataset = pDataset
periodName = pPeriodName
timeFrameLabel = ptimeFrameLabel
cursorDate = removeTime(pCursorDate)
timeFrame = pTimeFrame
beginDateRange = pBeginDateRange
@@ -109,11 +109,11 @@ function newFileCursor() {
eventsServerClient = pEventsServerClient
let key = mine.config.codeName + '-' + bot.config.codeName + '-' + product.config.codeName + '-' + dataset.config.codeName + '-' + exchange.config.codeName + '-' + market.baseAsset + '/' + market.quotedAsset
let callerId = key + '-' + periodName + newUniqueId()
let callerId = key + '-' + timeFrameLabel + newUniqueId()
eventsServerClient.listenToEvent(key, 'Dataset Updated', undefined, callerId, onResponseDataSet, updateFiles)
key = mine.config.codeName + '-' + bot.config.codeName + '-' + product.config.codeName + '-' + exchange.config.codeName + '-' + market.baseAsset + '/' + market.quotedAsset
callerId = key + '-' + periodName + newUniqueId()
callerId = key + '-' + timeFrameLabel + newUniqueId()
eventsServerClient.listenToEvent(key, 'Data Range Updated', undefined, callerId, onResponseDataRange, updateDataRange)
callBackFunction(GLOBAL.DEFAULT_OK_RESPONSE)
@@ -168,7 +168,7 @@ function newFileCursor() {
dateString = targetDate.getUTCFullYear() + '-' + pad(targetDate.getUTCMonth() + 1, 2) + '-' + pad(targetDate.getUTCDate(), 2)
fileCloud.getFile(mine, bot, session, product, dataset, exchange, market, periodName, targetDate, undefined, undefined, undefined, onFileReceived)
fileCloud.getFile(mine, bot, session, product, dataset, exchange, market, timeFrameLabel, targetDate, undefined, undefined, undefined, onFileReceived)
function onFileReceived(err, file) {
try {
@@ -468,7 +468,7 @@ function newFileCursor() {
if (thisObject.files.get(dateString) === undefined) {
// We dont reload files we already have.
fileCloud.getFile(mine, bot, session, product, dataset, exchange, market, periodName, targetDate, undefined, undefined, undefined, onFileReceived)
fileCloud.getFile(mine, bot, session, product, dataset, exchange, market, timeFrameLabel, targetDate, undefined, undefined, undefined, onFileReceived)
} else {
controlLoop()
}
+11 -11
View File
@@ -30,7 +30,7 @@ function newMarketFiles() {
let session
let dataset
let product
let periodName
let timeFrameLabel
thisObject.eventHandler = newEventHandler()
@@ -60,7 +60,7 @@ function newMarketFiles() {
session = undefined
dataset = undefined
product = undefined
periodName = undefined
timeFrameLabel = undefined
eventsServerClient = undefined
finalized = true
@@ -150,21 +150,21 @@ function newMarketFiles() {
/* Now we will get the market files */
for (let i = 0; i < marketTimeFramesArray.length; i++) {
let periodTime = marketTimeFramesArray[i][0]
let periodName = marketTimeFramesArray[i][1]
let timeFrameLabel = marketTimeFramesArray[i][1]
if (dataset.config.validTimeFrames.includes(periodName) === false) {
if (dataset.config.validTimeFrames.includes(timeFrameLabel) === false) {
filesNotLoaded++
continue
}
if (timeFrames !== undefined) {
if (timeFrames.includes(periodName) === false) {
if (timeFrames.includes(timeFrameLabel) === false) {
filesNotLoaded++
continue
}
}
filesExpected++
fileCloud.getFile(mine, bot, session, product, dataset, exchange, market, periodName, undefined, undefined, undefined, undefined, onFileReceived)
fileCloud.getFile(mine, bot, session, product, dataset, exchange, market, timeFrameLabel, undefined, undefined, undefined, undefined, onFileReceived)
function onFileReceived(err, file) {
try {
@@ -178,7 +178,7 @@ function newMarketFiles() {
if (filesLoaded + filesNotLoaded === marketTimeFramesArray.length) {
let key = mine.config.codeName + '-' + bot.config.codeName + '-' + product.config.codeName + '-' + dataset.config.codeName + '-' + exchange.config.codeName + '-' + market.baseAsset + '/' + market.quotedAsset
let callerId = key + '-' + periodName + newUniqueId()
let callerId = key + '-' + timeFrameLabel + newUniqueId()
eventsServerClient.listenToEvent(key, 'Dataset Updated', undefined, callerId, onResponse, updateFiles)
callBackFunction(GLOBAL.DEFAULT_OK_RESPONSE, thisObject)
@@ -211,15 +211,15 @@ function newMarketFiles() {
for (let i = 0; i < marketTimeFramesArray.length; i++) {
let periodTime = marketTimeFramesArray[i][0]
let periodName = marketTimeFramesArray[i][1]
let timeFrameLabel = marketTimeFramesArray[i][1]
if (dataset.config.validTimeFrames.includes(periodName) !== true) { continue }
if (dataset.config.validTimeFrames.includes(timeFrameLabel) !== true) { continue }
if (message.event !== undefined) {
if (message.event.timeFrames !== undefined) {
if (message.event.timeFrames.includes(periodName) !== true) { continue }
if (message.event.timeFrames.includes(timeFrameLabel) !== true) { continue }
}
}
fileCloud.getFile(mine, bot, session, product, dataset, exchange, market, periodName, undefined, undefined, undefined, undefined, onFileReceived)
fileCloud.getFile(mine, bot, session, product, dataset, exchange, market, timeFrameLabel, undefined, undefined, undefined, undefined, onFileReceived)
function onFileReceived(err, file) {
try {