Fixed duplicated messages when restarting client #17

app.js

@@ -150,7 +150,8 @@ app.post('/api/settings', function(req, res) {
   jsonStore.put(store.settings, req.body)
   .then(data => {
     res.json({success: true, message: "Configuration updated successfully"});
-    gw.close(() => startGateway());
+    gw.close();
+    startGateway();
   }).catch(err => {
     debug(err);
     res.json({success: false, message: err.message})
@@ -183,7 +184,8 @@ process.removeAllListeners('SIGINT');
 
 process.on('SIGINT', function() {
   debug('Closing...');
-  gw.close(() => process.exit());
+  gw.close();
+  process.exit();
 });
 
 module.exports = app;

lib/Gateway.js

@@ -278,29 +278,16 @@ function parsePayload(payload, value, valueConf, config){
 /**
  * Method used to close clients connection, use this before destroy
  */
-Gateway.prototype.close = function (callback) {
+Gateway.prototype.close = function () {
   this.closed = true;
 
+  debug("Closing Gateway...")
+
   if(this.mqtt)
     this.mqtt.close();
 
   if(this.zwave)
-    this.zwave.close(callback);
-}
-
-
-/**
- * Method used to update client
- */
-Gateway.prototype.update = function (config) {
-  debug(`Restarting Gateway after update...`);
-  var self = this;
-  this.close(() => init.call(self, config));
-}
-
-
-function sendLog(self, ...args){
-  console.log(`Gateway:`, ...args);
+    this.zwave.close();
 }
 
 module.exports = Gateway

lib/ZwaveClient.js

@@ -458,18 +458,17 @@ function valueRemoved(nodeid, comclass, instance, index) {
   /**
   * Method used to close client connection, use this before destroy
   */
-  ZwaveClient.prototype.close = function (callback) {
+  ZwaveClient.prototype.close = function () {
     if(this.tail){
       this.tail.unwatch();
     }
 
     if(this.connected && this.client){
       this.connected = false;
       this.closed = true;
+      this.client.removeAllListeners();
       this.client.disconnect(this.cfg.port);
     }
-
-    if(callback) setTimeout(callback, 2000);
   }
 
   /**