node-red-contrib-aedes 0.6.0 → 0.8.1

package/.github/workflows/nodejs.yml

@@ -9,7 +9,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x, 14.x, 16.x]
+        node-version: [14.x, 16.x, 18.x]
 
     steps:
     - uses: actions/checkout@v2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # node-red-contrib-aedes Changelog
 
+## May 29, 2022, Version 0.8.1
+### Notable changes
+- Fix issue with incomplete credentials
+
+
+## May 22, 2022, Version 0.8
+### Notable changes
+- Update aedes to version 0.47
+
+## Feb 18, 2022, Version 0.7
+### Notable changes
+- Fix Close Time Out Issue
 ## Oct 17, 2021, Version 0.6
 ### Notable changes
 - Add output node for publish events

package/aedes.js

@@ -169,8 +169,10 @@ module.exports = function (RED) {
 
     if (this.credentials && this.username && this.password) {
       const authenticate = function (client, username, password, callback) {
-        const authorized = (username === node.username && password.toString() === node.password);
-        if (authorized) { client.user = username; }
+        const authorized = (username === node.username && password && password.toString() === node.password);
+        if (authorized) {
+          client.user = username;
+        }
         callback(null, authorized);
       };
 
@@ -194,7 +196,11 @@ module.exports = function (RED) {
           client: client
         }
       };
-      node.status({ fill: 'green', shape: 'dot', text: RED._('aedes-mqtt-broker.status.connected', { count: broker.connectedClients }) });
+      node.status({
+        fill: 'green',
+        shape: 'dot',
+        text: RED._('aedes-mqtt-broker.status.connected', { count: broker.connectedClients })
+      });
       node.send([msg, null]);
     });
 
@@ -206,7 +212,11 @@ module.exports = function (RED) {
         }
       };
       node.send([msg, null]);
