From ba9ec3d40dd387772fa3aa7c8ec838a8e6a29dbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Majdand=C5=BEi=C4=87?= <dmajdandzic@neos.hr>
Date: Wed, 29 Mar 2023 16:43:47 +0200
Subject: [PATCH] Minor fixes regarding sending messages

---
 .run/main.ts.run.xml               |  2 +-
 src/Center/Center.ts               | 11 ++++++-----
 src/Client/ClientSessionManager.ts |  2 +-
 src/WS/ClientSet.ts                |  2 +-
 src/main.ts                        | 25 +++++++++++--------------
 5 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/.run/main.ts.run.xml b/.run/main.ts.run.xml
index 80468cc..b4e9633 100644
--- a/.run/main.ts.run.xml
+++ b/.run/main.ts.run.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="main.ts" type="TypeScriptProgramRunner" factoryName="TypeScript">
     <module name="smsgwtester" />
     <envs>
-      <env name="LOG_LEVEL" value="5" />
+      <env name="LOG_LEVEL" value="4" />
     </envs>
     <option name="interpreterRef" value="project" />
     <option name="enabledTsNodeEsmLoader" value="false" />
diff --git a/src/Center/Center.ts b/src/Center/Center.ts
index 625f273..2a3d4c6 100644
--- a/src/Center/Center.ts
+++ b/src/Center/Center.ts
@@ -1,4 +1,5 @@
 import EventEmitter from "events";
+import * as repl from "repl";
 import {Job} from "../Job/Job";
 import {JobEvents} from "../Job/JobEvents";
 import Logger from "../Logger";
@@ -220,9 +221,7 @@ export class Center implements SmppSession {
 				if (count > 0 && counter >= count) {
 					this.cancelSendInterval();
 				} else {
-					this.sendPdu(job.pdu, true)
-						.then(() => {
-						}, err => this.logger.log1(`Error sending message: ${err}`));
+					this.sendPdu(job.pdu, true);
 					counter++;
 				}
 			}, '', `${interval} s`);
@@ -240,7 +239,9 @@ export class Center implements SmppSession {
 				this.validateSessions(reject);
 			}
 			this.logger.log5(`Center-${this._id} sending PDU: ${JSON.stringify(pdu)}`);
-			this.getNextSession().send(pdu, (replyPdu: object) => resolve(replyPdu), (err: object) => reject(err));
+			this.getNextSession().send(pdu, (replyPdu: any) => {
+				resolve(replyPdu);
+			});
 		});
 	}
 
@@ -320,7 +321,7 @@ export class Center implements SmppSession {
 	}
 
 	private eventSessionError(session: any): void {
-		this.logger.log1(`A client encountered an error on center-${this._id}}`);
+		this.logger.log1(`A client encountered an error on center-${this._id}`);
 	}
 
 	private eventSessionClose(session: any): void {
diff --git a/src/Client/ClientSessionManager.ts b/src/Client/ClientSessionManager.ts
index 38fc2e6..c007c34 100644
--- a/src/Client/ClientSessionManager.ts
+++ b/src/Client/ClientSessionManager.ts
@@ -106,7 +106,7 @@ export default class ClientSessionManager implements SessionManager {
 			this.logger.log1(`Loading clients from ${CLIENT_SESSIONS_FILE}`)
 			let sessions: Buffer = fs.readFileSync(CLIENT_SESSIONS_FILE);
 			let loadedSessions: any[] = JSON.parse(String(sessions));
-			this.logger.log1(`Loaded ${sessions.length} clients from ${CLIENT_SESSIONS_FILE}`);
+			this.logger.log1(`Loaded ${loadedSessions.length} clients from ${CLIENT_SESSIONS_FILE}`);
 			loadedSessions.forEach(session => {
 				this.createSession(session.url, session.username, session.password).then((sessionObj: SmppSession) => {
 					sessionObj.setDefaultSingleJob(Job.deserialize(session.defaultSingleJob));
diff --git a/src/WS/ClientSet.ts b/src/WS/ClientSet.ts
index c68208b..f7138d9 100644
--- a/src/WS/ClientSet.ts
+++ b/src/WS/ClientSet.ts
@@ -61,6 +61,6 @@ export class ClientSet {
 	}
 
 	private attachListener(session: SmppSession) {
-		session.on(session.UPDATE_WS, (message: string) => this.notifyClients(message));
+		session.on(session.UPDATE_WS, (message: object) => this.notifyClients(JSON.stringify(message)));
 	}
 }
\ No newline at end of file
diff --git a/src/main.ts b/src/main.ts
index 5484911..edf2c3d 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -30,19 +30,12 @@ let logger = new Logger("main");
 let clientManager: ClientSessionManager = new ClientSessionManager();
 clientManager.setup();
 
-let wss: WSServer = new WSServer([clientManager]);
+// let wss: WSServer = new WSServer([clientManager]);
 
 async function main() {
 	// let client: Client = await clientManager.createSession("smpp://localhost:7000", "test", "test") as Client;
 	let client: Client = await clientManager.getSession(0) as Client;
 
-	// client.connectAndBind().then(() => {
-	// 	console.log("POGGIES");
-	// 	let pdu1 = new smpp.PDU('submit_sm', {
-	// 		source_addr: "1234567890",
-	// 		destination_addr: "1234567890",
-	// 		short_message: "Hello World"
-	// 	});
 	// 	// client.sendMultipleDefault();
 	//
 	// 	// client.on(ClientEvents.ANY_PDU, (pdu: any) => console.log(pdu));
@@ -62,13 +55,17 @@ async function main() {
 
 	let center: Center = new Center(0, 7000, "test", "test");
 	setTimeout(() => {
-		// center.sendMultiple(new Job(new PDU("deliver_sm", {
-		// 	source_addr: "1234567890",
-		// 	destination_addr: "1234567890",
-		// 	short_message: "Hello World"
-		// }), 100, 100));
+		center.sendMultiple(new Job(new PDU("deliver_sm", {
+			source_addr: "1234567890",
+			destination_addr: "1234567890",
+			short_message: "Hello World"
+		}), 10, 100));
 		// center.close();
-	}, 1000);
+	}, 5000);
+
+	client.connectAndBind().then(() => {
+		console.log("POGGIES");
+	});
 }
 
 main();