@5minds/node-red-contrib-processcube 0.14.0-feature-ef048b-lyy1ngi6 → 0.14.0-fix-error-in-process-instance-query-433395-lyzh0xul

package/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20 AS builder
+FROM node:20 as builder
 
 COPY ./ /src/node-red-contrib-processcube
 

package/docker-compose.yml

@@ -11,10 +11,6 @@ services:
       - FLOWS=/nodered/node-red-contrib-processcube-flows.json
     volumes:
       - ./nodered/:/nodered/
-      - ./examples/:/examples/
-    depends_on:
-      - engine
-      - authority
   
   engine:
     image: 5minds/processcube_engine:2024-1
@@ -23,16 +19,9 @@ services:
     volumes:
       - ./processes:/processes:ro
     environment:
-      application__name: Engine for Node-RED contrib
       iam__baseUrl: http://authority:11560
       iam__allowAnonymousRootAccess: true
     command: --seed-dir=/processes --port 8000
-    depends_on:
-      - authority
-    healthcheck:
-      test: bash -c "[ -f /tmp/healthy ]"
-      timeout: 1s
-      retries: 20      
 
   authority:
     image: 5minds/processcube_authority:3.0.4

package/externaltask-error.js

@@ -8,25 +8,24 @@ module.exports = function(RED) {
 
         node.on('input', function(msg) {
 
-            const flowNodeInstanceId = msg.flowNodeInstanceId;
+            const externalTaskId = msg.externalTaskId;
 
-            let msgError = msg.error;
+            let error = msg.error;
 
-            if (msgError === undefined) {
-                msgError.message = "An error occurred";
+            if (error === undefined) {
+                error.message = "An error occurred";
+                error.source = msg.payload;
             }
 
-            msg.errorCode = config.error;
-            msg.errorMessage = msgError.message;
-            //msg.errorDetails = RED.util.encodeObject(msg); // circular structure
+            msg.payload = {
+                "error": {
+                    errorCode: config.error,
+                    errorMessage: error.message,
+                    errorDetails: error.source
+                }
+            };
 
-            const error = new Error(msg.errorMessage);
-            error.errorCode = config.error;
-            
-            // 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-${flowNodeInstanceId}`, error, true);
+            eventEmitter.emit(`error-${externalTaskId}`, msg.payload);
             
             node.send(msg);
         });     

package/externaltask-input.js

@@ -1,24 +1,44 @@
+const process = require('process');
 const EventEmitter = require('node:events');
 
+const engine_client = require('@5minds/processcube_engine_client');
+
 function showStatus(node, msgCounter) {
     if (msgCounter >= 1) {
-        node.status({fill: "blue", shape: "dot", text: `handling tasks ${msgCounter}.`});
+        node.status({fill: "blue", shape: "dot", text: `handling tasks ${msgCounter}`});
     } else {
-        node.status({fill: "blue", shape: "ring", text: `subcribed.`});
+        node.status({fill: "blue", shape: "ring", text: `subcribed ${msgCounter}`});
     }
 }
 
-const started_external_tasks = {};
+function decrCounter(msgCounter) {
+    msgCounter--;
+
+    if (msgCounter < 0) {
+        msgCounter = 0;
+    }
+
+    return msgCounter;
+}
 
 module.exports = function(RED) {
     function ExternalTaskInput(config) {
         RED.nodes.createNode(this,config);
         var node = this;
+        var msgCounter = 0;
         var flowContext = node.context().flow;
-      
+        var nodeContext = node.context();
+
         this.engine = this.server = RED.nodes.getNode(config.engine);
 
-        const client = this.engine.getEngineClient();
+        const engineUrl = this.engine?.url || process.env.ENGINE_URL || 'http://engine:8000';
+
+        var client = nodeContext.get('client');
+
+        if (!client) {
+            nodeContext.set('client', new engine_client.EngineClient(engineUrl));
+            client = nodeContext.get('client');
+        }   
 
         var eventEmitter = flowContext.get('emitter');
 
@@ -30,75 +50,30 @@ module.exports = function(RED) {
         client.externalTasks.subscribeToExternalTaskTopic(
             config.topic,
             async (payload, externalTask) => {
+                msgCounter++;
 
-                const saveHandleCallback = (data, callback) => {
-                    try {
-                        callback(data);
-                    } catch (error) {
-                        node.error(`Error in callback 'saveHandleCallback': ${error.message}`);
-                    }
-                };
-                
                 return await new Promise((resolve, reject) => {
+                    
+                    // TODO: once ist 2x gebunden
+                    eventEmitter.once(`finish-${externalTask.flowNodeInstanceId}`, (result) => {
+                        msgCounter = decrCounter(msgCounter);
 
-                    const handleFinishTask = (msg) => {
-                        let result = RED.util.encodeObject(msg.payload);
-
-                        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];
-                        }
-
-                        showStatus(node, Object.keys(started_external_tasks).length);
-
-
-                        //resolve(result);
-                        saveHandleCallback(result, resolve)
-                    };
-
-                    const handleErrorTask = (msg) => {
-
-                        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];
-                        }
-
-                        showStatus(node, Object.keys(started_external_tasks).length);
-
+                        showStatus(node, msgCounter);
+                        resolve(result);
+                    });
 
-                        // 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);
-                    };
+                    eventEmitter.once(`error-${externalTask.flowNodeInstanceId}`, (msg) => {
+                        msgCounter = decrCounter(msgCounter);
+                        showStatus(node, msgCounter);
 
-                    eventEmitter.once(`handle-${externalTask.flowNodeInstanceId}`, (msg, isError = false) => {
-                        node.log(`handle event for *external task flowNodeInstanceId* '${externalTask.flowNodeInstanceId}' and *processInstanceId* '${externalTask.processInstanceId}' with *msg._msgid* '${msg._msgid}' and *isError* '${isError}'`);
+                        var result = msg.payload ? msg.payload : msg;
 
-                        if (isError) {
-                            handleErrorTask(msg);
-                        } else {
-                            handleFinishTask(msg);
-                        }
+                        reject(result);
                     });
 
-                    started_external_tasks[externalTask.flowNodeInstanceId] = externalTask;
-
-                    showStatus(node, Object.keys(started_external_tasks).length);
-
-                    let msg = {
-                        _msgid: RED.util.generateId(),
-                        task: RED.util.encodeObject(externalTask),
-                        payload: payload,
-                        flowNodeInstanceId: externalTask.flowNodeInstanceId
-                    };
-                    
-                    node.log(`Received *external task flowNodeInstanceId* '${externalTask.flowNodeInstanceId}' and *processInstanceId* '${externalTask.processInstanceId}' with *msg._msgid* '${msg._msgid}'`);
+                    showStatus(node, msgCounter);
                     
-                    node.send(msg);
+                    node.send({topic: externalTask.topic, payload: payload, externalTaskId: externalTask.flowNodeInstanceId});
                 });
             },
             ).then(async externalTaskWorker => {
@@ -108,36 +83,9 @@ module.exports = function(RED) {
                 node.server.registerOnIdentityChanged((identity) => {
                     externalTaskWorker.identity = identity;
                 }); 
+                await externalTaskWorker.start();
 
-                // export type WorkerErrorHandler = (errorType: 'fetchAndLock' | 'extendLock' | 'processExternalTask' | 'finishExternalTask', error: Error, externalTask?: ExternalTask<any>) => void;
-                externalTaskWorker.onWorkerError((errorType, error, externalTask) => {
-                    switch (errorType) {
-                        case 'extendLock':
-                        case 'finishExternalTask':
-                        case 'processExternalTask':
-                            node.error(`Worker error ${errorType} for *external task flowNodeInstanceId* '${externalTask.flowNodeInstanceId}' and *processInstanceId* '${externalTask.processInstanceId}': ${error.message}`);
-                    
-                            externalTaskWorker.stop();
-
-                            if (externalTask) {
-                                delete started_external_tasks[externalTask.flowNodeInstanceId];
-                            }
-
-                            showStatus(node, Object.keys(started_external_tasks).length);
-                            break;
-                        default:
-                            node.error(`Worker error ${errorType}: ${error.message}`);
-                            break;
-                    }
-                });
-
-                try {
-                    externalTaskWorker.start();
-                } catch (error) {
-                    node.error(`Worker start 'externalTaskWorker.start' failed: ${error.message}`);
-                }
-
-                node.on("close", () => {
+                node.on("close", async () => {
                     try {
                         externalTaskWorker.stop();
                     } catch {
@@ -145,10 +93,7 @@ module.exports = function(RED) {
                     }
                 });
             }
-        ).error((error) => {
-            node.error(`Error in subscribeToExternalTaskTopic: ${error.message}`);
-        });
+        );
     }
-
     RED.nodes.registerType("externaltask-input", ExternalTaskInput);
 }

package/externaltask-output.js

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

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

@@ -2,7 +2,7 @@
     {
         "id": "a23d2e782beb66f4",
         "type": "tab",
-        "label": "External Task Sample",
+        "label": "ExternalTasks",
         "disabled": false,
         "info": "",
         "env": []
@@ -79,57 +79,6 @@
         "w": 572,
         "h": 142
     },
-    {
-        "id": "70d7a70e375b162a",
-        "type": "group",
-        "z": "a23d2e782beb66f4",
-        "style": {
-            "stroke": "#999999",
-            "stroke-opacity": "1",
-            "fill": "none",
-            "fill-opacity": "1",
-            "label": true,
-            "label-position": "nw",
-            "color": "#a4a4a4"
-        },
-        "nodes": [
-            "2991a5e6df2b87d2",
-            "911fde53bcbb7e3f",
-            "d56bb7cd73fd220c",
-            "15a5f64b9e2e05fc"
-        ],
-        "x": 34,
-        "y": 79,
-        "w": 512,
-        "h": 142
-    },
-    {
-        "id": "31cb6729aac0ba46",
-        "type": "group",
-        "z": "a23d2e782beb66f4",
-        "style": {
-            "stroke": "#999999",
-            "stroke-opacity": "1",
-            "fill": "none",
-            "fill-opacity": "1",
-            "label": true,
-            "label-position": "nw",
-            "color": "#a4a4a4"
-        },
-        "nodes": [
-            "18e05d562d48f32d",
-            "49aee03a7885fae8",
-            "e4555d9019cd3f47",
-            "bd68c4bdc53b8f80",
-            "fb87f79852b22e4a",
-            "1ba1e62c9935255f",
-            "b49f226ba865e164"
-        ],
-        "x": 34,
-        "y": 259,
-        "w": 812,
-        "h": 202
-    },
     {
         "id": "42e6796dddd9d4db",
         "type": "processcube-engine-config",
@@ -139,15 +88,15 @@
         "id": "2991a5e6df2b87d2",
         "type": "externaltask-input",
         "z": "a23d2e782beb66f4",
-        "g": "70d7a70e375b162a",
         "name": "Test",
         "engine": "42e6796dddd9d4db",
         "topic": "Test",
-        "x": 110,
-        "y": 180,
+        "x": 90,
+        "y": 400,
         "wires": [
             [
-                "d56bb7cd73fd220c"
+                "d56bb7cd73fd220c",
+                "75c7bb5cc34e354a"
             ]
         ]
     },
@@ -155,17 +104,15 @@
         "id": "911fde53bcbb7e3f",
         "type": "externaltask-output",
         "z": "a23d2e782beb66f4",
-        "g": "70d7a70e375b162a",
         "name": "Test Ende",
-        "x": 460,
-        "y": 180,
+        "x": 500,
+        "y": 400,
         "wires": []
     },
     {
         "id": "d56bb7cd73fd220c",
         "type": "delay",
         "z": "a23d2e782beb66f4",
-        "g": "70d7a70e375b162a",
         "name": "",
         "pauseType": "delay",
         "timeout": "1",
@@ -180,23 +127,56 @@
         "allowrate": false,
         "outputs": 1,
         "x": 280,
-        "y": 180,
+        "y": 400,
         "wires": [
             [
-                "911fde53bcbb7e3f"
+                "911fde53bcbb7e3f",
+                "69aec57d8bb00292"
             ]
         ]
     },
+    {
+        "id": "75c7bb5cc34e354a",
+        "type": "debug",
+        "z": "a23d2e782beb66f4",
+        "name": "debug 1",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 260,
+        "y": 480,
+        "wires": []
+    },
+    {
+        "id": "69aec57d8bb00292",
+        "type": "debug",
+        "z": "a23d2e782beb66f4",
+        "name": "debug 6",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "externalTaskId",
+        "targetType": "msg",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 480,
+        "y": 480,
+        "wires": []
+    },
     {
         "id": "18e05d562d48f32d",
         "type": "externaltask-input",
         "z": "a23d2e782beb66f4",
-        "g": "31cb6729aac0ba46",
         "name": "SampleError",
         "engine": "42e6796dddd9d4db",
         "topic": "SampleError",
-        "x": 130,
-        "y": 360,
+        "x": 110,
+        "y": 640,
         "wires": [
             [
                 "49aee03a7885fae8"
@@ -207,10 +187,9 @@
         "id": "49aee03a7885fae8",
         "type": "delay",
         "z": "a23d2e782beb66f4",
-        "g": "31cb6729aac0ba46",
         "name": "",
         "pauseType": "delay",
-        "timeout": "15",
+        "timeout": "5",
         "timeoutUnits": "seconds",
         "rate": "1",
         "nbRateUnits": "1",
@@ -221,8 +200,8 @@
         "drop": false,
         "allowrate": false,
         "outputs": 1,
-        "x": 330,
-        "y": 360,
+        "x": 350,
+        "y": 640,
         "wires": [
             [
                 "bd68c4bdc53b8f80"
@@ -233,14 +212,15 @@
         "id": "e4555d9019cd3f47",
         "type": "catch",
         "z": "a23d2e782beb66f4",
-        "g": "31cb6729aac0ba46",
         "name": "",
-        "scope": "group",
+        "scope": null,
         "uncaught": false,
-        "x": 510,
-        "y": 420,
+        "x": 360,
+        "y": 760,
         "wires": [
             [
+                "fa1c26d470c38efd",
+                "019797b5a0882e7b",
                 "fb87f79852b22e4a"
             ]
         ]
@@ -249,8 +229,7 @@
         "id": "bd68c4bdc53b8f80",
         "type": "function",
         "z": "a23d2e782beb66f4",
-        "g": "31cb6729aac0ba46",
-        "name": "raise Error",
+        "name": "function 1",
         "func": "throw Error(\"hello error\");\n\nreturn msg;",
         "outputs": 1,
         "timeout": 0,
@@ -258,23 +237,55 @@
         "initialize": "",
         "finalize": "",
         "libs": [],
-        "x": 510,
-        "y": 360,
+        "x": 560,
+        "y": 640,
         "wires": [
             [
                 "1ba1e62c9935255f"
             ]
         ]
     },
+    {
+        "id": "fa1c26d470c38efd",
+        "type": "debug",
+        "z": "a23d2e782beb66f4",
+        "name": "debug 8",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 620,
+        "y": 760,
+        "wires": []
+    },
+    {
+        "id": "019797b5a0882e7b",
+        "type": "debug",
+        "z": "a23d2e782beb66f4",
+        "name": "debug 9",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "externalTaskId",
+        "targetType": "msg",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 620,
+        "y": 820,
+        "wires": []
+    },
     {
         "id": "fb87f79852b22e4a",
         "type": "externaltask-error",
         "z": "a23d2e782beb66f4",
-        "g": "31cb6729aac0ba46",
-        "name": "Send Error to Engine",
+        "name": "Fehler",
         "error": "MyErrorCode",
-        "x": 720,
-        "y": 420,
+        "x": 570,
+        "y": 900,
         "wires": [
             []
         ]
@@ -283,42 +294,56 @@
         "id": "1ba1e62c9935255f",
         "type": "externaltask-output",
         "z": "a23d2e782beb66f4",
-        "g": "31cb6729aac0ba46",
         "name": "",
-        "x": 710,
-        "y": 360,
+        "x": 770,
+        "y": 640,
         "wires": []
     },
     {
-        "id": "15a5f64b9e2e05fc",
-        "type": "comment",
-        "z": "a23d2e782beb66f4",
-        "g": "70d7a70e375b162a",
-        "name": "Simple External Task handling",
-        "info": "",
-        "x": 180,
-        "y": 120,
-        "wires": []
-    },
-    {
-        "id": "b49f226ba865e164",
-        "type": "comment",
+        "id": "c18723294975e975",
+        "type": "inject",
         "z": "a23d2e782beb66f4",
-        "g": "31cb6729aac0ba46",
-        "name": "Error handling with external tasks",
-        "info": "",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "eventName",
+                "v": "sampleEvent",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "{\t    \t}",
+        "payloadType": "jsonata",
         "x": 190,
-        "y": 300,
-        "wires": []
+        "y": 1200,
+        "wires": [
+            [
+                "ddcde0ab7abfb8af"
+            ]
+        ]
     },
     {
-        "id": "799125e21de02f13",
-        "type": "comment",
+        "id": "ddcde0ab7abfb8af",
+        "type": "debug",
         "z": "a23d2e782beb66f4",
-        "name": "For Testing, deploy \"External-Task-Sample.bpmn\" and start the process.",
-        "info": "",
-        "x": 300,
-        "y": 40,
+        "name": "debug 18",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "true",
+        "targetType": "full",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 480,
+        "y": 1200,
         "wires": []
     },
     {

package/nodered/settings.js

@@ -385,7 +385,7 @@ module.exports = {
         //tours: false,
 
         header: {
-            title: "Node-RED powered by ProcessCube©",
+            title: "Node-RED powered by ProcessCube ©",
             url: "https://processcube.io" // optional url to make the header text/image a link to this url
 
         },

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@5minds/node-red-contrib-processcube",
-    "version": "0.14.0-feature-ef048b-lyy1ngi6",
+    "version": "0.14.0-fix-error-in-process-instance-query-433395-lyzh0xul",
     "license": "MIT",
     "description": "Node-RED nodes for ProcessCube",
     "authors": [