node-red-contrib-aedes 0.5.2 → 0.8.0

package/.github/workflows/nodejs.yml

@@ -9,7 +9,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [10.x, 12.x, 14.x]
+        node-version: [14.x, 16.x, 18.x]
 
     steps:
     - uses: actions/checkout@v2
@@ -18,7 +18,7 @@ jobs:
       with:
         node-version: ${{ matrix.node-version }}
     - run: npm install
-    - run: npm install -g node-red@1.2.9
+    - run: npm install -g node-red
     - run: npm link node-red
     - run: npm install -g mocha
     - run: npm install -g semistandard

package/.travis.yml

@@ -14,8 +14,9 @@ services:
   - mongodb
 node_js:
   - "12"
+  - "14"
 before_script:
-  - npm install -g node-red@1.2.9
+  - npm install -g node-red
   - npm link node-red
   - npm install -g mocha
   - npm install -g semistandard

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # node-red-contrib-aedes Changelog
 
+## 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
+
 ## Apr 23, 2021, Version 0.5.2
 ### Notable changes
 - Update aedes to version 0.46

package/aedes.html

@@ -133,7 +133,7 @@
     },
     color: '#d8bfd8',
     inputs: 0,
-    outputs: 1,
+    outputs: 2,
     icon: 'aedes.png',
     label: function () {
       return this.name || 'Aedes MQTT broker';
@@ -141,6 +141,7 @@
     labelStyle: function () {
       return this.name ? 'node_label_italic' : '';
     },
+    outputLabels: ["events","publish"],
     oneditprepare: function () {
       var tabs = RED.tabs.create({
         id: 'node-config-aedes-broker-tabs',

package/aedes.js

@@ -170,7 +170,9 @@ 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; }
+        if (authorized) {
+          client.user = username;
+        }
         callback(null, authorized);
       };
 
@@ -184,7 +186,7 @@ module.exports = function (RED) {
           client: client
         }
       };
-      node.send(msg);
+      node.send([msg, null]);
     });
 
     broker.on('clientReady', function (client) {
@@ -194,8 +196,12 @@ module.exports = function (RED) {
           client: client
         }
       };
-      node.status({ fill: 'green', shape: 'dot', text: RED._('aedes-mqtt-broker.status.connected', { count: broker.connectedClients }) });
-      node.send(msg);
+      node.status({
+        fill: 'green',
+        shape: 'dot',
+        text: RED._('aedes-mqtt-broker.status.connected', { count: broker.connectedClients })
+      });
+      node.send([msg, null]);
     });
 
     broker.on('clientDisconnect', function (client) {
@@ -205,8 +211,12 @@ module.exports = function (RED) {
           client: client
         }
       };
-      node.send(msg);
-      node.status({ fill: 'green', shape: 'dot', text: RED._('aedes-mqtt-broker.status.connected', { count: broker.connectedClients }) });
+      node.send([msg, null]);
+      node.status({
+        fill: 'green',
+        shape: 'dot',
+        text: RED._('aedes-mqtt-broker.status.connected', { count: broker.connectedClients })
+      });
     });
 
     broker.on('clientError', function (client, err) {
@@ -217,8 +227,12 @@ module.exports = function (RED) {
           err: err
         }
       };
-      node.send(msg);
-      node.status({ fill: 'green', shape: 'dot', text: RED._('aedes-mqtt-broker.status.connected', { count: broker.connectedClients }) });
+      node.send([msg, null]);
+      node.status({
+        fill: 'green',
+        shape: 'dot',
+        text: RED._('aedes-mqtt-broker.status.connected', { count: broker.connectedClients })
+      });
     });
 
     broker.on('connectionError', function (client, err) {
@@ -229,8 +243,12 @@ module.exports = function (RED) {
           err: err
         }
       };
-      node.send(msg);
-      node.status({ fill: 'green', shape: 'dot', text: RED._('aedes-mqtt-broker.status.connected', { count: broker.connectedClients }) });
+      node.send([msg, null]);
+      node.status({
+        fill: 'green',
+        shape: 'dot',
+        text: RED._('aedes-mqtt-broker.status.connected', { count: broker.connectedClients })
+      });
     });
 
     broker.on('keepaliveTimeout', function (client) {
@@ -240,8 +258,12 @@ module.exports = function (RED) {
           client: client
         }
       };
-      node.send(msg);
-      node.status({ fill: 'green', shape: 'dot', text: RED._('aedes-mqtt-broker.status.connected', { count: broker.connectedClients }) });
+      node.send([msg, null]);
+      node.status({
+        fill: 'green',
+        shape: 'dot',
+        text: RED._('aedes-mqtt-broker.status.connected', { count: broker.connectedClients })
+      });
     });
 
     broker.on('subscribe', function (subscription, client) {
@@ -253,7 +275,7 @@ module.exports = function (RED) {
           client: client
         }
       };
-      node.send(msg);
+      node.send([msg, null]);
     });
 
     broker.on('unsubscribe', function (subscription, client) {
@@ -265,48 +287,51 @@ module.exports = function (RED) {
           client: client
         }
       };
-      node.send(msg);
+      node.send([msg, null]);
     });
 
