From 190ae7e2961bc3be40f1f26d12ae82252decdfdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Majdand=C5=BEi=C4=87?= <dmajdandzic@neos.hr>
Date: Sun, 26 Mar 2023 18:14:06 +0200
Subject: [PATCH] Fix issue where websockets would be sent duplicate messages

---
 main.js          | 41 +++++++++++++++++++++++++++--------------
 websocketTest.js |  2 +-
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/main.js b/main.js
index 899250f..2f09edc 100644
--- a/main.js
+++ b/main.js
@@ -1417,6 +1417,7 @@ class HTTPServer {
 class WSServer {
 	clients = {};
 	unknownClients = [];
+	listenersAlreadySetup = [];
 
 	constructor() {
 		this.server = new WebSocket.Server({port: WS_SERVER_PORT});
@@ -1439,22 +1440,35 @@ class WSServer {
 		if (!this.clients[type][sessionId]) {
 			this.clients[type][sessionId] = [];
 		}
+		this.logger.log1(`Adding client ${ws.id} to ${type} session ${sessionId}`);
 
 		if (type === "client") {
-			let session = clientSessionManager.getSession(sessionId);
-			if (!!session) {
-				session.on(ClientSession.STATUS_CHANGED_EVENT, this.onClientSessionStatusChange.bind(this, sessionId));
-				session.on(ClientSession.ANY_PDU_EVENT, this.onClientSessionPdu.bind(this, sessionId));
-				session.on(ClientSession.MESSAGE_SEND_COUNTER_UPDATE_EVENT, this.onClientMessageCounterUpdate.bind(this, sessionId));
+			if (this.listenersAlreadySetup.indexOf(`client-${sessionId}`) === -1) {
+				let session = clientSessionManager.getSession(sessionId);
+				if (!!session) {
+					this.logger.log1(`Setting up listeners for client session ${sessionId}`);
+					session.on(ClientSession.STATUS_CHANGED_EVENT, this.onClientSessionStatusChange.bind(this, sessionId));
+					session.on(ClientSession.ANY_PDU_EVENT, this.onClientSessionPdu.bind(this, sessionId));
+					session.on(ClientSession.MESSAGE_SEND_COUNTER_UPDATE_EVENT, this.onClientMessageCounterUpdate.bind(this, sessionId));
+				}
+				this.listenersAlreadySetup.push(`client-${sessionId}`);
+			} else {
+				this.logger.log1(`Listeners for client session ${sessionId} already set up`);
 			}
 		} else if (type === "center") {
-			let session = centerSessionManager.getSession(sessionId);
-			if (!!session) {
-				session.on(CenterSession.STATUS_CHANGED_EVENT, this.onCenterStatusChange.bind(this, sessionId));
-				session.on(CenterSession.ANY_PDU_EVENT, this.onCenterServerPdu.bind(this, sessionId));
-				session.on(CenterSession.MODE_CHANGED_EVENT, this.onCenterModeChanged.bind(this, sessionId));
-				session.on(CenterSession.SESSION_CHANGED_EVENT, this.onCenterSessionsChanged.bind(this, sessionId));
-				session.on(ClientSession.MESSAGE_SEND_COUNTER_UPDATE_EVENT, this.onCenterMessageCounterUpdate.bind(this, sessionId));
+			if (this.listenersAlreadySetup.indexOf(`center-${sessionId}`) === -1) {
+				let session = centerSessionManager.getSession(sessionId);
+				if (!!session) {
+					this.logger.log1(`Setting up listeners for center session ${sessionId}`);
+					session.on(CenterSession.STATUS_CHANGED_EVENT, this.onCenterStatusChange.bind(this, sessionId));
+					session.on(CenterSession.ANY_PDU_EVENT, this.onCenterServerPdu.bind(this, sessionId));
+					session.on(CenterSession.MODE_CHANGED_EVENT, this.onCenterModeChanged.bind(this, sessionId));
+					session.on(CenterSession.SESSION_CHANGED_EVENT, this.onCenterSessionsChanged.bind(this, sessionId));
+					session.on(ClientSession.MESSAGE_SEND_COUNTER_UPDATE_EVENT, this.onCenterMessageCounterUpdate.bind(this, sessionId));
+				}
+				this.listenersAlreadySetup.push(`center-${sessionId}`);
+			} else {
+				this.logger.log1(`Listeners for center session ${sessionId} already set up`);
 			}
 		}
 
@@ -1535,7 +1549,6 @@ class WSServer {
 				value: pdu
 			}
 			this.logger.log2(`Broadcasting session with ID ${sessionId} to ${clients.length} clients`);
-			console.log(clients);
 			clients.forEach(client => {
 				client.send(JSON.stringify(payload));
 			});
@@ -1663,7 +1676,7 @@ let server = centerSessionManager.getSession(1);
 session.connect()
 	.then(() => {
 		session.bind().then(() => {
-			setTimeout(() => session.close(), 1000);
+			// setTimeout(() => session.close(), 1000);
 		}).catch(err => console.log(err));
 	}).catch(err => console.log(err));
 
diff --git a/websocketTest.js b/websocketTest.js
index a7f7a63..67f46fb 100644
--- a/websocketTest.js
+++ b/websocketTest.js
@@ -13,7 +13,7 @@ ws.on('message', (data) => {
 });
 ws2.on('open', () => {
 	console.log('WebSocket connection established');
-	ws.send("center:0");
+	ws.send("center:1");
 });
 ws2.on('message', (data) => {
 	console.log(String(data));