@5minds/node-red-contrib-processcube 1.7.4-feature-6f3f78-m6l0ykww → 1.7.5-develop-106e2c-m6jdhezm

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

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

package/.processcube/nodered/config.js

@@ -1,3 +1,4 @@
+
 // let cause of merge custom settings
 
 let config = {};
@@ -5,7 +6,7 @@ let config = {};
 try {
     config = require('./settings.js');
 } catch (e) {
-    console.log('>>>', e);
+    console.log(">>>", e);
 }
 
 process.on('uncaughtException', (err) => {
@@ -14,6 +15,6 @@ process.on('uncaughtException', (err) => {
 
 process.on('unhandledRejection', (reason, promise) => {
     console.error(`Unhandled Rejection at ${promise} reason: ${reason}`, {});
-});
+});    
 
 module.exports = config;

package/.processcube/nodered/flows.json

@@ -111,6 +111,28 @@
         "info": "",
         "env": []
     },
+    {
+        "id": "8eb64bb58f95989d",
+        "type": "subflow",
+        "name": "ETW Error Handling",
+        "info": "",
+        "category": "",
+        "in": [
+            {
+                "x": 80,
+                "y": 80,
+                "wires": [
+                    {
+                        "id": "b7ddfedf82d8120f"
+                    }
+                ]
+            }
+        ],
+        "out": [],
+        "env": [],
+        "meta": {},
+        "color": "#DDAA99"
+    },
     {
         "id": "4c59118134081e05",
         "type": "group",
@@ -159,30 +181,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",
@@ -206,7 +204,7 @@
             "b49f226ba865e164"
         ],
         "x": 34,
-        "y": 259,
+        "y": 379,
         "w": 812,
         "h": 202
     },
@@ -232,7 +230,7 @@
             "eb96f3128ece1be8"
         ],
         "x": 34,
-        "y": 499,
+        "y": 619,
         "w": 832,
         "h": 202
     },
@@ -553,8 +551,8 @@
             "412d03bddecd4fd4"
         ],
         "x": 34,
-        "y": 739,
-        "w": 682,
+        "y": 859,
+        "w": 692,
         "h": 202
     },
     {
@@ -655,10 +653,39 @@
             "0cf6a2ec7112f5f6"
         ],
         "x": 34,
-        "y": 979,
+        "y": 1099,
         "w": 652,
         "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",
+            "15a5f64b9e2e05fc",
+            "c937c772bb4b6a9d",
+            "1b54da9f999c39fd",
+            "a54dbeccaa680ea5",
+            "664cb218bba78642",
+            "17c7bb9f5f18dca0",
+            "d56bb7cd73fd220c"
+        ],
+        "x": 34,
+        "y": 79,
+        "w": 912,
+        "h": 262
+    },
     {
         "id": "42e6796dddd9d4db",
         "type": "processcube-engine-config",
@@ -671,6 +698,18 @@
         "name": "Engine Auth 8000",
         "url": "http://engine:8000"
     },
+    {
+        "id": "b7ddfedf82d8120f",
+        "type": "externaltask-error",
+        "z": "8eb64bb58f95989d",
+        "name": "Subflow handle error",
+        "error": "handleSubFlowError",
+        "x": 240,
+        "y": 80,
+        "wires": [
+            []
+        ]
+    },
     {
         "id": "2991a5e6df2b87d2",
         "type": "externaltask-input",
@@ -685,6 +724,7 @@
         "y": 180,
         "wires": [
             [
+                "c937c772bb4b6a9d",
                 "d56bb7cd73fd220c"
             ]
         ]
@@ -695,36 +735,10 @@
         "z": "a23d2e782beb66f4",
         "g": "70d7a70e375b162a",
         "name": "Test Ende",
-        "x": 460,
+        "x": 620,
         "y": 180,
         "wires": []
     },
