@5minds/node-red-contrib-processcube-amqp 0.5.0 → 0.7.0

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

@@ -1,7 +1,7 @@
 {
     "node-red": {
         "name": "node-red",
-        "version": "3.1.9",
+        "version": "4.0.3",
         "local": false,
         "user": false,
         "nodes": {
@@ -429,7 +429,7 @@
     },
     "@5minds/node-red-contrib-processcube-amqp": {
         "name": "@5minds/node-red-contrib-processcube-amqp",
-        "version": "0.4.0",
+        "version": "0.5.0",
         "local": true,
         "user": false,
         "nodes": {
@@ -444,6 +444,28 @@
                 "module": "@5minds/node-red-contrib-processcube-amqp",
                 "file": "/data/node_modules/node-red-contrib-processcube-amqp/amqp-input.js"
             },
+            "amqpIntermediateInput": {
+                "name": "amqpIntermediateInput",
+                "types": [
+                    "amqp-intermediate-input"
+                ],
+                "enabled": true,
+                "local": true,
+                "user": false,
+                "module": "@5minds/node-red-contrib-processcube-amqp",
+                "file": "/data/node_modules/node-red-contrib-processcube-amqp/amqp-intermediate-input.js"
+            },
+            "amqpIntermediateOutput": {
+                "name": "amqpIntermediateOutput",
+                "types": [
+                    "amqp-intermediate-output"
+                ],
+                "enabled": true,
+                "local": true,
+                "user": false,
+                "module": "@5minds/node-red-contrib-processcube-amqp",
+                "file": "/data/node_modules/node-red-contrib-processcube-amqp/amqp-intermediate-output.js"
+            },
             "amqpOutput": {
                 "name": "amqpOutput",
                 "types": [

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

@@ -1,7 +1,7 @@
 {
     "node-red": {
         "name": "node-red",
-        "version": "3.1.9",
+        "version": "4.0.3",
         "local": false,
         "user": false,
         "nodes": {
@@ -429,7 +429,7 @@
     },
     "@5minds/node-red-contrib-processcube-amqp": {
         "name": "@5minds/node-red-contrib-processcube-amqp",
-        "version": "0.2.0",
+        "version": "0.5.0",
         "local": true,
         "user": false,
         "nodes": {
@@ -444,6 +444,17 @@
                 "module": "@5minds/node-red-contrib-processcube-amqp",
                 "file": "/data/node_modules/node-red-contrib-processcube-amqp/amqp-input.js"
             },
+            "amqpIntermediateInput": {
+                "name": "amqpIntermediateInput",
+                "types": [
+                    "amqp-intermediate-input"
+                ],
+                "enabled": true,
+                "local": true,
+                "user": false,
+                "module": "@5minds/node-red-contrib-processcube-amqp",
+                "file": "/data/node_modules/node-red-contrib-processcube-amqp/amqp-intermediate-input.js"
+            },
             "amqpOutput": {
                 "name": "amqpOutput",
                 "types": [

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

@@ -13,7 +13,7 @@
                 "view-show-welcome-tours": true
             },
             "tours": {
-                "welcome": "3.1.9"
+                "welcome": "4.0.3"
             }
         }
     }

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

@@ -11,6 +11,9 @@
                 "view-node-show-label": true,
                 "view-show-tips": true,
                 "view-show-welcome-tours": true
+            },
+            "tours": {
+                "welcome": "3.1.9"
             }
         }
     }

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

@@ -89,7 +89,8 @@
         "amqpServer": "cbcfcb0a896f9765",
         "exchange": "Test2",
         "exchangeType": "topic",
-        "routingKey": "test.test",
+        "routingKey": "test.${TEST}",
+        "routingKeyFieldType": "env",
         "x": 630,
         "y": 140,
         "wires": []
@@ -116,11 +117,138 @@
         "payload": "{\"test\": 1123 }",
         "payloadType": "json",
         "x": 250,
-        "y": 140,
+        "y": 120,
         "wires": [
             [
                 "b6e1bc8cac43d73d"
             ]
         ]
+    },
+    {
+        "id": "674b6dfdd29d03ff",
+        "type": "inject",
+        "z": "ea5e703747705005",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 200,
+        "y": 480,
+        "wires": [
+            [
+                "80b6a88a75218de8"
+            ]
+        ]
+    },
+    {
+        "id": "80b6a88a75218de8",
+        "type": "amqp-intermediate-input",
+        "z": "ea5e703747705005",
+        "name": "",
+        "amqpServer": "cbcfcb0a896f9765",
+        "exchange": "Test2",
+        "exchangeType": "topic",
+        "routingKey": "test.${TEST}",
+        "routingKeyFieldType": "env",
+        "queue": "IntermediateQueue",
+        "x": 440,
+        "y": 480,
+        "wires": [
+            [
+                "3c9347a9984c8f4a"
+            ]
+        ]
+    },
+    {
+        "id": "3c9347a9984c8f4a",
+        "type": "debug",
+        "z": "ea5e703747705005",
+        "name": "debug 3",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 730,
+        "y": 480,
+        "wires": []
+    },
+    {
+        "id": "73dfe1f014cf2a95",
+        "type": "amqp-intermediate-output",
+        "z": "ea5e703747705005",
+        "name": "",
+        "amqpServer": "cbcfcb0a896f9765",
+        "exchange": "Test2",
+        "exchangeType": "topic",
+        "routingKey": "test.${TEST}",
+        "routingKeyFieldType": "env",
+        "x": 420,
+        "y": 580,
+        "wires": [
+            [
+                "ea31e27c53c0b8cb"
+            ]
+        ]
+    },
+    {
+        "id": "a5d8ae6eb5ac20de",
+        "type": "inject",
+        "z": "ea5e703747705005",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 180,
+        "y": 580,
+        "wires": [
+            [
+                "73dfe1f014cf2a95"
+            ]
+        ]
+    },
+    {
+        "id": "ea31e27c53c0b8cb",
+        "type": "debug",
+        "z": "ea5e703747705005",
+        "name": "debug 4",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 690,
+        "y": 580,
+        "wires": []
     }
 ]

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

@@ -117,11 +117,138 @@
         "payload": "{\"test\": 1123 }",
         "payloadType": "json",
         "x": 250,
-        "y": 140,
+        "y": 120,
         "wires": [
             [
                 "b6e1bc8cac43d73d"
             ]
         ]
+    },
+    {
+        "id": "674b6dfdd29d03ff",
+        "type": "inject",
+        "z": "ea5e703747705005",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 200,
+        "y": 480,
+        "wires": [
+            [
+                "80b6a88a75218de8"
+            ]
+        ]
+    },
+    {
+        "id": "80b6a88a75218de8",
+        "type": "amqp-intermediate-input",
+        "z": "ea5e703747705005",
+        "name": "",
+        "amqpServer": "cbcfcb0a896f9765",
+        "exchange": "Test2",
+        "exchangeType": "topic",
+        "routingKey": "test.${TEST}",
+        "routingKeyFieldType": "env",
+        "queue": "IntermediateQueue",
+        "x": 440,
+        "y": 480,
+        "wires": [
+            [
+                "3c9347a9984c8f4a"
+            ]
+        ]
+    },
+    {
+        "id": "3c9347a9984c8f4a",
+        "type": "debug",
+        "z": "ea5e703747705005",
+        "name": "debug 3",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 730,
+        "y": 480,
+        "wires": []
+    },
+    {
+        "id": "73dfe1f014cf2a95",
+        "type": "amqp-intermediate-output",
+        "z": "ea5e703747705005",
+        "name": "",
+        "amqpServer": "cbcfcb0a896f9765",
+        "exchange": "Test2",
+        "exchangeType": "topic",
+        "routingKey": "test.${TEST}",
+        "routingKeyFieldType": "env",
+        "x": 420,
+        "y": 580,
+        "wires": [
+            [
+                "ea31e27c53c0b8cb"
+            ]
+        ]
+    },
+    {
+        "id": "a5d8ae6eb5ac20de",
+        "type": "inject",
+        "z": "ea5e703747705005",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "{\"test\":123}",
+        "payloadType": "json",
+        "x": 190,
+        "y": 580,
+        "wires": [
+            [
+                "73dfe1f014cf2a95"
+            ]
+        ]
+    },
+    {
+        "id": "ea31e27c53c0b8cb",
+        "type": "debug",
+        "z": "ea5e703747705005",
+        "name": "debug 4",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 690,
+        "y": 580,
+        "wires": []
     }
 ]

