@5minds/node-red-contrib-processcube 0.0.8 → 0.1.0

package/.node-red/data/.config.nodes.json

@@ -499,7 +499,7 @@
     },
     "@5minds/node-red-contrib-processcube": {
         "name": "@5minds/node-red-contrib-processcube",
-        "version": "0.0.8",
+        "version": "0.0.9",
         "local": true,
         "user": false,
         "nodes": {

package/.node-red/data/.config.nodes.json.backup

@@ -499,7 +499,7 @@
     },
     "@5minds/node-red-contrib-processcube": {
         "name": "@5minds/node-red-contrib-processcube",
-        "version": "0.0.6",
+        "version": "0.0.8",
         "local": true,
         "user": false,
         "nodes": {
@@ -525,6 +525,17 @@
                 "module": "@5minds/node-red-contrib-processcube",
                 "file": "/data/node_modules/node-red-contrib-processcube/externaltask-output.js"
             },
+            "externaltaskError": {
+                "name": "externaltaskError",
+                "types": [
+                    "externaltask-error"
+                ],
+                "enabled": true,
+                "local": true,
+                "user": false,
+                "module": "@5minds/node-red-contrib-processcube",
+                "file": "/data/node_modules/node-red-contrib-processcube/externaltask-error.js"
+            },
             "processStart": {
                 "name": "processStart",
                 "types": [

package/.node-red/data/flows.json

@@ -132,6 +132,7 @@
         "type": "externaltask-input",
         "z": "a23d2e782beb66f4",
         "name": "processmodels",
+        "engine": "",
         "topic": "processmodels",
         "x": 100,
         "y": 460,
@@ -560,7 +561,7 @@
         "z": "a23d2e782beb66f4",
         "name": "",
         "pauseType": "delay",
-        "timeout": "5",
+        "timeout": "1",
         "timeoutUnits": "seconds",
         "rate": "1",
         "nbRateUnits": "1",
@@ -609,7 +610,7 @@
         "z": "a23d2e782beb66f4",
         "name": "",
         "pauseType": "delay",
-        "timeout": "5",
+        "timeout": "1",
         "timeoutUnits": "seconds",
         "rate": "1",
         "nbRateUnits": "1",
@@ -725,7 +726,7 @@
         "statusVal": "",
         "statusType": "auto",
         "x": 380,
-        "y": 200,
+        "y": 180,
         "wires": []
     },
     {

package/externaltask-error.js

@@ -1,10 +1,11 @@
-const EventAggregator = require('./EventAggregator');
-
 module.exports = function(RED) {
     function ExternalTaskError(config) {
         RED.nodes.createNode(this,config);
         var node = this;
 
+        var flowContext = node.context().flow;
+        var eventEmitter = flowContext.get('emitter');       
+
         node.on('input', function(msg) {
 
             const externalTaskId = msg.externalTaskId;
@@ -17,7 +18,7 @@ module.exports = function(RED) {
                 }
             };
 
-            EventAggregator.eventEmitter.emit(`error-${externalTaskId}`, msg.payload);
+            eventEmitter.emit(`error-${externalTaskId}`, msg.payload);
         });     
     }
     RED.nodes.registerType("externaltask-error", ExternalTaskError);

package/externaltask-input.html

@@ -3,8 +3,9 @@
         category: 'ProcessCube',
         color: '#00aed7',
         defaults: {
-            name: {value:""},
-            topic: {value:""}
+            name: {value: ""},
+            engine: {value: "http://engine:8000"},
+            topic: {value: ""}
         },
         inputs: 0,
         outputs: 1,
@@ -20,6 +21,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-engine"><i class="fa fa-tag"></i> Engine-URL</label>
+        <input type="text" id="node-input-engine" placeholder="http://engine:8000">
+    </div>
     <div class="form-row">
         <label for="node-input-topic"><i class="fa fa-tag"></i> Topic</label>
         <input type="text" id="node-input-topic" placeholder="Topic of ExternalTask">

package/externaltask-input.js

@@ -1,11 +1,7 @@
 const process = require('process');
+const EventEmitter = require('node:events');
 
 const engine_client = require('@5minds/processcube_engine_client');
-const EventAggregator = require('./EventAggregator');
-
-const engineUrl = process.env.ENGINE_URL || 'http://engine:8000';
-
-const client = new engine_client.EngineClient(engineUrl);
 
 function showStatus(node, msgCounter) {
     if (msgCounter >= 1) {
@@ -20,6 +16,24 @@ module.exports = function(RED) {
         RED.nodes.createNode(this,config);
         var node = this;
         var msgCounter = 0;
+        var flowContext = node.context().flow;
+        var nodeContext = node.context();
+
+        const engineUrl = config.engine || process.env.ENGINE_URL || 'http://engine:8000';
+
+        var client = nodeContext.get('client');
+
+        if (!client) {
+            nodeContext.set('client', new engine_client.EngineClient(engineUrl));
+            client = nodeContext.get('client');
+        }   
+
+        var eventEmitter = flowContext.get('emitter');
+
+        if (!eventEmitter) {
+            flowContext.set('emitter', new EventEmitter());
+            eventEmitter = flowContext.get('emitter');
+        }
 
         client.externalTasks.subscribeToExternalTaskTopic(
             config.topic,
@@ -28,13 +42,14 @@ module.exports = function(RED) {
 
                 return await new Promise((resolve, reject) => {
                     
-                    EventAggregator.eventEmitter.once(`finish-${externalTask.flowNodeInstanceId}`, (result) => {
+                    // TODO: once ist 2x gebunden
+                    eventEmitter.once(`finish-${externalTask.flowNodeInstanceId}`, (result) => {
                         msgCounter--;
                         showStatus(node, msgCounter);
                         resolve(result);
                     });
 
-                    EventAggregator.eventEmitter.once(`error-${externalTask.flowNodeInstanceId}`, (msg) => {
+                    eventEmitter.once(`error-${externalTask.flowNodeInstanceId}`, (msg) => {
                         msgCounter--;
                         showStatus(node, msgCounter);
 

package/externaltask-output.js

@@ -1,15 +1,16 @@
-const EventAggregator = require('./EventAggregator');
-
 module.exports = function(RED) {
     function ExternalTaskOutput(config) {
         RED.nodes.createNode(this,config);
         var node = this;
 
+        var flowContext = node.context().flow;
+        var eventEmitter = flowContext.get('emitter');
+
         node.on('input', function(msg) {
 
             const externalTaskId = msg.externalTaskId;
 
-            EventAggregator.eventEmitter.emit(`finish-${externalTaskId}`, msg.payload);
+            eventEmitter.emit(`finish-${externalTaskId}`, msg.payload);
         });     
     }
     RED.nodes.registerType("externaltask-output", ExternalTaskOutput);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@5minds/node-red-contrib-processcube",
-    "version": "0.0.8",
+    "version": "0.1.0",
     "license": "MIT",
     "description": "Node-RED nodes for ProcessCube",
     "keywords": [

package/EventAggregator.js

@@ -1,25 +0,0 @@
-const EventEmitter = require('node:events');
-
-const eventEmitter = new EventEmitter();
-
-const eventSubscriptionDictionary = {};
-
-function subscribeOnce(eventName, callback) {
-  eventSubscriptionDictionary[eventName] = callback;
-}
-
-async function publish(eventName, payload) {
-  const callback = eventSubscriptionDictionary[eventName];
-
-  if (callback) {
-    await callback(payload);
-    delete eventSubscriptionDictionary[eventName]
-  }
-}
-
-module.exports = {
-  eventEmitter: eventEmitter,
-  subscribeOnce: subscribeOnce,
-  publish: publish,
-  countSubscriptions: () => Object.keys(eventSubscriptionDictionary).length
-}