node-red-contrib-aedes 0.7.0 → 0.8.2

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,20 @@
 # node-red-contrib-aedes Changelog
 
+## Jun 03, 2022, Version 0.8.2
+### Notable changes
+- Fix Scorecard Warnings
+
+## 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/README.md

@@ -6,8 +6,10 @@ You can use the MQTT protocol in Node-RED without an external MQTT broker like M
 ![Node.js CI](https://github.com/martin-doyle/node-red-contrib-aedes/workflows/Node.js%20CI/badge.svg)
 [![js-semistandard-style](https://img.shields.io/badge/code%20style-semistandard-brightgreen.svg?style=flat-square)](https://github.com/standard/semistandard)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/898bf62b040a4d999b150487e9cc837b)](https://www.codacy.com/manual/martin-doyle/node-red-contrib-aedes?utm_source=github.com&utm_medium=referral&utm_content=martin-doyle/node-red-contrib-aedes&utm_campaign=Badge_Grade)
+<!--
 [![Dependency Status](https://david-dm.org/martin-doyle/node-red-contrib-aedes.svg)](https://david-dm.org/martin-doyle/node-red-contrib-aedes)
 [![devDependency Status](https://david-dm.org/martin-doyle/node-red-contrib-aedes/dev-status.svg)](https://david-dm.org/martin-doyle/node-red-contrib-aedes#info=devDependencies)
+-->
 [![Open Source Love](https://badges.frapsoft.com/os/mit/mit.svg?v=102)](https://github.com/ellerbrock/open-source-badge/)
 [![NPM version](https://img.shields.io/npm/v/node-red-contrib-aedes.svg?style=flat)](https://www.npmjs.com/node-red-contrib-aedes)
 

package/aedes.js

@@ -169,7 +169,7 @@ 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);
+        const authorized = (username === node.username && password && password.toString() === node.password);
         if (authorized) {
           client.user = username;
         }

package/examples/aedes_simple.json

@@ -0,0 +1 @@
+[{"id":"2968a4fcf75e9496","type":"tab","label":"Aedes","disabled":false,"info":"","env":[]},{"id":"71f56412e0a1bd0b","type":"debug","z":"2968a4fcf75e9496","name":"Aedes Events","active":true,"tosidebar":true,"console":false,"tostatus":false,"complete":"payload","targetType":"msg","statusVal":"","statusType":"auto","x":480,"y":300,"wires":[]},{"id":"94a8707a2c4a4308","type":"aedes broker","z":"2968a4fcf75e9496","name":"Aedes MQTT Broker","mqtt_port":"1884","mqtt_ws_bind":"port","mqtt_ws_port":"","mqtt_ws_path":"","cert":"","key":"","certname":"","keyname":"","dburl":"","usetls":false,"x":270,"y":320,"wires":[["71f56412e0a1bd0b"],["30bcabc71382bd19"]]},{"id":"30bcabc71382bd19","type":"debug","z":"2968a4fcf75e9496","name":"Aedes Publish Events","active":true,"tosidebar":true,"console":false,"tostatus":false,"complete":"payload","targetType":"msg","statusVal":"","statusType":"auto","x":500,"y":340,"wires":[]},{"id":"a92eb1e50a7e0fb2","type":"inject","z":"2968a4fcf75e9496","name":"MQTT Message","props":[{"p":"payload"},{"p":"topic","vt":"str"}],"repeat":"","crontab":"","once":false,"onceDelay":0.1,"topic":"test","payload":"Test","payloadType":"str","x":280,"y":180,"wires":[["4195ccca2060a2c5"]]},{"id":"4195ccca2060a2c5","type":"mqtt out","z":"2968a4fcf75e9496","name":"MQTT Publisher","topic":"test","qos":"","retain":"","respTopic":"","contentType":"","userProps":"","correl":"","expiry":"","broker":"47a469b15c9c5f27","x":480,"y":180,"wires":[]},{"id":"5ce36754784a00e0","type":"mqtt in","z":"2968a4fcf75e9496","name":"MQTT Subscriber","topic":"test","qos":"0","datatype":"auto","broker":"47a469b15c9c5f27","nl":false,"rap":true,"rh":0,"inputs":0,"x":280,"y":240,"wires":[["ed51b3734a88ef79"]]},{"id":"ed51b3734a88ef79","type":"debug","z":"2968a4fcf75e9496","name":"MQTT Message","active":true,"tosidebar":true,"console":false,"tostatus":false,"complete":"payload","targetType":"msg","statusVal":"","statusType":"auto","x":480,"y":240,"wires":[]},{"id":"47a469b15c9c5f27","type":"mqtt-broker","name":"","broker":"localhost","port":"1884","clientid":"","autoConnect":true,"usetls":false,"protocolVersion":"4","keepalive":"60","cleansession":true,"birthTopic":"","birthQos":"0","birthPayload":"","birthMsg":{},"closeTopic":"","closeQos":"0","closePayload":"","closeMsg":{},"willTopic":"","willQos":"0","willPayload":"","willMsg":{},"sessionExpiry":""}]

package/package.json

@@ -1,24 +1,28 @@
 {
   "name": "node-red-contrib-aedes",
-  "version": "0.7.0",
+  "version": "0.8.2",
   "description": "Node Red MQTT broker node based on aedes.js",
   "dependencies": {
-    "aedes": "^0.46.3",
-    "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/**/*.js --exit"
   },
   "node-red": {
+    "version": ">=2.0.0",
     "nodes": {
       "aedes-mqtt-broker": "aedes.js"
     }
   },
+  "engines": {
+    "node": ">=12.0.0"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/martin-doyle/node-red-contrib-aedes.git"

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) {