@5minds/node-red-contrib-processcube 1.9.1-develop-73f12b-m8el0slf → 1.9.3-develop-c9db83-m8k3pb8w

package/.processcube/engine/config/config.json

@@ -0,0 +1,17 @@
+{
+  "logging": {
+    "outputPath": "logs",
+    "minLogLevel": "info"
+  },
+  "database": {
+    "username": "engine_user",
+    "password": "enigne_password",
+    "database": "engine_db",
+    "host": "postgres",
+    "port": 5432,
+    "dialect": "postgres",
+    "supportBigNumbers": true,
+    "resetPasswordRequestTimeToLive": 12,
+    "logging": false
+  }
+}

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

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

package/.processcube/nodered/.config.users.json

@@ -23,7 +23,7 @@
             }
         },
         "menu-menu-item-sidebar": true,
-        "menu-menu-item-palette": true,
+        "menu-menu-item-palette": false,
         "do": {
             "markNodes": true
         }

package/.processcube/nodered/flows.json

@@ -675,17 +675,17 @@
             "911fde53bcbb7e3f",
             "15a5f64b9e2e05fc",
             "c937c772bb4b6a9d",
-            "1b54da9f999c39fd",
-            "a54dbeccaa680ea5",
             "664cb218bba78642",
             "17c7bb9f5f18dca0",
-            "d56bb7cd73fd220c",
-            "ae84dbc4cb7080ac",
-            "1f20e1ea2b52c8d6"
+            "f503048db777642f",
+            "7b7e536ce13ff02e",
+            "ee77f6e85bd2d76f",
+            "d289b450aca4064e",
+            "9a3c7f3da50bdb42"
         ],
-        "x": 34,
+        "x": 14,
         "y": 79,
-        "w": 1112,
+        "w": 1172,
         "h": 262
     },
     {
@@ -721,15 +721,14 @@
         "engine": "42e6796dddd9d4db",
         "topic": "Test",
         "topicType": "str",
-        "workerConfig": "{}",
+        "workerConfig": "{\"maxTasks\":1}",
         "workerConfigType": "json",
         "x": 110,
         "y": 180,
         "wires": [
             [
                 "c937c772bb4b6a9d",
-                "d56bb7cd73fd220c",
-                "1f20e1ea2b52c8d6"
+                "d289b450aca4064e"
             ]
         ]
     },
@@ -739,7 +738,7 @@
         "z": "a23d2e782beb66f4",
         "g": "70d7a70e375b162a",
         "name": "Test Ende",
-        "x": 800,
+        "x": 1100,
         "y": 180,
         "wires": []
     },
@@ -1171,93 +1170,120 @@
         "complete": "false",
         "statusVal": "",
         "statusType": "auto",
