From a9979def9984524b7f26f9d315b328f50758582b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Majdand=C5=BEi=C4=87?=
 <david.majdandzic@hotmail.com>
Date: Tue, 12 Dec 2023 09:22:08 +0100
Subject: [PATCH] Fix issues with multiple sessions and shared timer

---
 center.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/center.js b/center.js
index 1691c3d..42eb976 100644
--- a/center.js
+++ b/center.js
@@ -40,15 +40,16 @@ let failed = 0;
 const sendTimer = new NanoTimer();
 const metricManager = new MetricManager(options);
 
-// TODO: Fix issue where a client disconnecting does not stop this timer
-// TODO: Fix issue where only one session is being utilized because they all share the same timer
+// TODO: Currently bars are broken
+// A major rework will need to happen before bars are able to play nice with multiple sessions
 // TODO: Maybe add only receiver and only transmitter modes instead of transciever
 // Instead just use the same timer but make a pool of connections; That way both problems will be solved
-function startInterval(session, sessionLogger, rxMetrics) {
+function startInterval(sessions, sessionLogger, rxMetrics) {
 	if (!options.messagecount > 0) {
 		sessionLogger.info("No messages to send");
 		return;
 	}
+	let sessionPointer = 0;
 	sendTimer.setInterval(
 		async () => {
 			if (sent >= options.messagecount) {
@@ -62,7 +63,10 @@ function startInterval(session, sessionLogger, rxMetrics) {
 					short_message: options.message,
 				});
 
-				sendPdu(session, pdu, sessionLogger, options.longsms)
+				if (sessionPointer >= sessions.length) {
+					sessionPointer = 0;
+				}
+				sendPdu(sessions[sessionPointer++], pdu, sessionLogger, options.longsms)
 					.then((resp) => {
 						inFlight--;
 						sessionLogger.info(`Received response with id ${resp.message_id}`);
@@ -73,10 +77,6 @@ function startInterval(session, sessionLogger, rxMetrics) {
 						sessionLogger.warn(`Message failed with id ${resp.message_id}`);
 						failed++;
 					});
-
-				if (rxMetrics) {
-					rxMetrics.AddEvent();
-				}
 				sent++;
 				inFlight++;
 			} else {
@@ -84,7 +84,7 @@ function startInterval(session, sessionLogger, rxMetrics) {
 					`${inFlight}/${options.window} messages pending, waiting for a reply before sending more`
 				);
 				sendTimer.clearInterval();
-				setTimeout(() => startInterval(session, sessionLogger), options.windowsleep);
+				setTimeout(() => startInterval(sessions, sessionLogger), options.windowsleep);
 			}
 		},
 		"",
@@ -111,7 +111,7 @@ const server = smpp.createServer(
 				sessions.push(session);
 				sessionLogger.info(`Client connected, currently: ${sessions.length}`);
 				session.send(pdu.response());
-				startInterval(session, sessionLogger);
+				startInterval(sessions, sessionLogger);
 			} else {
 				sessionLogger.warn(
 					`Client tried to connect with incorrect login ('${pdu.system_id}' '${pdu.password}')`
@@ -126,7 +126,7 @@ const server = smpp.createServer(
 			if (pdu.system_id === options.systemid && pdu.password === options.password) {
 				sessionLogger.info("Client connected");
 				session.send(pdu.response());
-				startInterval(session, sessionLogger);
+				startInterval(session, sessionLogger, rxMetrics);
 			} else {
 				sessionLogger.warn(
 					`Client tried to connect with incorrect login ('${pdu.system_id}' '${pdu.password}')`