@5minds/node-red-contrib-processcube 1.7.7-feature-fae782-m6wffu2k → 1.8.0-feature-6eed29-m6wgknb1

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

@@ -429,10 +429,21 @@
     },
     "@5minds/node-red-contrib-processcube": {
         "name": "@5minds/node-red-contrib-processcube",
-        "version": "2.0.0",
+        "version": "1.8.0",
         "local": false,
         "user": false,
         "nodes": {
+            "checkAuthorization": {
+                "name": "checkAuthorization",
+                "types": [
+                    "check-authorization"
+                ],
+                "enabled": true,
+                "local": false,
+                "user": false,
+                "module": "@5minds/node-red-contrib-processcube",
+                "file": "/usr/src/node-red/node_modules/@5minds/node-red-contrib-processcube/check-authorization.js"
+            },
             "EndEventFinishedListener": {
                 "name": "EndEventFinishedListener",
                 "types": [
@@ -444,6 +455,17 @@
                 "module": "@5minds/node-red-contrib-processcube",
                 "file": "/usr/src/node-red/node_modules/@5minds/node-red-contrib-processcube/endevent-finished-listener.js"
             },
+            "ExternalTaskInputInject": {
+                "name": "ExternalTaskInputInject",
+                "types": [
+                    "externaltask-input-inject"
+                ],
+                "enabled": true,
+                "local": false,
+                "user": false,
+                "module": "@5minds/node-red-contrib-processcube",
+                "file": "/usr/src/node-red/node_modules/@5minds/node-red-contrib-processcube/externaltask-input-inject.js"
+            },
             "externaltaskInput": {
                 "name": "externaltaskInput",
                 "types": [

package/.processcube/nodered/flows.json

@@ -111,6 +111,14 @@
         "info": "",
         "env": []
     },
+    {
+        "id": "17865ef049c3b83d",
+        "type": "tab",
+        "label": "External Task Testing",
+        "disabled": false,
+        "info": "",
+        "env": []
+    },
     {
         "id": "8eb64bb58f95989d",
         "type": "subflow",
@@ -3231,5 +3239,132 @@
                 "af52431420fa7e15"
             ]
         ]
+    },
+    {
+        "id": "d75f8915b26e8f52",
+        "type": "externaltask-input-inject",
+        "z": "17865ef049c3b83d",
+        "name": "a",
+        "externaltask": "476cbb99633a9539",
+        "x": 370,
+        "y": 320,
+        "wires": [
+            [
+                "1afda17294a69742"
+            ]
+        ]
+    },
+    {
+        "id": "3c50b6d63b7b81d8",
+        "type": "inject",
+        "z": "17865ef049c3b83d",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "{\"hello\":\"world\"}",
+        "payloadType": "json",
+        "x": 160,
+        "y": 320,
+        "wires": [
+            [
+                "d75f8915b26e8f52"
+            ]
+        ]
+    },
+    {
+        "id": "1afda17294a69742",
+        "type": "debug",
+        "z": "17865ef049c3b83d",
+        "name": "debug 4",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 560,
+        "y": 320,
+        "wires": []
+    },
+    {
+        "id": "476cbb99633a9539",
+        "type": "externaltask-input",
+        "z": "17865ef049c3b83d",
+        "name": "test inject",
+        "engine": "b78932d162d8d468",
+        "topic": "test",
+        "topicType": "str",
+        "workerConfig": "{}",
+        "workerConfigType": "json",
+        "x": 220,
+        "y": 140,
+        "wires": [
+            [
+                "36c31ae7ce4b2536"
+            ]
+        ]
+    },
+    {
+        "id": "dd8e11733ed305c1",
+        "type": "externaltask-output",
+        "z": "17865ef049c3b83d",
+        "name": "",
+        "x": 670,
+        "y": 200,
+        "wires": []
+    },
+    {
+        "id": "36c31ae7ce4b2536",
+        "type": "delay",
+        "z": "17865ef049c3b83d",
+        "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": 400,
+        "y": 140,
+        "wires": [
+            [
+                "59f385728d7d350d"
+            ]
+        ]
+    },
+    {
+        "id": "59f385728d7d350d",
+        "type": "function",
+        "z": "17865ef049c3b83d",
+        "name": "function 1",
+        "func": "msg.payload.running = \"1\";\nmsg.payload.at = new Date().toISOString();\nreturn msg;",
+        "outputs": 1,
+        "timeout": 0,
+        "noerr": 0,
+        "initialize": "",
+        "finalize": "",
+        "libs": [],
+        "x": 580,
+        "y": 120,
+        "wires": [
+            [
+                "dd8e11733ed305c1"
+            ]
+        ]
     }
 ]

package/.processcube/nodered/settings.js

@@ -393,7 +393,7 @@ module.exports = {
              * If not set, the following default order is used:
              */
             //categories: ['subflows', 'common', 'function', 'network', 'sequence', 'parser', 'storage'],
-            categories: ['ProcessCube', 'ProcessCube Events', 'ProcessCube UI', 'dashboard 2'],
+            categories: ['ProcessCube', 'ProcessCube Events', 'ProcessCube UI', 'ProcessCube Testing', 'ProcessCube DevOps', 'dashboard 2'],
         },
 
         projects: {

package/examples/External-Task-Inject-Sample.json

@@ -0,0 +1,143 @@
+[
+    {
+        "id": "17865ef049c3b83d",
+        "type": "tab",
+        "label": "External Task Testing",
+        "disabled": false,
+        "info": "",
+        "env": []
+    },
+    {
+        "id": "d75f8915b26e8f52",
+        "type": "externaltask-input-inject",
+        "z": "17865ef049c3b83d",
+        "name": "a",
+        "externaltask": "476cbb99633a9539",
+        "x": 370,
+        "y": 320,
+        "wires": [
+            [
+                "1afda17294a69742"
+            ]
+        ]
+    },
+    {
+        "id": "3c50b6d63b7b81d8",
+        "type": "inject",
+        "z": "17865ef049c3b83d",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "{\"hello\":\"world\"}",
+        "payloadType": "json",
+        "x": 160,
+        "y": 320,
+        "wires": [
+            [
+                "d75f8915b26e8f52"
+            ]
+        ]
+    },
+    {
+        "id": "1afda17294a69742",
+        "type": "debug",
+        "z": "17865ef049c3b83d",
+        "name": "debug 4",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 560,
+        "y": 320,
+        "wires": []
+    },
+    {
+        "id": "476cbb99633a9539",
+        "type": "externaltask-input",
+        "z": "17865ef049c3b83d",
+        "name": "test inject",
+        "engine": "b78932d162d8d468",
+        "topic": "test",
+        "topicType": "str",
+        "workerConfig": "{}",
+        "workerConfigType": "json",
+        "x": 220,
+        "y": 140,
+        "wires": [
+            [
+                "36c31ae7ce4b2536"
+            ]
+        ]
+    },
+    {
+        "id": "dd8e11733ed305c1",
+        "type": "externaltask-output",
+        "z": "17865ef049c3b83d",
+        "name": "",
+        "x": 670,
+        "y": 200,
+        "wires": []
+    },
+    {
+        "id": "36c31ae7ce4b2536",
+        "type": "delay",
+        "z": "17865ef049c3b83d",
+        "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": 400,
+        "y": 140,
+        "wires": [
+            [
+                "59f385728d7d350d"
+            ]
+        ]
+    },
+    {
+        "id": "59f385728d7d350d",
+        "type": "function",
+        "z": "17865ef049c3b83d",
+        "name": "function 1",
+        "func": "msg.payload.running = \"1\";\nmsg.payload.at = new Date().toISOString();\nreturn msg;",
+        "outputs": 1,
+        "timeout": 0,
+        "noerr": 0,
+        "initialize": "",
+        "finalize": "",
+        "libs": [],
+        "x": 580,
+        "y": 120,
+        "wires": [
+            [
+                "dd8e11733ed305c1"
+            ]
+        ]
+    },
+    {
+        "id": "b78932d162d8d468",
+        "type": "processcube-engine-config",
+        "name": "Engine Auth 8000",
+        "url": "http://engine:8000"
+    }
+]

package/externaltask-input-inject.html

@@ -0,0 +1,100 @@
+<script type="text/javascript">
+    RED.nodes.registerType('externaltask-input-inject', {
+        category: 'ProcessCube Testing',
+        color: '#02AFD6',
+        defaults: {
+            name: { value: '' },
+            externaltask: { value: '' }
+        },
+        inputs: 1,
+        outputs: 1,
+        icon: 'externaltask_input.svg',
+        label: function () {
+            const nodes = RED.nodes.filterNodes({ type: 'externaltask-input' });
+
+            if (nodes && nodes.length > 0) {
+                let foundNode = null;
+                nodes.forEach((node) => {
+                    if (node.id === this.externaltask) {
+                        foundNode = node;
+                    }
+                });    
+
+                return foundNode ? `inject '${foundNode.name}'` : this.name || 'externaltask-input-inject';
+            } else {
+                return this.name || 'externaltask-input-inject';
+            }
+        },
+        oneditprepare: function () {            
+            
+            try {
+                var dropdown = $('#node-input-externaltask');
+                dropdown.empty();
+                const selectedValue = this.externaltask || "";
+
+
+                const localCallNodes = RED.nodes.filterNodes({ type: 'externaltask-input' });
+                if (!Array.isArray(localCallNodes)) {
+                    console.error("Expected an array from RED.nodes.filterNodes but got:", localCallNodes);
+                    return;
+                }
+        
+                if (localCallNodes.length === 0) {
+                    console.warn("No externaltask-input nodes found.");
+                    dropdown.append($("<option></option>").attr("value", "").text("No available tasks"));
+                } else {
+                    localCallNodes.forEach((node) => {
+                        let option = $("<option></option>")
+                            .attr("value", node.id)
+                            .text(`${node.name || "Unnamed"} (${node.id})`);
+    
+                        if (node.id === selectedValue) {
+                            option.attr("selected", "selected");
+                        }
+
+                        dropdown.append(option);
+                    });
+                }
+
+            } catch (error) {
+                console.error(error);
+            }
+        },
+        oneditsave: function () {
+            this.externaltask = $('#node-input-externaltask').val();
+        }
+     });
+</script>
+
+<script type="text/html" data-template-name="externaltask-input-inject">
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
+        <input type="text" id="node-input-name" placeholder="Name" />
+    </div>
+    <div class="form-row">
+        <label for="node-input-externaltask"><i class="fa fa-tag"></i> External Task</label>
+        <select id="node-input-externaltask"></select>
+    </div>
+</script>
+
+<script type="text/markdown" data-help-name="externaltask-input-inject">
+Send the incoming message to the external task.
+
+## Configs
+
+: name (string) : The name of the node
+: externaltask (external-input) : The External task to inject the message
+
+## Input
+
+: payload (string | {}) : The payload to send to the external task.
+
+## Outputs
+
+: payload (string | {}) : The payload the result from the external task.
+
+### References
+
+-   [The ProcessCube&copy; Developer Network](https://processcube.io) - All documentation for the ProcessCube&copy; platform
+-   [ProcessCube&copy; LowCode Integration](https://processcube.io/docs/node-red) - LowCode integration in ProcessCube&copy;
+</script>

package/externaltask-input-inject.js

@@ -0,0 +1,38 @@
+module.exports = function (RED) {
+    function ExternalTaskInputInject(config) {
+        RED.nodes.createNode(this, config);
+        var node = this;
+
+        node.config = config;
+
+
+        node.on('input', async function (msg, send, done) {
+            node.externalTask = RED.nodes.getNode(node.config.externaltask);
+
+            if (node.externalTask) {
+                node.log(`Received message: ${JSON.stringify(msg)} and send to external task ${node.externalTask.id}.`);
+
+                node.externalTask.injectNodeCallback = (msg) => {
+                    send(msg);
+                    done()
+                }
+
+                if (node.externalTask.injectCall) {
+                    node.externalTask.injectCall(msg).catch((error) => {
+                        node.error(`Error in inject call: ${error.message}`, {});
+                        done(`Error in inject call: ${error.message}`);
+                    });
+                } else {
+                    node.error('No inject call found.');
+                    done('No inject call found.');
+                }
+            } else {
+                node.error('No external task node found.');
+                done('No external task node found.');
+            }
+        });
+
+    }
+
+    RED.nodes.registerType('externaltask-input-inject', ExternalTaskInputInject);
+};

package/externaltask-input.js

@@ -22,6 +22,32 @@ module.exports = function (RED) {
 
         node.eventEmitter = new EventEmitter();
 
+        // for external-task-inject
+        node.injectNodeCallback = null;
+        node.injectCall = null; // will be build in the register function
+
+        const buildMessage = (msg, externalTask, payload) => {
+            let newMsg = msg;
+
+            if (!newMsg) {
+                newMsg = {
+                    _msgid: RED.util.generateId(),
+                };
+            }
+
+            newMsg.task = RED.util.encodeObject(externalTask);
+            newMsg.payload = payload;
+            newMsg.flowNodeInstanceId = externalTask.flowNodeInstanceId;
+            newMsg.processInstanceId = externalTask.processInstanceId;
+            newMsg.etw_input_node_id = node.id;
+
+            if (externalTask._injectCall) {
+                newMsg._injectCall = true;
+            }
+
+            return newMsg;
+        }
+
         const register = async () => {
             if (node.etw) {
                 try {
@@ -64,7 +90,6 @@ module.exports = function (RED) {
 
                         showStatus(node, Object.keys(node.started_external_tasks).length);
 
-                        //resolve(result);
                         saveHandleCallback(result, resolve);
                     };
 
@@ -81,8 +106,6 @@ module.exports = function (RED) {
 
                         // 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);
                     };
 
@@ -91,17 +114,34 @@ module.exports = function (RED) {
                             `handle event for *external task flowNodeInstanceId* '${externalTask.flowNodeInstanceId}' and *processInstanceId* '${externalTask.processInstanceId}' with *msg._msgid* '${msg._msgid}' and *isError* '${isError}'`
                         );
 
-                        if (isError) {
-                            handleErrorTask(msg);
+                        if (msg._injectCall) {                            
+                            if (node.injectNodeCallback)  {
+                                node.injectNodeCallback(msg);
+                            } else {
+                                node.error('No injectCall function defined.', {});
+                            }
+
+                            if (externalTask.flowNodeInstanceId) {
+                                delete node.started_external_tasks[externalTask.flowNodeInstanceId];
+                                showStatus(node, Object.keys(node.started_external_tasks).length);
+                            }
+                            
                         } else {
-                            handleFinishTask(msg);
+                            if (isError) {
+                                handleErrorTask(msg);
+                            } else {
+                                handleFinishTask(msg);
+                            }
+    
                         }
+
                     });
 
                     node.started_external_tasks[externalTask.flowNodeInstanceId] = externalTask;
 
                     showStatus(node, Object.keys(node.started_external_tasks).length);
 
+                    /*
                     let msg = {
                         _msgid: RED.util.generateId(),
                         task: RED.util.encodeObject(externalTask),
@@ -110,6 +150,9 @@ module.exports = function (RED) {
                         processInstanceId: externalTask.processInstanceId,
                         etw_input_node_id: node.id,
                     };
+                    */
+
+                    let msg = buildMessage(null, externalTask, payload);
 
                     node.log(
                         `Received *external task flowNodeInstanceId* '${externalTask.flowNodeInstanceId}' and *processInstanceId* '${externalTask.processInstanceId}' with *msg._msgid* '${msg._msgid}'`
@@ -122,6 +165,17 @@ module.exports = function (RED) {
             let options = RED.util.evaluateNodeProperty(config.workerConfig, config.workerConfigType, node);
             let topic =  RED.util.evaluateNodeProperty(config.topic, config.topicType, node)
 
+            node.injectCall = async (msg) => {
+                const genericTask = {
+                    task: {},
+                    flowNodeInstanceId: msg._msgid,
+                    processInstanceId: msg._msgid,
+                    _injectCall: true
+                };
+    
+                await etwCallback(msg, genericTask);
+            };    
+
             client.externalTasks
                 .subscribeToExternalTaskTopic(topic, etwCallback, options)
                 .then(async (externalTaskWorker) => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@5minds/node-red-contrib-processcube",
-    "version": "1.7.7-feature-fae782-m6wffu2k",
+    "version": "1.8.0-feature-6eed29-m6wgknb1",
     "license": "MIT",
     "description": "Node-RED nodes for ProcessCube",
     "scripts": {
@@ -37,6 +37,7 @@
         "nodes": {
             "checkAuthorization": "check-authorization.js",
             "EndEventFinishedListener": "endevent-finished-listener.js",
+            "ExternalTaskInputInject": "externaltask-input-inject.js",
             "externaltaskInput": "externaltask-input.js",
             "externaltaskOutput": "externaltask-output.js",
             "externaltaskError": "externaltask-error.js",