@5minds/node-red-contrib-processcube 1.8.3 → 1.8.5-develop-e1e2dc-m7pcoei4

package/.processcube/nodered/.config.nodes.json

@@ -429,7 +429,7 @@
     },
     "@5minds/node-red-contrib-processcube": {
         "name": "@5minds/node-red-contrib-processcube",
-        "version": "1.8.2",
+        "version": "1.8.4",
         "local": false,
         "user": false,
         "nodes": {

package/.processcube/nodered/flows.json

@@ -698,17 +698,6 @@
         "name": "Engine Auth 8000",
         "url": "http://engine:8000"
     },
-    {
-        "id": "f7961bee80d8bcb5",
-        "type": "processcube-engine-config",
-        "name": "",
-        "url": "http://engine:8001",
-        "urlType": "str",
-        "clientId": "",
-        "clientIdType": "str",
-        "clientSecret": "",
-        "clientSecretType": "str"
-    },
     {
         "id": "b7ddfedf82d8120f",
         "type": "externaltask-error",
@@ -818,7 +807,7 @@
         "z": "a23d2e782beb66f4",
         "g": "31cb6729aac0ba46",
         "name": "raise Error",
-        "func": "throw Error(\"hello error\");\n\nreturn msg;",
+        "func": "const randomDelay = Math.floor(Math.random() * (10000 - 1000 + 1)) + 1000; // Zufall zwischen 1000 und 10000 ms\n\nsetTimeout(() => {\n    node.send(msg);\n}, randomDelay);\n\n//throw Error(\"hello error\");",
         "outputs": 1,
         "timeout": 0,
         "noerr": 0,
@@ -1172,7 +1161,7 @@
         "z": "a23d2e782beb66f4",
         "g": "70d7a70e375b162a",
         "name": "debug 3",
-        "active": true,
+        "active": false,
         "tosidebar": true,
         "console": false,
         "tostatus": false,
@@ -2616,7 +2605,7 @@
         "type": "debug",
         "z": "76c047e0d8770a20",
         "name": "debug 34",
-        "active": true,
+        "active": false,
         "tosidebar": true,
         "console": false,
         "tostatus": false,

package/docker-compose.yml

@@ -14,7 +14,8 @@ services:
       - TOPIC=TopicFromENV
       # start node-red with debugger port open
       - NODE_OPTIONS=--inspect=0.0.0.0:9229
-      - NODE_RED_ETW_HEARTBEAT_LOGGING=true
+      - NODE_RED_ETW_HEARTBEAT_LOGGING=false
+      - NODE_RED_ETW_STEP_LOGGING=true
     volumes:
       # required for mapping the current source into the directory
       - ./.:/package_src/

package/externaltask-input.js

@@ -1,4 +1,5 @@
 const EventEmitter = require('node:events');
+const { send } = require('node:process');
 
 
 module.exports = function (RED) {
@@ -14,10 +15,114 @@ module.exports = function (RED) {
 
         let options = RED.util.evaluateNodeProperty(config.workerConfig, config.workerConfigType, node);
         let topic = node.topic =  RED.util.evaluateNodeProperty(config.topic, config.topicType, node)
-
-        
+ 
         node._subscribed = true;
         node._subscribed_error = null;
+        node._trace = '';
+        node._step = '';
+        node._tracking_nodes = {};
+        node._tracking_for_etw = {};
+
+        node.isHandling = () => {
+            return Object.keys(node.started_external_tasks).length > 0;
+        };
+
+        node.ownMessage = (msg) => {
+            return msg.etw_input_node_id === node.id;
+        };
+
+        node.clearTracking = (msg) => {
+            if (msg.flowNodeInstanceId) {
+                node._tracking_for_etw[msg.flowNodeInstanceId].forEach((theNode) => {
+                    node.decrMsgOnNode(theNode, msg);
+                });
+            }
+        };
+
+        node.incMsgOnNode = (theNode, msg) => {
+            if (node.id === theNode.id) {
+                return;
+            }
+
+            if (!node._tracking_nodes[theNode.id]) {
+                node._tracking_nodes[theNode.id] = {
+                    node: theNode,
+                    count: 1,
+                };
+            } else {
+                node._tracking_nodes[theNode.id].count++;
+            }
+            
+            if (!node._tracking_for_etw[msg.flowNodeInstanceId]) {
+                node._tracking_for_etw[msg.flowNodeInstanceId] = [];
+                node._tracking_for_etw[msg.flowNodeInstanceId].push(theNode);
+            } else {
+                node._tracking_for_etw[msg.flowNodeInstanceId].push(theNode);
+            }
+
+            theNode.status({ fill: 'green', shape: 'dot', text: `tasks(${node._tracking_nodes[theNode.id].count}).` });
+        };
+
+        node.decrMsgOnNode = (theNode, msg) => {
+            if (node.id === theNode.id) {
+                return;
+            }
+
+            if (!node._tracking_nodes[theNode.id]) {
+                node._tracking_nodes[theNode.id] = {
+                    node: theNode,
+                    count: 0,
+                };
+            } else {
+                node._tracking_nodes[theNode.id].count--;
+
+                if (node._tracking_nodes[theNode.id].count <= 0) {
+                    node._tracking_nodes[theNode.id].count = 0;
+                }
+            }
+
+            if (node._tracking_for_etw[msg.flowNodeInstanceId]) {
+                node._tracking_for_etw[msg.flowNodeInstanceId] = node._tracking_for_etw[msg.flowNodeInstanceId].filter(item => item !== theNode)
+
+                if (node._tracking_for_etw[msg.flowNodeInstanceId].count <= 0) {
+                    delete node._tracking_for_etw[msg.flowNodeInstanceId];
+                }
+            }
+
+            theNode.status({ fill: 'green', shape: 'dot', text: `tasks(${node._tracking_nodes[theNode.id].count}).` });
+        };
+
+        RED.hooks.add('preDeliver', (sendEvent) => {
+            if (node.isHandling() && node.ownMessage(sendEvent.msg)) {  
+                
+                const sourceNode = sendEvent?.source?.node;
+                const destinationNode = sendEvent?.destination?.node;
+
+                node._step = `${destinationNode.name || destinationNode.type}`;
+
+                node.showStatus();
+
+                if (process.env.NODE_RED_ETW_STEP_LOGGING == 'true') {
+                    node._trace = `'${sourceNode.name || sourceNode.type}'->'${destinationNode.name || destinationNode.type}'`;
+                    node.log(`preDeliver: ${node._trace}`);
+                }
+            }
+        });
+
+        RED.hooks.add('postDeliver', (sendEvent) => {
+            if (node.isHandling() && node.ownMessage(sendEvent.msg)) {
+                const sourceNode = sendEvent?.source?.node;
+                const destinationNode = sendEvent?.destination?.node;
+
+                node.decrMsgOnNode(sourceNode, sendEvent.msg);
+                node.incMsgOnNode(destinationNode, sendEvent.msg);
+
+                if (process.env.NODE_RED_ETW_STEP_LOGGING == 'true') {
+                    node._trace = `'${sourceNode.name || sourceNode.type}'->'${destinationNode.name || destinationNode.type}'`;
+                    node.log(`postDeliver: ${node._trace}`);
+                }
+            }
+        });
 
         node.setSubscribedStatus = () => {
             this._subscribed = true;
@@ -30,7 +135,7 @@ module.exports = function (RED) {
             this._subscribed_error = error;
             
             this.error(`subscription failed (topic: ${node.topic}).`);
-            RED.log.error(`topic: ${node.topic} (${error.message}).`);
+            RED.log.error(`topic: ${node.topic} (${error?.message}).`);
 
             this.showStatus();
         };
@@ -46,11 +151,14 @@ module.exports = function (RED) {
         node.setFinishHandlingTaskStatus = (externalTask) => {
             if (externalTask.flowNodeInstanceId) {
                 delete this.started_external_tasks[externalTask.flowNodeInstanceId];
+                node._trace = '';
+                node._step = '';
             }
 
             this._subscribed = true;
             this._subscribed_error = null;
 
+            this.clearTracking(externalTask); // as msg
             this.showStatus();
         };
 
@@ -61,7 +169,7 @@ module.exports = function (RED) {
 
             this._subscribed_error = error;
             this.error(`finished task failed (topic: ${node.topic}).`);
-            RED.log.error(`topic: ${node.topic} (${error.message}).`);
+            RED.log.error(`topic: ${node.topic} (${error?.message}).`);
 
             this.showStatus();
         };
@@ -70,13 +178,50 @@ module.exports = function (RED) {
             const msgCounter = Object.keys(this.started_external_tasks).length;
 
             if (this._subscribed === false) {
-                this.status({ fill: 'red', shape: 'ring', text: `subscription failed (${msgCounter}).` })
+                this.status({ fill: 'red', shape: 'ring', text: `subscription failed (${msgCounter}).` });
+
+                RED.events.emit("processcube:healthcheck:update", {
+                    nodeId: node.id,
+                    status: 'NotOk',
+                    nodeName: node.name,
+                    nodeType: 'externaltask-input',
+                    message: `subscription failed (${msgCounter}).`
+                });
             } else {
                 if (msgCounter >= 1) {
-                    this.status({ fill: 'green', shape: 'dot', text: `handling tasks ${msgCounter}.` });
+                    if (node._step) {
+                        this.status({ fill: 'green', shape: 'dot', text: `tasks(${msgCounter}) ->'${node._step}'.` });
+
+                        RED.events.emit("processcube:healthcheck:update", {
+                            nodeId: node.id,
+                            status: 'Ok',
+                            nodeName: node.name,
+                            nodeType: 'externaltask-input',
+                            message: `tasks(${msgCounter}) ->'${node._step}'.`
+                        });
+        
+                    } else {
+                        this.status({ fill: 'green', shape: 'dot', text: `tasks(${msgCounter}).` });
+
+                        RED.events.emit("processcube:healthcheck:update", {
+                            nodeId: node.id,
+                            status: 'Ok',
+                            nodeName: node.name,
+                            nodeType: 'externaltask-input',
+                            message: `tasks(${msgCounter}).`
+                        });
+                    }
                     this.log(`handling tasks ${msgCounter}.`);
                 } else {
                     this.status({ fill: 'blue', shape: 'ring', text: `subcribed.` });
+
+                    RED.events.emit("processcube:healthcheck:update", {
+                        nodeId: node.id,
+                        status: 'Ok',
+                        nodeName: node.name,
+                        nodeType: 'externaltask-input',
+                        message: `subcribed.`
+                    });
                 }               
             }
         };
@@ -101,11 +246,12 @@ module.exports = function (RED) {
                 const saveHandleCallback = (data, callback, msg) => {
                     try {
                         callback(data);
+                        node.log(`send to engine *external task flowNodeInstanceId* '${externalTask.flowNodeInstanceId}' and *processInstanceId* ${externalTask.processInstanceId}`);
                         node.setFinishHandlingTaskStatus(externalTask);
                     } catch (error) {
                         node.setErrorFinishHandlingTaskStatus(externalTask, error);
                         msg.error = error;
-                        node.error(`Error in callback 'saveHandleCallback': ${error.message}`, msg);
+                        node.error(`failed send to engine *external task flowNodeInstanceId* '${externalTask.flowNodeInstanceId}' and *processInstanceId* ${externalTask.processInstanceId}: ${erro?.message}`, msg);
                     }
                 };
 
@@ -125,16 +271,16 @@ module.exports = function (RED) {
                         saveHandleCallback(result, resolve, msg);
                     };
 
-                    const handleErrorTask = (msg) => {
+                    const handleErrorTask = (error) => {
                         node.log(
-                            `handle error event for *external task flowNodeInstanceId* '${externalTask.flowNodeInstanceId}' and *processInstanceId* '${externalTask.processInstanceId}' on *msg._msgid* '${msg._msgid}'.`
+                            `handle error event for *external task flowNodeInstanceId* '${externalTask.flowNodeInstanceId}' and *processInstanceId* '${externalTask.processInstanceId}' on *msg._msgid* '${error.errorDetails?._msgid}'.`
                         );
 
                         // 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);
-                        saveHandleCallback(msg, resolve, msg);
+                        saveHandleCallback(error, resolve, error);
                     };
 
                     node.eventEmitter.once(`handle-${externalTask.flowNodeInstanceId}`, (msg, isError = false) => {
@@ -178,7 +324,7 @@ module.exports = function (RED) {
                     externalTaskWorker.onHeartbeat((event, external_task_id) => {
                         node.setSubscribedStatus();
                         
-                        if (process.env.NODE_RED_ETW_HEARTBEAT_LOGGING) {
+                        if (process.env.NODE_RED_ETW_HEARTBEAT_LOGGING  == 'true') {
                             if (external_task_id) {
                                 this.log(`subscription (heartbeat:topic ${node.topic}, ${event} for ${external_task_id}).`);
                             } else {
@@ -193,13 +339,9 @@ module.exports = function (RED) {
                             case 'finishExternalTask':
                             case 'processExternalTask':
                                 node.error(
-                                    `Worker error ${errorType} for *external task flowNodeInstanceId* '${externalTask.flowNodeInstanceId}' and *processInstanceId* '${externalTask.processInstanceId}': ${error.message}`
+                                    `Worker error ${errorType} for *external task flowNodeInstanceId* '${externalTask.flowNodeInstanceId}' and *processInstanceId* '${externalTask.processInstanceId}': ${error?.message}`
                                 );
 
-                                //if (externalTask) {
-                                //    delete node.started_external_tasks[externalTask.flowNodeInstanceId];
-                                //}
-
                                 node.setUnsubscribedStatus(error);
 
                                 break;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@5minds/node-red-contrib-processcube",
-    "version": "1.8.3",
+    "version": "1.8.5-develop-e1e2dc-m7pcoei4",
     "license": "MIT",
     "description": "Node-RED nodes for ProcessCube",
     "scripts": {

package/processes/External-Task-Sample.bpmn

@@ -9,9 +9,6 @@
   </bpmn:collaboration>
   <bpmn:process id="External-Task-Sample_Process" name="External-Task-Sample" isExecutable="true">
     <bpmn:laneSet />
-    <bpmn:startEvent id="StartEvent_1" name="Start">
-      <bpmn:outgoing>Flow_0qmxzxk</bpmn:outgoing>
-    </bpmn:startEvent>
     <bpmn:sequenceFlow id="Flow_0qmxzxk" sourceRef="StartEvent_1" targetRef="Activity_02ykwt2" />
     <bpmn:sequenceFlow id="Flow_16dfeac" sourceRef="Activity_02ykwt2" targetRef="Activity_0ma3kzt" />
     <bpmn:endEvent id="Event_05wpeos">
@@ -23,6 +20,11 @@
     </bpmn:endEvent>
     <bpmn:sequenceFlow id="Flow_0y6es1p" sourceRef="Event_0o7qlkd" targetRef="Event_0yn9mzh" />
     <bpmn:serviceTask id="Activity_02ykwt2" name="Topic &#34;Test&#34;" camunda:type="external" camunda:topic="Test">
+      <bpmn:extensionElements>
+        <camunda:properties>
+          <camunda:property name="payload" value="{&#10;    &#34;hello&#34;: &#34;world&#34;&#10;}" />
+        </camunda:properties>
+      </bpmn:extensionElements>
       <bpmn:incoming>Flow_0qmxzxk</bpmn:incoming>
       <bpmn:outgoing>Flow_16dfeac</bpmn:outgoing>
     </bpmn:serviceTask>
@@ -42,6 +44,17 @@
       <bpmn:outgoing>Flow_1fsn04u</bpmn:outgoing>
       <bpmn:errorEventDefinition id="ErrorEventDefinition_0kojqkb" errorRef="Error_TrRFOiMy" />
     </bpmn:boundaryEvent>
+    <bpmn:startEvent id="StartEvent_1" name="Start">
+      <bpmn:extensionElements>
+        <camunda:properties>
+          <camunda:property name="enabled" value="false" />
+        </camunda:properties>
+      </bpmn:extensionElements>
+      <bpmn:outgoing>Flow_0qmxzxk</bpmn:outgoing>
+      <bpmn:timerEventDefinition id="TimerEventDefinition_02zdsh9">
+        <bpmn:timeCycle xsi:type="bpmn:tFormalExpression">*/10 * * * * *</bpmn:timeCycle>
+      </bpmn:timerEventDefinition>
+    </bpmn:startEvent>
   </bpmn:process>
   <bpmn:error id="Error_3O8wBFQi" errorCode="MyErrorCode" />
   <bpmn:error id="Error_TrRFOiMy" errorCode="handleSubFlowError" />
@@ -50,12 +63,6 @@
       <bpmndi:BPMNShape id="Participant_0px403d_di" bpmnElement="Participant_0px403d" isHorizontal="true">
         <dc:Bounds x="5" y="30" width="635" height="320" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="StartEvent_1_di" bpmnElement="StartEvent_1">
-        <dc:Bounds x="92" y="152" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="98" y="195" width="24" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_05wpeos_di" bpmnElement="Event_05wpeos">
         <dc:Bounds x="502" y="152" width="36" height="36" />
       </bpmndi:BPMNShape>
@@ -73,6 +80,12 @@
       <bpmndi:BPMNShape id="Event_0rs3geg_di" bpmnElement="Event_0rs3geg">
         <dc:Bounds x="312" y="272" width="36" height="36" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_00jrf2t_di" bpmnElement="StartEvent_1">
+        <dc:Bounds x="92" y="152" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="98" y="195" width="24" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_03ytp91_di" bpmnElement="Event_007u06e">
         <dc:Bounds x="222" y="192" width="36" height="36" />
       </bpmndi:BPMNShape>