-    {
-        "id": "d56bb7cd73fd220c",
-        "type": "delay",
-        "z": "a23d2e782beb66f4",
-        "g": "70d7a70e375b162a",
-        "name": "",
-        "pauseType": "delay",
-        "timeout": "1",
-        "timeoutUnits": "seconds",
-        "rate": "1",
-        "nbRateUnits": "1",
-        "rateUnits": "second",
-        "randomFirst": "1",
-        "randomLast": "5",
-        "randomUnits": "seconds",
-        "drop": false,
-        "allowrate": false,
-        "outputs": 1,
-        "x": 280,
-        "y": 180,
-        "wires": [
-            [
-                "911fde53bcbb7e3f"
-            ]
-        ]
-    },
     {
         "id": "18e05d562d48f32d",
         "type": "externaltask-input",
@@ -736,7 +750,7 @@
         "workerConfig": "{}",
         "workerConfigType": "json",
         "x": 130,
-        "y": 360,
+        "y": 480,
         "wires": [
             [
                 "49aee03a7885fae8"
@@ -762,7 +776,7 @@
         "allowrate": false,
         "outputs": 1,
         "x": 320,
-        "y": 360,
+        "y": 480,
         "wires": [
             [
                 "bd68c4bdc53b8f80"
@@ -778,7 +792,7 @@
         "scope": "group",
         "uncaught": false,
         "x": 510,
-        "y": 420,
+        "y": 540,
         "wires": [
             [
                 "fb87f79852b22e4a"
@@ -799,7 +813,7 @@
         "finalize": "",
         "libs": [],
         "x": 510,
-        "y": 360,
+        "y": 480,
         "wires": [
             [
                 "1ba1e62c9935255f"
@@ -814,7 +828,7 @@
         "name": "Send Error to Engine",
         "error": "MyErrorCode",
         "x": 720,
-        "y": 420,
+        "y": 540,
         "wires": [
             []
         ]
@@ -826,7 +840,7 @@
         "g": "31cb6729aac0ba46",
         "name": "",
         "x": 710,
-        "y": 360,
+        "y": 480,
         "wires": []
     },
     {
@@ -834,9 +848,9 @@
         "type": "comment",
         "z": "a23d2e782beb66f4",
         "g": "70d7a70e375b162a",
-        "name": "Simple External Task handling",
+        "name": "Simple External Task handling - raise an error if payload not empty",
         "info": "",
-        "x": 180,
+        "x": 300,
         "y": 120,
         "wires": []
     },
@@ -848,7 +862,7 @@
         "name": "Error handling with external tasks",
         "info": "",
         "x": 190,
-        "y": 300,
+        "y": 420,
         "wires": []
     },
     {
@@ -870,7 +884,7 @@
         "name": "",
         "engine": "42e6796dddd9d4db",
         "x": 170,
-        "y": 600,
+        "y": 720,
         "wires": [
             [
                 "f4011d6a57c6e13f"
@@ -896,7 +910,7 @@
         "allowrate": false,
         "outputs": 1,
         "x": 400,
-        "y": 600,
+        "y": 720,
         "wires": [
             [
                 "18e9e15ef645a908"
@@ -913,7 +927,7 @@
         "processmodel": "External-Task-Sample_Process",
         "startevent": "StartEvent_1",
         "x": 770,
-        "y": 600,
+        "y": 720,
         "wires": [
             []
         ]
@@ -937,7 +951,7 @@
         "payload": "start",
         "payloadType": "str",
         "x": 430,
-        "y": 660,
+        "y": 780,
         "wires": [
             [
                 "18e9e15ef645a908"
@@ -958,7 +972,7 @@
         "finalize": "",
         "libs": [],
         "x": 590,
-        "y": 600,
+        "y": 720,
         "wires": [
             [
                 "fba605329413c78d"
@@ -973,7 +987,7 @@
         "name": "Start of Process and restart if it is finished",
         "info": "",
         "x": 220,
-        "y": 540,
+        "y": 660,
         "wires": []
     },
     {
@@ -988,7 +1002,7 @@
         "workerConfig": "{}",
         "workerConfigType": "json",
         "x": 140,
-        "y": 840,
+        "y": 960,
         "wires": [
             [
                 "f2b869714547df91"
@@ -1014,7 +1028,7 @@
         "allowrate": false,
         "outputs": 1,
         "x": 400,
-        "y": 840,
+        "y": 960,
         "wires": [
             [
                 "7a24dd57f7964be1"
@@ -1028,7 +1042,7 @@
         "g": "73ca179de59cdabf",
         "name": "",
         "x": 600,
-        "y": 840,
+        "y": 960,
         "wires": []
     },
     {
@@ -1038,8 +1052,8 @@
         "g": "73ca179de59cdabf",
         "name": "",
         "error": "",
-        "x": 510,
-        "y": 900,
+        "x": 610,
+        "y": 1020,
         "wires": [
             []
         ]
@@ -1050,10 +1064,10 @@
         "z": "a23d2e782beb66f4",
         "g": "73ca179de59cdabf",
         "name": "",
-        "scope": null,
+        "scope": "group",
         "uncaught": false,
-        "x": 320,
-        "y": 900,
+        "x": 410,
+        "y": 1020,
         "wires": [
             [
                 "9be410342a64e57a"
@@ -1068,7 +1082,7 @@
         "name": "External Task with Topic from ENV",
         "info": "",
         "x": 200,
-        "y": 780,
+        "y": 900,
         "wires": []
     },
     {
@@ -1083,7 +1097,7 @@
         "workerConfig": "{}",
         "workerConfigType": "json",
         "x": 140,
-        "y": 1080,
+        "y": 1200,
         "wires": [
             [
                 "d513d7e0c850c44d"
@@ -1109,7 +1123,7 @@
         "allowrate": false,
         "outputs": 1,
         "x": 350,
-        "y": 1080,
+        "y": 1200,
         "wires": [
             [
                 "6f6e80c41332e9c1"
@@ -1123,7 +1137,7 @@
         "g": "be22a2d8eb2e28c4",
         "name": "",
         "x": 570,
-        "y": 1080,
+        "y": 1200,
         "wires": []
     },
     {
@@ -1134,9 +1148,127 @@
         "name": "Handle: the_simple_topic",
         "info": "",
         "x": 170,
-        "y": 1020,
+        "y": 1140,
+        "wires": []
+    },
+    {
+        "id": "c937c772bb4b6a9d",
+        "type": "debug",
+        "z": "a23d2e782beb66f4",
+        "g": "70d7a70e375b162a",
+        "name": "debug 3",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 280,
+        "y": 240,
         "wires": []
     },
+    {
+        "id": "1b54da9f999c39fd",
+        "type": "switch",
+        "z": "a23d2e782beb66f4",
+        "g": "70d7a70e375b162a",
+        "name": "",
+        "property": "payload",
+        "propertyType": "msg",
+        "rules": [
+            {
+                "t": "empty"
+            },
+            {
+                "t": "else"
+            }
+        ],
+        "checkall": "true",
+        "repair": false,
+        "outputs": 2,
+        "x": 470,
+        "y": 180,
+        "wires": [
+            [
+                "911fde53bcbb7e3f"
+            ],
+            [
+                "a54dbeccaa680ea5"
+            ]
+        ]
+    },
+    {
+        "id": "a54dbeccaa680ea5",
+        "type": "function",
+        "z": "a23d2e782beb66f4",
+        "g": "70d7a70e375b162a",
+        "name": "raise Error()",
+        "func": "throw Error(\"hello error\");\n\nreturn msg;",
+        "outputs": 1,
+        "timeout": 0,
+        "noerr": 0,
+        "initialize": "",
+        "finalize": "",
+        "libs": [],
+        "x": 630,
+        "y": 240,
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "664cb218bba78642",
+        "type": "catch",
+        "z": "a23d2e782beb66f4",
+        "g": "70d7a70e375b162a",
+        "name": "",
+        "scope": "group",
+        "uncaught": false,
+        "x": 630,
+        "y": 300,
+        "wires": [
+            [
+                "17c7bb9f5f18dca0"
+            ]
+        ]
+    },
+    {
+        "id": "17c7bb9f5f18dca0",
+        "type": "subflow:8eb64bb58f95989d",
+        "z": "a23d2e782beb66f4",
+        "g": "70d7a70e375b162a",
+        "name": "",
+        "x": 830,
+        "y": 300,
+        "wires": []
+    },
+    {
+        "id": "d56bb7cd73fd220c",
+        "type": "delay",
+        "z": "a23d2e782beb66f4",
+        "g": "70d7a70e375b162a",
+        "name": "",
+        "pauseType": "delay",
+        "timeout": "5",
+        "timeoutUnits": "seconds",
+        "rate": "1",
+        "nbRateUnits": "1",
+        "rateUnits": "second",
+        "randomFirst": "1",
+        "randomLast": "5",
+        "randomUnits": "seconds",
+        "drop": false,
+        "allowrate": false,
+        "outputs": 1,
+        "x": 300,
+        "y": 180,
+        "wires": [
+            [
+                "1b54da9f999c39fd"
+            ]
+        ]
+    },
     {
         "id": "82533b02fb9a9f04",
         "type": "comment",

package/.processcube/nodered/settings.js

@@ -383,7 +383,7 @@ module.exports = {
 
         header: {
             title: ' powers by Node-RED',
-            image: '/data/static/ProcessCube_Logo.svg',
+            image: "/data/static/ProcessCube_Logo.svg",
             url: 'https://processcube.io', // optional url to make the header text/image a link to this url
         },
         palette: {

package/README.md

@@ -25,19 +25,13 @@ To install and run the Node-RED flows, follow these steps:
     cd processcube_nodered
     ```
 
-3. Install the dependencies of the package `@5minds/node-red-contrib-processcube`:
-
-    ```bash
-    npm install
-    ```
-
-4. Build the Docker containers:
+3. Build the Docker containers:
 
     ```bash
     docker-compose build
     ```
 
-5. Start the Docker containers:
+4. Start the Docker containers:
 
     ```bash
     docker-compose up -d

package/doc_generator/generator.js

@@ -1,14 +1,14 @@
 const Mustache = require('mustache');
 const fs = require('fs');
 
-const swaggerFilename = '../../ProcessCube.Engine/docs/swagger/swagger.json'; // Dateiname der Swagger-Datei
+const swaggerFilename = '../../ProcessCube.Engine/docs/swagger/swagger.json';  // Dateiname der Swagger-Datei
 
 const swaggerJson = JSON.parse(fs.readFileSync(swaggerFilename, 'utf-8'));
 
 //console.log(Object.keys(swaggerJson.paths));
 //return
 
-const apiPath = '/process_instances/query'; // Die API-Route, die du dokumentieren möchtest
+const apiPath = '/process_instances/query';  // Die API-Route, die du dokumentieren möchtest
 const routeData = swaggerJson.paths[apiPath];
 
 if (routeData) {
@@ -20,14 +20,14 @@ if (routeData) {
 // API-Route-Information vorbereiten
 const apiRouteData = {
     path: apiPath,
-    method: Object.keys(routeData)[0], // z.B. GET, POST, etc.
+    method: Object.keys(routeData)[0],  // z.B. GET, POST, etc.
     summary: routeData[Object.keys(routeData)[0]].summary,
     description: routeData[Object.keys(routeData)[0]].description,
     parameters: routeData[Object.keys(routeData)[0]].parameters || [],
     responses: Object.entries(routeData[Object.keys(routeData)[0]].responses).map(([status, response]) => ({
         status,
-        description: response.description,
-    })),
+        description: response.description
+    }))
 };
 
 // Mustache-Template einlesen