fez5587/Superalgos
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Task Server independent of bot types

Browse Source
This commit is contained in:
Luis Fernando Molina committed 2020-12-03 13:10:46 +01:00
1 parent 5400ff5eef
commit a0e2f17524
3 files changed
+33 -77
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Projects/ProjectsSchema.json
+6 -3
View File
@@ -497,14 +497,16 @@
"propertyName": "singleMarketSensorBot",
"functionName": "newSuperalgosBotModulesSingleMarketSensorBot",
"fileName": "SingleMarketSensorBot.js",
"folderName": "Sensor-Bot"
"folderName": "Sensor-Bot",
"botType": "Sensor Bot"
},
{
"name": "Single Market Indicator Bot",
"propertyName": "singleMarketIndicatorBot",
"functionName": "newSuperalgosBotModulesSingleMarketIndicatorBot",
"fileName": "SingleMarketIndicatorBot.js",
"folderName": "Indicator-Bot"
"folderName": "Indicator-Bot",
"botType": "Indicator Bot"
},
{
"name": "Multi Period Market",
@@ -532,7 +534,8 @@
"propertyName": "singleMarketTradingBot",
"functionName": "newSuperalgosBotModulesSingleMarketTradingBot",
"fileName": "SingleMarketTradingBot.js",
"folderName": "Trading-Bot"
"folderName": "Trading-Bot",
"botType": "Trading Bot"
},
{
"name": "Trading Session",
Projects/Superalgos/TS/Bot-Modules/Sensor-Bot/SingleMarketSensorBot.js
-1
View File
@@ -5,7 +5,6 @@
let USER_BOT_MODULE;
let COMMONS_MODULE;
let fileStorage = TS.projects.superalgos.taskModules.fileStorage.newFileStorage(processIndex);
let nextLoopTimeoutHandle;
TaskServer/ProcessInstance.js
+27 -73
View File
@@ -12,7 +12,7 @@
function start(processIndex) {
try {
let botInstance
let botModuleObject
let botConfig = TS.projects.superalgos.globals.taskConstants.TASK_NODE.bot.processes[processIndex].referenceParent.parentNode.config
let processConfig = TS.projects.superalgos.globals.taskConstants.TASK_NODE.bot.processes[processIndex].referenceParent.config
@@ -63,78 +63,32 @@
"-" +
TS.projects.superalgos.globals.taskConstants.TASK_NODE.parentNode.parentNode.parentNode.referenceParent.quotedAsset.referenceParent.config.codeName
switch (TS.projects.superalgos.globals.taskConstants.TASK_NODE.bot.processes[processIndex].referenceParent.parentNode.type) {
case 'Sensor Bot': {
runSensorBot()
break;
}
case 'Indicator Bot': {
runIndicatorBot()
break;
}
case 'Trading Bot': {
runTradingBot()
break;
}
case 'Learning Bot': {
runLearningBot()
break;
}
default: {
console.log(logDisplace + "Process Instance : [ERROR] start -> Unexpected bot type. -> TS.projects.superalgos.globals.taskConstants.TASK_NODE.bot.processes[processIndex].referenceParent.parentNode.type = " + TS.projects.superalgos.globals.taskConstants.TASK_NODE.bot.processes[processIndex].referenceParent.parentNode.type);
}
}
function runSensorBot() {
try {
TS.projects.superalgos.globals.processVariables.TOTAL_PROCESS_INSTANCES_CREATED++
botInstance = TS.projects.superalgos.botModules.singleMarketSensorBot.newSuperalgosBotModulesSingleMarketSensorBot(processIndex);
botInstance.initialize(processConfig, onInitializeReady);
}
catch (err) {
console.log(logDisplace + "Process Instance : [ERROR] start -> err = " + err.stack);
setTimeout(exitProcessInstance, WAIT_TIME_FOR_ALL_PROCESS_INSTANCES_TO_START)
}
}
function runIndicatorBot() {
try {
TS.projects.superalgos.globals.processVariables.TOTAL_PROCESS_INSTANCES_CREATED++
botInstance = TS.projects.superalgos.botModules.singleMarketIndicatorBot.newSuperalgosBotModulesSingleMarketIndicatorBot(processIndex);
botInstance.initialize(processConfig, onInitializeReady);
}
catch (err) {
console.log(logDisplace + "Process Instance : [ERROR] start -> runIndicatorBot -> err = " + err.stack);
setTimeout(exitProcessInstance, WAIT_TIME_FOR_ALL_PROCESS_INSTANCES_TO_START)
}
}
function runTradingBot() {
try {
TS.projects.superalgos.globals.processVariables.TOTAL_PROCESS_INSTANCES_CREATED++
botInstance = TS.projects.superalgos.botModules.singleMarketTradingBot.newSuperalgosBotModulesSingleMarketTradingBot(processIndex);
botInstance.initialize(processConfig, onInitializeReady);
}
catch (err) {
console.log(logDisplace + "Process Instance : [ERROR] start -> runTradingBot -> err = " + err.stack);
setTimeout(exitProcessInstance, WAIT_TIME_FOR_ALL_PROCESS_INSTANCES_TO_START)
}
}
function runLearningBot() {
try {
TS.projects.superalgos.globals.processVariables.TOTAL_PROCESS_INSTANCES_CREATED++
botInstance = LEARNING_BOT_MODULE.newLearningBot(processIndex);
botInstance.initialize(processConfig, onInitializeReady);
}
catch (err) {
console.log(logDisplace + "Process Instance : [ERROR] start -> runLearningBot -> err = " + err.stack);
setTimeout(exitProcessInstance, WAIT_TIME_FOR_ALL_PROCESS_INSTANCES_TO_START)
/*
We will scan the project schema until we find the module that will run the bot
associated to this process. Note that for being able to find the module that represents
the bot type received via websockets events, at the PROJECTS SCHEMA a botModule must be
defined with the same type at the property botType.
*/
for (let i = 0; i < TS.projects.superalgos.globals.taskConstants.PROJECTS_SCHEMA.length; i++) {
let project = TS.projects.superalgos.globals.taskConstants.PROJECTS_SCHEMA[i]
if (project.name !== TS.projects.superalgos.globals.taskConstants.PROJECT_DEFINITION_NODE.config.codeName) { continue }
for (let j = 0; j < project.TS.botModules.length; j++) {
botModuleDefinition = project.TS.botModules[j]
if (botModuleDefinition.botType === TS.projects.superalgos.globals.taskConstants.TASK_NODE.bot.processes[processIndex].referenceParent.parentNode.type) {
try {
TS.projects.superalgos.globals.processVariables.TOTAL_PROCESS_INSTANCES_CREATED++
let botModule = TS.projects.superalgos.botModules[botModuleDefinition.propertyName]
let moduleFunction = botModule[botModuleDefinition.functionName]
botModuleObject = moduleFunction(processIndex)
botModuleObject.initialize(processConfig, onInitializeReady);
}
catch (err) {
console.log(logDisplace + "[ERROR] start -> err = " + err.stack);
setTimeout(exitProcessInstance, WAIT_TIME_FOR_ALL_PROCESS_INSTANCES_TO_START)
}
}
}
}
@@ -142,7 +96,7 @@
if (err.result === TS.projects.superalgos.globals.standardResponses.DEFAULT_OK_RESPONSE.result) {
botInstance.run(whenRunFinishes);
botModuleObject.run(whenRunFinishes);
function whenRunFinishes(err) {