@5minds/node-red-contrib-processcube-elasticsearch 0.3.3-feature-056883-m66btl04 → 0.4.0-develop-7b8fdf-m692xvm9

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

@@ -429,7 +429,7 @@
     },
     "@5minds/node-red-contrib-processcube-elasticsearch": {
         "name": "@5minds/node-red-contrib-processcube-elasticsearch",
-        "version": "0.3.2",
+        "version": "0.4.0",
         "local": false,
         "user": false,
         "nodes": {

package/.processcube/nodered/config.js

@@ -9,5 +9,12 @@ try {
     console.log(">>>", e);
 }
 
+process.on('uncaughtException', (err) => {
+    console.error(`Uncaught Exception: ${err}`, {});
+});
+
+process.on('unhandledRejection', (reason, promise) => {
+    console.error(`Unhandled Rejection at ${promise} reason: ${reason}`, {});
+});    
 
 module.exports = config;

package/.processcube/nodered/flows.json

@@ -135,6 +135,54 @@
         "w": 532,
         "h": 142
     },
+    {
+        "id": "38edcaecf5968ff5",
+        "type": "group",
+        "z": "53b75a173ac5abcc",
+        "style": {
+            "stroke": "#999999",
+            "stroke-opacity": "1",
+            "fill": "none",
+            "fill-opacity": "1",
+            "label": true,
+            "label-position": "nw",
+            "color": "#a4a4a4"
+        },
+        "nodes": [
+            "0b2f670fec931f5f",
+            "443b329ab591c4dd",
+            "f4a0d7de5d04c121",
+            "946add545fa1db9f",
+            "0c15060915aac994"
+        ],
+        "x": 34,
+        "y": 19,
+        "w": 372,
+        "h": 202
+    },
+    {
+        "id": "4aae454884faa826",
+        "type": "group",
+        "z": "53b75a173ac5abcc",
+        "style": {
+            "stroke": "#999999",
+            "stroke-opacity": "1",
+            "fill": "none",
+            "fill-opacity": "1",
+            "label": true,
+            "label-position": "nw",
+            "color": "#a4a4a4"
+        },
+        "nodes": [
+            "f90f2ba54f023834",
+            "31dcfc340dae3780",
+            "59df2485b6c11412"
+        ],
+        "x": 34,
+        "y": 259,
+        "w": 372,
+        "h": 142
+    },
     {
         "id": "e8672d361683672d",
         "type": "elastic-search-logger",
@@ -148,6 +196,19 @@
         "maxsize": 1,
         "maxfiles": 2
     },
+    {
+        "id": "3667972f5cb77061",
+        "type": "elastic-search-logger",
+        "name": "Failed docker compose",
+        "url": "",
+        "urlType": "str",
+        "usernameType": "str",
+        "passwordType": "str",
+        "indexType": "str",
+        "filename": "log-elastic.log",
+        "maxsize": 1,
+        "maxfiles": 2
+    },
     {
         "id": "95fa4d376d072354",
         "type": "http request",
@@ -530,18 +591,20 @@
         "id": "0b2f670fec931f5f",
         "type": "elastic-search",
         "z": "53b75a173ac5abcc",
+        "g": "38edcaecf5968ff5",
         "name": "",
         "logger": "e8672d361683672d",
         "complete": "payload",
         "loglevel": "Debug",
-        "x": 320,
-        "y": 100,
+        "x": 300,
+        "y": 120,
         "wires": []
     },
     {
         "id": "443b329ab591c4dd",
         "type": "inject",
         "z": "53b75a173ac5abcc",
+        "g": "38edcaecf5968ff5",
         "name": "",
         "props": [
             {
@@ -553,14 +616,109 @@
         "once": false,
         "onceDelay": 0.1,
         "topic": "",
-        "payload": "{\"message\":\"hello world\"}",
+        "payload": "{\"message\":\"hello world\",\"messageTemplate\":\"a messageTemplate\",\"meta\":{\"message\":\"a message\",\"messageTemplate\":\"a messageTemplate\",\"severity\":\"a severity\",\"level\":\"a level\",\"fields\":{\"firstField\":\"a FirstField\",\"secondField\":\"a SecondField\"},\"transaction.id\":\"a transaction.id\",\"trace.id\":\"a trace.id\",\"span.id\":\"a span.id\"}}",
         "payloadType": "json",
         "x": 130,
-        "y": 100,
+        "y": 120,
         "wires": [
             [
                 "0b2f670fec931f5f"
             ]
         ]
+    },
+    {
+        "id": "f4a0d7de5d04c121",
+        "type": "comment",
+        "z": "53b75a173ac5abcc",
+        "g": "38edcaecf5968ff5",
+        "name": "Handle log",
+        "info": "",
+        "x": 120,
+        "y": 60,
+        "wires": []
+    },
+    {
+        "id": "946add545fa1db9f",
+        "type": "catch",
+        "z": "53b75a173ac5abcc",
+        "g": "38edcaecf5968ff5",
+        "name": "",
+        "scope": null,
+        "uncaught": false,
+        "x": 120,
+        "y": 180,
+        "wires": [
+            [
+                "0c15060915aac994"
+            ]
+        ]
+    },
+    {
+        "id": "0c15060915aac994",
+        "type": "debug",
+        "z": "53b75a173ac5abcc",
+        "g": "38edcaecf5968ff5",
+        "name": "error",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "true",
+        "targetType": "full",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 270,
+        "y": 180,
+        "wires": []
+    },
+    {
+        "id": "f90f2ba54f023834",
+        "type": "elastic-search",
+        "z": "53b75a173ac5abcc",
+        "g": "4aae454884faa826",
+        "name": "",
+        "logger": "3667972f5cb77061",
+        "complete": "payload",
+        "loglevel": "Debug",
+        "x": 300,
+        "y": 360,
+        "wires": []
+    },
+    {
+        "id": "31dcfc340dae3780",
+        "type": "inject",
+        "z": "53b75a173ac5abcc",
+        "g": "4aae454884faa826",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "{\"message\":\"hello world\"}",
+        "payloadType": "json",
+        "x": 130,
+        "y": 360,
+        "wires": [
+            [
+                "f90f2ba54f023834"
+            ]
+        ]
+    },
+    {
+        "id": "59df2485b6c11412",
+        "type": "comment",
+        "z": "53b75a173ac5abcc",
+        "g": "4aae454884faa826",
+        "name": "Handle failed log",
+        "info": "",
+        "x": 140,
+        "y": 300,
+        "wires": []
     }
 ]

package/.processcube/nodered/flows_cred.json

@@ -1,3 +1,3 @@
 {
-    "$": "4efe193314c0113d27ddc85f0ca8c8b59WfztXveJzJVxnfXu8ZgieUMyTAsFh1WJzSgnt4L4rtGgdmzm8gt5XaDftof8b6QNfnsOn/U45tm7+9AY7mmio1atUn+Zdgjl5pFXfC2KGW+ZX538a/5Gl7Jo+jT0MP81KbdrN9FoNHAUoToFMj4P4ZS7DT1FX1T7AjaBUQ+tMDC"
+    "$": "69c2a3b18186363d4e5849655756e7349gcyp66cMJ2/lgr6ulxmCSArRIQWk2T3HrJ7yfqDFqO7OXOON2aVmPkkjsW0asmrmrja7buybbECE8+uj2QSR3m8ncp/9umm9nM//dgBrCOkpiQ62Rg2vlDYw8PcUvEaNuGm0040d1swspl21P6mqXwGp57SOBpTz/U6MPLQTixR4IWCxUl5euN6kJNUnXYXoAbW5nnx/Q=="
 }

package/elastic-search-logger.js

@@ -1,37 +1,97 @@
+'use strict';
+
+const winston = require('winston');
+const winstonElasticSearch = require('winston-elasticsearch');
+const { ElasticsearchTransformer } = require('winston-elasticsearch');
+
+const logLevels = {
+    levels: {
+        Error: 0,
+        Warning: 1,
+        Information: 2,
+        Debug: 3
+    }
+};
+
+function transformElasticFields(logData) {
+    const transformed = ElasticsearchTransformer(logData);
+
+    transformed['@timestamp'] = logData.timestamp ? logData.timestamp : new Date().toISOString();
+    transformed.message = logData.message;
+    transformed.messageTemplate = logData.messageTemplate;
+    transformed.severity = logData.level;
+    transformed.level = logData.level;
+    transformed.fields = logData.meta;
+
+    if (logData.meta['transaction.id']) {
+        transformed.transaction = { id: logData.meta['transaction.id'] };
+    }
+
+    if (logData.meta['trace.id']) {
+        transformed.trace = {
+            id: logData.meta['trace.id']
+        };
+    }
+
+    if (logData.meta['span.id']) {
+        transformed.span = {
+            id: logData.meta['span.id']
+        };
+    }
+
+    return transformed;
+}
+
+function raiseErrorAndSetNodeStatus(node, message) {
+    node.error(message, {});
+    node.status({
+        fill: 'red',
+        shape: 'ring',
+        text: message,
+    });
+}
+
+
+// TODO: MM winston-elasticsearch/index.js#112 wird die log als async function deklariert, 
+// aber nicht als async aufgerufen
+process.on('unhandledRejection', (reason, promise) => {
+    console.error(`Unhandled Rejection at ${promise} reason: ${reason}`, {});
+});    
+
+
 module.exports = function (RED) {
-    'use strict';
 
     function LogElasticLoggerNode(config) {
-        let winston = require('winston');
-        let winstonElasticSearch = require('winston-elasticsearch');
-
         RED.nodes.createNode(this, config);
-        this.logger = null;
-        let transports = [];
+        const node = this;
+
+        node.logger = null;
 
         // Elastic settings
-        let url = RED.util.evaluateNodeProperty(config.url, config.urlType, this);
-        if (url == '') {
-            this.error('Elastic search url is not set');
+        const url = RED.util.evaluateNodeProperty(config.url, config.urlType, node);
+        if (!url || url === 'undefined') {
+            raiseErrorAndSetNodeStatus(node, 'Elastic search url is not set');
         }
 
-        let user = RED.util.evaluateNodeProperty(this.credentials.username, config.usernameType, this);
-        if (user == '') {
-            this.error('Elastic search username is not set');
+        const user = RED.util.evaluateNodeProperty(this.credentials.username, config.usernameType, node);
+        if (!user || user === 'undefined') {
+            raiseErrorAndSetNodeStatus(node, 'Elastic search username is not set');
         }
 
-        let password = RED.util.evaluateNodeProperty(this.credentials.password, config.passwordType, this);
-        if (password == '') {
-            this.error('Elastic search password is not set');
+        const password = RED.util.evaluateNodeProperty(this.credentials.password, config.passwordType, node);
+        if (!password || password === 'undefined') {
+            raiseErrorAndSetNodeStatus(node, 'Elastic search password is not set');
         }
 
-        let index = RED.util.evaluateNodeProperty(this.credentials.index, config.indexType, this);
-        if (index == '') {
-            this.error('Elastic search index is not set');
+        let index = RED.util.evaluateNodeProperty(this.credentials.index, config.indexType, node);
+        if (!index || index === 'undefined') {
+            raiseErrorAndSetNodeStatus(node, 'Elastic search index is not set');
+        } else {
+            index = index.toLowerCase();
         }
 
-        index = index.toLowerCase();
         if (url) {
+            const transports = [];
             const elasticSearchTransport = new winstonElasticSearch.ElasticsearchTransport({
                 clientOpts: {
                     node: url,
@@ -44,63 +104,52 @@ module.exports = function (RED) {
                         rejectUnauthorized: false,
                     },
                 },
-                transformer: (logData) => setElasticFields(logData, this),
+                transformer: (logData) => transformElasticFields(logData),
                 index: index,
             });
 
             transports.push(elasticSearchTransport);
 
             elasticSearchTransport.on('error', (error) => {
-                this.error(`Error in elasticSearchTransport caught: ${error.message}`);
-                console.error('Error in elasticSearchTransport caught', error);
+                raiseErrorAndSetNodeStatus(node, `Error in elasticSearchTransport caught: ${error.message}`);
             });
-        }
 
-        let logLevels = {
-            levels: {
-                Error: 0,
-                Warning: 1,
-                Information: 2,
-                Debug: 3,
-            },
-        };
-        this.logger = new winston.createLogger({
-            exitOnError: false,
-            level: 'Debug',
-            levels: logLevels.levels,
-            transports: transports,
-        });
+            node.logger = new winston.createLogger({
+                exitOnError: false,
+                level: 'Debug',
+                levels: logLevels.levels,
+                transports: transports,
+            });
+
+            node.logger.on('error', (error) => {
+                raiseErrorAndSetNodeStatus(node, `Error in logger caught: ${error.message}`);
+            });
+
+            this.debug('elastic-search logger created');
+        }
 
-        this.debug('elastic-search logger created');
 
-        this.on('close', function (removed, done) {
+        this.on('close', function () {
             // close logger
-            if (this.loggger) {
-                this.logger.close();
+            if (node.logger) {
+                node.logger.close();
             }
 
-            this.debug('elastic-search logger closed');
-
-            if (done) done();
+            node.debug('elastic-search logger closed');
         });
     }
 
-    function setElasticFields(logData, node) {
-        let { ElasticsearchTransformer } = require('winston-elasticsearch');
-        const transformed = ElasticsearchTransformer(logData);
-        transformed['@timestamp'] = logData.timestamp ? logData.timestamp : new Date().toISOString();
-        transformed.message = logData.message;
-        transformed.messageTemplate = logData.messageTemplate;
-        transformed.severity = logData.level;
-        transformed.level = logData.level;
-        transformed.fields = logData.meta;
-
-        if (logData.meta['transaction.id']) transformed.transaction = { id: logData.meta['transaction.id'] };
-        if (logData.meta['trace.id']) transformed.trace = { id: logData.meta['trace.id'] };
-        if (logData.meta['span.id']) transformed.span = { id: logData.meta['span.id'] };
-
-        return transformed;
-    }
+    LogElasticLoggerNode.prototype.addToLog = function addTolog(loglevel, msg) {
+        try {
+            if (this.logger == null) {
+                raiseErrorAndSetNodeStatus(this, `Elastic search logger is not initialized: ${JSON.stringify(msg)}`);
+            } else {
+                this.logger.log(loglevel, msg.payload.message, msg.payload.meta);
+            }
+        } catch (error) {
+            this.error(error, msg);
+        }
+    };
 
     RED.nodes.registerType('elastic-search-logger', LogElasticLoggerNode, {
         credentials: {
@@ -109,8 +158,4 @@ module.exports = function (RED) {
             index: { type: 'text' },
         },
     });
-
-    LogElasticLoggerNode.prototype.addToLog = function addTolog(loglevel, msg) {
-        this.logger.log(loglevel, msg.payload.message, msg.payload.meta);
-    };
 };

package/elastic-search.js

@@ -10,7 +10,7 @@ module.exports = function (RED) {
         RED.nodes.createNode(this, config);
         const node = this;
 
-        this.on('input', function (msg, send, done) {
+        this.on('input', function (msg) {
             node.logger = RED.nodes.getNode(config.logger);
 
             let loglevel = config.loglevel || '';
@@ -34,10 +34,12 @@ module.exports = function (RED) {
                     }
                 }
 
-                node.logger.addToLog(level, msg);
+                try {
+                    node.logger.addToLog(level, msg);
+                } catch (err) {
+                    node.error(err);
+                }
             }
-
-            if (done) done();
         });
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@5minds/node-red-contrib-processcube-elasticsearch",
-    "version": "0.3.3-feature-056883-m66btl04",
+    "version": "0.4.0-develop-7b8fdf-m692xvm9",
     "license": "MIT",
     "description": "Node-RED nodes for Elasticsearch",
     "scripts": {
@@ -10,6 +10,10 @@
         {
             "name": "Robin Lenz",
             "email": "Robin.Lenz@5Minds.de"
+        },
+        {
+            "name": "Martin Möllenbeck",
+            "email": "martin.moellenbeck@5Minds.de"
         }
     ],
     "repository": {
@@ -25,7 +29,7 @@
         "npm": ">=8.0.0"
     },
     "node-red": {
-        "version": ">=3.1.9",
+        "version": ">=4.0.0",
         "nodes": {
             "elastic-search": "elastic-search.js",
             "elastic-search-logger": "elastic-search-logger.js"