package/amqp-config.js

@@ -1,7 +1,13 @@
+const AMQPConnection = require('./amqp-connection');
+
 module.exports = function(RED) {
     function AMQPServerNode(n) {
         RED.nodes.createNode(this,n);
         this.connectionString = n.connectionString;
+        const node = this;
+
+        this.connection = new AMQPConnection(this.connectionString);
+        this.connection.connect();
     }
     RED.nodes.registerType("amqp-config",AMQPServerNode);
 }

package/amqp-connection.js

@@ -52,6 +52,7 @@ module.exports = function(connectionString) {
             try {
                 return await amqplib.connect(connectionString);
             } catch (e) {
+                console.log(e);
                 await sleep(500);
             }
         }

package/amqp-input.js

@@ -1,5 +1,3 @@
-const AMQPConnection = require('./amqp-connection');
-
 function showStatus(node, msgCounter) {
     if (msgCounter >= 1) {
         node.status({fill: "blue", shape: "dot", text: `handling tasks ${msgCounter}`});
@@ -13,17 +11,14 @@ module.exports = function(RED) {
     function AMQPInput(config) {
         RED.nodes.createNode(this,config);
         var node = this;
-        var flowContext = node.context().flow;
 
         const amqpServer = RED.nodes.getNode(config.amqpServer);
 
         async function initNode() {
-            var connection = flowContext.get('amqpConnection');
+            var connection = amqpServer.connection;
 
             if (!connection) {
-                connection = new AMQPConnection(amqpServer.connectionString);
-                flowContext.set('amqpConnection', connection);
-                await connection.connect();
+                return;
             }
 
             const routingKey = (config.exchangeType == 'topic') ? RED.util.evaluateNodeProperty(config.routingKey, config.routingKeyFieldType, node) : '';

package/amqp-intermediate-input.html

@@ -0,0 +1,74 @@
+<script type="text/javascript">
+    RED.nodes.registerType('amqp-intermediate-input',{
+        category: 'ProcessCube (MQ)',
+        color: '#00aed7',
+        defaults: {
+            name: {value: "", type: "string"},
+            amqpServer: {value: "", type: "amqp-config"},
+            exchange: {value: "", type: "string", required:true},
+            exchangeType: { value: 'fanout'},
+            routingKey: { value: "" },
+            routingKeyFieldType: { value: "str"},
+            queue: {value: "", type: "string", required:true}
+        },
+        inputs: 1,
+        outputs: 1,
+        icon: "font-awesome/fa-envelope-open",
+        label: function() {
+            return this.name||"amqp-intermediate-input";
+        },
+        oneditprepare: function () {
+
+            $('#node-input-exchangeType').change(function (e) {
+                const exchangeType = this.value
+
+                if (['fanout'].includes(exchangeType)) {
+                    $('.routing-key-form-input').hide()
+                } else {
+                    $('.routing-key-form-input').show()
+                }
+            })
+
+            $("#node-input-routingKey").typedInput({
+                typeField: "#node-input-routingKeyFieldType",
+                types: ["str","env"]
+            });
+        },
+    });
+</script>
+
+<script type="text/html" data-template-name="amqp-intermediate-input">
+    <div class="form-row">
+        <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-amqpServer"><i class="fa fa-tag"></i> AMQP Server</label>
+        <input type="text" id="node-input-amqpServer" placeholder="">
+    </div>
+    <div class="form-row wide-label-amqp-in">
+        <label for="node-input-exchangeType"><i class="fa fa-filter"></i>&nbsp;&nbsp;Type</label>
+        <select id="node-input-exchangeType">
+          <option value="topic">Topic</option>
+          <option value="direct">Direct</option>
+          <option value="fanout">Fanout</option>
+        </select>
+    </div>
+    <div class="form-row">
+        <label for="node-input-exchange"><i class="fa fa-tag"></i> Exchange</label>
+        <input type="text" id="node-input-exchange" placeholder="Exchange">
+    </div>
+    <div class="form-row routing-key-form-input">
+        <label>Routing key:</label>
+        <input type="text" id="node-input-routingKey">
+        <input type="hidden" id="node-input-routingKeyFieldType">
+    </div>
+    <div class="form-row">
+        <label for="node-input-queue"><i class="fa fa-tag"></i> Queue</label>
+        <input type="text" id="node-input-queue" placeholder="Queue">
+    </div>
+</script>
+
+<script type="text/html" data-help-name="amqp-intermediate-input">
+    <p>A node to consume AMQP Messages.</p>
+</script>

package/amqp-intermediate-input.js

@@ -0,0 +1,61 @@
+function showStatus(node, msgCounter) {
+    if (msgCounter >= 1) {
+        node.status({fill: "blue", shape: "dot", text: `handling tasks ${msgCounter}`});
+    } else {
+        node.status({fill: "blue", shape: "ring", text: `subcribed ${msgCounter}`});
+    }
+}
+
+module.exports = function(RED) {
+
+    function AMQPIntermediateInput(config) {
+        RED.nodes.createNode(this,config);
+        var node = this;
+
+        const amqpServer = RED.nodes.getNode(config.amqpServer);
+
+        async function initNode() {
+            var connection = amqpServer.connection;
+
+            if (!connection) {
+                return;
+            }
+
+            const routingKey = (config.exchangeType == 'topic') ? RED.util.evaluateNodeProperty(config.routingKey, config.routingKeyFieldType, node) : '';
+    
+            const channel = await connection.createChannel();
+            await channel.assertExchange(config.exchange, config.exchangeType);
+            const queue = await channel.assertQueue(config.queue);
+            await channel.bindQueue(queue.queue, config.exchange, routingKey);
+    
+            node.on('input', async function (msg) {
+
+                await channel.prefetch(1);
+                await channel.consume(queue.queue, async (message) => {
+                    channel.cancel(msg._msgid);
+                    msg.payload = JSON.parse(message.content.toString());
+        
+                    node.send(msg);
+                    channel.ack(message);
+                }, { consumerTag: msg._msgid});
+            });
+
+            const onCloseHandlerId = connection.onClose(async () => {
+                console.log('onClose connection');
+                await initNode();
+            });
+
+            node.on("close", async () => {
+                console.log('closeChannel');
+                try {
+                    await channel.close();
+                    connection.removeOnCloseHandler(onCloseHandlerId);
+                } catch {
+                    console.warn('Channel closed');
+                }
+            });
+        }
+        initNode();
+    }
+    RED.nodes.registerType("amqp-intermediate-input", AMQPIntermediateInput);
+}

package/amqp-intermediate-output.html

@@ -0,0 +1,69 @@
+<script type="text/javascript">
+    RED.nodes.registerType('amqp-intermediate-output',{
+        category: 'ProcessCube (MQ)',
+        color: '#00aed7',
+        defaults: {
+            name: {value: "", type: "string"},
+            amqpServer: {value: "", type: "amqp-config"},
+            exchange: {value: "", type: "string", required:true},
+            exchangeType: { value: 'fanout'},
+            routingKey: { value: "" },
+            routingKeyFieldType: { value: "str"},
+        },
+        inputs: 1,
+        outputs: 1,
+        icon: "font-awesome/fa-envelope-open",
+        label: function() {
+            return this.name||"amqp-intermediate-output";
+        },
+        oneditprepare: function () {
+
+            $('#node-input-exchangeType').change(function (e) {
+                const exchangeType = this.value
+
+                if (['fanout'].includes(exchangeType)) {
+                    $('.routing-key-form-input').hide()
+                } else {
+                    $('.routing-key-form-input').show()
+                }
+            });
+
+            $("#node-input-routingKey").typedInput({
+                typeField: "#node-input-routingKeyFieldType",
+                types: ["str","env"]
+            });
+        },
+    });
+</script>
+
+<script type="text/html" data-template-name="amqp-intermediate-output">
+    <div class="form-row">
+        <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-amqpServer"><i class="fa fa-tag"></i> AMQP Server</label>
+        <input type="text" id="node-input-amqpServer" placeholder="">
+    </div>
+    <div class="form-row wide-label-amqp-in">
+        <label for="node-input-exchangeType"><i class="fa fa-filter"></i>&nbsp;&nbsp;Type</label>
+        <select id="node-input-exchangeType">
+          <option value="topic">Topic</option>
+          <option value="direct">Direct</option>
+          <option value="fanout">Fanout</option>
+        </select>
+    </div>
+    <div class="form-row">
+        <label for="node-input-exchange"><i class="fa fa-tag"></i> Exchange</label>
+        <input type="text" id="node-input-exchange" placeholder="Exchange">
+    </div>
+    <div class="form-row routing-key-form-input">
+        <label>Routing key:</label>
+        <input type="text" id="node-input-routingKey">
+        <input type="hidden" id="node-input-routingKeyFieldType">
+    </div>
+</script>
+
+<script type="text/html" data-help-name="amqp-intermediate-output">
+    <p>A node to publish AMQP Messages.</p>
+</script>

package/amqp-intermediate-output.js

@@ -0,0 +1,29 @@
+module.exports = function(RED) {
+    function AMQPIntermediateOutput(config) {
+        RED.nodes.createNode(this,config);
+        var node = this;
+        var flowContext = node.context().flow;
+
+        const amqpServer = RED.nodes.getNode(config.amqpServer);
+
+        node.on('input', async (msg) => {
+            var connection = amqpServer.connection;
+
+            if (!connection) {
+                return;
+            }
+
+            const routingKey = (config.exchangeType == 'topic') ? RED.util.evaluateNodeProperty(config.routingKey, config.routingKeyFieldType, node) : '';
+    
+            const channel = await connection.createChannel();
+            await channel.assertExchange(config.exchange, config.exchangeType);
+    
+            await channel.publish(config.exchange, routingKey, Buffer.from(JSON.stringify(msg.payload)));
+            await channel.close();
+
+            node.send(msg);
+        });
+        
+    }
+    RED.nodes.registerType("amqp-intermediate-output", AMQPIntermediateOutput);
+}

package/amqp-output.js

@@ -10,11 +10,10 @@ module.exports = function(RED) {
         const amqpServer = RED.nodes.getNode(config.amqpServer);
 
         node.on('input', async (msg) => {
-            var connection = flowContext.get('amqpConnection');
+            var connection = amqpServer.connection;
 
             if (!connection) {
-                connection = new AMQPConnection(amqpServer.connectionString);
-                flowContext.set('amqpConnection', connection);
+                return;
             }
 
             const routingKey = (config.exchangeType == 'topic') ? RED.util.evaluateNodeProperty(config.routingKey, config.routingKeyFieldType, node) : '';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@5minds/node-red-contrib-processcube-amqp",
-    "version": "0.5.0",
+    "version": "0.7.0",
     "license": "MIT",
     "description": "Node-RED nodes for AMQP",
     "authors": [
@@ -29,6 +29,8 @@
         "version": ">=3.1.9",
         "nodes": {
             "amqpInput": "amqp-input.js",
+            "amqpIntermediateInput": "amqp-intermediate-input.js",
+            "amqpIntermediateOutput": "amqp-intermediate-output.js",
             "amqpOutput": "amqp-output.js",
             "amqpConfig": "amqp-config.js"
         }