@5minds/node-red-contrib-processcube 0.14.0-feature-c8461c-lyxixqqm → 0.14.0-feature-a07566-lyy11h2t

package/externaltask-error.js

@@ -8,7 +8,7 @@ module.exports = function(RED) {
 
         node.on('input', function(msg) {
 
-            const externalTaskId = msg.externalTaskId;
+            const flowNodeInstanceId = msg.flowNodeInstanceId;
 
             let msgError = msg.error;
 
@@ -26,7 +26,7 @@ module.exports = function(RED) {
             // TODO: hack cause https://github.com/5minds/ProcessCube.Engine.Client.ts/blob/develop/src/ExternalTaskWorker.ts#L180
             error.stack = RED.util.encodeObject(msg); 
 
-            eventEmitter.emit(`handle-${externalTaskId}`, error, true);
+            eventEmitter.emit(`handle-${flowNodeInstanceId}`, error, true);
             
             node.send(msg);
         });     

package/externaltask-input.js

@@ -30,13 +30,21 @@ module.exports = function(RED) {
         client.externalTasks.subscribeToExternalTaskTopic(
             config.topic,
             async (payload, externalTask) => {
+
+                const saveHandleCallback = (data, callback) => {
+                    try {
+                        callback(data);
+                    } catch (error) {
+                        node.error(`Error in callback 'saveHandleCallback': ${error.message}`);
+                    }
+                };
                 
                 return await new Promise((resolve, reject) => {
 
                     const handleFinishTask = (msg) => {
                         let result = RED.util.encodeObject(msg.payload);
 
-                        node.log(`handle event for external task ${externalTask.flowNodeInstanceId} and process it with result ${result} on msg._msgid ${msg._msgid}.`);
+                        node.log(`handle event for *external task flowNodeInstanceId* '${externalTask.flowNodeInstanceId}' and *processInstanceId* ${externalTask.processInstanceId} with result ${result} on msg._msgid ${msg._msgid}.`);
 
                         if (externalTask.flowNodeInstanceId) {
                             delete started_external_tasks[externalTask.flowNodeInstanceId];
@@ -45,12 +53,13 @@ module.exports = function(RED) {
                         showStatus(node, Object.keys(started_external_tasks).length);
 
 
-                        resolve(result);
+                        //resolve(result);
+                        saveHandleCallback(result,resolve)
                     };
 
                     const handleErrorTask = (msg) => {
 
-                        node.log(`handle error event for external task ${externalTask.flowNodeInstanceId} with result ${msg} on msg._msgid ${msg._msgid}.`);
+                        node.log(`handle error event for *external task flowNodeInstanceId* '${externalTask.flowNodeInstanceId}' and *processInstanceId* '${externalTask.processInstanceId}' on *msg._msgid* '${msg._msgid}'.`);
 
                         if (externalTask.flowNodeInstanceId) {
                             delete started_external_tasks[externalTask.flowNodeInstanceId];
@@ -62,11 +71,12 @@ module.exports = function(RED) {
                         // TODO: with reject, the default error handling is proceed 
                         // SEE: https://github.com/5minds/ProcessCube.Engine.Client.ts/blob/develop/src/ExternalTaskWorker.ts#L180
                         // reject(result);
-                        resolve(msg);
+                        //resolve(msg);
+                        saveHandleCallback(msg,resolve);
                     };
 
                     eventEmitter.once(`handle-${externalTask.flowNodeInstanceId}`, (msg, isError = false) => {
-                        node.log(`handle event for external task ${externalTask.flowNodeInstanceId} and process it with msg._msgid ${msg._msgid} and isError ${isError}`);
+                        node.log(`handle event for *external task flowNodeInstanceId* '${externalTask.flowNodeInstanceId}' and *processInstanceId* '${externalTask.processInstanceId}' with *msg._msgid* '${msg._msgid}' and *isError* '${isError}'`);
 
                         if (isError) {
                             handleErrorTask(msg);
@@ -81,12 +91,12 @@ module.exports = function(RED) {
 
                     let msg = {
                         _msgid: RED.util.generateId(),
-                        topic: externalTask.topic,
+                        task: RED.util.encodeObject(externalTask),
                         payload: payload,
-                        externalTaskId: externalTask.flowNodeInstanceId
+                        flowNodeInstanceId: externalTask.flowNodeInstanceId
                     };
                     
-                    node.log(`Received external task ${externalTask.flowNodeInstanceId} and process it with msg._msgid ${msg._msgid}`);
+                    node.log(`Received *external task flowNodeInstanceId* '${externalTask.flowNodeInstanceId}' and *processInstanceId* '${externalTask.processInstanceId}' with *msg._msgid* '${msg._msgid}'`);
                     
                     node.send(msg);
                 });
@@ -105,7 +115,7 @@ module.exports = function(RED) {
                         case 'extendLock':
                         case 'finishExternalTask':
                         case 'processExternalTask':
-                            node.error(`Worker error ${errorType} for external task ${externalTask.flowNodeInstanceId}: ${error.message}`);
+                            node.error(`Worker error ${errorType} for *external task flowNodeInstanceId* '${externalTask.flowNodeInstanceId}' and *processInstanceId* '${externalTask.processInstanceId}': ${error.message}`);
                     
                             externalTaskWorker.stop();
 
@@ -121,7 +131,11 @@ module.exports = function(RED) {
                     }
                 });
 
-                externalTaskWorker.start();
+                try {
+                    externalTaskWorker.start();
+                } catch (error) {
+                    node.error(`Worker start 'externalTaskWorker.start' failed: ${error.message}`);
+                }
 
                 node.on("close", () => {
                     try {

package/externaltask-output.js

@@ -8,13 +8,13 @@ module.exports = function(RED) {
 
         node.on('input', function(msg) {
             
-            const externalTaskId = msg.externalTaskId;
+            const flowNodeInstanceId = msg.flowNodeInstanceId;
 
-            if (!externalTaskId) {
+            if (!flowNodeInstanceId) {
                node.error('Error: The message did not contain the required external task id.', msg);
             }  
 
-            eventEmitter.emit(`handle-${externalTaskId}`, msg, false);
+            eventEmitter.emit(`handle-${flowNodeInstanceId}`, msg, false);
         });     
     }
     RED.nodes.registerType("externaltask-output", ExternalTaskOutput);

package/nodered/node-red-contrib-processcube-flows.json

@@ -210,7 +210,7 @@
         "g": "31cb6729aac0ba46",
         "name": "",
         "pauseType": "delay",
-        "timeout": "5",
+        "timeout": "15",
         "timeoutUnits": "seconds",
         "rate": "1",
         "nbRateUnits": "1",
@@ -221,7 +221,7 @@
         "drop": false,
         "allowrate": false,
         "outputs": 1,
-        "x": 320,
+        "x": 330,
         "y": 360,
         "wires": [
             [

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@5minds/node-red-contrib-processcube",
-    "version": "0.14.0-feature-c8461c-lyxixqqm",
+    "version": "0.14.0-feature-a07566-lyy11h2t",
     "license": "MIT",
     "description": "Node-RED nodes for ProcessCube",
     "authors": [