@5minds/node-red-contrib-processcube 1.11.1 → 1.12.0

package/externaltask-input.html

@@ -9,7 +9,8 @@
             topic: { value: '' },
             topicType: { value: '' },
             workerConfig: { value: '{}'},
-            workerConfigType: { value: 'json'}
+            workerConfigType: { value: 'json'},
+            traces: { value: [] },
         },
         inputs: 0,
         outputs: 1,
@@ -33,6 +34,24 @@
 
             $('#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: "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');
@@ -43,6 +62,9 @@
             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>
@@ -68,6 +90,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="4" style="width: 100%"></select>
+    </div>
 </script>
 
 <script type="text/markdown" data-help-name="externaltask-input">

package/externaltask-input.js

@@ -17,6 +17,7 @@ module.exports = function (RED) {
         let options = RED.util.evaluateNodeProperty(config.workerConfig, config.workerConfigType, node);
         let topic = node.topic =  RED.util.evaluateNodeProperty(config.topic, config.topicType, node)
         this.workername = RED.util.evaluateNodeProperty(config.workername, config.workernameType, node);
+        node._traces = config.traces || [];
  
         if (!options['workerId']) {
 
@@ -146,6 +147,23 @@ module.exports = function (RED) {
             theNode.status({ fill: 'blue', shape: 'dot', text: `tasks(${node._tracking_nodes[theNode.id].count})` });
         };
 
+        node.traceExecution = (msg) => {
+            if ((node._traces || []).includes(msg.event)) {
+                
+                const message = {
+                    id: node.id, 
+                    z: node.z, 
+                    _alias: node._alias,  
+                    path: node._flow.path, 
+                    name: node.name, 
+                    topic: node.topic, 
+                    msg: msg
+                };
+
+                RED.comms.publish("debug", message);    
+            }
+        };
+
         RED.hooks.add('preDeliver', (sendEvent) => {
             if (node.isHandling() && node.ownMessage(sendEvent.msg)) {  
                 
@@ -156,6 +174,17 @@ module.exports = function (RED) {
 
                 node.showStatus();
 
+                const debugMsg = {
+                    event: 'enter',
+                    sourceName: sourceNode.name,
+                    sourceType: sourceNode.type,
+                    destinationNodeName: destinationNode.name,
+                    destinationNodeType: destinationNode.type,
+                    timestamp: new Date().toISOString(),
+                };
+
+                node.traceExecution(debugMsg);
+
                 if (process.env.NODE_RED_ETW_STEP_LOGGING == 'true') {
                     node._trace = `'${sourceNode.name || sourceNode.type}'->'${destinationNode.name || destinationNode.type}'`;
                     node.log(`preDeliver: ${node._trace}`);
@@ -171,6 +200,17 @@ module.exports = function (RED) {
                 node.decrMsgOnNode(sourceNode, sendEvent.msg);
                 node.incMsgOnNode(destinationNode, sendEvent.msg);
 
+                const debugMsg = {
+                    event: 'exit',
+                    sourceName: sourceNode.name,
+                    sourceType: sourceNode.type,
+                    destinationNodeName: destinationNode.name,
+                    destinationNodeType: destinationNode.type,
+                    timestamp: new Date().toISOString(),
+                };
+
+                node.traceExecution(debugMsg);
+
                 if (process.env.NODE_RED_ETW_STEP_LOGGING == 'true') {
                     node._trace = `'${sourceNode.name || sourceNode.type}'->'${destinationNode.name || destinationNode.type}'`;
                     node.log(`postDeliver: ${node._trace}`);
@@ -200,6 +240,15 @@ module.exports = function (RED) {
             this._subscribed_error = null;
             this.started_external_tasks[externalTask.flowNodeInstanceId] = externalTask;
 
+            const debugMsg = {
+                event: 'start',
+                topic: node.topic,
+                flowNodeInstanceId: externalTask.flowNodeInstanceId,
+                timestamp: new Date().toISOString(),
+            };
+
+            node.traceExecution(debugMsg);
+
             this.showStatus();
         };
 
@@ -213,6 +262,16 @@ module.exports = function (RED) {
             this._subscribed = true;
             this._subscribed_error = null;
 
+            const debugMsg = {
+                event: 'finish',
+                topic: node.topic,
+                flowNodeInstanceId: externalTask.flowNodeInstanceId,
+                timestamp: new Date().toISOString(),
+            };
+
+            node.traceExecution(debugMsg);
+
+
             this.clearTracking(externalTask); // as msg
             this.showStatus();
         };
@@ -249,7 +308,7 @@ module.exports = function (RED) {
                 if (msgCounter >= 1) {
                     if (node._step) {
                         this.status({ fill: 'blue', shape: 'dot', text: `tasks(${msgCounter}) ->'${node._step}'` });
-                        this.sendStatus('Ok', `tasks(${msgCounter}) ->'${node._step}'.`);
+                        this.sendStatus('Ok', `tasks(${msgCounter}) ->'${node._step}'.`);                        
                     } else {
                         this.status({ fill: 'blue', shape: 'dot', text: `tasks(${msgCounter})` });
                         this.sendStatus('Ok', `tasks(${msgCounter})`);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@5minds/node-red-contrib-processcube",
-    "version": "1.11.1",
+    "version": "1.12.0",
     "license": "MIT",
     "description": "Node-RED nodes for ProcessCube",
     "scripts": {