-        "x": 260,
-        "y": 300,
+        "x": 280,
+        "y": 280,
         "wires": []
     },
     {
-        "id": "1b54da9f999c39fd",
-        "type": "switch",
+        "id": "664cb218bba78642",
+        "type": "catch",
         "z": "a23d2e782beb66f4",
         "g": "70d7a70e375b162a",
         "name": "",
-        "property": "payload",
-        "propertyType": "msg",
-        "rules": [
-            {
-                "t": "empty"
-            },
-            {
-                "t": "else"
-            }
-        ],
-        "checkall": "true",
-        "repair": false,
-        "outputs": 2,
-        "x": 630,
-        "y": 180,
+        "scope": "group",
+        "uncaught": false,
+        "x": 850,
+        "y": 300,
         "wires": [
             [
-                "911fde53bcbb7e3f"
-            ],
-            [
-                "a54dbeccaa680ea5"
+                "17c7bb9f5f18dca0"
             ]
         ]
     },
     {
-        "id": "a54dbeccaa680ea5",
-        "type": "function",
+        "id": "17c7bb9f5f18dca0",
+        "type": "subflow:8eb64bb58f95989d",
         "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": 810,
-        "y": 240,
+        "name": "",
+        "x": 1070,
+        "y": 300,
+        "wires": []
+    },
+    {
+        "id": "d37ef0e9d22656fa",
+        "type": "join",
+        "z": "a23d2e782beb66f4",
+        "name": "",
+        "mode": "auto",
+        "build": "array",
+        "property": "payload",
+        "propertyType": "msg",
+        "key": "payload",
+        "joiner": "\\n",
+        "joinerType": "str",
+        "useparts": false,
+        "accumulate": false,
+        "timeout": "",
+        "count": "2",
+        "reduceRight": false,
+        "reduceExp": "",
+        "reduceInit": "",
+        "reduceInitType": "",
+        "reduceFixup": "",
+        "x": 750,
+        "y": 180,
         "wires": [
-            []
+            [
+                "9a3c7f3da50bdb42"
+            ]
         ]
     },
     {
-        "id": "664cb218bba78642",
-        "type": "catch",
+        "id": "77854a01cb815c27",
+        "type": "split",
         "z": "a23d2e782beb66f4",
-        "g": "70d7a70e375b162a",
         "name": "",
-        "scope": "group",
-        "uncaught": false,
-        "x": 810,
-        "y": 300,
+        "splt": "\\n",
+        "spltType": "str",
+        "arraySplt": "2",
+        "arraySpltType": "len",
+        "stream": false,
+        "addname": "",
+        "property": "payload",
+        "x": 410,
+        "y": 180,
         "wires": [
             [
-                "17c7bb9f5f18dca0"
+                "7b7e536ce13ff02e",
+                "ee77f6e85bd2d76f"
             ]
         ]
     },
     {
-        "id": "17c7bb9f5f18dca0",
-        "type": "subflow:8eb64bb58f95989d",
+        "id": "7b7e536ce13ff02e",
+        "type": "delay",
         "z": "a23d2e782beb66f4",
         "g": "70d7a70e375b162a",
         "name": "",
-        "x": 1030,
-        "y": 300,
-        "wires": []
+        "pauseType": "delay",
+        "timeout": "2",
+        "timeoutUnits": "seconds",
+        "rate": "1",
+        "nbRateUnits": "1",
+        "rateUnits": "second",
+        "randomFirst": "1",
+        "randomLast": "5",
+        "randomUnits": "seconds",
+        "drop": false,
+        "allowrate": false,
+        "outputs": 1,
+        "x": 580,
+        "y": 160,
+        "wires": [
+            [
+                "d37ef0e9d22656fa"
+            ]
+        ]
     },
     {
-        "id": "d56bb7cd73fd220c",
+        "id": "ee77f6e85bd2d76f",
         "type": "delay",
         "z": "a23d2e782beb66f4",
         "g": "70d7a70e375b162a",
         "name": "",
         "pauseType": "delay",
-        "timeout": "10",
+        "timeout": "3",
         "timeoutUnits": "seconds",
         "rate": "1",
         "nbRateUnits": "1",
@@ -1268,46 +1294,63 @@
         "drop": false,
         "allowrate": false,
         "outputs": 1,
-        "x": 310,
-        "y": 180,
+        "x": 580,
+        "y": 220,
         "wires": [
             [
-                "ae84dbc4cb7080ac"
+                "d37ef0e9d22656fa"
             ]
         ]
     },
     {
-        "id": "ae84dbc4cb7080ac",
-        "type": "join",
+        "id": "f503048db777642f",
+        "type": "inject",
         "z": "a23d2e782beb66f4",
         "g": "70d7a70e375b162a",
         "name": "",
-        "mode": "custom",
-        "build": "string",
-        "property": "payload",
-        "propertyType": "msg",
-        "key": "topic",
-        "joiner": "",
-        "joinerType": "str",
-        "useparts": false,
-        "accumulate": false,
-        "timeout": "",
-        "count": "",
-        "reduceRight": false,
-        "reduceExp": "",
-        "reduceInit": "",
-        "reduceInitType": "",
-        "reduceFixup": "",
-        "x": 490,
+        "props": [
+            {
+                "p": "payload"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "[{\"test\":\"value\"},{\"test\":\"value\"}]",
+        "payloadType": "json",
+        "x": 110,
+        "y": 280,
+        "wires": [
+            [
+                "d289b450aca4064e"
+            ]
+        ]
+    },
+    {
+        "id": "d289b450aca4064e",
+        "type": "function",
+        "z": "a23d2e782beb66f4",
+        "g": "70d7a70e375b162a",
+        "name": "function 1",
+        "func": "msg.payload = [\n    {\n        \"test\": \"value\"\n    },\n    {\n        \"test\": \"value\"\n    }\n];\n\n\nreturn msg;",
+        "outputs": 1,
+        "timeout": 0,
+        "noerr": 0,
+        "initialize": "",
+        "finalize": "",
+        "libs": [],
+        "x": 260,
         "y": 180,
         "wires": [
             [
-                "1b54da9f999c39fd"
+                "77854a01cb815c27"
             ]
         ]
     },
     {
-        "id": "1f20e1ea2b52c8d6",
+        "id": "9a3c7f3da50bdb42",
         "type": "delay",
         "z": "a23d2e782beb66f4",
         "g": "70d7a70e375b162a",
@@ -1324,11 +1367,11 @@
         "drop": false,
         "allowrate": false,
         "outputs": 1,
-        "x": 310,
-        "y": 240,
+        "x": 920,
+        "y": 180,
         "wires": [
             [
-                "ae84dbc4cb7080ac"
+                "911fde53bcbb7e3f"
             ]
         ]
     },
@@ -2645,6 +2688,7 @@
         "id": "930624edc6169c55",
         "type": "process-event-listener",
         "z": "76c047e0d8770a20",
+        "d": true,
         "name": "",
         "engine": "42e6796dddd9d4db",
         "processmodel": "External-Task-Sample_Process",
@@ -2689,6 +2733,7 @@
         "id": "798de686e9cec9e3",
         "type": "process-event-listener",
         "z": "76c047e0d8770a20",
+        "d": true,
         "name": "deployed",
         "engine": "42e6796dddd9d4db",
         "processmodel": "",
@@ -2723,6 +2768,7 @@
         "id": "78dd82dbc5fe824e",
         "type": "process-event-listener",
         "z": "76c047e0d8770a20",
+        "d": true,
         "name": "undeployed",
         "engine": "42e6796dddd9d4db",
         "processmodel": "",
@@ -2757,6 +2803,7 @@
         "id": "6b1eeb91a71c7bcb",
         "type": "process-event-listener",
         "z": "76c047e0d8770a20",
+        "d": true,
         "name": "is-exeutable-changed",
         "engine": "42e6796dddd9d4db",
         "processmodel": "",

package/Dockerfile

@@ -5,12 +5,15 @@ FROM nodered/node-red:4.0.8-22
 # package 
 USER root
 
+RUN npm i node-red-debugger
+
 COPY ./ /package_src/
 RUN cd /package_src/ && npm install
     
 
 RUN npm install /package_src/
 
+
 # defaults
 USER node-red
 

package/docker-compose.yml

@@ -32,8 +32,10 @@ services:
     ports:
       - 8000:8000
     volumes:
+      - ./.processcube/engine/config/config.json:/etc/engine/config/config.json:ro
       - ./processes:/processes:ro
     environment:
+      CONFIG_PATH: /etc/engine/config/config.json
       application__name: Engine for Node-RED contrib
       iam__baseUrl: http://authority:11560
       iam__allowAnonymousRootAccess: true
@@ -45,6 +47,26 @@ services:
       timeout: 1s
       retries: 20      
 
+  postgres:
+    image: postgres
+    environment:
+      POSTGRES_USER: ${POSTGRES_USER:-postgres}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-postgres}
+      POSTGRES_DB: enginedb
+      PGDATA: /data/postgres/db
+    volumes:
+      - ./postgres/init.sql:/docker-entrypoint-initdb.d/init.sql:ro
+      - ./postgres/db.instance:/data/postgres
+    ports:
+      - 5432:5432
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-postgres}"]
+      interval: 5s
+      retries: 10
+      timeout: 10s
+    restart: unless-stopped
+
+
   authority:
     image: 5minds/processcube_authority:3.0.4
     ports:

