@5minds/node-red-contrib-processcube 7.7.1-develop-716de1-mkynb1ql → 7.7.1-develop-016853-mkynel2k

package/externaltask-input.js

@@ -144,110 +144,6 @@ module.exports = function (RED) {
 
         node._subscribed = true;
         node._subscribed_error = null;
-        node._trace = '';
-        node._step = '';
-        node._tracking_nodes = {};
-        node._join_inputs = {};
-        node._tracking_for_etw = {};
-
-        node.isHandling = () => {
-            return Object.keys(node.started_external_tasks).length > 0;
-        };
-
-        node.ownMessage = (msg) => {
-            return msg.etw_input_node_id === node.id;
-        };
-
-        node.clearTracking = (msg) => {
-            if (msg.flowNodeInstanceId) {
-                node._tracking_for_etw[msg.flowNodeInstanceId].forEach((theNode) => {
-                    node.decrMsgOnNode(theNode, msg);
-                });
-            }
-        };
-
-        node.incMsgOnNode = (theNode, msg) => {
-            if (node.id === theNode.id) {
-                return;
-            }
-
-            if (!node._tracking_nodes[theNode.id]) {
-                node._tracking_nodes[theNode.id] = {
-                    node: theNode,
-                    count: 1,
-                };
-            } 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] = [];
-                node._tracking_for_etw[msg.flowNodeInstanceId].push(theNode);
-            } else {
-                node._tracking_for_etw[msg.flowNodeInstanceId].push(theNode);
-            }
-
-            theNode.status({ fill: 'blue', shape: 'dot', text: `tasks(${node._tracking_nodes[theNode.id].count})` });
-        };
-
-        node.decrMsgOnNode = (theNode, msg) => {
-            if (node.id === theNode.id) {
-                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 =- dec_count;
-
-                if (node._tracking_nodes[theNode.id].count <= 0) {
-                    node._tracking_nodes[theNode.id].count = 0;
-                }
-            }
-
-            if (node._tracking_for_etw[msg.flowNodeInstanceId]) {
-                const count_nodes = node._tracking_for_etw[msg.flowNodeInstanceId].filter(item => item !== theNode)
-
-                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})` });
-        };
 
         node.traceExecution = (msg) => {
             if ((node._traces || []).includes(msg.event)) {
@@ -266,70 +162,6 @@ module.exports = function (RED) {
             }
         };
 
-        const onPreDeliver = (sendEvent) => {
-            try {
-                if (node.isHandling() && node.ownMessage(sendEvent.msg)) {
-
-                    const sourceNode = sendEvent?.source?.node;
-                    const destinationNode = sendEvent?.destination?.node;
-
-                    node._step = `${destinationNode.name || destinationNode.type}`;
-
-                    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' || process.env.NODERED_ETW_STEP_LOGGING == 'true') {
-                        node._trace = `'${sourceNode.name || sourceNode.type}'->'${destinationNode.name || destinationNode.type}'`;
-                        node.log(`preDeliver: ${node._trace}`);
-                    }
-                }
-            } catch (error) {
-                node.error(`Error in onPreDeliver: ${error?.message}`, { error: error });
-            }
-        };
-        RED.hooks.add(`preDeliver.etw-input-${node.id}`, onPreDeliver);
-
-        const onPostDeliver = (sendEvent) => {
-            try {
-                if (node.isHandling() && node.ownMessage(sendEvent.msg)) {
-                    const sourceNode = sendEvent?.source?.node;
-                    const destinationNode = sendEvent?.destination?.node;
-
-                    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' || process.env.NODERED_ETW_STEP_LOGGING == 'true') {
-                        node._trace = `'${sourceNode.name || sourceNode.type}'->'${destinationNode.name || destinationNode.type}'`;
-                        node.log(`postDeliver: ${node._trace}`);
-                    }
-                }
-            } catch (error) {
-                node.error(`Error in onPostDeliver: ${error?.message}`, { error: error });
-            }
-        };
-        RED.hooks.add(`postDeliver.etw-input-${node.id}`, onPostDeliver);
-
         node.setSubscribedStatus = () => {
             this._subscribed = true;
             this._subscribed_error = null;
@@ -367,8 +199,6 @@ module.exports = function (RED) {
         node.setFinishHandlingTaskStatus = (externalTask) => {
             if (externalTask.flowNodeInstanceId) {
                 delete this.started_external_tasks[externalTask.flowNodeInstanceId];
-                node._trace = '';
-                node._step = '';
             }
 
             this._subscribed = true;
@@ -383,7 +213,6 @@ module.exports = function (RED) {
 
             node.traceExecution(debugMsg);
 
-            this.clearTracking(externalTask); // as msg
             this.showStatus();
         };
 
@@ -423,22 +252,15 @@ module.exports = function (RED) {
 
             if (this._subscribed === false) {
                 this.status({ fill: 'red', shape: 'ring', text: `subscription failed (${msgCounter})` });
-
                 this.sendStatus('NotOk', `subscription failed (${msgCounter})`);
             } else {
                 if (msgCounter >= 1) {
-                    if (node._step) {
-                        this.status({ fill: 'blue', shape: 'dot', text: `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})`);
-                    }
-                    this.log(`handling tasks ${msgCounter}.`);
+                    this.status({ fill: 'blue', shape: 'dot', text: `tasks(${msgCounter})` });
+                    this.sendStatus('Ok', `tasks(${msgCounter})`);
                 } else {
-                    this.status({ fill: 'green', shape: 'ring', text: `subcribed` });
-                    this.sendStatus('Ok', `subcribed`);
-                }               
+                    this.status({ fill: 'green', shape: 'ring', text: `subscribed` });
+                    this.sendStatus('Ok', `subscribed`);
+                }
             }
         };
 
@@ -560,7 +382,7 @@ module.exports = function (RED) {
             client.externalTasks
                 .subscribeToExternalTaskTopic(topic, etwCallback, options)
                 .then(async (externalTaskWorker) => {
-                    node.status({ fill: 'blue', shape: 'ring', text: 'subcribed' });
+                    node.status({ fill: 'blue', shape: 'ring', text: 'subscribed' });
 
                     node.etw = externalTaskWorker;
 
@@ -614,8 +436,6 @@ module.exports = function (RED) {
                     node.on('close', () => {
                         try {
                             externalTaskWorker.stop();
-                            RED.hooks.remove(`preDeliver.etw-input-${node.id}`);
-                            RED.hooks.remove(`postDeliver.etw-input-${node.id}`);
                             node.log('External Task Worker closed.');
                         } catch (error) {
                             node.error(`Client close failed: ${JSON.stringify(error)}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@5minds/node-red-contrib-processcube",
-  "version": "7.7.1-develop-716de1-mkynb1ql",
+  "version": "7.7.1-develop-016853-mkynel2k",
   "license": "MIT",
   "description": "Node-RED nodes for ProcessCube",
   "authors": [