@5minds/node-red-contrib-processcube 2.0.0-feature-629c78-m2dq1ygt → 7.6.0-develop-51b534-mjy4rzoh

package/examples/Dataobject-Instance-Query-Sample.json

@@ -0,0 +1,109 @@
+[
+    {
+        "id": "8b280114f8ac9c23",
+        "type": "tab",
+        "label": "Dataobject Instances Query Sample",
+        "disabled": false,
+        "info": "",
+        "env": []
+    },
+    {
+        "id": "be0d703c70d1687b",
+        "type": "group",
+        "z": "8b280114f8ac9c23",
+        "style": {
+            "stroke": "#999999",
+            "stroke-opacity": "1",
+            "fill": "none",
+            "fill-opacity": "1",
+            "label": true,
+            "label-position": "nw",
+            "color": "#a4a4a4"
+        },
+        "nodes": [
+            "8687cdf9bf6c4d7d",
+            "74773491693b7f22",
+            "29e796ef38867f2a"
+        ],
+        "x": 74,
+        "y": 79,
+        "w": 632,
+        "h": 82
+    },
+    {
+        "id": "8687cdf9bf6c4d7d",
+        "type": "dataobject-instance-query",
+        "z": "8b280114f8ac9c23",
+        "g": "be0d703c70d1687b",
+        "name": "Query 5 DataobjectInstances",
+        "engine": "7de3086e71c028f9",
+        "query": "{ \"limit\": 5}",
+        "query_type": "json",
+        "x": 400,
+        "y": 120,
+        "wires": [
+            [
+                "74773491693b7f22"
+            ]
+        ]
+    },
+    {
+        "id": "74773491693b7f22",
+        "type": "debug",
+        "z": "8b280114f8ac9c23",
+        "g": "be0d703c70d1687b",
+        "name": "Log",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "payload",
+        "targetType": "msg",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 610,
+        "y": 120,
+        "wires": []
+    },
+    {
+        "id": "29e796ef38867f2a",
+        "type": "inject",
+        "z": "8b280114f8ac9c23",
+        "g": "be0d703c70d1687b",
+        "name": "Trigger",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 170,
+        "y": 120,
+        "wires": [
+            [
+                "8687cdf9bf6c4d7d"
+            ]
+        ]
+    },
+    {
+        "id": "7de3086e71c028f9",
+        "type": "processcube-engine-config",
+        "name": "",
+        "url": "http://engine:8000",
+        "urlType": "str",
+        "clientId": "",
+        "clientIdType": "str",
+        "clientSecret": "",
+        "clientSecretType": "str"
+    }
+]

package/externaltask-error.html

@@ -5,6 +5,7 @@
         defaults: {
             name: { value: '' },
             error: { value: '' },
+            message: { value: '' },
         },
         inputs: 1,
         outputs: 1,
@@ -25,6 +26,10 @@
         <label for="node-input-error"><i class="fa fa-tag"></i> Error Code</label>
         <input type="text" id="node-input-error" placeholder="Error Code of ExternalTask" />
     </div>
+    <div class="form-row">
+        <label for="node-input-message"><i class="fa fa-tag"></i> Error Message</label>
+        <input type="text" id="node-input-message" placeholder="Error Message of ExternalTask" />
+    </div>
 </script>
 
 <script type="text/markdown" data-help-name="externaltask-error">
@@ -35,9 +40,9 @@ handling within _Error-Boundary-Events_.
 ## Inputs
 
 : msg (Object) : Passed as `ErrorDetails` to the engine
-: Error (string) : From the configuration
-: Message (string) : The caught exception message
-: StackTrace (string) : The stack trace of the exception
+: Error (string) : From the configuration or from `msg.errorCode` or `msg.error.code`
+: Message (string) : The caught exception message or `msg.errorMessage` or `msg.error.message`
+: StackTrace (string) : The stack trace of the exception!
 
 ### References
 

package/externaltask-error.js