package/externaltask-input.js

@@ -19,6 +19,7 @@ module.exports = function (RED) {
         node._trace = '';
         node._step = '';
         node._tracking_nodes = {};
+        node._join_inputs = {};
         node._tracking_for_etw = {};
 
         node.isHandling = () => {
@@ -50,6 +51,20 @@ module.exports = function (RED) {
             } else {
                 node._tracking_nodes[theNode.id].count++;
             }
+
+            // bei nodes vom type 'join' müssen die eingänge gezählt werden, 
+            // dass diese dann wieder beim verlassen am ausgang gesamt entfernt werden müssem
+            if (theNode.type === 'join') {
+                if (!node._join_inputs[theNode.id]) {
+                    node._join_inputs[theNode.id] = {};
+                }
+
+                if (!node._join_inputs[theNode.id][msg.flowNodeInstanceId]) {
+                    node._join_inputs[theNode.id][msg.flowNodeInstanceId] = 1;
+                } else {
+                    node._join_inputs[theNode.id][msg.flowNodeInstanceId]++;
+                }
+            }
             
             if (!node._tracking_for_etw[msg.flowNodeInstanceId]) {
                 node._tracking_for_etw[msg.flowNodeInstanceId] = [];
@@ -58,7 +73,9 @@ module.exports = function (RED) {
                 node._tracking_for_etw[msg.flowNodeInstanceId].push(theNode);
             }
 
-            theNode.status({ fill: 'blue', shape: 'dot', text: `tasks(${node._tracking_nodes[theNode.id].count})` });
+            if (!theNode.type === 'delay') {
+                theNode.status({ fill: 'blue', shape: 'dot', text: `tasks(${node._tracking_nodes[theNode.id].count})` });
+            }
         };
 
         node.decrMsgOnNode = (theNode, msg) => {
@@ -66,13 +83,29 @@ module.exports = function (RED) {
                 return;
             }
 
+            // bei nodes vom type 'join' müssen die eingänge gezählt werden, 
+            // dass diese dann wieder beim verlassen am ausgang gesamt entfernt werden müssen
+            let dec_count = 1;
+
+            if (theNode.type === 'join') {
+                if (!node._join_inputs[theNode.id]) {
+                    node._join_inputs[theNode.id] = {};
+                }
+
+                if (node._join_inputs[theNode.id][msg.flowNodeInstanceId]) {
+                    dec_count = node._join_inputs[theNode.id][msg.flowNodeInstanceId];
+                    delete node._join_inputs[theNode.id][msg.flowNodeInstanceId];
+                }
+            }
+
             if (!node._tracking_nodes[theNode.id]) {
                 node._tracking_nodes[theNode.id] = {
                     node: theNode,
                     count: 0,
                 };
             } else {
-                node._tracking_nodes[theNode.id].count--;
+                //node._tracking_nodes[theNode.id].count--;
+                node._tracking_nodes[theNode.id].count =- dec_count;
 
                 if (node._tracking_nodes[theNode.id].count <= 0) {
                     node._tracking_nodes[theNode.id].count = 0;
@@ -80,14 +113,16 @@ module.exports = function (RED) {
             }
 
             if (node._tracking_for_etw[msg.flowNodeInstanceId]) {
-                node._tracking_for_etw[msg.flowNodeInstanceId] = node._tracking_for_etw[msg.flowNodeInstanceId].filter(item => item !== theNode)
+                const count_nodes = node._tracking_for_etw[msg.flowNodeInstanceId].filter(item => item !== theNode)
 
-                if (node._tracking_for_etw[msg.flowNodeInstanceId].count <= 0) {
+                if (count_nodes <= 0) {
                     delete node._tracking_for_etw[msg.flowNodeInstanceId];
                 }
             }
 
-            theNode.status({ fill: 'blue', shape: 'dot', text: `tasks(${node._tracking_nodes[theNode.id].count})` });
+            if (!theNode.type === 'delay') {
+                theNode.status({ fill: 'blue', shape: 'dot', text: `tasks(${node._tracking_nodes[theNode.id].count})` });
+            }
         };
 
         RED.hooks.add('preDeliver', (sendEvent) => {
@@ -296,6 +331,8 @@ module.exports = function (RED) {
                 });
             };
 
+            node.setUnsubscribedStatus(new Error('Worker starting.'));
+
             client.externalTasks
                 .subscribeToExternalTaskTopic(topic, etwCallback, options)
                 .then(async (externalTaskWorker) => {
@@ -346,7 +383,6 @@ module.exports = function (RED) {
 
                     try {
                         externalTaskWorker.start();
-                        node.setUnsubscribedStatus(new Error('Worker starting.'));
                     } catch (error) {
                         node.error(`Worker start 'externalTaskWorker.start' failed: ${error.message}`, {});
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@5minds/node-red-contrib-processcube",
-    "version": "1.9.1-develop-73f12b-m8el0slf",
+    "version": "1.9.3-develop-c9db83-m8k3pb8w",
     "license": "MIT",
     "description": "Node-RED nodes for ProcessCube",
     "scripts": {

package/postgres/init.sql

@@ -0,0 +1,13 @@
+CREATE USER engine_user with password 'enigne_password';
+CREATE DATABASE engine_db;
+GRANT ALL PRIVILEGES ON DATABASE engine_db TO engine_user;
+
+\connect engine_db;
+
+-- Berechtigungen erteilen
+GRANT CREATE ON SCHEMA public TO engine_user;
+
+-- Eigentümer des Schemas ändern
+ALTER SCHEMA public OWNER TO engine_user;
+
+