fix duplicate listeners on mqttclient.on('connect')

coordinator.js

@@ -7,22 +7,25 @@ const cache = require('./cache');
 
 const RESETDELAY = 1000
 
+
 const Coordinator = function(param={}) {
 	let that = this;
 	let resettimer = 0;
 
+	this.x = 0;
+
 	this.started = false;
 
 	this.events = new events.EventEmitter;
-	this.remoteclient = param.remoteclient;
+	this.mqttclient = param.mqttclient;
 	this.flowemitter = param.flowemitter   || null;
 
 	this.flowemitter.on('newclient', function(client){
 		let deviceid = client.deviceid;
 		let devicetoken = client.devicetoken;
 
-		that.remoteclient.subscribe(`@tap/shadow/updated/${deviceid}:${devicetoken}`);
-		that.remoteclient.subscribe(`@tap/device/changed/${deviceid}:${devicetoken}`);
+		that.mqttclient.subscribe(`@tap/shadow/updated/${deviceid}:${devicetoken}`);
+		that.mqttclient.subscribe(`@tap/device/changed/${deviceid}:${devicetoken}`);
 
 		if (DEBUG_SUBLIST) {
 			console.log(`\nshadow client #${deviceid} connected -->`)
@@ -38,24 +41,24 @@ const Coordinator = function(param={}) {
 			case '@shadow/data/update' :
 						outtopic = `@tap/shadow/update/${deviceid}:${devicetoken}`;
 						outmsg = payload.toString();
-						that.remoteclient.publish(outtopic, outmsg);
+						that.mqttclient.publish(outtopic, outmsg);
 					break;
 			case '@local/shadow/get' :
 						outtopic = `@tap/shadow/get/${deviceid}:${devicetoken}`;
 						outmsg = payload.toString();
-						that.remoteclient.publish(outtopic, outmsg);
+						that.mqttclient.publish(outtopic, outmsg);
 					break;
 			case '@local/device/get' :
 						outtopic = `@tap/device/get/${deviceid}:${devicetoken}`;
 						outmsg = payload.toString();
-						that.remoteclient.publish(outtopic, outmsg);
+						that.mqttclient.publish(outtopic, outmsg);
 					break;
 			default:
 						if (topic.startsWith('@local/msgout/')) {
 							let part = topic.substr(14);
 							outtopic = `@tap/msg/topic/${deviceid}:${devicetoken}/${part}`;
 							outmsg = payload.toString();
-							that.remoteclient.publish(outtopic, outmsg);
+							that.mqttclient.publish(outtopic, outmsg);
 						}
 		}
     });
@@ -68,7 +71,7 @@ const Coordinator = function(param={}) {
 			let msgpart = topic.split('/').splice(4).join('/');
 
 			outtopic = `@tap/msg/topic/${deviceid}:${devicetoken}/${msgpart}`;
-			that.remoteclient.subscribe(outtopic);
+			that.mqttclient.subscribe(outtopic);
 
 		}
 		else {
@@ -79,22 +82,21 @@ const Coordinator = function(param={}) {
 		if (!resettimer) {
 			resettimer = setTimeout(function() {
 				console.log('                  [info] MQTT resetting...');
-				that.remoteclient.resetbroker();
+				that.mqttclient.resetbroker();
 			}, RESETDELAY);
 		}
 	});
 
-	this.remoteclient.on('connect', function() {
-		console.log('                  [info] Connected to MQTT broker.')
-		that.remoteclient.subscribe('@private/#');
+	this.mqttclient.on('connect', function() {
+		that.mqttclient.subscribe('@private/#');
 	});
 
-	this.remoteclient.on('close', function() {
+	this.mqttclient.on('close', function() {
 		this.started = false;
 		console.log('                  [info] Disconnect from MQTT broker.')
 	});
 
-	this.remoteclient.on('message', function(topic, payload){
+	this.mqttclient.on('message', function(topic, payload){
 		let jsonpayload = {};
 		try {
 			jsonpayload = JSON.parse(payload.toString());
@@ -148,7 +150,7 @@ Coordinator.prototype.emit = function(eventname, data1, data2, data3) {
 Coordinator.prototype.start = function() {
 	if (!this.started) {
 		this.started = true;
-		this.remoteclient.connect();
+		this.mqttclient.connect();
 		this.flowemitter.start();
 		return true;
 	}

flowagent.js

@@ -3,16 +3,16 @@ module.exports.create = create
 const MQTTClient = require('./mqttclient');
 const MQTTServer = require('./mqttserver');
 const FlowEmitter = require('./flowemitter');
+const Coordinatior = require('./coordinator');
 
 const events = require('events');
 
 let FlowAgent = function(option = {}) {
     let that = this;
 
-	const Coordinatior = require('./coordinator');
+    this.started = false;
 
 	this.events = new events.EventEmitter;
-
     this.option = {
     	broker_uri : option.broker_uri,
     	flowagentid : option.flowagentid,
@@ -32,19 +32,19 @@ let FlowAgent = function(option = {}) {
         keepalive: 30
     }
 
-	this.remoteclient = MQTTClient.create({
+	let mqttclient = MQTTClient.create({
 	    host: that.option.broker_uri,
 	    options: opt
 	});
 
-	this.flowemitter = FlowEmitter.create({
+	let flowemitter = FlowEmitter.create({
 		red: this.option.red,
 		namespace: this.option.namespace
 	});
 	
 	this.coordinator = Coordinatior.create({
-		remoteclient: that.remoteclient,
-		flowemitter: that.flowemitter
+		mqttclient: mqttclient,
+		flowemitter: flowemitter
 	});
 }
 
@@ -57,7 +57,8 @@ FlowAgent.prototype.emit = function(eventname, data1, data2, data3) {
 }
 
 FlowAgent.prototype.start = function() {
-    if (this.coordinator.start()) {
+    if (!this.started) {
+    	this.started = this.coordinator.start();
     	console.log('Staring FlowAgent...')
     }
 }

mqttclient.js

 module.exports.create = create
 
 const MQTT = require('mqtt');
-const events = require('events');
+const EventEmitter = require('events');
 
 const MQTTClient = function(param = {}) {
     this.client = null;
@@ -12,19 +12,24 @@ const MQTTClient = function(param = {}) {
 function sleep(ms) {
     return new Promise(resolve => setTimeout(resolve, ms));
 }
-MQTTClient.prototype = new events.EventEmitter;
+
+//----
+//const events = require('events');
+//MQTTClient.prototype = new events.EventEmitter;
+//MQTTClient.prototype = new EventEmitter();
+//----
+
+MQTTClient.prototype.__proto__ = EventEmitter.prototype;
 
 MQTTClient.prototype.connect = function() {
     var that = this;
 
-    this.subscription = [];
+    if (this.client) delete this.client;
 
+    this.subscription = [];
     this.client = MQTT.connect(this.host, this.options || {});
 
     this.client.on('connect', function() {
-        // for (let topic in that.subscription) {
-        //     await sleep(100);
-        // }
         that.emit('connect');
     });
 
@@ -61,11 +66,9 @@ MQTTClient.prototype.publish = function(topic, payload) {
 }
 
 MQTTClient.prototype.subscribe = function(topic) {
-    if (this.client && this.client.connected) {
-	    this.client.subscribe(topic);
-	}
-	else {
-	}
+    this.client.subscribe(topic, function(err, granted){
+        //console.log({err, granted})
+    });
 }
 
 MQTTClient.prototype.unsubscribe = function(topic) {