diff --git a/Projects/Superalgos/UI/Function-Libraries/TaskFunctions.js b/Projects/Superalgos/UI/Function-Libraries/TaskFunctions.js index d13f422cc..e4c96e235 100644 --- a/Projects/Superalgos/UI/Function-Libraries/TaskFunctions.js +++ b/Projects/Superalgos/UI/Function-Libraries/TaskFunctions.js @@ -192,8 +192,7 @@ function newSuperalgosFunctionLibraryTaskFunctions() { taskId: node.id, taskName: node.name, taskDefinition: JSON.stringify(taskDefinition), - networkDefinition: JSON.stringify(networkDefinition), - projectsSchema: JSON.stringify(PROJECTS_SCHEMA) + networkDefinition: JSON.stringify(networkDefinition) } if (isDebugging === true) { diff --git a/TaskServer/MultiProject.js b/TaskServer/MultiProject.js index 31b9638e1..a26cc5a98 100644 --- a/TaskServer/MultiProject.js +++ b/TaskServer/MultiProject.js @@ -7,6 +7,11 @@ exports.newMultiProject = function () { return thisObject; function initialize() { + /* + First thing is to load the project schema file. + */ + let PROJECTS_SCHEMA = require(global.env.PATH_TO_PROJECTS_REQUIRED + '/' + 'ProjectsSchema.json') + /* Here we will setup the TS object, with all the projects and modules that will have inside. @@ -14,8 +19,8 @@ exports.newMultiProject = function () { global.TS = { projects: {} } - for (let i = 0; i < global.PROJECTS_SCHEMA.length; i++) { - let projectDefinition = global.PROJECTS_SCHEMA[i] + for (let i = 0; i < PROJECTS_SCHEMA.length; i++) { + let projectDefinition = PROJECTS_SCHEMA[i] global.TS.projects[projectDefinition.propertyName] = {} let projectInstance = global.TS.projects[projectDefinition.propertyName] @@ -95,5 +100,8 @@ exports.newMultiProject = function () { } } } + + TS.projects.superalgos.globals.taskConstants.PROJECTS_SCHEMA = PROJECTS_SCHEMA + } } \ No newline at end of file diff --git a/TaskServer/Task.js b/TaskServer/Task.js index af288a929..0bba4d864 100644 --- a/TaskServer/Task.js +++ b/TaskServer/Task.js @@ -8,6 +8,11 @@ let NODE_JS_PROCESS = require('./NodeJsProcess.js'); let NODE_JS_PROCESS_MODULE = NODE_JS_PROCESS.newNodeJsProcess() NODE_JS_PROCESS_MODULE.initialize() +/* Setting up the modules that will be available for the Task and it's processes */ +let MULTI_PROJECT = require('./MultiProject.js'); +let MULTI_PROJECT_MODULE = MULTI_PROJECT.newMultiProject() +MULTI_PROJECT_MODULE.initialize() + /* Setting up the global Event Handler */ let EVENT_SERVER_CLIENT = require('../Projects/Superalgos/TS/Task-Modules/EventServerClient.js'); global.EVENT_SERVER_CLIENT_MODULE = EVENT_SERVER_CLIENT.newSuperalgosTaskModulesEventServerClient() @@ -33,7 +38,6 @@ function preLoader() { setUpAppSchema(JSON.parse(message.event.projectSchemas)) global.TASK_NODE = JSON.parse(message.event.taskDefinition) global.NETWORK_NODE = JSON.parse(message.event.networkDefinition) - global.PROJECTS_SCHEMA = JSON.parse(message.event.projectsSchema) bootingProcess() } catch (err) { console.log('[ERROR] Task Server -> Task -> preLoader -> eventReceived -> ' + err.stack) @@ -63,7 +67,6 @@ function preLoader() { setUpAppSchema(JSON.parse(message.event.projectSchemas)) global.TASK_NODE = JSON.parse(message.event.taskDefinition) global.NETWORK_NODE = JSON.parse(message.event.networkDefinition) - global.PROJECTS_SCHEMA = JSON.parse(message.event.projectsSchema) bootingProcess() } catch (err) { @@ -94,16 +97,9 @@ function preLoader() { function bootingProcess() { try { - setupMultiProjectFramework() initializeTaskConstants() setupTaskHeartbeats() - function setupMultiProjectFramework() { - let MULTI_PROJECT = require('./MultiProject.js'); - let MULTI_PROJECT_MODULE = MULTI_PROJECT.newMultiProject() - MULTI_PROJECT_MODULE.initialize() - } - function initializeTaskConstants() { /* These constants could not be initialized before since they are received via websockets. @@ -112,8 +108,6 @@ function bootingProcess() { global.TASK_NODE = undefined TS.projects.superalgos.globals.taskConstants.NETWORK_NODE = global.NETWORK_NODE NETWORK_NODE = undefined - TS.projects.superalgos.globals.taskConstants.PROJECTS_SCHEMA = global.PROJECTS_SCHEMA - global.PROJECTS_SCHEMA = undefined TS.projects.superalgos.globals.taskConstants.APP_SCHEMA_MAP = global.APP_SCHEMA_MAP global.APP_SCHEMA_MAP = undefined