From 658dc4714a6c77339fc91c5ed9c622a0973beea7 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Fri, 27 Nov 2020 13:36:25 +0100 Subject: [PATCH] Process Functions --- Projects/ProjectsSchema.json | 9 ++- .../TS/Function-Libraries/ProcessFunctions.js | 61 +++++++++++++++++++ TaskServer/Globals.js | 51 ---------------- TaskServer/IndicatorBot.js | 2 +- .../ReinforcementLearning/LearningBot.js | 2 +- TaskServer/SensorBot.js | 2 +- TaskServer/StatusReport.js | 2 +- TaskServer/TradingBot.js | 2 +- 8 files changed, 74 insertions(+), 57 deletions(-) create mode 100644 Projects/Superalgos/TS/Function-Libraries/ProcessFunctions.js diff --git a/Projects/ProjectsSchema.json b/Projects/ProjectsSchema.json index e7b6078e2..090ec5225 100644 --- a/Projects/ProjectsSchema.json +++ b/Projects/ProjectsSchema.json @@ -339,7 +339,14 @@ "fileName": "StandardResponses.js" } ], - "functionLibraries": [], + "functionLibraries": [ + { + "name": "Process Functions", + "propertyName": "processFunctions", + "functionName": "newSuperalgosFunctionLibrariesProcessFunctions", + "fileName": "ProcessFunctions.js" + } + ], "utilities": [], "botClasses": [] }, diff --git a/Projects/Superalgos/TS/Function-Libraries/ProcessFunctions.js b/Projects/Superalgos/TS/Function-Libraries/ProcessFunctions.js new file mode 100644 index 000000000..672b551cd --- /dev/null +++ b/Projects/Superalgos/TS/Function-Libraries/ProcessFunctions.js @@ -0,0 +1,61 @@ +exports.newSuperalgosFunctionLibrariesProcessFunctions = function () { + + let thisObject = { + processError: processError, + processWarning: processWarning, + processInfo: processInfo + } + + return thisObject + + function processError (processKey, node, errorMessage) { + let event + if (node !== undefined) { + event = { + nodeName: node.name, + nodeType: node.type, + nodeId: node.id, + errorMessage: errorMessage + } + } else { + event = { + errorMessage: errorMessage + } + } + global.EVENT_SERVER_CLIENT_MODULE.raiseEvent(processKey, 'Error', event) + } + + function processWarning (processKey, node, warningMessage) { + let event + if (node !== undefined) { + event = { + nodeName: node.name, + nodeType: node.type, + nodeId: node.id, + warningMessage: warningMessage + } + } else { + event = { + warningMessage: warningMessage + } + } + global.EVENT_SERVER_CLIENT_MODULE.raiseEvent(processKey, 'Warning', event) + } + + function processInfo (processKey, node, infoMessage) { + let event + if (node !== undefined) { + event = { + nodeName: node.name, + nodeType: node.type, + nodeId: node.id, + infoMessage: infoMessage + } + } else { + event = { + infoMessage: infoMessage + } + } + global.EVENT_SERVER_CLIENT_MODULE.raiseEvent(processKey, 'Info', event) + } +} \ No newline at end of file diff --git a/TaskServer/Globals.js b/TaskServer/Globals.js index 0c3c3cdb6..25b93fe7a 100644 --- a/TaskServer/Globals.js +++ b/TaskServer/Globals.js @@ -38,57 +38,6 @@ exports.newGlobals = function newGlobals() { return new Date(date.getUTCFullYear() + "-" + (date.getUTCMonth() + 1) + "-" + date.getUTCDate() + " " + "00:00" + GMT_SECONDS); } - global.PROCESS_ERROR = function (processKey, node, errorMessage) { - let event - if (node !== undefined) { - event = { - nodeName: node.name, - nodeType: node.type, - nodeId: node.id, - errorMessage: errorMessage - } - } else { - event = { - errorMessage: errorMessage - } - } - global.EVENT_SERVER_CLIENT_MODULE.raiseEvent(processKey, 'Error', event) - } - - global.PROCESS_WARNING = function (processKey, node, warningMessage) { - let event - if (node !== undefined) { - event = { - nodeName: node.name, - nodeType: node.type, - nodeId: node.id, - warningMessage: warningMessage - } - } else { - event = { - warningMessage: warningMessage - } - } - global.EVENT_SERVER_CLIENT_MODULE.raiseEvent(processKey, 'Warning', event) - } - - global.PROCESS_INFO = function (processKey, node, infoMessage) { - let event - if (node !== undefined) { - event = { - nodeName: node.name, - nodeType: node.type, - nodeId: node.id, - infoMessage: infoMessage - } - } else { - event = { - infoMessage: infoMessage - } - } - global.EVENT_SERVER_CLIENT_MODULE.raiseEvent(processKey, 'Info', event) - } - global.NODE_BRANCH_TO_ARRAY = function (node, nodeType) { let resultArray = [] scanNodeBranch(node, nodeType) diff --git a/TaskServer/IndicatorBot.js b/TaskServer/IndicatorBot.js index 242aa949b..e24c8e7a9 100644 --- a/TaskServer/IndicatorBot.js +++ b/TaskServer/IndicatorBot.js @@ -767,7 +767,7 @@ function processStopped() { if (global.unexpectedError !== undefined) { - global.PROCESS_ERROR(bot.processKey, undefined, "An unexpected error caused the Process to stop.") + TS.projects.superalgos.functionLibraries.processFunctions.processError(bot.processKey, undefined, "An unexpected error caused the Process to stop.") } else { global.EVENT_SERVER_CLIENT_MODULE.raiseEvent(bot.processKey, 'Stopped') } diff --git a/TaskServer/ReinforcementLearning/LearningBot.js b/TaskServer/ReinforcementLearning/LearningBot.js index c24f20a35..1c2ccf6d9 100644 --- a/TaskServer/ReinforcementLearning/LearningBot.js +++ b/TaskServer/ReinforcementLearning/LearningBot.js @@ -653,7 +653,7 @@ exports.newLearningBot = function newLearningBot(bot, parentLogger) { function processStopped() { if (global.unexpectedError !== undefined) { - global.PROCESS_ERROR(bot.processKey, undefined, "An unexpected error caused the Process to stop.") + TS.projects.superalgos.functionLibraries.processFunctions.processError(bot.processKey, undefined, "An unexpected error caused the Process to stop.") } else { global.EVENT_SERVER_CLIENT_MODULE.raiseEvent(bot.processKey, 'Stopped') } diff --git a/TaskServer/SensorBot.js b/TaskServer/SensorBot.js index 5f56d3f15..8932fba88 100644 --- a/TaskServer/SensorBot.js +++ b/TaskServer/SensorBot.js @@ -576,7 +576,7 @@ function processStopped() { if (global.unexpectedError !== undefined) { - global.PROCESS_ERROR(bot.processKey, undefined, "An unexpected error caused the Process to stop.") + TS.projects.superalgos.functionLibraries.processFunctions.processError(bot.processKey, undefined, "An unexpected error caused the Process to stop.") } else { global.EVENT_SERVER_CLIENT_MODULE.raiseEvent(bot.processKey, 'Stopped') } diff --git a/TaskServer/StatusReport.js b/TaskServer/StatusReport.js index 636b9daad..7993ee4d1 100644 --- a/TaskServer/StatusReport.js +++ b/TaskServer/StatusReport.js @@ -83,7 +83,7 @@ function validationFailed(errorInNode, errorMessage) { let nodeString = JSON.stringify(errorInNode) logger.write(MODULE_NAME, "[ERROR] initialize -> " + errorMessage + ' -> nodeString = ' + nodeString) - global.PROCESS_ERROR(bot.processKey, errorInNode, errorMessage) + TS.projects.superalgos.functionLibraries.processFunctions.processError(bot.processKey, errorInNode, errorMessage) callBackFunction(TS.projects.superalgos.globals.standardResponses.DEFAULT_FAIL_RESPONSE) } diff --git a/TaskServer/TradingBot.js b/TaskServer/TradingBot.js index 03bfeab72..4e3b8b260 100644 --- a/TaskServer/TradingBot.js +++ b/TaskServer/TradingBot.js @@ -653,7 +653,7 @@ function processStopped() { if (global.unexpectedError !== undefined) { - global.PROCESS_ERROR(bot.processKey, undefined, "An unexpected error caused the Process to stop.") + TS.projects.superalgos.functionLibraries.processFunctions.processError(bot.processKey, undefined, "An unexpected error caused the Process to stop.") } else { global.EVENT_SERVER_CLIENT_MODULE.raiseEvent(bot.processKey, 'Stopped') }