-    /*
-    broker.on('publish', function (packet, client) {
-      var msg = {
-        topic: 'publish',
-        payload: {
-          packet: packet,
-          client: client
-        }
-      };
-      node.send(msg);
-    });
-     */
+    if (this.wires && this.wires[1] && this.wires[1].length > 0) {
+      node.log('Publish output wired. Enable broker publish event messages.');
+      broker.on('publish', function (packet, client) {
+        const msg = {
+          topic: 'publish',
+          payload: {
+            packet: packet,
+            client: client
+          }
+        };
+        node.send([null, msg]);
+      });
+    }
 
     broker.on('closed', function () {
       node.debug('Closed event');
     });
 
     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/locales/en-US/aedes.html

@@ -2,10 +2,13 @@
     <p>MQTT broker based on Barebone MQTT broker Aedes. You can use MQTT-in and MQTT-out nodes without an external broker like Mosquitto.</p>
     <h3>Outputs</h3>
         <dl class="message-properties">
-            <dt>payload <span class="property-type">object</span></dt>
-            <dd>the content of the events from the broker.</dd>
             <dt>topic <span class="property-type">string</span></dt>
             <dd>the topic of the event.</dd>
+            <dt>payload 1<span class="property-type">object</span></dt>
+            <dd>the content of all events from the broker except publish.</dd>
+            <dt>payload 2<span class="property-type">object</span></dt>
+            <dd>the content of the publish events from the broker.</dd>
+
         </dl>
     <h3>Details</h3>
     <h3>References</h3>

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "node-red-contrib-aedes",
-  "version": "0.5.2",
+  "version": "0.8.0",
   "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_last_will_spec.js

