node-red-contrib-aedes 1.1.0 → 1.2.0

package/test/aedes_qos_spec.js

@@ -5,6 +5,7 @@ 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');
 const should = require('should');
+const { logError } = require('./test-utils');
 
 helper.init(require.resolve('node-red'));
 
@@ -55,16 +56,12 @@ describe('Aedes Broker QOS tests', function () {
       const n1 = helper.getNode('n1');
       n1._initPromise.then(function () {
         const client1 = mqtt.connect('mqtt://localhost:1883', { clientId: 'client1' });
-        client1.on('error', function (err) {
-          console.error('Error: ', err.toString());
-        });
+        client1.on('error', logError);
         client1.on('connect', function () {
           // console.log('External client1 connected');
         });
         const client2 = mqtt.connect('mqtt://localhost:1883', { clientId: 'client2', clean: false });
-        client2.on('error', function (err) {
-          console.error('Error: ', err.toString());
-        });
+        client2.on('error', logError);
         client2.on('connect', function () {
           // console.log('External client2 connected');
           client2.subscribe('test1883', { qos: 1 }, function (err, granted) {
@@ -124,16 +121,12 @@ describe('Aedes Broker QOS tests', function () {
       const n1 = helper.getNode('n1');
       n1._initPromise.then(function () {
         const client1 = mqtt.connect('mqtt://localhost:1883', { clientId: 'client1' });
-        client1.on('error', function (err) {
-          console.error('Error: ', err.toString());
-        });
+        client1.on('error', logError);
         client1.on('connect', function () {
           // console.log('External client1 connected');
         });
         const client2 = mqtt.connect('mqtt://localhost:1883', { clientId: 'client2', clean: false });
-        client2.on('error', function (err) {
-          console.error('Error: ', err.toString());
-        });
+        client2.on('error', logError);
         client2.on('connect', function () {
           // console.log('External client2 connected');
           client2.subscribe('test1883', { qos: 2 }, function (err, granted) {

package/test/aedes_retain_spec.js

@@ -5,6 +5,7 @@ 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');
 const should = require('should');
+const { logError } = require('./test-utils');
 
 helper.init(require.resolve('node-red'));
 
@@ -56,12 +57,8 @@ describe('Aedes Broker retain tests', function () {
       n1._initPromise.then(function () {
         const client1 = mqtt.connect('mqtt://localhost:1883', { clientId: 'client1' });
         const client2 = mqtt.connect('mqtt://localhost:1883', { clientId: 'client2' });
-        client1.on('error', function (err) {
-          console.error('Error: ', err.toString());
-        });
-        client2.on('error', function (err) {
-          console.error('Error: ', err.toString());
-        });
+        client1.on('error', logError);
+        client2.on('error', logError);
         client1.on('connect', function () {
           // console.log('External client1 connected');
           client1.publish('test1883', 'test', { retain: true }, function () {
@@ -123,12 +120,8 @@ describe('Aedes Broker retain tests', function () {
       n1._initPromise.then(function () {
         const client1 = mqtt.connect('mqtt://localhost:1883', { clientId: 'client1' });
         const client2 = mqtt.connect('mqtt://localhost:1883', { clientId: 'client2' });
-        client1.on('error', function (err) {
-          console.error('Error: ', err.toString());
-        });
-        client2.on('error', function (err) {
-          console.error('Error: ', err.toString());
-        });
+        client1.on('error', logError);
+        client2.on('error', logError);
         client2.on('connect', function () {
           // console.log('External client2 connected');
         });
@@ -170,130 +163,4 @@ describe('Aedes Broker retain tests', function () {
       });
     });
   });
-
-  /*
-
-  it('a publisher (retain = true) should send a message', 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',
-        persistence_bind: 'level',
-        name: 'Aedes 1883',
-        wires: [
-          ['n2'], []
-        ]
-      },
-      {
-        id: 'n2',
-        type: 'helper'
-      }
-    ];
-
-    helper.load([aedesNode, mqttNode], flow, function () {
-      const client1 = mqtt.connect('mqtt://localhost:1883', { clientId: 'client1' });
-      client1.on('error', function (err) {
-        console.error('Error: ', err.toString());
-      });
-
-      client1.on('connect', function () {
-        // console.log('External client1 connected');
-        client1.subscribe('test1883', function (err, granted) {
-          // console.log('Subscription successful ' + JSON.stringify(granted));
-          if (err) {
-            console.error('Error subscribing');
-            done();
-          }
-          client1.publish('test1883', 'Retained Message', { retain: true }, function () {
-            // console.log('Published  Retained Message');
-          });
-        });
-        const n2 = helper.getNode('n2');
-        let counter = 0;
-        n2.on('input', function (msg) {
-          // console.log('Broker received message topic: ' + msg.topic + ', clientid: ' + msg.payload.client.id);
-          if (msg.topic === 'subscribe') {
-            // console.log('Client ' + msg.payload.client.id + ' subscribed ' + JSON.stringify(msg.payload.client.subscriptions));
-          } else if (msg.topic === 'clientReady') {
-            // console.log('Client ' + msg.payload.client.id + ' connected with clean ' + msg.payload.client.clean);
-          }
-        });
-        client1.on('message', function (topic, message) {
-          if (counter === 0) {
-            counter++;
-          } else {
-            return;
-          }
-          console.log(message.toString());
-          should(topic.toString()).equal('test1883');
-          should(message.toString()).equal('Retained Message');
-          try {
-            client1.end(true, {}, function () {
-              done();
-            });
-          } catch (err) {
-            done(err);
-          }
-        });
-      });
-    });
-  });
-
-  it('a subscriber (retain = true) should receive the last message on first subscribe after restart', 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',
-        persistence_bind: 'level',
-        name: 'Aedes 1883',
-        wires: [
-          ['n2']
-        ]
-      },
-      {
-        id: 'n2',
-        type: 'helper'
-      }
-    ];
-
-    helper.load([aedesNode, mqttNode], flow, function () {
-      const client1 = mqtt.connect('mqtt://localhost:1883', { clientId: 'client1' });
-      client1.on('error', function (err) {
-        console.error('Error: ', err.toString());
-      });
-
-      client1.on('connect', function () {
-        // console.log('External client1 connected');
-        client1.subscribe('test1883', function (err, granted) {
-          // console.log('Subscription successful ' + JSON.stringify(granted));
-          if (err) {
-            console.error('Error subscribing');
-            done();
-          }
-        });
-      });
-      const n2 = helper.getNode('n2');
-      n2.on('input', function (msg) {
-        // console.log('Broker received message topic: ' + msg.topic + ', clientid: ' + msg.payload.client.id);
-        if (msg.topic === 'subscribe') {
-          // console.log('Client ' + msg.payload.client.id + ' subscribed ' + JSON.stringify(msg.payload.client.subscriptions));
-        } else if (msg.topic === 'clientReady') {
-          // console.log('Client ' + msg.payload.client.id + ' connected with clean ' + msg.payload.client.clean);
-        }
-      });
-      client1.on('message', function (topic, message) {
-        // console.log(message.toString());
-        should(topic.toString()).equal('test1883');
-        should(message.toString()).equal('Retained Message');
-        client1.end(true, {}, function () {
-          done();
-        });
-      });
-    });
-  });
-  */
 });

package/test/aedes_spec.js

@@ -5,6 +5,7 @@ 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');
 const should = require('should');
+const { logError } = require('./test-utils');
 
 const credentialsOK = { n1: { username: 'test', password: 'test' }, b1: { user: 'test', password: 'test' } };
 const credentialsMissing = { n1: { username: 'test', password: 'test' }, b1: { user: 'test' } };
@@ -354,9 +355,7 @@ describe('Aedes Broker TCP tests', function () {
       const n1 = helper.getNode('n1');
       n1._initPromise.then(function () {
         const client = mqtt.connect('mqtt://localhost:1883', { clientId: 'client', resubscribe: false, reconnectPeriod: -1 });
-        client.on('error', function (err) {
-          console.error('Error: ', err.toString());
-        });
+        client.on('error', logError);
         client.on('connect', function () {
           // console.log('External client connected');
         });
@@ -410,9 +409,7 @@ describe('Aedes Broker TCP tests', function () {
       const n1 = helper.getNode('n1');
       n1._initPromise.then(function () {
         const client = mqtt.connect('mqtt://localhost:1883', { clientId: 'client', resubscribe: false, reconnectPeriod: -1 });
-        client.on('error', function (err) {
-          console.error('Error: ', err.toString());
-        });
+        client.on('error', logError);
         client.on('connect', function () {
           // console.log('External client connected');
         });

package/test/aedes_ws_spec.js

@@ -4,6 +4,7 @@ const helper = require('node-red-node-test-helper');
 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');
+const { logError } = require('./test-utils');
 
 helper.init(require.resolve('node-red'));
 
@@ -41,9 +42,7 @@ describe('Aedes Broker Websocket tests', function () {
           resubscribe: false,
           reconnectPeriod: -1
         });
-        client.on('error', function (err) {
-          console.error('Error: ', err.toString());
-        });
+        client.on('error', logError);
         const n2 = helper.getNode('n2');
         n2.on('input', function (msg) {
           if (msg.topic === 'clientReady') {
@@ -158,9 +157,7 @@ describe('Aedes Broker Websocket tests', function () {
       const n1 = helper.getNode('n1');
       n1._initPromise.then(function () {
         const client = mqtt.connect('ws://localhost:8080', { clientId: 'client', resubscribe: false, reconnectPeriod: -1 });
-        client.on('error', function (err) {
-          console.error('Error: ', err.toString());
-        });
+        client.on('error', logError);
         client.on('connect', function () {
           // console.log('External client connected');
         });
@@ -224,9 +221,7 @@ describe('Aedes Broker Websocket tests', function () {
       const n1 = helper.getNode('n1');
       n1._initPromise.then(function () {
         const client = mqtt.connect(helper.url().replace(/http/, 'ws') + '/mqtt', { clientId: 'client', resubscribe: false, reconnectPeriod: -1 });
-        client.on('error', function (err) {
-          console.error('Client on error: ', err.toString());
-        });
+        client.on('error', logError);
         client.on('connect', function () {
           // console.log('External client connected');
         });