-      node.status({ fill: 'green', shape: 'dot', text: RED._('aedes-mqtt-broker.status.connected', { count: broker.connectedClients }) });
+      node.status({
+        fill: 'green',
+        shape: 'dot',
+        text: RED._('aedes-mqtt-broker.status.connected', { count: broker.connectedClients })
+      });
     });
 
     broker.on('clientError', function (client, err) {
@@ -218,7 +228,11 @@ module.exports = function (RED) {
         }
       };
       node.send([msg, null]);
-      node.status({ fill: 'green', shape: 'dot', text: RED._('aedes-mqtt-broker.status.connected', { count: broker.connectedClients }) });
+      node.status({
+        fill: 'green',
+        shape: 'dot',
+        text: RED._('aedes-mqtt-broker.status.connected', { count: broker.connectedClients })
+      });
     });
 
     broker.on('connectionError', function (client, err) {
@@ -230,7 +244,11 @@ module.exports = function (RED) {
         }
       };
       node.send([msg, null]);
-      node.status({ fill: 'green', shape: 'dot', text: RED._('aedes-mqtt-broker.status.connected', { count: broker.connectedClients }) });
+      node.status({
+        fill: 'green',
+        shape: 'dot',
+        text: RED._('aedes-mqtt-broker.status.connected', { count: broker.connectedClients })
+      });
     });
 
     broker.on('keepaliveTimeout', function (client) {
@@ -241,7 +259,11 @@ module.exports = function (RED) {
         }
       };
       node.send([msg, null]);
-      node.status({ fill: 'green', shape: 'dot', text: RED._('aedes-mqtt-broker.status.connected', { count: broker.connectedClients }) });
+      node.status({
+        fill: 'green',
+        shape: 'dot',
+        text: RED._('aedes-mqtt-broker.status.connected', { count: broker.connectedClients })
+      });
     });
 
     broker.on('subscribe', function (subscription, client) {
@@ -287,27 +309,29 @@ module.exports = function (RED) {
     });
 
     this.on('close', function (done) {
-      broker.close(function () {
-        node.log('Unbinding aedes mqtt server from port: ' + config.mqtt_port);
-        server.close(function () {
-          node.debug('after server.close(): ');
-          if (node.mqtt_ws_path !== '') {
-            node.log('Unbinding aedes mqtt server from ws path: ' + node.fullPath);
-            delete listenerNodes[node.fullPath];
-            node.server.close();
-          }
-          if (wss) {
-            node.log('Unbinding aedes mqtt server from ws port: ' + config.mqtt_ws_port);
-            wss.close(function () {
-              node.debug('after wss.close(): ');
-              httpServer.close(function () {
-                node.debug('after httpServer.close(): ');
-                done();
+      process.nextTick(function onCloseDelayed () {
+        broker.close(function () {
+          node.log('Unbinding aedes mqtt server from port: ' + config.mqtt_port);
+          server.close(function () {
+            node.debug('after server.close(): ');
+            if (node.mqtt_ws_path !== '') {
+              node.log('Unbinding aedes mqtt server from ws path: ' + node.fullPath);
+              delete listenerNodes[node.fullPath];
+              node.server.close();
+            }
+            if (wss) {
+              node.log('Unbinding aedes mqtt server from ws port: ' + config.mqtt_ws_port);
+              wss.close(function () {
+                node.debug('after wss.close(): ');
+                httpServer.close(function () {
+                  node.debug('after httpServer.close(): ');
+                  done();
+                });
               });
-            });
-          } else {
-            done();
-          }
+            } else {
+              done();
+            }
+          });
         });
       });
     });

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "node-red-contrib-aedes",
-  "version": "0.6.0",
+  "version": "0.8.1",
   "description": "Node Red MQTT broker node based on aedes.js",
   "dependencies": {
-    "aedes": "^0.46.0",
-    "aedes-persistence-mongodb": "^8.2.0",
+    "aedes": "^0.47.0",
+    "aedes-persistence-mongodb": "^9.0.0",
     "websocket-stream": "^5.5.2"
   },
   "devDependencies": {
-    "mqtt": "^4.2.6",
+    "mqtt": "^4.3.7",
     "node-red-node-test-helper": "^0.2.7"
   },
   "scripts": {
-    "test": "semistandard --verbose | snazzy && mocha test/**/*_spec.js"
+    "test": "semistandard --verbose | snazzy && mocha test/**/*.js --exit"
   },
   "node-red": {
     "nodes": {

package/test/aedes_spec.js

@@ -5,6 +5,9 @@ const aedesNode = require('../aedes.js');
 const mqttNode = require('../node_modules/node-red/node_modules/@node-red/nodes/core/network/10-mqtt.js');
 const mqtt = require('mqtt/mqtt.js');
 
+const credentialsOK = { n1: { username: 'test', password: 'test' }, b1: { user: 'test', password: 'test' } };
+const credentialsMissing = { n1: { username: 'test', password: 'test' }, b1: { user: 'test' } };
+
 helper.init(require.resolve('node-red'));
 
 describe('Aedes Broker TCP tests', function () {
@@ -70,8 +73,87 @@ describe('Aedes Broker TCP tests', function () {
         msg.should.have.property('topic', 'clientReady');
         done();
       });
-    }
-    );
+    });
+  });
+
+  it('should not connect an mqtt client with missing authentication', function (done) {
+    this.timeout(10000); // have to wait for the inject with delay of 10 seconds
+    const flow = [
+      {
+        id: 'n1',
+        type: 'aedes broker',
+        mqtt_port: '1883',
+        name: 'Aedes 1883',
+        wires: [
+          ['n2'], []
+        ]
+      },
+      {
+        id: 'n2',
+        type: 'helper'
+      }, {
+        id: 'n3',
+        type: 'mqtt in',
+        name: 'Aedes1 1883',
+        topic: 'test1883',
+        broker: 'b1'
+      }, {
+        id: 'b1',
+        type: 'mqtt-broker',
+        name: 'Broker',
+        broker: 'localhost',
+        port: '1883'
+      }
+    ];
+
+    helper.load([aedesNode, mqttNode], flow, credentialsMissing,
+      function () {
+        const n2 = helper.getNode('n2');
+        n2.on('input', function (msg) {
+          msg.should.have.property('topic', 'clientError');
+          done();
+        });
+      });
+  });
+
+  it('should connect an mqtt client with authentication', function (done) {
+    this.timeout(10000); // have to wait for the inject with delay of 10 seconds
+    const flow = [
+      {
+        id: 'n1',
+        type: 'aedes broker',
+        mqtt_port: '1883',
+        name: 'Aedes 1883',
+        wires: [
+          ['n2'], []
+        ]
+      },
+      {
+        id: 'n2',
+        type: 'helper'
+      }, {
+        id: 'n3',
+        type: 'mqtt in',
+        name: 'Aedes1 1883',
+        topic: 'test1883',
+        broker: 'b1'
+      }, {
+        id: 'b1',
+        type: 'mqtt-broker',
+        name: 'Broker',
+        broker: 'localhost',
+        port: '1883'
+      }
+    ];
+
+    helper.load([aedesNode, mqttNode], flow, credentialsOK,
+      function () {
+        const n2 = helper.getNode('n2');
+        n2.on('input', function (msg) {
+          msg.should.have.property('topic', 'clientReady');
+          done();
+        });
+      });
   });
 
   it('a subscriber should receive a message from a publisher', function (done) {