From 28f4c56d5646e6ec5a816ef907796776aed85bfa Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Mon, 30 Nov 2020 19:39:38 +0100 Subject: [PATCH] bot parameter removed from all files --- .../Multi-Period-Daily/User.Bot.js | 4 ++-- .../Multi-Period-Market/User.Bot.js | 4 ++-- .../Multi-Period-Daily/User.Bot.js | 4 ++-- .../Multi-Period-Market/User.Bot.js | 4 ++-- .../Exchange-Raw-Data-Sensor-Bot/Commons.js | 2 +- .../Historic-OHLCVs/User.Bot.js | 4 ++-- .../Historic-Trades/User.Bot.js | 4 ++-- .../Check-Webhook/User.Bot.js | 4 ++-- .../Masters/bots/Webhooks-Sensor-Bot/Commons.js | 2 +- .../UI/Function-Libraries/TaskFunctions.js | 4 ++-- TaskServer/Commons.js | 2 +- TaskServer/DataDependencies.js | 6 ++---- TaskServer/DataSet.js | 4 +--- TaskServer/DebugLog.js | 3 --- TaskServer/IndicatorBot.js | 17 ++++++++--------- TaskServer/IndicatorOutput.js | 4 ++-- TaskServer/LearningSession.js | 2 +- TaskServer/LowFrequencyTrading/Announcements.js | 2 +- TaskServer/LowFrequencyTrading/ExchangeAPI.js | 2 +- .../LowFrequencyTrading/OrdersCalculations.js | 2 +- .../LowFrequencyTrading/OrdersSimulations.js | 2 +- TaskServer/LowFrequencyTrading/Snapshots.js | 2 +- TaskServer/LowFrequencyTrading/TradingEngine.js | 2 +- .../LowFrequencyTrading/TradingEpisode.js | 2 +- .../LowFrequencyTrading/TradingExecution.js | 4 ++-- TaskServer/LowFrequencyTrading/TradingOrders.js | 12 ++++++------ TaskServer/LowFrequencyTrading/TradingOutput.js | 4 ++-- .../LowFrequencyTrading/TradingPosition.js | 2 +- .../LowFrequencyTrading/TradingProcess.js | 8 ++++---- .../LowFrequencyTrading/TradingRecords.js | 2 +- .../LowFrequencyTrading/TradingSimulation.js | 10 +++++----- TaskServer/LowFrequencyTrading/TradingStages.js | 14 +++++++------- .../LowFrequencyTrading/TradingStrategy.js | 2 +- TaskServer/LowFrequencyTrading/TradingSystem.js | 4 ++-- TaskServer/MultiPeriodDaily.js | 4 ++-- TaskServer/MultiPeriodMarket.js | 4 ++-- TaskServer/ProcessExecutionEvents.js | 4 +--- TaskServer/ProcessInstance.js | 9 ++++----- TaskServer/ProcessOutput.js | 4 +--- TaskServer/ReinforcementLearning/LearningBot.js | 4 ++-- .../ReinforcementLearning/LearningProcess.js | 2 +- .../MarkovDecisionProcess.js | 2 +- TaskServer/SensorBot.js | 12 +++++------- TaskServer/SocialBots.js | 4 ++-- TaskServer/StatusDependencies.js | 6 ++---- TaskServer/StatusReport.js | 10 ++++------ TaskServer/TelegramBot.js | 2 +- TaskServer/TradingBot.js | 15 +++++++-------- TaskServer/TradingSession.js | 4 ++-- 49 files changed, 108 insertions(+), 128 deletions(-) diff --git a/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Bollinger-Bands-Indicator-Bot/Multi-Period-Daily/User.Bot.js b/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Bollinger-Bands-Indicator-Bot/Multi-Period-Daily/User.Bot.js index 67ac4b173..f152e365c 100644 --- a/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Bollinger-Bands-Indicator-Bot/Multi-Period-Daily/User.Bot.js +++ b/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Bollinger-Bands-Indicator-Bot/Multi-Period-Daily/User.Bot.js @@ -1,4 +1,4 @@ -exports.newUserBot = function (processIndex, bot, logger, COMMONS, UTILITIES, FILE_STORAGE) { +exports.newUserBot = function (processIndex, logger, COMMONS, UTILITIES, FILE_STORAGE) { const FULL_LOG = true; const INTENSIVE_LOG = false; @@ -20,7 +20,7 @@ start: start }; - let utilities = UTILITIES.newCloudUtilities(bot, logger); + let utilities = UTILITIES.newCloudUtilities(logger); let fileStorage = FILE_STORAGE.newFileStorage(logger); let statusDependencies; diff --git a/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Bollinger-Bands-Indicator-Bot/Multi-Period-Market/User.Bot.js b/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Bollinger-Bands-Indicator-Bot/Multi-Period-Market/User.Bot.js index b0987a896..99e8c8020 100644 --- a/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Bollinger-Bands-Indicator-Bot/Multi-Period-Market/User.Bot.js +++ b/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Bollinger-Bands-Indicator-Bot/Multi-Period-Market/User.Bot.js @@ -1,4 +1,4 @@ -exports.newUserBot = function (processIndex, bot, logger, COMMONS, UTILITIES, FILE_STORAGE) { +exports.newUserBot = function (processIndex, logger, COMMONS, UTILITIES, FILE_STORAGE) { const FULL_LOG = true; const LOG_FILE_CONTENT = false; @@ -17,7 +17,7 @@ }; let statusDependencies; - let utilities = UTILITIES.newCloudUtilities(bot, logger); + let utilities = UTILITIES.newCloudUtilities(logger); let fileStorage = FILE_STORAGE.newFileStorage(logger); return thisObject; diff --git a/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Candles-Volumes-Indicator-Bot/Multi-Period-Daily/User.Bot.js b/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Candles-Volumes-Indicator-Bot/Multi-Period-Daily/User.Bot.js index 1ea15a180..c5c9671cf 100644 --- a/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Candles-Volumes-Indicator-Bot/Multi-Period-Daily/User.Bot.js +++ b/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Candles-Volumes-Indicator-Bot/Multi-Period-Daily/User.Bot.js @@ -1,4 +1,4 @@ -exports.newUserBot = function (processIndex, bot, logger, COMMONS, UTILITIES, FILE_STORAGE) { +exports.newUserBot = function (processIndex, logger, COMMONS, UTILITIES, FILE_STORAGE) { const FULL_LOG = true; const LOG_FILE_CONTENT = false; @@ -22,7 +22,7 @@ start: start }; - let utilities = UTILITIES.newCloudUtilities(bot, logger); + let utilities = UTILITIES.newCloudUtilities(logger); let fileStorage = FILE_STORAGE.newFileStorage(logger); let statusDependencies; diff --git a/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Candles-Volumes-Indicator-Bot/Multi-Period-Market/User.Bot.js b/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Candles-Volumes-Indicator-Bot/Multi-Period-Market/User.Bot.js index bd2868bcb..c47590fe8 100644 --- a/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Candles-Volumes-Indicator-Bot/Multi-Period-Market/User.Bot.js +++ b/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Candles-Volumes-Indicator-Bot/Multi-Period-Market/User.Bot.js @@ -1,4 +1,4 @@ -exports.newUserBot = function (processIndex, bot, logger, COMMONS, UTILITIES, FILE_STORAGE) { +exports.newUserBot = function (processIndex, logger, COMMONS, UTILITIES, FILE_STORAGE) { const FULL_LOG = true; const LOG_FILE_CONTENT = false; @@ -22,7 +22,7 @@ start: start }; - let utilities = UTILITIES.newCloudUtilities(bot, logger); + let utilities = UTILITIES.newCloudUtilities(logger); let fileStorage = FILE_STORAGE.newFileStorage(logger); let statusDependencies; diff --git a/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Exchange-Raw-Data-Sensor-Bot/Commons.js b/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Exchange-Raw-Data-Sensor-Bot/Commons.js index 271f6cbe2..44d28a36e 100644 --- a/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Exchange-Raw-Data-Sensor-Bot/Commons.js +++ b/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Exchange-Raw-Data-Sensor-Bot/Commons.js @@ -1,4 +1,4 @@ -exports.newCommons = function newCommons(bot, logger, UTILITIES) { +exports.newCommons = function newCommons(logger, UTILITIES) { let thisObject = { diff --git a/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Exchange-Raw-Data-Sensor-Bot/Historic-OHLCVs/User.Bot.js b/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Exchange-Raw-Data-Sensor-Bot/Historic-OHLCVs/User.Bot.js index 07c5e741f..fba29d095 100644 --- a/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Exchange-Raw-Data-Sensor-Bot/Historic-OHLCVs/User.Bot.js +++ b/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Exchange-Raw-Data-Sensor-Bot/Historic-OHLCVs/User.Bot.js @@ -1,5 +1,5 @@  -exports.newUserBot = function (processIndex, bot, logger, COMMONS, UTILITIES, FILE_STORAGE, STATUS_REPORT, EXCHANGE_API) { +exports.newUserBot = function (processIndex, logger, COMMONS, UTILITIES, FILE_STORAGE, STATUS_REPORT, EXCHANGE_API) { const FULL_LOG = true; const GMT_SECONDS = ':00.000 GMT+0000'; @@ -12,7 +12,7 @@ exports.newUserBot = function (processIndex, bot, logger, COMMONS, UTILITIES, FI start: start }; - let utilities = UTILITIES.newCloudUtilities(bot, logger) + let utilities = UTILITIES.newCloudUtilities(logger) let fileStorage = FILE_STORAGE.newFileStorage(logger); let statusDependencies diff --git a/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Exchange-Raw-Data-Sensor-Bot/Historic-Trades/User.Bot.js b/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Exchange-Raw-Data-Sensor-Bot/Historic-Trades/User.Bot.js index 1b46af1b5..422e01ace 100644 --- a/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Exchange-Raw-Data-Sensor-Bot/Historic-Trades/User.Bot.js +++ b/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Exchange-Raw-Data-Sensor-Bot/Historic-Trades/User.Bot.js @@ -1,5 +1,5 @@  -exports.newUserBot = function (processIndex, bot, logger, COMMONS, UTILITIES, FILE_STORAGE, STATUS_REPORT, EXCHANGE_API) { +exports.newUserBot = function (processIndex, logger, COMMONS, UTILITIES, FILE_STORAGE, STATUS_REPORT, EXCHANGE_API) { const FULL_LOG = true; const LOG_FILE_CONTENT = false; @@ -13,7 +13,7 @@ exports.newUserBot = function (processIndex, bot, logger, COMMONS, UTILITIES, FI start: start }; - let utilities = UTILITIES.newCloudUtilities(bot, logger) + let utilities = UTILITIES.newCloudUtilities(logger) let fileStorage = FILE_STORAGE.newFileStorage(logger); let statusDependencies diff --git a/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Webhooks-Sensor-Bot/Check-Webhook/User.Bot.js b/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Webhooks-Sensor-Bot/Check-Webhook/User.Bot.js index 4873c9d22..a2183a8b6 100644 --- a/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Webhooks-Sensor-Bot/Check-Webhook/User.Bot.js +++ b/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Webhooks-Sensor-Bot/Check-Webhook/User.Bot.js @@ -1,5 +1,5 @@  -exports.newUserBot = function (processIndex, bot, logger, COMMONS, UTILITIES, FILE_STORAGE, STATUS_REPORT, EXCHANGE_API) { +exports.newUserBot = function (processIndex, logger, COMMONS, UTILITIES, FILE_STORAGE, STATUS_REPORT, EXCHANGE_API) { const FULL_LOG = true; const LOG_FILE_CONTENT = false; @@ -11,7 +11,7 @@ exports.newUserBot = function (processIndex, bot, logger, COMMONS, UTILITIES, FI start: start }; - let utilities = UTILITIES.newCloudUtilities(bot, logger) + let utilities = UTILITIES.newCloudUtilities(logger) let fileStorage = FILE_STORAGE.newFileStorage(logger); let statusDependencies diff --git a/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Webhooks-Sensor-Bot/Commons.js b/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Webhooks-Sensor-Bot/Commons.js index 271f6cbe2..44d28a36e 100644 --- a/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Webhooks-Sensor-Bot/Commons.js +++ b/Projects/Superalgos/Bots-Plotters-Code/Masters/bots/Webhooks-Sensor-Bot/Commons.js @@ -1,4 +1,4 @@ -exports.newCommons = function newCommons(bot, logger, UTILITIES) { +exports.newCommons = function newCommons(logger, UTILITIES) { let thisObject = { diff --git a/Projects/Superalgos/UI/Function-Libraries/TaskFunctions.js b/Projects/Superalgos/UI/Function-Libraries/TaskFunctions.js index 56601d5a3..d13f422cc 100644 --- a/Projects/Superalgos/UI/Function-Libraries/TaskFunctions.js +++ b/Projects/Superalgos/UI/Function-Libraries/TaskFunctions.js @@ -757,7 +757,7 @@ function newSuperalgosFunctionLibraryTaskFunctions() { } let botInstance - switch (bot.type) { + switch (TS.projects.superalgos.globals.taskConstants.TASK_NODE.bot.processes[processIndex].referenceParent.parentNode.type) { case 'Sensor Bot': { botInstance = UI.projects.superalgos.functionLibraries.uiObjectsFromNodes.addUIObject(task, 'Sensor Bot Instance') botInstance.name = bot.name @@ -783,7 +783,7 @@ function newSuperalgosFunctionLibraryTaskFunctions() { for (let j = 0; j < bot.processes.length; j++) { let process = bot.processes[j] let processInstance - switch (bot.type) { + switch (TS.projects.superalgos.globals.taskConstants.TASK_NODE.bot.processes[processIndex].referenceParent.parentNode.type) { case 'Sensor Bot': { processInstance = UI.projects.superalgos.functionLibraries.uiObjectsFromNodes.addUIObject(botInstance, 'Sensor Process Instance') processInstance.payload.referenceParent = process diff --git a/TaskServer/Commons.js b/TaskServer/Commons.js index 67d316319..9f28f3d6c 100644 --- a/TaskServer/Commons.js +++ b/TaskServer/Commons.js @@ -1,4 +1,4 @@ -exports.newCommons = function newCommons(bot, logger, UTILITIES, FILE_STORAGE) { +exports.newCommons = function newCommons(logger, UTILITIES, FILE_STORAGE) { const MODULE_NAME = "Commons"; diff --git a/TaskServer/DataDependencies.js b/TaskServer/DataDependencies.js index 2cf89a20a..a33816e73 100644 --- a/TaskServer/DataDependencies.js +++ b/TaskServer/DataDependencies.js @@ -1,9 +1,7 @@ -exports.newDataDependencies = function (processIndex, BOT, logger, DATA_SET) { +exports.newDataDependencies = function (processIndex, logger, DATA_SET) { const MODULE_NAME = "Data Dependencies"; - let bot = BOT - let thisObject = { nodeArray: undefined, dataSetsModulesArray: [], @@ -75,7 +73,7 @@ let newNodeArray = [] for (let i = 0; i < thisObject.nodeArray.length; i++) { - let dataSetModule = DATA_SET.newDataSet(processIndex, BOT, logger); + let dataSetModule = DATA_SET.newDataSet(processIndex, logger); dataSetModule.initialize(thisObject.nodeArray[i], onInitilized); function onInitilized(err, wasInitialized) { diff --git a/TaskServer/DataSet.js b/TaskServer/DataSet.js index dfa8ab9ca..fa8bb8be4 100644 --- a/TaskServer/DataSet.js +++ b/TaskServer/DataSet.js @@ -1,9 +1,7 @@ -exports.newDataSet = function (processIndex, BOT, logger) { +exports.newDataSet = function (processIndex, logger) { const MODULE_NAME = "Dataset"; - let bot = BOT; - let thisObject = { node: undefined, networkNode: undefined, diff --git a/TaskServer/DebugLog.js b/TaskServer/DebugLog.js index 94e66f5b4..a363a173d 100644 --- a/TaskServer/DebugLog.js +++ b/TaskServer/DebugLog.js @@ -12,7 +12,6 @@ exports.newDebugLog = function (processIndex) { let messageId = 0; let thisObject = { - bot: undefined, write: write, newMainLoop: newMainLoop, newInternalLoop: newInternalLoop, @@ -171,8 +170,6 @@ exports.newDebugLog = function (processIndex) { try { if (disableLogging === true) { return; } - if (thisObject.bot === undefined) { return; } - if (pModule === "") { // For debugging purposes console.log(pMessage) } diff --git a/TaskServer/IndicatorBot.js b/TaskServer/IndicatorBot.js index ae3092e97..73a9eb068 100644 --- a/TaskServer/IndicatorBot.js +++ b/TaskServer/IndicatorBot.js @@ -1,4 +1,4 @@ -exports.newIndicatorBot = function newIndicatorBot(processIndex, bot, parentLogger) { +exports.newIndicatorBot = function newIndicatorBot(processIndex, parentLogger) { const MODULE_NAME = "Indicator Bot"; @@ -28,7 +28,7 @@ try { processConfig = pProcessConfig; - if (bot.repo === undefined) { + if (TS.projects.superalgos.globals.taskConstants.TASK_NODE.bot.processes[processIndex].referenceParent.parentNode.config.repo === undefined) { /* The code of the bot is defined at the UI. No need to load a file with the code. */ callBackFunction(TS.projects.superalgos.globals.standardResponses.DEFAULT_OK_RESPONSE); return @@ -99,7 +99,6 @@ } logger = DEBUG_MODULE.newDebugLog(processIndex); TS.projects.superalgos.globals.taskVariables.LOGGER_MAP.set(MODULE_NAME + TS.projects.superalgos.globals.taskConstants.TASK_NODE.bot.processes[processIndex].id, logger) - logger.bot = bot; logger.initialize(); TS.projects.superalgos.globals.processVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).MAIN_LOOP_COUNTER++; @@ -135,7 +134,7 @@ function initializeProcessExecutionEvents() { try { - processExecutionEvents = PROCESS_EXECUTION_EVENTS.newProcessExecutionEvents(processIndex, bot, logger) + processExecutionEvents = PROCESS_EXECUTION_EVENTS.newProcessExecutionEvents(processIndex, logger) processExecutionEvents.initialize(processConfig, onInizialized); function onInizialized(err) { @@ -236,7 +235,7 @@ function initializeStatusDependencies() { try { - statusDependencies = STATUS_DEPENDENCIES.newStatusDependencies(processIndex, bot, logger, STATUS_REPORT, UTILITIES, PROCESS_OUTPUT); + statusDependencies = STATUS_DEPENDENCIES.newStatusDependencies(processIndex, logger, STATUS_REPORT, UTILITIES, PROCESS_OUTPUT); statusDependencies.initialize(onInizialized); function onInizialized(err) { @@ -284,7 +283,7 @@ function initializeDataDependencies() { try { - dataDependencies = DATA_DEPENDENCIES.newDataDependencies(processIndex, bot, logger, DATA_SET); + dataDependencies = DATA_DEPENDENCIES.newDataDependencies(processIndex, logger, DATA_SET); dataDependencies.initialize(onInizialized); function onInizialized(err) { @@ -299,12 +298,12 @@ switch (processConfig.framework.name) { case 'Multi-Period-Market': { - processFramework = MULTI_PERIOD_MARKET.newMultiPeriodMarket(processIndex, bot, logger, UTILITIES, FILE_STORAGE); + processFramework = MULTI_PERIOD_MARKET.newMultiPeriodMarket(processIndex, logger, UTILITIES, FILE_STORAGE); intitializeProcessFramework(); break; } case 'Multi-Period-Daily': { - processFramework = MULTI_PERIOD_DAILY.newMultiPeriodDaily(processIndex, bot, logger, UTILITIES, FILE_STORAGE); + processFramework = MULTI_PERIOD_DAILY.newMultiPeriodDaily(processIndex, logger, UTILITIES, FILE_STORAGE); intitializeProcessFramework(); break; } @@ -356,7 +355,7 @@ function initializeUserBot() { try { - usertBot = USER_BOT_MODULE.newUserBot(processIndex, bot, logger, COMMONS_MODULE, UTILITIES, FILE_STORAGE); + usertBot = USER_BOT_MODULE.newUserBot(processIndex, logger, COMMONS_MODULE, UTILITIES, FILE_STORAGE); usertBot.initialize(statusDependencies, onInizialized); function onInizialized(err) { diff --git a/TaskServer/IndicatorOutput.js b/TaskServer/IndicatorOutput.js index db4f4f31d..4a5ce2761 100644 --- a/TaskServer/IndicatorOutput.js +++ b/TaskServer/IndicatorOutput.js @@ -1,4 +1,4 @@ -exports.newIndicatorOutput = function (processIndex, bot, logger, UTILITIES, FILE_STORAGE) { +exports.newIndicatorOutput = function (processIndex, logger, UTILITIES, FILE_STORAGE) { const MODULE_NAME = "Indicator Bot"; let thisObject = { @@ -11,7 +11,7 @@ let fileStorage = FILE_STORAGE.newFileStorage(logger); const COMMONS = require('./Commons.js'); - let commons = COMMONS.newCommons(bot, logger, UTILITIES, FILE_STORAGE); + let commons = COMMONS.newCommons(logger, UTILITIES, FILE_STORAGE); return thisObject; diff --git a/TaskServer/LearningSession.js b/TaskServer/LearningSession.js index 7ce970666..ab2575845 100644 --- a/TaskServer/LearningSession.js +++ b/TaskServer/LearningSession.js @@ -1,4 +1,4 @@ -exports.newLearningSession = function (processIndex, bot, parentLogger) { +exports.newLearningSession = function (processIndex, parentLogger) { const MODULE_NAME = "Learning Session" diff --git a/TaskServer/LowFrequencyTrading/Announcements.js b/TaskServer/LowFrequencyTrading/Announcements.js index f52a6ae4f..b4c18cd23 100644 --- a/TaskServer/LowFrequencyTrading/Announcements.js +++ b/TaskServer/LowFrequencyTrading/Announcements.js @@ -1,4 +1,4 @@ -exports.newAnnouncements = function (processIndex, bot, logger) { +exports.newAnnouncements = function (processIndex, logger) { const MODULE_NAME = 'Announcements' diff --git a/TaskServer/LowFrequencyTrading/ExchangeAPI.js b/TaskServer/LowFrequencyTrading/ExchangeAPI.js index a6d8c4fb7..730deb933 100644 --- a/TaskServer/LowFrequencyTrading/ExchangeAPI.js +++ b/TaskServer/LowFrequencyTrading/ExchangeAPI.js @@ -1,4 +1,4 @@ -exports.newExchangeAPI = function (processIndex, bot, logger) { +exports.newExchangeAPI = function (processIndex, logger) { let MODULE_NAME = "Exchange API"; diff --git a/TaskServer/LowFrequencyTrading/OrdersCalculations.js b/TaskServer/LowFrequencyTrading/OrdersCalculations.js index aa06cfe7d..a26874f25 100644 --- a/TaskServer/LowFrequencyTrading/OrdersCalculations.js +++ b/TaskServer/LowFrequencyTrading/OrdersCalculations.js @@ -1,4 +1,4 @@ -exports.newOrdersCalculations = function (processIndex, bot, logger) { +exports.newOrdersCalculations = function (processIndex, logger) { /* When we are live trading, we need to syncronize with the exchange. */ diff --git a/TaskServer/LowFrequencyTrading/OrdersSimulations.js b/TaskServer/LowFrequencyTrading/OrdersSimulations.js index 38b357945..f5c4e1636 100644 --- a/TaskServer/LowFrequencyTrading/OrdersSimulations.js +++ b/TaskServer/LowFrequencyTrading/OrdersSimulations.js @@ -1,4 +1,4 @@ -exports.newOrdersSimulations = function (processIndex, bot, logger) { +exports.newOrdersSimulations = function (processIndex, logger) { /* When we are backtesting or paper trading, we need to simulate what would have happened at the exchange. */ diff --git a/TaskServer/LowFrequencyTrading/Snapshots.js b/TaskServer/LowFrequencyTrading/Snapshots.js index c6bb6ecc2..56151840f 100644 --- a/TaskServer/LowFrequencyTrading/Snapshots.js +++ b/TaskServer/LowFrequencyTrading/Snapshots.js @@ -1,4 +1,4 @@ -exports.newSnapshots = function (processIndex, bot, logger) { +exports.newSnapshots = function (processIndex, logger) { /* This module encapsulates the snapshots functionality. */ diff --git a/TaskServer/LowFrequencyTrading/TradingEngine.js b/TaskServer/LowFrequencyTrading/TradingEngine.js index 042ae700d..a9a349aa9 100644 --- a/TaskServer/LowFrequencyTrading/TradingEngine.js +++ b/TaskServer/LowFrequencyTrading/TradingEngine.js @@ -1,4 +1,4 @@ -exports.newTradingEngine = function (processIndex, bot, logger) { +exports.newTradingEngine = function (processIndex, logger) { /* We call the Trading Engine to the data structure that is needed in order to exevute the trading protocol with the specific rules defined at the Trading System. diff --git a/TaskServer/LowFrequencyTrading/TradingEpisode.js b/TaskServer/LowFrequencyTrading/TradingEpisode.js index 15c45f217..c3f3c8ae3 100644 --- a/TaskServer/LowFrequencyTrading/TradingEpisode.js +++ b/TaskServer/LowFrequencyTrading/TradingEpisode.js @@ -1,4 +1,4 @@ -exports.newTradingEpisode = function (processIndex, bot, logger, tradingEngineModule) { +exports.newTradingEpisode = function (processIndex, logger, tradingEngineModule) { /* This module packages all functions related to Episodes. */ diff --git a/TaskServer/LowFrequencyTrading/TradingExecution.js b/TaskServer/LowFrequencyTrading/TradingExecution.js index 9f3e9cc38..434002a7a 100644 --- a/TaskServer/LowFrequencyTrading/TradingExecution.js +++ b/TaskServer/LowFrequencyTrading/TradingExecution.js @@ -1,4 +1,4 @@ -exports.newTradingExecution = function (processIndex, bot, logger, tradingEngineModule) { +exports.newTradingExecution = function (processIndex, logger, tradingEngineModule) { /* The Trading Execution modules manages the execution nodes and execution algoritms. */ @@ -17,7 +17,7 @@ exports.newTradingExecution = function (processIndex, bot, logger, tradingEngine let sessionParameters const TRADING_ORDERS_MODULE = require('./TradingOrders.js') - let tradingOrdersModule = TRADING_ORDERS_MODULE.newTradingOrders(processIndex, bot, logger, tradingEngineModule) + let tradingOrdersModule = TRADING_ORDERS_MODULE.newTradingOrders(processIndex, logger, tradingEngineModule) return thisObject diff --git a/TaskServer/LowFrequencyTrading/TradingOrders.js b/TaskServer/LowFrequencyTrading/TradingOrders.js index e6c72e534..2f621d4e5 100644 --- a/TaskServer/LowFrequencyTrading/TradingOrders.js +++ b/TaskServer/LowFrequencyTrading/TradingOrders.js @@ -1,4 +1,4 @@ -exports.newTradingOrders = function (processIndex, bot, logger, tradingEngineModule) { +exports.newTradingOrders = function (processIndex, logger, tradingEngineModule) { /* The Trading Orders modules manages the execution of orders against the exchanges. */ @@ -17,10 +17,10 @@ exports.newTradingOrders = function (processIndex, bot, logger, tradingEngineMod let sessionParameters const EXCHANGE_API_MODULE = require('./ExchangeAPI.js') - let exchangeAPIModule = EXCHANGE_API_MODULE.newExchangeAPI(processIndex, bot, logger) + let exchangeAPIModule = EXCHANGE_API_MODULE.newExchangeAPI(processIndex, logger) const ANNOUNCEMENTS_MODULE = require('./Announcements.js') - let announcementsModule = ANNOUNCEMENTS_MODULE.newAnnouncements(processIndex, bot, logger) + let announcementsModule = ANNOUNCEMENTS_MODULE.newAnnouncements(processIndex, logger) return thisObject @@ -572,7 +572,7 @@ exports.newTradingOrders = function (processIndex, bot, logger, tradingEngineMod tradingEngineOrder.status.value = 'Closed' /* We must be carefull here not to overide an already defined exitType. It can happen - for instance that the order was cancellerd from the bot, but veryfing the cancellation + for instance that the order was cancellerd from the but veryfing the cancellation was not possible because of a connection to the exchange problem. In that case the exit type was defined but the order was kept open until the verification could be done. */ @@ -658,7 +658,7 @@ exports.newTradingOrders = function (processIndex, bot, logger, tradingEngineMod let previousQuotedAssetFeesPaid = tradingEngineOrder.orderQuotedAsset.feesPaid.value const ORDERS_SIMULATIONS_MODULE = require('./OrdersSimulations.js') - let ordersSimulationsModule = ORDERS_SIMULATIONS_MODULE.newOrdersSimulations(processIndex, bot, logger) + let ordersSimulationsModule = ORDERS_SIMULATIONS_MODULE.newOrdersSimulations(processIndex, logger) ordersSimulationsModule.initialize() ordersSimulationsModule.actualSizeSimulation(tradingEngineStage, tradingSystemOrder, tradingEngineOrder, applyFeePercentage) @@ -690,7 +690,7 @@ exports.newTradingOrders = function (processIndex, bot, logger, tradingEngineMod let previousQuotedAssetFeesPaid = tradingEngineOrder.orderQuotedAsset.feesPaid.value const ORDERS_CALCULATIONS_MODULE = require('./OrdersCalculations.js') - let ordersCalculationsModule = ORDERS_CALCULATIONS_MODULE.newOrdersCalculations(processIndex, bot, logger) + let ordersCalculationsModule = ORDERS_CALCULATIONS_MODULE.newOrdersCalculations(processIndex, logger) ordersCalculationsModule.initialize() await ordersCalculationsModule.actualSizeCalculation(tradingEngineStage, tradingSystemOrder, tradingEngineOrder, order, applyFeePercentage) diff --git a/TaskServer/LowFrequencyTrading/TradingOutput.js b/TaskServer/LowFrequencyTrading/TradingOutput.js index 55ba6bc43..5a5afafe7 100644 --- a/TaskServer/LowFrequencyTrading/TradingOutput.js +++ b/TaskServer/LowFrequencyTrading/TradingOutput.js @@ -1,4 +1,4 @@ -exports.newTradingOutput = function (processIndex, bot, logger, tradingEngineModule, UTILITIES, FILE_STORAGE) { +exports.newTradingOutput = function (processIndex, logger, tradingEngineModule, UTILITIES, FILE_STORAGE) { /* This module will load if necesary all the data outputs so that they can be appended with new records if needed. After running the simulation, it will save all the data outputs. @@ -38,7 +38,7 @@ exports.newTradingOutput = function (processIndex, bot, logger, tradingEngineMod /* Preparing everything for the Simulation */ const TRADING_SIMULATION = require('./TradingSimulation.js') - let tradingSimulation = TRADING_SIMULATION.newTradingSimulation(processIndex, bot, logger, tradingEngineModule, UTILITIES) + let tradingSimulation = TRADING_SIMULATION.newTradingSimulation(processIndex, logger, tradingEngineModule, UTILITIES) let outputDatasets = TS.projects.superalgos.utilities.nodeFunctions.nodeBranchToArray(TS.projects.superalgos.globals.taskConstants.TASK_NODE.bot.processes[processIndex].referenceParent.processOutput, 'Output Dataset') let outputDatasetsMap = new Map() diff --git a/TaskServer/LowFrequencyTrading/TradingPosition.js b/TaskServer/LowFrequencyTrading/TradingPosition.js index b04765f22..a209255b2 100644 --- a/TaskServer/LowFrequencyTrading/TradingPosition.js +++ b/TaskServer/LowFrequencyTrading/TradingPosition.js @@ -1,4 +1,4 @@ -exports.newTradingPosition = function (processIndex, bot, logger, tradingEngineModule) { +exports.newTradingPosition = function (processIndex, logger, tradingEngineModule) { /* This module packages all functions related to Positions. */ diff --git a/TaskServer/LowFrequencyTrading/TradingProcess.js b/TaskServer/LowFrequencyTrading/TradingProcess.js index f27c4d0eb..f74f92263 100644 --- a/TaskServer/LowFrequencyTrading/TradingProcess.js +++ b/TaskServer/LowFrequencyTrading/TradingProcess.js @@ -1,4 +1,4 @@ -exports.newTradingProcess = function (processIndex, bot, logger, UTILITIES) { +exports.newTradingProcess = function (processIndex, logger, UTILITIES) { /* This Module will load all the process data dependencies from files and send them downstream. After execution, will save the time range and status report of the process. @@ -24,10 +24,10 @@ let fileStorage = FILE_STORAGE.newFileStorage(logger); const TRADING_ENGINE_MODULE = require('./TradingEngine.js') - let tradingEngineModule = TRADING_ENGINE_MODULE.newTradingEngine(processIndex, bot, logger) + let tradingEngineModule = TRADING_ENGINE_MODULE.newTradingEngine(processIndex, logger) let TRADING_OUTPUT_MODULE = require("./TradingOutput") - let tradingOutputModule = TRADING_OUTPUT_MODULE.newTradingOutput(processIndex, bot, logger, tradingEngineModule, UTILITIES, FILE_STORAGE) + let tradingOutputModule = TRADING_OUTPUT_MODULE.newTradingOutput(processIndex, logger, tradingEngineModule, UTILITIES, FILE_STORAGE) let processConfig; @@ -550,7 +550,7 @@ function buildCharts(chart) { const COMMONS = require('../Commons.js') - let commons = COMMONS.newCommons(bot, logger, UTILITIES, FILE_STORAGE) + let commons = COMMONS.newCommons(logger, UTILITIES, FILE_STORAGE) let mainDependency = {} diff --git a/TaskServer/LowFrequencyTrading/TradingRecords.js b/TaskServer/LowFrequencyTrading/TradingRecords.js index 1be60f58f..c8998d848 100644 --- a/TaskServer/LowFrequencyTrading/TradingRecords.js +++ b/TaskServer/LowFrequencyTrading/TradingRecords.js @@ -1,4 +1,4 @@ -exports.newTradingRecords = function (processIndex, bot, logger) { +exports.newTradingRecords = function (processIndex, logger) { /* This module facilitates the appending of records to the output of the process. */ diff --git a/TaskServer/LowFrequencyTrading/TradingSimulation.js b/TaskServer/LowFrequencyTrading/TradingSimulation.js index 394f80bf9..59c5983b8 100644 --- a/TaskServer/LowFrequencyTrading/TradingSimulation.js +++ b/TaskServer/LowFrequencyTrading/TradingSimulation.js @@ -1,4 +1,4 @@ -exports.newTradingSimulation = function (processIndex, bot, logger, tradingEngineModule, UTILITIES) { +exports.newTradingSimulation = function (processIndex, logger, tradingEngineModule, UTILITIES) { /* This Module represents the trading simulacion. Escentially a loop through a set of candles and the execution at each loop cycle of the Trading System Protocol. @@ -11,7 +11,7 @@ exports.newTradingSimulation = function (processIndex, bot, logger, tradingEngin runSimulation: runSimulation } - let utilities = UTILITIES.newCloudUtilities(bot, logger) + let utilities = UTILITIES.newCloudUtilities(logger) return thisObject @@ -35,15 +35,15 @@ exports.newTradingSimulation = function (processIndex, bot, logger, tradingEngin /* These are the Modules we will need to run the Simulation */ const TRADING_RECORDS_MODULE = require('./TradingRecords.js') - let tradingRecordsModule = TRADING_RECORDS_MODULE.newTradingRecords(processIndex, bot, logger) + let tradingRecordsModule = TRADING_RECORDS_MODULE.newTradingRecords(processIndex, logger) tradingRecordsModule.initialize(outputDatasetsMap) const TRADING_SYSTEM_MODULE = require('./TradingSystem.js') - let tradingSystemModule = TRADING_SYSTEM_MODULE.newTradingSystem(processIndex, bot, logger, tradingEngineModule) + let tradingSystemModule = TRADING_SYSTEM_MODULE.newTradingSystem(processIndex, logger, tradingEngineModule) tradingSystemModule.initialize() const TRADING_EPISODE_MODULE = require('./TradingEpisode.js') - let tradingEpisodeModule = TRADING_EPISODE_MODULE.newTradingEpisode(processIndex, bot, logger, tradingEngineModule) + let tradingEpisodeModule = TRADING_EPISODE_MODULE.newTradingEpisode(processIndex, logger, tradingEngineModule) tradingEpisodeModule.initialize() /* Setting up the candles array: The whole simulation is based on the array of candles at the time-frame defined at the session parameters. */ diff --git a/TaskServer/LowFrequencyTrading/TradingStages.js b/TaskServer/LowFrequencyTrading/TradingStages.js index c4e094d74..d91d9a347 100644 --- a/TaskServer/LowFrequencyTrading/TradingStages.js +++ b/TaskServer/LowFrequencyTrading/TradingStages.js @@ -1,4 +1,4 @@ -exports.newTradingStages = function (processIndex, bot, logger, tradingEngineModule) { +exports.newTradingStages = function (processIndex, logger, tradingEngineModule) { /* This module packages all functions related to Stages. */ @@ -21,22 +21,22 @@ exports.newTradingStages = function (processIndex, bot, logger, tradingEngineMod } const TRADING_STRATEGY_MODULE = require('./TradingStrategy.js') - let tradingStrategyModule = TRADING_STRATEGY_MODULE.newTradingStrategy(processIndex, bot, logger, tradingEngineModule) + let tradingStrategyModule = TRADING_STRATEGY_MODULE.newTradingStrategy(processIndex, logger, tradingEngineModule) const TRADING_POSITION_MODULE = require('./TradingPosition.js') - let tradingPositionModule = TRADING_POSITION_MODULE.newTradingPosition(processIndex, bot, logger, tradingEngineModule) + let tradingPositionModule = TRADING_POSITION_MODULE.newTradingPosition(processIndex, logger, tradingEngineModule) const TRADING_ENGINE_EXECUTION = require('./TradingExecution.js') - let tradingExecutionModule = TRADING_ENGINE_EXECUTION.newTradingExecution(processIndex, bot, logger, tradingEngineModule) + let tradingExecutionModule = TRADING_ENGINE_EXECUTION.newTradingExecution(processIndex, logger, tradingEngineModule) const ANNOUNCEMENTS_MODULE = require('./Announcements.js') - let announcementsModule = ANNOUNCEMENTS_MODULE.newAnnouncements(processIndex, bot, logger) + let announcementsModule = ANNOUNCEMENTS_MODULE.newAnnouncements(processIndex, logger) const SNAPSHOTS_MODULE = require('./Snapshots.js') - let snapshotsModule = SNAPSHOTS_MODULE.newSnapshots(processIndex, bot, logger) + let snapshotsModule = SNAPSHOTS_MODULE.newSnapshots(processIndex, logger) const TRADING_EPISODE_MODULE = require('./TradingEpisode.js') - let tradingEpisodeModule = TRADING_EPISODE_MODULE.newTradingEpisode(processIndex, bot, logger) + let tradingEpisodeModule = TRADING_EPISODE_MODULE.newTradingEpisode(processIndex, logger) let tradingEngine let tradingSystem diff --git a/TaskServer/LowFrequencyTrading/TradingStrategy.js b/TaskServer/LowFrequencyTrading/TradingStrategy.js index 471391ecd..04bcc975f 100644 --- a/TaskServer/LowFrequencyTrading/TradingStrategy.js +++ b/TaskServer/LowFrequencyTrading/TradingStrategy.js @@ -1,4 +1,4 @@ -exports.newTradingStrategy = function (processIndex, bot, logger, tradingEngineModule) { +exports.newTradingStrategy = function (processIndex, logger, tradingEngineModule) { /* This module packages all functions related to Strategies. */ diff --git a/TaskServer/LowFrequencyTrading/TradingSystem.js b/TaskServer/LowFrequencyTrading/TradingSystem.js index 08ba5112a..b5aa3f553 100644 --- a/TaskServer/LowFrequencyTrading/TradingSystem.js +++ b/TaskServer/LowFrequencyTrading/TradingSystem.js @@ -1,4 +1,4 @@ -exports.newTradingSystem = function (processIndex, bot, logger, tradingEngineModule) { +exports.newTradingSystem = function (processIndex, logger, tradingEngineModule) { /* The Trading System is the user defined set of rules compliant with the Trading Protocol that defines the trading logic to be applied during each cycle of the Simulation. @@ -20,7 +20,7 @@ exports.newTradingSystem = function (processIndex, bot, logger, tradingEngineMod let dynamicIndicators const TRADING_STAGES_MODULE = require('./TradingStages.js') - let tradingStagesModule = TRADING_STAGES_MODULE.newTradingStages(processIndex, bot, logger, tradingEngineModule) + let tradingStagesModule = TRADING_STAGES_MODULE.newTradingStages(processIndex, logger, tradingEngineModule) return thisObject diff --git a/TaskServer/MultiPeriodDaily.js b/TaskServer/MultiPeriodDaily.js index d6cc23e1b..b34789aa2 100644 --- a/TaskServer/MultiPeriodDaily.js +++ b/TaskServer/MultiPeriodDaily.js @@ -1,4 +1,4 @@ -exports.newMultiPeriodDaily = function (processIndex, bot, logger, UTILITIES, FILE_STORAGE) { +exports.newMultiPeriodDaily = function (processIndex, logger, UTILITIES, FILE_STORAGE) { const MODULE_NAME = "Multi Period Daily"; const GMT_SECONDS = ':00.000 GMT+0000'; @@ -33,7 +33,7 @@ let INDICATOR_OUTPUT_MODULE = require("./IndicatorOutput") - indicatorOutputModule = INDICATOR_OUTPUT_MODULE.newIndicatorOutput(processIndex, bot, logger, UTILITIES, FILE_STORAGE) + indicatorOutputModule = INDICATOR_OUTPUT_MODULE.newIndicatorOutput(processIndex, logger, UTILITIES, FILE_STORAGE) indicatorOutputModule.initialize(callBackFunction) } diff --git a/TaskServer/MultiPeriodMarket.js b/TaskServer/MultiPeriodMarket.js index 5f51f2463..9a8de46c2 100644 --- a/TaskServer/MultiPeriodMarket.js +++ b/TaskServer/MultiPeriodMarket.js @@ -1,4 +1,4 @@ -exports.newMultiPeriodMarket = function (processIndex, bot, logger, UTILITIES, FILE_STORAGE) { +exports.newMultiPeriodMarket = function (processIndex, logger, UTILITIES, FILE_STORAGE) { const MODULE_NAME = "Multi Period Market"; thisObject = { initialize: initialize, @@ -27,7 +27,7 @@ let INDICATOR_OUTPUT_MODULE = require("./IndicatorOutput") - indicatorOutputModule = INDICATOR_OUTPUT_MODULE.newIndicatorOutput(processIndex, bot, logger, UTILITIES, FILE_STORAGE) + indicatorOutputModule = INDICATOR_OUTPUT_MODULE.newIndicatorOutput(processIndex, logger, UTILITIES, FILE_STORAGE) indicatorOutputModule.initialize(callBackFunction) } diff --git a/TaskServer/ProcessExecutionEvents.js b/TaskServer/ProcessExecutionEvents.js index edb334375..806f3bd6f 100644 --- a/TaskServer/ProcessExecutionEvents.js +++ b/TaskServer/ProcessExecutionEvents.js @@ -1,4 +1,4 @@ -exports.newProcessExecutionEvents = function (processIndex, BOT, logger) { +exports.newProcessExecutionEvents = function (processIndex, logger) { /* Here we manage the process execution events. This allow us to emit events when the process starts and finishes. Also to wait for a dependent event @@ -7,8 +7,6 @@ const MODULE_NAME = "Process Execution Events"; logger.fileName = MODULE_NAME - let bot = BOT; - let thisObject = { networkNode: undefined, initialize: initialize, diff --git a/TaskServer/ProcessInstance.js b/TaskServer/ProcessInstance.js index a2e00af4d..4c02366e1 100644 --- a/TaskServer/ProcessInstance.js +++ b/TaskServer/ProcessInstance.js @@ -30,7 +30,6 @@ */ let logger = DEBUG_MODULE.newDebugLog(processIndex) TS.projects.superalgos.globals.taskVariables.LOGGER_MAP.set('Pre-Bot-Main-Loop' + TS.projects.superalgos.globals.taskConstants.TASK_NODE.bot.processes[processIndex].id, logger) - logger.bot = botConfig; /* There are a few variables with the scope of the process instance. We will store it here so that it can be @@ -94,7 +93,7 @@ try { TS.projects.superalgos.globals.processVariables.TOTAL_PROCESS_INSTANCES_CREATED++ - botInstance = SENSOR_BOT.newSensorBot(processIndex, botConfig, logger); + botInstance = SENSOR_BOT.newSensorBot(processIndex, logger); botInstance.initialize(processConfig, onInitializeReady); } catch (err) { @@ -107,7 +106,7 @@ try { TS.projects.superalgos.globals.processVariables.TOTAL_PROCESS_INSTANCES_CREATED++ - botInstance = INDICATOR_BOT_MODULE.newIndicatorBot(processIndex, botConfig, logger); + botInstance = INDICATOR_BOT_MODULE.newIndicatorBot(processIndex, logger); botInstance.initialize(processConfig, onInitializeReady); } @@ -121,7 +120,7 @@ try { TS.projects.superalgos.globals.processVariables.TOTAL_PROCESS_INSTANCES_CREATED++ - botInstance = TRADING_BOT_MODULE.newTradingBot(processIndex, botConfig, logger); + botInstance = TRADING_BOT_MODULE.newTradingBot(processIndex, logger); botInstance.initialize(processConfig, onInitializeReady); } catch (err) { @@ -134,7 +133,7 @@ try { TS.projects.superalgos.globals.processVariables.TOTAL_PROCESS_INSTANCES_CREATED++ - botInstance = TRADING_BOT_MODULE.newLearningBot(processIndex, botConfig, logger); + botInstance = TRADING_BOT_MODULE.newLearningBot(processIndex, logger); botInstance.initialize(processConfig, onInitializeReady); } catch (err) { diff --git a/TaskServer/ProcessOutput.js b/TaskServer/ProcessOutput.js index beabe87ac..cd503f385 100644 --- a/TaskServer/ProcessOutput.js +++ b/TaskServer/ProcessOutput.js @@ -1,4 +1,4 @@ -exports.newProcessOutput = function (processIndex, BOT, logger) { +exports.newProcessOutput = function (processIndex, logger) { /* Here we emit the events that signals that a Dataset was updated. @@ -6,8 +6,6 @@ const MODULE_NAME = "Process Output"; - let bot = BOT; - let thisObject = { raiseEvents: raiseEvents, asyncRaiseEvents: asyncRaiseEvents diff --git a/TaskServer/ReinforcementLearning/LearningBot.js b/TaskServer/ReinforcementLearning/LearningBot.js index 2e4c5789a..205459e07 100644 --- a/TaskServer/ReinforcementLearning/LearningBot.js +++ b/TaskServer/ReinforcementLearning/LearningBot.js @@ -1,4 +1,4 @@ -exports.newLearningBot = function (processIndex, bot, parentLogger) { +exports.newLearningBot = function (processIndex, parentLogger) { const MODULE_NAME = "Learning Bot"; const FULL_LOG = true; @@ -8,7 +8,7 @@ exports.newLearningBot = function (processIndex, bot, parentLogger) { const SESSION = require(TS.projects.superalgos.globals.nodeJSConstants.REQUIRE_ROOT_DIR + 'TradingSession'); let fileStorage = FILE_STORAGE.newFileStorage(parentLogger); - let session = SESSION.newLearningSession(processIndex, bot, parentLogger) + let session = SESSION.newLearningSession(processIndex, parentLogger) const DEBUG_MODULE = require(TS.projects.superalgos.globals.nodeJSConstants.REQUIRE_ROOT_DIR + 'DebugLog'); let logger; // We need this here in order for the loopHealth function to work and be able to rescue the loop when it gets in trouble. diff --git a/TaskServer/ReinforcementLearning/LearningProcess.js b/TaskServer/ReinforcementLearning/LearningProcess.js index daa1abbbd..daee4a4ba 100644 --- a/TaskServer/ReinforcementLearning/LearningProcess.js +++ b/TaskServer/ReinforcementLearning/LearningProcess.js @@ -1,4 +1,4 @@ -exports.newLearningProcess = function (processIndex, bot, logger, UTILITIES) { +exports.newLearningProcess = function (processIndex, logger, UTILITIES) { thisObject = { diff --git a/TaskServer/ReinforcementLearning/MarkovDecisionProcess.js b/TaskServer/ReinforcementLearning/MarkovDecisionProcess.js index 9e2072835..1c6d18c5f 100644 --- a/TaskServer/ReinforcementLearning/MarkovDecisionProcess.js +++ b/TaskServer/ReinforcementLearning/MarkovDecisionProcess.js @@ -1,4 +1,4 @@ -exports.newMarkovDecisionProcess = function newMarkovDecisionProcess(bot, logger) { +exports.newMarkovDecisionProcess = function newMarkovDecisionProcess(logger) { const MODULE_NAME = 'Markov Decision Process' let thisObject = { diff --git a/TaskServer/SensorBot.js b/TaskServer/SensorBot.js index cf5db1699..63d1403e5 100644 --- a/TaskServer/SensorBot.js +++ b/TaskServer/SensorBot.js @@ -1,7 +1,6 @@ -exports.newSensorBot = function newSensorBot(processIndex, bot, parentLogger) { +exports.newSensorBot = function newSensorBot(processIndex, parentLogger) { const MODULE_NAME = "Sensor Bot"; - const FULL_LOG = true; let USER_BOT_MODULE; let COMMONS_MODULE; @@ -28,7 +27,7 @@ try { processConfig = pProcessConfig; - if (bot.repo === undefined) { + if (TS.projects.superalgos.globals.taskConstants.TASK_NODE.bot.processes[processIndex].referenceParent.parentNode.config.repo === undefined) { /* The code of the bot is defined at the UI. No need to load a file with the code. */ callBackFunction(TS.projects.superalgos.globals.standardResponses.DEFAULT_OK_RESPONSE); return @@ -105,7 +104,6 @@ } logger = DEBUG_MODULE.newDebugLog(processIndex); TS.projects.superalgos.globals.taskVariables.LOGGER_MAP.set(MODULE_NAME + TS.projects.superalgos.globals.taskConstants.TASK_NODE.bot.processes[processIndex].id, logger) - logger.bot = bot; logger.initialize(); TS.projects.superalgos.globals.processVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).MAIN_LOOP_COUNTER++; @@ -138,7 +136,7 @@ function initializeProcessExecutionEvents() { try { - processExecutionEvents = PROCESS_EXECUTION_EVENTS.newProcessExecutionEvents(processIndex, bot, logger) + processExecutionEvents = PROCESS_EXECUTION_EVENTS.newProcessExecutionEvents(processIndex, logger) processExecutionEvents.initialize(processConfig, onInizialized); function onInizialized(err) { @@ -240,7 +238,7 @@ function initializeStatusDependencies() { try { - statusDependencies = STATUS_DEPENDENCIES.newStatusDependencies(processIndex, bot, logger, STATUS_REPORT, UTILITIES, PROCESS_OUTPUT); + statusDependencies = STATUS_DEPENDENCIES.newStatusDependencies(processIndex, logger, STATUS_REPORT, UTILITIES, PROCESS_OUTPUT); statusDependencies.initialize(onInizialized); function onInizialized(err) { @@ -288,7 +286,7 @@ function initializeUserBot() { try { - usertBot = USER_BOT_MODULE.newUserBot(processIndex, bot, logger, COMMONS_MODULE, UTILITIES, FILE_STORAGE, STATUS_REPORT, exchangeAPI); + usertBot = USER_BOT_MODULE.newUserBot(processIndex, logger, COMMONS_MODULE, UTILITIES, FILE_STORAGE, STATUS_REPORT, exchangeAPI); usertBot.initialize(statusDependencies, onInizialized); function onInizialized(err) { diff --git a/TaskServer/SocialBots.js b/TaskServer/SocialBots.js index 08db46cd2..7cec0e440 100644 --- a/TaskServer/SocialBots.js +++ b/TaskServer/SocialBots.js @@ -1,4 +1,4 @@ -exports.newSocialBots = function (processIndex, bot, logger) { +exports.newSocialBots = function (processIndex, logger) { const MODULE_NAME = 'Social Bots' @@ -19,7 +19,7 @@ exports.newSocialBots = function (processIndex, bot, logger) { let socialBot = TS.projects.superalgos.globals.processConstants.CONSTANTS_BY_PROCESS_INDEX_MAP.get(processIndex).SESSION_NODE.socialBots.bots[i] if (socialBot.type === "Telegram Bot") { let config = socialBot.config - socialBot.botInstance = TELEGRAM_BOT_MODULE.newTelegramBot(bot, logger) + socialBot.botInstance = TELEGRAM_BOT_MODULE.newTelegramBot(logger) socialBot.botInstance.initialize(config.botToken, config.chatId) } } diff --git a/TaskServer/StatusDependencies.js b/TaskServer/StatusDependencies.js index ccffccbac..b44c01ebf 100644 --- a/TaskServer/StatusDependencies.js +++ b/TaskServer/StatusDependencies.js @@ -1,9 +1,7 @@ -exports.newStatusDependencies = function (processIndex, BOT, logger, STATUS_REPORT, UTILITIES, PROCESS_OUTPUT) { +exports.newStatusDependencies = function (processIndex, logger, STATUS_REPORT, UTILITIES, PROCESS_OUTPUT) { const MODULE_NAME = "Status Dependencies"; - let bot = BOT - let thisObject = { nodeArray: undefined, statusReports: new Map(), @@ -48,7 +46,7 @@ for (let i = 0; i < dependenciesToProcess.length; i++) { - let statusReportModule = STATUS_REPORT.newStatusReport(processIndex, BOT, logger, UTILITIES, PROCESS_OUTPUT); + let statusReportModule = STATUS_REPORT.newStatusReport(processIndex, logger, UTILITIES, PROCESS_OUTPUT); logger.write(MODULE_NAME, "[INFO] initialize -> onInitilized -> Initializing Status Report # " + (i + 1)); let statusDependency = dependenciesToProcess[i] diff --git a/TaskServer/StatusReport.js b/TaskServer/StatusReport.js index 24071cfb1..37df1ab15 100644 --- a/TaskServer/StatusReport.js +++ b/TaskServer/StatusReport.js @@ -1,4 +1,4 @@ -exports.newStatusReport = function (processIndex, BOT, logger, UTILITIES, PROCESS_OUTPUT) { +exports.newStatusReport = function (processIndex, logger, UTILITIES, PROCESS_OUTPUT) { /* @@ -10,8 +10,6 @@ const MODULE_NAME = "Status Report"; - let bot = BOT; - let thisObject = { networkNode: undefined, mainUtility: undefined, @@ -267,7 +265,7 @@ If we are funning Trading Engines, we can not allow ourselves to use a Status Report that is not the latest one, because it might contain transactioinal information related to the context of the operations the trading engine is doing. - On the contraty, if we are running a Sensor bot or an Indicator bot, we might, if necesary, use a previous version of a Status Report since + On the contraty, if we are running a Sensor bot or an Indicator we might, if necesary, use a previous version of a Status Report since there will be no big impact, just some reprocessing. */ if (TS.projects.superalgos.globals.processConstants.CONSTANTS_BY_PROCESS_INDEX_MAP.get(processIndex).SESSION_NODE !== undefined) { @@ -368,7 +366,7 @@ /* All good, lets emit the event that means data has been updated. */ - let processOutput = PROCESS_OUTPUT.newProcessOutput(processIndex, bot, logger) + let processOutput = PROCESS_OUTPUT.newProcessOutput(processIndex, logger) processOutput.raiseEvents(thisObject.file.lastFile, thisObject.file.timeFrames, callBackFunction); return } @@ -395,7 +393,7 @@ } /* All good, lets emit the event that means data has been updated. */ - let processOutput = PROCESS_OUTPUT.newProcessOutput(processIndex, bot, logger) + let processOutput = PROCESS_OUTPUT.newProcessOutput(processIndex, logger) processOutput.asyncRaiseEvents(thisObject.file.lastFile, thisObject.file.timeFrames) } } diff --git a/TaskServer/TelegramBot.js b/TaskServer/TelegramBot.js index 226e08cc3..f136e7290 100644 --- a/TaskServer/TelegramBot.js +++ b/TaskServer/TelegramBot.js @@ -1,4 +1,4 @@ -exports.newTelegramBot = function newTelegramBot(bot, logger) { +exports.newTelegramBot = function newTelegramBot(logger) { const MODULE_NAME = 'Telegram Bot' diff --git a/TaskServer/TradingBot.js b/TaskServer/TradingBot.js index b76e83119..23028ef86 100644 --- a/TaskServer/TradingBot.js +++ b/TaskServer/TradingBot.js @@ -1,4 +1,4 @@ -exports.newTradingBot = function newTradingBot(processIndex, bot, parentLogger) { +exports.newTradingBot = function newTradingBot(processIndex, parentLogger) { const MODULE_NAME = "Trading Bot"; const FULL_LOG = true; @@ -8,7 +8,7 @@ const SESSION = require(TS.projects.superalgos.globals.nodeJSConstants.REQUIRE_ROOT_DIR + 'TradingSession'); let fileStorage = FILE_STORAGE.newFileStorage(parentLogger); - let session = SESSION.newTradingSession(processIndex, bot, parentLogger) + let session = SESSION.newTradingSession(processIndex, parentLogger) const DEBUG_MODULE = require(TS.projects.superalgos.globals.nodeJSConstants.REQUIRE_ROOT_DIR + 'DebugLog'); let logger; // We need this here in order for the loopHealth function to work and be able to rescue the loop when it gets in trouble. @@ -28,7 +28,7 @@ /* This function is exactly the same in the 3 modules representing the 2 different bot types loops. */ try { processConfig = pProcessConfig; - if (bot.repo === undefined) { + if (TS.projects.superalgos.globals.taskConstants.TASK_NODE.bot.processes[processIndex].referenceParent.parentNode.config.repo === undefined) { /* The code of the bot is defined at the UI. No need to load a file with the code. */ session.initialize(processConfig, callBackFunction) } @@ -61,7 +61,6 @@ } logger = DEBUG_MODULE.newDebugLog(processIndex); TS.projects.superalgos.globals.taskVariables.LOGGER_MAP.set(MODULE_NAME + TS.projects.superalgos.globals.taskConstants.TASK_NODE.bot.processes[processIndex].id, logger) - logger.bot = bot; logger.initialize(); TS.projects.superalgos.globals.processVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).MAIN_LOOP_COUNTER++; @@ -122,7 +121,7 @@ function initializeProcessExecutionEvents() { try { - processExecutionEvents = PROCESS_EXECUTION_EVENTS.newProcessExecutionEvents(processIndex, bot, logger) + processExecutionEvents = PROCESS_EXECUTION_EVENTS.newProcessExecutionEvents(processIndex, logger) processExecutionEvents.initialize(processConfig, onInizialized); function onInizialized(err) { @@ -223,7 +222,7 @@ function initializeStatusDependencies() { try { - statusDependencies = STATUS_DEPENDENCIES.newStatusDependencies(processIndex, bot, logger, STATUS_REPORT, UTILITIES, PROCESS_OUTPUT); + statusDependencies = STATUS_DEPENDENCIES.newStatusDependencies(processIndex, logger, STATUS_REPORT, UTILITIES, PROCESS_OUTPUT); statusDependencies.initialize(onInizialized); function onInizialized(err) { @@ -271,7 +270,7 @@ function initializeDataDependencies() { try { - dataDependencies = DATA_DEPENDENCIES.newDataDependencies(processIndex, bot, logger, DATA_SET); + dataDependencies = DATA_DEPENDENCIES.newDataDependencies(processIndex, logger, DATA_SET); dataDependencies.initialize(onInizialized); function onInizialized(err) { @@ -281,7 +280,7 @@ logger.write(MODULE_NAME, "[INFO] run -> loop -> initializeDataDependencies -> onInizialized -> Execution finished well.") switch (processConfig.framework.name) { case 'Low-Frequency-Trading-Process': { - processFramework = TRADING_PROCESS_MODULE.newTradingProcess(processIndex, bot, logger, UTILITIES); + processFramework = TRADING_PROCESS_MODULE.newTradingProcess(processIndex, logger, UTILITIES); intitializeProcessFramework(); break; } diff --git a/TaskServer/TradingSession.js b/TaskServer/TradingSession.js index 67385ad4a..89a9d343d 100644 --- a/TaskServer/TradingSession.js +++ b/TaskServer/TradingSession.js @@ -1,4 +1,4 @@ -exports.newTradingSession = function (processIndex, bot, parentLogger) { +exports.newTradingSession = function (processIndex, parentLogger) { const MODULE_NAME = "Trading Session" @@ -7,7 +7,7 @@ } const SOCIAL_BOTS_MODULE = require('./SocialBots.js') - TS.projects.superalgos.globals.processVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).SOCIAL_BOTS_MODULE = SOCIAL_BOTS_MODULE.newSocialBots(processIndex, bot, parentLogger) + TS.projects.superalgos.globals.processVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).SOCIAL_BOTS_MODULE = SOCIAL_BOTS_MODULE.newSocialBots(processIndex, parentLogger) return thisObject;