@@ -22,7 +22,10 @@ describe('Aedes Broker Last Will tests', function () {
       id: 'n1',
       type: 'aedes broker',
       mqtt_port: '1883',
-      name: 'Aedes 1883'
+      name: 'Aedes 1883',
+      wires: [
+        [], []
+      ]
     }];
     helper.load(aedesNode, flow, function () {
       const n1 = helper.getNode('n1');
@@ -40,7 +43,7 @@ describe('Aedes Broker Last Will tests', function () {
         mqtt_port: '1883',
         name: 'Aedes 1883',
         wires: [
-          ['n2']
+          ['n2'], []
         ]
       },
       {
@@ -48,14 +51,17 @@ describe('Aedes Broker Last Will tests', function () {
         type: 'helper'
       }
     ];
-    const client1 = mqtt.connect('mqtt://localhost:1883', { clientId: 'client1', will: { topic: 'testLastWill', payload: 'last will' } });
-    client1.on('error', function (err) {
-      console.error('Error: ', err.toString());
-    });
-    client1.on('connect', function () {
-      // console.log('External client1 connected');
-    });
     helper.load([aedesNode], flow, function () {
+      const client1 = mqtt.connect('mqtt://localhost:1883', {
+        clientId: 'client1',
+        will: { topic: 'testLastWill', payload: 'last will' }
+      });
+      client1.on('error', function (err) {
+        console.error('Error: ', err.toString());
+      });
+      client1.on('connect', function () {
+        // console.log('External client1 connected');
+      });
       const n2 = helper.getNode('n2');
       n2.on('input', function (msg) {
         // console.log('Broker received message topic: ' + msg.topic + ', clientid: ' + msg.payload.client.id);

package/test/aedes_qos_spec.js

@@ -23,7 +23,10 @@ describe('Aedes Broker QOS tests', function () {
       id: 'n1',
       type: 'aedes broker',
       mqtt_port: '1883',
-      name: 'Aedes 1883'
+      name: 'Aedes 1883',
+      wires: [
+        [], []
+      ]
     }];
     helper.load(aedesNode, flow, function () {
       const n1 = helper.getNode('n1');
@@ -40,7 +43,7 @@ describe('Aedes Broker QOS tests', function () {
         mqtt_port: '1883',
         name: 'Aedes 1883',
         wires: [
-          ['n2']
+          ['n2'], []
         ]
       },
       {
@@ -48,28 +51,28 @@ describe('Aedes Broker QOS tests', function () {
         type: 'helper'
       }
     ];
-    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');
-    });
-    const client2 = mqtt.connect('mqtt://localhost:1883', { clientId: 'client2', clean: false });
-    client2.on('error', function (err) {
-      console.error('Error: ', err.toString());
-    });
-    client2.on('connect', function () {
-      // console.log('External client2 connected');
-      client2.subscribe('test1883', { qos: 1 }, function (err, granted) {
-        // console.log('Subscription successful ' + JSON.stringify(granted));
-        if (err) {
-          console.error('Error subscribing');
-          done();
-        }
-      });
-    });
     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');
+      });
+      const client2 = mqtt.connect('mqtt://localhost:1883', { clientId: 'client2', clean: false });
+      client2.on('error', function (err) {
+        console.error('Error: ', err.toString());
+      });
+      client2.on('connect', function () {
+        // console.log('External client2 connected');
+        client2.subscribe('test1883', { qos: 1 }, 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);
@@ -108,7 +111,7 @@ describe('Aedes Broker QOS tests', function () {
         mqtt_port: '1883',
         name: 'Aedes 1883',
         wires: [
-          ['n2']
+          ['n2'], []
         ]
       },
       {
@@ -116,29 +119,28 @@ describe('Aedes Broker QOS tests', function () {
         type: 'helper'
       }
     ];
-    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');
-    });
-    const client2 = mqtt.connect('mqtt://localhost:1883', { clientId: 'client2', clean: false });
-    client2.on('error', function (err) {
-      console.error('Error: ', err.toString());
-    });
-    client2.on('connect', function () {
-      // console.log('External client2 connected');
-      client2.subscribe('test1883', { qos: 2 }, function (err, granted) {
-        // console.log('Subscription successful ' + JSON.stringify(granted));
-        if (err) {
-          console.error('Error subscribing');
-          done();
-        }
-      });
-    });
     helper.load([aedesNode, mqttNode], flow, function () {
-      const n2 = helper.getNode('n2');
+      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');
+      });
+      const client2 = mqtt.connect('mqtt://localhost:1883', { clientId: 'client2', clean: false });
+      client2.on('error', function (err) {
+        console.error('Error: ', err.toString());
+      });
+      client2.on('connect', function () {
+        // console.log('External client2 connected');
+        client2.subscribe('test1883', { qos: 2 }, 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') {

package/test/aedes_retain_spec.js

@@ -23,7 +23,10 @@ describe('Aedes Broker retain tests', function () {
       id: 'n1',
       type: 'aedes broker',
       mqtt_port: '1883',
-      name: 'Aedes 1883'
+      name: 'Aedes 1883',
+      wires: [
+        [], []
+      ]
     }];
     helper.load(aedesNode, flow, function () {
       const n1 = helper.getNode('n1');
@@ -40,7 +43,7 @@ describe('Aedes Broker retain tests', function () {
         mqtt_port: '1883',
         name: 'Aedes 1883',
         wires: [
-          ['n2']
+          ['n2'], []
         ]
       },
       {
@@ -48,34 +51,33 @@ describe('Aedes Broker retain tests', function () {
         type: 'helper'
       }
     ];
-    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());
-    });
-    client1.on('connect', function () {
-      // console.log('External client1 connected');
-      client1.publish('test1883', 'test', { retain: true }, function () {
-        // console.log('Published  test');
-        client2.on('error', function (err) {
-          console.error('Error: ', err.toString());
-        });
-        client2.on('connect', function () {
-          // console.log('External client2 connected');
-          setTimeout(function () {
-            client2.subscribe('test1883', function (err, granted) {
-              // console.log('Subscription successful ' + JSON.stringify(granted));
-              if (err) {
-                console.error('Error subscribing');
-                done();
-              }
-            });
-          }, 1000);
-        });
-      });
-    });
     helper.load([aedesNode, mqttNode], flow, function () {
-      const n2 = helper.getNode('n2');
+      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());
+      });
+      client1.on('connect', function () {
+        // console.log('External client1 connected');
+        client1.publish('test1883', 'test', { retain: true }, function () {
+          // console.log('Published  test');
+          client2.on('error', function (err) {
+            console.error('Error: ', err.toString());
+          });
+          client2.on('connect', function () {
+            // console.log('External client2 connected');
+            setTimeout(function () {
+              client2.subscribe('test1883', function (err, granted) {
+                // console.log('Subscription successful ' + JSON.stringify(granted));
+                if (err) {
+                  console.error('Error subscribing');
+                  done();
+                }
+              });
+            }, 1000);
+          });
+        });
+      }); 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') {
@@ -105,7 +107,7 @@ describe('Aedes Broker retain tests', function () {
         mqtt_port: '1883',
         name: 'Aedes 1883',
         wires: [
-          ['n2']
+          ['n2'], []
         ]
       },
       {
@@ -113,37 +115,36 @@ describe('Aedes Broker retain tests', function () {
         type: 'helper'
       }
     ];
-    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());
-    });
-    client1.on('connect', function () {
-      // console.log('External client1 connected');
-      client1.publish('test1883', 'test1', { retain: true }, function () {
-        // console.log('Published  test1');
-        client1.publish('test1883', 'test2', { retain: true }, function () {
-          // console.log('Published  test2');
-          client2.on('error', function (err) {
-            console.error('Error: ', err.toString());
-          });
-          client2.on('connect', function () {
-            // console.log('External client2 connected');
-            setTimeout(function () {
-              client2.subscribe('test1883', function (err, granted) {
-                // console.log('Subscription successful ' + JSON.stringify(granted));
-                if (err) {
-                  console.error('Error subscribing');
-                  done();
-                }
-              });
-            }, 1000);
+    helper.load([aedesNode, mqttNode], flow, 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());
+      });
+      client1.on('connect', function () {
+        // console.log('External client1 connected');
+        client1.publish('test1883', 'test1', { retain: true }, function () {
+          // console.log('Published  test1');
+          client1.publish('test1883', 'test2', { retain: true }, function () {
+            // console.log('Published  test2');
+            client2.on('error', function (err) {
+              console.error('Error: ', err.toString());
+            });
+            client2.on('connect', function () {
+              // console.log('External client2 connected');
+              setTimeout(function () {
+                client2.subscribe('test1883', function (err, granted) {
+                  // console.log('Subscription successful ' + JSON.stringify(granted));
+                  if (err) {
+                    console.error('Error subscribing');
+                    done();
+                  }
+                });
+              }, 1000);
+            });
           });
         });
-      });
-    });
-    helper.load([aedesNode, mqttNode], flow, function () {
-      const n2 = helper.getNode('n2');
+      }); 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') {

package/test/aedes_spec.js

@@ -22,7 +22,10 @@ describe('Aedes Broker TCP tests', function () {
       id: 'n1',
       type: 'aedes broker',
       mqtt_port: '1883',
-      name: 'Aedes 1883'
+      name: 'Aedes 1883',
+      wires: [
+        [], []
+      ]
     }];
     helper.load(aedesNode, flow, function () {
       const n1 = helper.getNode('n1');
@@ -41,7 +44,7 @@ describe('Aedes Broker TCP tests', function () {
         mqtt_port: '1883',
         name: 'Aedes 1883',
         wires: [
-          ['n2']
+          ['n2'], []
         ]
       },
       {
@@ -67,7 +70,8 @@ describe('Aedes Broker TCP tests', function () {
         msg.should.have.property('topic', 'clientReady');
         done();
       });
-    });
+    }
+    );
   });
 
   it('a subscriber should receive a message from a publisher', function (done) {
@@ -79,7 +83,7 @@ describe('Aedes Broker TCP tests', function () {
         mqtt_port: '1883',
         name: 'Aedes 1883',
         wires: [
-          ['n2']
+          ['n2'], []
         ]
       },
       {
@@ -137,7 +141,7 @@ describe('Aedes Broker TCP tests', function () {
         mqtt_port: '1883',
         name: 'Aedes 1883',
         wires: [
-          ['n2']
+          ['n2'], []
         ]
       },
       {
@@ -161,7 +165,7 @@ describe('Aedes Broker TCP tests', function () {
         mqtt_port: '1884',
         name: 'Aedes 1884',
         wires: [
-          ['n12']
+          ['n12'], []
         ]
       }, {
         id: 'n12',
@@ -209,12 +213,18 @@ describe('Aedes Broker TCP tests', function () {
         id: 'n1',
         type: 'aedes broker',
         mqtt_port: '1883',
-        name: 'Aedes 1883'
+        name: 'Aedes 1883',
+        wires: [
+          [], []
+        ]
       }, {
         id: 'n11',
         type: 'aedes broker',
         mqtt_port: '1883',
-        name: 'Aedes 1883 2'
+        name: 'Aedes 1883 2',
+        wires: [
+          [], []
+        ]
       }
     ],
     function () {
@@ -234,21 +244,21 @@ describe('Aedes Broker TCP tests', function () {
       mqtt_port: '1883',
       name: 'Aedes 1883',
       wires: [
-        ['n2']
+        ['n2'], []
       ]
     },
     {
       id: 'n2',
       type: 'helper'
     }];
-    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('connect', function () {
-      // console.log('External client connected');
-    });
     helper.load(aedesNode, flow, 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('connect', function () {
+        // console.log('External client connected');
+      });
       const n2 = helper.getNode('n2');
       n2.on('input', function (msg) {
         msg.should.have.property('topic', 'clientReady');
@@ -268,7 +278,7 @@ describe('Aedes Broker TCP tests', function () {
         mqtt_port: '1883',
         name: 'Aedes 1883',
         wires: [
-          ['n2']
+          ['n2'], []
         ]
       },
       {
@@ -294,14 +304,14 @@ describe('Aedes Broker TCP tests', function () {
         port: '1883'
       }
     ];
-    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('connect', function () {
-      // console.log('External client connected');
-    });
     helper.load([aedesNode, mqttNode], flow, 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('connect', function () {
+        // console.log('External client connected');
+      });
       const n2 = helper.getNode('n2');
       const n5 = helper.getNode('n5');
       n2.on('input', function (msg) {

package/test/aedes_ws_spec.js

@@ -26,13 +26,19 @@ describe('Aedes Broker Websocket tests', function () {
         type: 'aedes broker',
         mqtt_port: '1883',
         name: 'Aedes 1883',
-        mqtt_ws_port: '8080'
+        mqtt_ws_port: '8080',
+        wires: [
+          [], []
+        ]
       }, {
         id: 'n11',
         type: 'aedes broker',
         mqtt_port: '1884',
         name: 'Aedes 1884',
-        mqtt_ws_port: '8080'
+        mqtt_ws_port: '8080',
+        wires: [
+          [], []
+        ]
       }
     ],
     function () {
@@ -54,7 +60,7 @@ describe('Aedes Broker Websocket tests', function () {
         mqtt_ws_port: '8080',
         name: 'Aedes 1883',
         wires: [
-          ['n2']
+          ['n2'], []
         ]
       },
       {
@@ -80,14 +86,14 @@ describe('Aedes Broker Websocket tests', function () {
         port: '1883'
       }
     ];
-    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('connect', function () {
-      // console.log('External client connected');
-    });
     helper.load([aedesNode, mqttNode], flow, 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('connect', function () {
+        // console.log('External client connected');
+      });
       const n2 = helper.getNode('n2');
       const n5 = helper.getNode('n5');
       n2.on('input', function (msg) {
@@ -116,7 +122,7 @@ describe('Aedes Broker Websocket tests', function () {
         mqtt_ws_path: '/mqtt',
         name: 'Aedes 1883',
         wires: [
-          ['n2']
+          ['n2'], []
         ]
       },
       {