From 9041525347ded7378483b39c7bbbec0410b0b290 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Thu, 24 Sep 2020 19:05:44 +0200 Subject: [PATCH] get ready --- BackendServers/taskManagerServer.js | 27 ++++++++++++++ .../FunctionLibraries/TaskFunctions.js | 37 ++++++++++++++++++- CanvasApp/Spaces/TutorialSpace.js | 4 +- 3 files changed, 65 insertions(+), 3 deletions(-) diff --git a/BackendServers/taskManagerServer.js b/BackendServers/taskManagerServer.js index e32d14a3a..381c4237a 100644 --- a/BackendServers/taskManagerServer.js +++ b/BackendServers/taskManagerServer.js @@ -38,6 +38,7 @@ eventsServerClient.createEventHandler('Task Manager') eventsServerClient.listenToEvent('Task Manager', 'Run Task', undefined, undefined, undefined, runTask) eventsServerClient.listenToEvent('Task Manager', 'Stop Task', undefined, undefined, undefined, stopTask) + eventsServerClient.listenToEvent('Task Manager', 'Task Status', undefined, undefined, undefined, taskStatus) console.log('Task Manager Server Started.') @@ -148,6 +149,32 @@ console.log('[WARN] BackendServers -> Task Manager Server -> stopTask -> Cannot delete Task that does not exist.') } } + + function taskStatus(message) { + //console.log('[INFO] BackendServers -> Task Manager Server -> taskStatus -> Entering function.') + if (message.event === undefined) { + console.log('[WARN] BackendServers -> Task Manager Server -> taskStatus -> Message Received Without Event -> message = ' + JSON.stringify(message).substring(0, 1000)) + return + } + + if (message.event.taskId === undefined) { + console.log('[WARN] BackendServers -> Task Manager Server -> taskStatus -> Message Received Without taskId -> message = ' + JSON.stringify(message).substring(0, 1000)) + return + } + //console.log('[INFO] BackendServers -> Task Manager Server -> taskStatus -> Task Name = ' + message.event.taskName) + //console.log('[INFO] BackendServers -> Task Manager Server -> taskStatus -> Task Id = ' + message.event.taskId) + + let task = tasksMap.get(message.event.taskId) + + let event = {status: 'Undefined'} + if (task) { + event.status = 'Task Process Running' + eventsServerClient.raiseEvent('Task Client - ' + task.id, 'Task Status', event.status) + } else { + event.status = 'Task Process Not Running' + eventsServerClient.raiseEvent('Task Client - ' + task.id, 'Task Status', event.status) + } + } } function newEventsServerClient() { diff --git a/CanvasApp/DesignSpace/Workspace/FunctionLibraries/TaskFunctions.js b/CanvasApp/DesignSpace/Workspace/FunctionLibraries/TaskFunctions.js index 24b0c3687..a7913454e 100644 --- a/CanvasApp/DesignSpace/Workspace/FunctionLibraries/TaskFunctions.js +++ b/CanvasApp/DesignSpace/Workspace/FunctionLibraries/TaskFunctions.js @@ -1,5 +1,7 @@ function newTaskFunctions() { thisObject = { + getReady: getReady, + runTask: runTask, stopTask: stopTask, runAllTasks: runAllTasks, @@ -33,6 +35,39 @@ function newTaskFunctions() { return thisObject + function getReady(node) { + let networkNode = validations(node) + if (networkNode === undefined) { + /* Nodes that do not belong to a network can not get ready. */ + return + } + + let eventsServerClient = canvas.designSpace.workspace.eventsServerClients.get(networkNode.id) + + /* First we setup everything so as to listen to the response from the Task Manger */ + let eventSubscriptionIdOnStatus + let key = 'Task Client - ' + node.id + eventsServerClient.listenToEvent(key, 'Task Status', undefined, node.id, onResponse, onStatus) + + function onResponse(message) { + eventSubscriptionIdOnStatus = message.eventSubscriptionId + } + + function onStatus(message) { + eventsServerClient.stopListening(key, eventSubscriptionIdOnStatus, node.id) + if (message.event.status === 'Task Process Running' ) { + node.payload.uiObject.run() + } + } + + /* Second we ask the Task Manager if this Task has a process Running. */ + let event = { + taskId: node.id + } + + eventsServerClient.raiseEvent('Task Manager', 'Task Status', event) + } + function runTask(node, functionLibraryProtocolNode, isDebugging, callBackFunction) { let networkNode = validations(node) @@ -494,7 +529,7 @@ function newTaskFunctions() { let task = functionLibraryUiObjectsFromNodes.addUIObject(taskManager, 'Task') if (tradingSystem !== undefined) { - task.name = tradingSystem.name + task.name = tradingSystem.name } else { task.name = bot.name } diff --git a/CanvasApp/Spaces/TutorialSpace.js b/CanvasApp/Spaces/TutorialSpace.js index 6e1bdd7da..7acd8a6d5 100644 --- a/CanvasApp/Spaces/TutorialSpace.js +++ b/CanvasApp/Spaces/TutorialSpace.js @@ -914,10 +914,10 @@ function newTutorialSpace() { html = html + '' } if (nodeConfig.important !== undefined && nodeConfig.important !== '') { - html = html + '' + html = html + '' } if (nodeConfig.warning !== undefined && nodeConfig.warning !== '') { - html = html + '' + html = html + '' } html = html + ''