@@ -3,37 +3,51 @@ module.exports = function (RED) {
         RED.nodes.createNode(this, config);
         var node = this;
 
-        const flowContext = node.context().flow;
-        let eventEmitter = null;
-
-        node.on('input', function (msg) {
-            eventEmitter = flowContext.get('emitter');
-
-            if (!eventEmitter) {
-                flowContext.set('emitter', new EventEmitter());
-                eventEmitter = flowContext.get('emitter');
-            }    
-            
+        node.on('input', function (msg) {            
             const flowNodeInstanceId = msg.flowNodeInstanceId;
-
-            let msgError = msg.error;
-
-            if (msgError === undefined) {
-                msgError.message = 'An error occurred';
+            const etw_input_node_id = msg.etw_input_node_id;
+           
+            if (!etw_input_node_id) {
+                node.error('Error: The message did not contain the required etw_input_node_id.');
+            } else {
+                const etwInputNode = RED.nodes.getNode(etw_input_node_id);
+
+                if (!etwInputNode) {
+                    node.error('Error: The message did not contain the required etw_input_node_id.');
+                } else {
+                    let msgError = msg.error;
+                    let errorCode = config.error;
+                    let errorMessage = config.message;
+                    let errorDetails = RED.util.encodeObject(msg);
+
+                    if (msgError) {
+                        if (msgError.code) {
+                            errorCode = msgError.code;
+                            errorMessage = msgError.message;
+                        } 
+                    } else if (msg.errorCode) {
+                        errorCode = msg.errorCode;
+                        errorMessage = msg.errorMessage;
+                    }
+
+                    const error = new Error(errorMessage);
+                    error.errorCode = errorCode;
+                    error.errorDetails = errorDetails;
+
+                    if (!error.etw_started_at) {
+                        error.etw_started_at = msg.errorDetails?.etw_started_at || msg.etw_started_at;
+                    }
+
+                    msg.errorCode = errorCode;
+                    msg.errorMessage = errorMessage;
+
+                    node.log(`handle-${flowNodeInstanceId}: *flowNodeInstanceId* '${flowNodeInstanceId}' with *msg._msgid* '${msg._msgid}'`);
+
+                    etwInputNode.eventEmitter.emit(`handle-${flowNodeInstanceId}`, error, true);
+
+                    node.send(msg);
+                }
             }
-
-            const error = new Error(msgError.message);
-            error.errorCode = config.error;
-            error.errorDetails = RED.util.encodeObject(msg);
-
-            msg.errorCode = config.error;
-            msg.errorMessage = msgError.message;
-
-            node.log(`handle-${flowNodeInstanceId}: *flowNodeInstanceId* '${flowNodeInstanceId}' with *msg._msgid* '${msg._msgid}'`);
-
-            eventEmitter.emit(`handle-${flowNodeInstanceId}`, error, true);
-
-            node.send(msg);
         });
     }
     RED.nodes.registerType('externaltask-error', ExternalTaskError);

package/externaltask-event-listener.js

@@ -4,18 +4,16 @@ module.exports = function (RED) {
         var node = this;
         node.engine = RED.nodes.getNode(config.engine);
 
-        const register = async () => {
-            let currentIdentity = node.engine.identity;
+        let subscription;
 
+        const register = async () => {
             const client = node.engine.engineClient;
 
             if (!client) {
-                node.error('No engine configured.');
+                node.error('No engine configured.', {});
                 return;
             }
 
-            let subscription;
-
             function externalTaskCallback() {
                 return (externalTaskNotification) => {
                     if (config.externaltask != '' && config.externaltask != externalTaskNotification.flowNodeId) return;
@@ -33,44 +31,29 @@ module.exports = function (RED) {
             async function subscribe() {
                 switch (config.eventtype) {
                     case 'created':
-                        return await client.notification.onExternalTaskCreated(externalTaskCallback(), {
-                            identity: currentIdentity,
-                        });
+                        return await client.notification.onExternalTaskCreated(externalTaskCallback());
                     case 'locked':
-                        return await client.notification.onExternalTaskLocked(externalTaskCallback(), {
-                            identity: currentIdentity,
-                        });
+                        return await client.notification.onExternalTaskLocked(externalTaskCallback());
                     case 'unlocked':
-                        return await client.notification.onExternalTaskUnlocked(externalTaskCallback(), {
-                            identity: currentIdentity,
-                        });
+                        return await client.notification.onExternalTaskUnlocked(externalTaskCallback());
                     default:
                         console.error('no such event: ' + config.eventtype);
                 }
             }
 
-            if (node.engine.isIdentityReady()) {
-                subscription = subscribe();
-            }
-
-            node.engine.registerOnIdentityChanged(async (identity) => {
-                if (subscription) {
-                    client.notification.removeSubscription(subscription, currentIdentity);
-                }
-                currentIdentity = identity;
-
-                subscription = subscribe();
-            });
+            subscription = subscribe();
 
             node.on('close', async () => {
                 if (node.engine && node.engine.engineClient && client) {
-                    client.notification.removeSubscription(subscription, currentIdentity);
+                    client.notification.removeSubscription(subscription);
                 }
             });
         };
 
         if (node.engine) {
-            register();
+            register().catch((error) => {
+                node.error(error, {});
+            });
         }
     }
     RED.nodes.registerType('externaltask-event-listener', ExternalTaskEventListener);

package/externaltask-input.html

@@ -4,16 +4,19 @@
         color: '#02AFD6',
         defaults: {
             name: { value: '' },
+            workername: { value: '' },
             engine: { value: '', type: 'processcube-engine-config' },
             topic: { value: '' },
+            topicType: { value: '' },
             workerConfig: { value: '{}'},
-            workerConfigType: { value: 'json'}
+            workerConfigType: { value: 'json'},
+            traces: { value: [] },
         },
         inputs: 0,
         outputs: 1,
         icon: 'externaltask_input.svg',
         label: function () {
-            return this.name || 'externaltask-input';
+            return this.name || (this.topic ? `topic: ${this.topic}` : 'externaltask-input');
         },
         oneditprepare: function () {
             $('#node-input-workerConfig').typedInput({
@@ -23,6 +26,33 @@
 
             $('#node-input-workerConfig').typedInput('value', this.workerConfig);
             $('#node-input-workerConfig').typedInput('type', this.workerConfigType);
+
+            $('#node-input-topic').typedInput({
+                default: 'str',
+                types: ['str', 'env'],
+            });
+
+            $('#node-input-topic').typedInput('value', this.topic);
+            $('#node-input-topic').typedInput('type', this.topicType);
+
+            const allTraces = [
+                { value: "start", label: "Start" },
+                { value: "enter", label: "Enter" },
+                { value: "exit", label: "Exit" },
+                { value: "error", label: "Error" },
+                { value: "finish", label: "Finish" }
+            ];
+
+            const selectEl = $("#node-input-traces");
+
+            // Optionen einfügen
+            allTraces.forEach(opt => {
+                selectEl.append(new Option(opt.label, opt.value));
+            });
+
+            // Bereits gespeicherte Werte setzen
+            const selectedOptions = this.traces || [];
+            selectEl.val(selectedOptions);            
         },
         oneditsave: function () {
             this.workerConfig = $('#node-input-workerConfig').typedInput('value');
@@ -31,6 +61,11 @@
                 $('#node-input-workerConfig').typedInput('value', '{}');
             }
             this.workerConfigType = $('#node-input-workerConfig').typedInput('type');
+            this.topic = $('#node-input-topic').typedInput('value');
+            this.topicType = $('#node-input-topic').typedInput('type');
+
+            const selected = $("#node-input-traces").val();
+            this.traces = selected;            
         },
     });
 </script>
@@ -40,6 +75,10 @@
         <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-workername"><i class="fa fa-tag"></i> Workername</label>
+        <input type="text" id="node-input-workername" placeholder="(optional) Workername" />
+    </div>
     <div class="form-row">
         <label for="node-input-engine"><i class="fa fa-tag"></i> Engine</label>
         <input type="text" id="node-input-engine" placeholder="Engine" />
@@ -52,6 +91,10 @@
         <label for="node-input-workerConfig"><i class="fa fa-tag"></i> Config</label>
         <input type="text" id="node-input-workerConfig" />
     </div>
+    <div class="form-row">
+        <label for="node-input-traces"><i class="fa fa-check-square"></i> Traces</label>
+        <select id="node-input-traces" multiple size="5" style="width: 100%"></select>
+    </div>
 </script>
 
 <script type="text/markdown" data-help-name="externaltask-input">
@@ -61,7 +104,9 @@ the connected ProcessCube Engine for processing.
 ## Configs
 
 : name (string) : The name of the node
-: engine (string) : The ProcessCube Engine to connect to
+: workername (string) : The optional name of the worker otherwise it will be generated with the pattern 
+    nodered:NODERED_NAME-host:HOST_NAME-pid:PID-id:ID of the node
+: engine (engine-node) : The ProcessCube Engine to connect to
 : topic (string) : The topic of the external task
 : workerConfig (object) : The configuration for the worker