@5minds/node-red-contrib-processcube 1.5.5-feature-4b765c-m3eudoth → 1.5.5

package/endevent-finished-listener.js

@@ -13,29 +13,37 @@ module.exports = function (RED) {
             }
     
             let currentIdentity = node.engine.identity;
-            let subscription = await client.events.onEndEventFinished(
-                (endEventFinished) => {
-                    node.send({
-                        payload: endEventFinished,
-                    });
-                },
-                { identity: currentIdentity },
-            );
-
-            node.engine.registerOnIdentityChanged(async (identity) => {
-                client.events.removeSubscription(subscription, currentIdentity);
-                
-                currentIdentity = identity;
 
+            let subscription = null;
+
+            try {
                 subscription = await client.events.onEndEventFinished(
                     (endEventFinished) => {
                         node.send({
-                            payload: endEventFinished
+                            payload: endEventFinished,
                         });
                     },
                     { identity: currentIdentity },
                 );
-            });
+
+                node.engine.registerOnIdentityChanged(async (identity) => {
+                    client.events.removeSubscription(subscription, currentIdentity);
+                    
+                    currentIdentity = identity;
+
+                    subscription = await client.events.onEndEventFinished(
+                        (endEventFinished) => {
+                            node.send({
+                                payload: endEventFinished
+                            });
+                        },
+                        { identity: currentIdentity },
+                    );
+                });
+
+            } catch (error) {
+                node.error(error);
+            }
 
             node.on('close', async () => {
                 if (node.engine && node.engine.engineClient && client) {

package/externaltask-input.html

@@ -58,26 +58,11 @@
 Waiting for external tasks that correspond to the `Topic` configured in
 the connected ProcessCube Engine for processing.
 
-## Configs
-
-: name (string) : The name of the node
-: engine (string) : The ProcessCube Engine to connect to
-: topic (string) : The topic of the external task
-: workerConfig (object) : The configuration for the worker
-
-### workerConfig
-
-- workerId (string): The id of the worker
-- lockDuration (number): The duration in milliseconds the external task is locked for execution
-- maxTasks (number): The maximum number of tasks that can be fetched at once
-- longpollingTimeout (number): The duration in milliseconds the external task is locked for execution
-- payloadFilter (Req-Expression): The filter for the payload of the external task
-
 ## Outputs
 
 : payload (string) : The payload the external task was started with.
 : task (object) : The external task object
-: flowNodeInstanceId (string) : The unique identifier of the external task, which is needed to complete the task
+: flowNodeInstanceId : The unique identifier of the external task, which is needed to complete the task
 
 ### Details
 

package/externaltask-input.js

@@ -109,14 +109,8 @@ module.exports = function (RED) {
             });
         };
 
-        let options = {};
-
-        if (!!config.workerConfig) {
-            options = RED.util.evaluateNodeProperty(config.workerConfig, 'json', node);
-        }
-
         client.externalTasks
-            .subscribeToExternalTaskTopic(config.topic, etwCallback, options)
+            .subscribeToExternalTaskTopic(config.topic, etwCallback, RED.util.evaluateNodeProperty(config.workerConfig, 'json', node))
             .then(async (externalTaskWorker) => {
                 node.status({ fill: 'blue', shape: 'ring', text: 'subcribed' });
 
@@ -142,8 +136,7 @@ module.exports = function (RED) {
                             showStatus(node, Object.keys(started_external_tasks).length);
                             break;
                         default:
-                            // reduce noise error logs
-                            // node.error(`Worker error ${errorType}: ${error.message}`);
+                            node.error(`Worker error ${errorType}: ${error.message}`);
                             break;
                     }
                 });

package/nodered/flows.json

@@ -71,22 +71,6 @@
         "info": "",
         "env": []
     },
-    {
-        "id": "76c047e0d8770a20",
-        "type": "tab",
-        "label": "Other Events",
-        "disabled": false,
-        "info": "",
-        "env": []
-    },
-    {
-        "id": "2766c40d84283368",
-        "type": "tab",
-        "label": "Placeholder",
-        "disabled": false,
-        "info": "",
-        "env": []
-    },
     {
         "id": "4c59118134081e05",
         "type": "group",
@@ -257,7 +241,7 @@
             "fc23f271b106648f"
         ],
         "x": 34,
-        "y": 259,
+        "y": 239,
         "w": 652,
         "h": 202
     },
@@ -484,9 +468,9 @@
         "h": 142
     },
     {
-        "id": "865723b71ced9418",
+        "id": "3f3c01daebb2d215",
         "type": "group",
-        "z": "76c047e0d8770a20",
+        "z": "fd3c725340de4f74",
         "style": {
             "stroke": "#999999",
             "stroke-opacity": "1",
@@ -497,36 +481,14 @@
             "color": "#a4a4a4"
         },
         "nodes": [
-            "930624edc6169c55",
-            "2f2ec1cc0213eab5",
-            "bde205e77cd20558"
+            "2fadb4c4667ecaf2",
+            "93331783b7ef3fc5",
+            "bc26f9821540f097",
+            "cc3fb9c2cb0edd3a"
         ],
         "x": 34,
-        "y": 39,
-        "w": 502,
-        "h": 142
-    },
-    {
-        "id": "9081b057a931f0cf",
-        "type": "group",
-        "z": "2766c40d84283368",
-        "style": {
-            "stroke": "#999999",
-            "stroke-opacity": "1",
-            "fill": "none",
-            "fill-opacity": "1",
-            "label": true,
-            "label-position": "nw",
-            "color": "#a4a4a4"
-        },
-        "nodes": [
-            "03ac7bc273197c45",
-            "bb734a85d4b37728",
-            "3d03550f7d93bfd3"
-        ],
-        "x": 54,
-        "y": 39,
-        "w": 422,
+        "y": 459,
+        "w": 552,
         "h": 142
     },
     {
@@ -549,6 +511,8 @@
         "name": "Test",
         "engine": "42e6796dddd9d4db",
         "topic": "Test",
+        "workerConfig": "{}",
+        "workerConfigType": "json",
         "x": 110,
         "y": 180,
         "wires": [
@@ -601,6 +565,8 @@
         "name": "SampleError",
         "engine": "42e6796dddd9d4db",
         "topic": "SampleError",
+        "workerConfig": "{}",
+        "workerConfigType": "json",
         "x": 130,
         "y": 360,
         "wires": [
@@ -1186,7 +1152,7 @@
         "query": "payload",
         "query_type": "msg",
         "x": 180,
-        "y": 420,
+        "y": 400,
         "wires": [
             [
                 "8ef39e83173d41e3"
@@ -1207,7 +1173,7 @@
         "finalize": "",
         "libs": [],
         "x": 390,
-        "y": 420,
+        "y": 400,
         "wires": [
             [
                 "f524b8cc35d56849"
@@ -1224,7 +1190,7 @@
         "result": "payload.result",
         "result_type": "msg",
         "x": 580,
-        "y": 420,
+        "y": 400,
         "wires": [
             []
         ]
@@ -1237,7 +1203,7 @@
         "name": "Demo to listen on a new usertask an finish them",
         "info": "",
         "x": 240,
-        "y": 300,
+        "y": 280,
         "wires": []
     },
     {
@@ -1252,7 +1218,7 @@
         "query": "{}",
         "query_type": "json",
         "x": 160,
-        "y": 360,
+        "y": 340,
         "wires": [
             [
                 "f7c7682e3a6adaaa"
@@ -1297,6 +1263,72 @@
             ]
         ]
     },
+    {
+        "id": "2fadb4c4667ecaf2",
+        "type": "usertask-input",
+        "z": "fd3c725340de4f74",
+        "g": "3f3c01daebb2d215",
+        "name": "",
+        "engine": "42e6796dddd9d4db",
+        "query": "{\"flowNodeId\":\"gibt_es_nicht\"}",
+        "query_type": "json",
+        "sendtype": "array",
+        "x": 300,
+        "y": 560,
+        "wires": [
+            [
+                "bc26f9821540f097"
+            ]
+        ]
+    },
+    {
+        "id": "93331783b7ef3fc5",
+        "type": "inject",
+        "z": "fd3c725340de4f74",
+        "g": "3f3c01daebb2d215",
+        "name": "",
+        "props": [],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "x": 130,
+        "y": 560,
+        "wires": [
+            [
+                "2fadb4c4667ecaf2"
+            ]
+        ]
+    },
+    {
+        "id": "bc26f9821540f097",
+        "type": "debug",
+        "z": "fd3c725340de4f74",
+        "g": "3f3c01daebb2d215",
+        "name": "debug 34",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 480,
+        "y": 560,
+        "wires": []
+    },
+    {
+        "id": "cc3fb9c2cb0edd3a",
+        "type": "comment",
+        "z": "fd3c725340de4f74",
+        "g": "3f3c01daebb2d215",
+        "name": "Search UserTasks",
+        "info": "",
+        "x": 150,
+        "y": 500,
+        "wires": []
+    },
     {
         "id": "c4f20aefe585bdad",
         "type": "comment",
@@ -1453,7 +1485,7 @@
         "g": "a71a168415778e2c",
         "name": "",
         "engine": "42e6796dddd9d4db",
-        "query": "{\"includeXml\":false,\"processDefinitionId\":\"External-Task-Sample_Definition\"}",
+        "query": "{\"includeXml\":false}",
         "query_type": "json",
         "x": 320,
         "y": 140,
@@ -2062,95 +2094,5 @@
         "x": 760,
         "y": 60,
         "wires": []
-    },
-    {
-        "id": "930624edc6169c55",
-        "type": "process-event-listener",
-        "z": "76c047e0d8770a20",
-        "g": "865723b71ced9418",
-        "name": "",
-        "engine": "42e6796dddd9d4db",
-        "processmodel": "External-Task-Sample_Process",
-        "eventtype": "starting",
-        "query": "{}",
-        "query_type": "json",
-        "x": 160,
-        "y": 140,
-        "wires": [
-            [
-                "2f2ec1cc0213eab5"
-            ]
-        ]
-    },
-    {
-        "id": "2f2ec1cc0213eab5",
-        "type": "debug",
-        "z": "76c047e0d8770a20",
-        "g": "865723b71ced9418",
-        "name": "debug 34",
-        "active": true,
-        "tosidebar": true,
-        "console": false,
-        "tostatus": false,
-        "complete": "false",
-        "statusVal": "",
-        "statusType": "auto",
-        "x": 430,
-        "y": 140,
-        "wires": []
-    },
-    {
-        "id": "bde205e77cd20558",
-        "type": "comment",
-        "z": "76c047e0d8770a20",
-        "g": "865723b71ced9418",
-        "name": "Hört auf die Events der Processe",
-        "info": "",
-        "x": 190,
-        "y": 80,
-        "wires": []
-    },
-    {
-        "id": "03ac7bc273197c45",
-        "type": "process-terminate",
-        "z": "2766c40d84283368",
-        "g": "9081b057a931f0cf",
-        "name": "",
-        "engine": "42e6796dddd9d4db",
-        "x": 170,
-        "y": 140,
-        "wires": [
-            [
-                "bb734a85d4b37728"
-            ]
-        ]
-    },
-    {
-        "id": "bb734a85d4b37728",
-        "type": "debug",
-        "z": "2766c40d84283368",
-        "g": "9081b057a931f0cf",
-        "name": "debug 35",
-        "active": true,
-        "tosidebar": true,
-        "console": false,
-        "tostatus": false,
-        "complete": "false",
-        "statusVal": "",
-        "statusType": "auto",
-        "x": 370,
-        "y": 140,
-        "wires": []
-    },
-    {
-        "id": "3d03550f7d93bfd3",
-        "type": "comment",
-        "z": "2766c40d84283368",
-        "g": "9081b057a931f0cf",
-        "name": "Event for Terminating a Process",
-        "info": "",
-        "x": 210,
-        "y": 80,
-        "wires": []
     }
 ]

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@5minds/node-red-contrib-processcube",
-    "version": "1.5.5-feature-4b765c-m3eudoth",
+    "version": "1.5.5",
     "license": "MIT",
     "description": "Node-RED nodes for ProcessCube",
     "scripts": {