From 2374cba341748e870fdef0065d669f88a19cd851 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Majdand=C5=BEi=C4=87?= <dmajdandzic@neos.hr>
Date: Thu, 30 Mar 2023 17:50:49 +0200
Subject: [PATCH] Generify everything a little

---
 .run/main.ts.run.xml                  |  2 +-
 src/Center/Center.ts                  | 15 ++++++++++-----
 src/Center/CenterSessionManager.ts    |  2 +-
 src/Client/Client.ts                  |  5 +++--
 src/Client/ClientSessionManager.ts    |  2 +-
 src/CommonObjects.ts                  | 15 +++++++++++++++
 src/Job/Job.ts                        | 15 ++++++++-------
 src/PDUProcessor/DebugPduProcessor.ts | 13 ++++++++-----
 src/PDUProcessor/EchoPduProcessor.ts  | 25 +++++++++++++++----------
 src/PDUProcessor/PduProcessor.ts      | 16 ++++++++--------
 10 files changed, 70 insertions(+), 40 deletions(-)
 create mode 100644 src/CommonObjects.ts

diff --git a/.run/main.ts.run.xml b/.run/main.ts.run.xml
index b4e9633..1e97700 100644
--- a/.run/main.ts.run.xml
+++ b/.run/main.ts.run.xml
@@ -12,7 +12,7 @@
     <option name="extraTypeScriptOptions" value="" />
     <option name="scriptName" value="$PROJECT_DIR$/src/main.ts" />
     <option name="programParameters" value="" />
-    <option name="tsnodePackage" value="C:\Program Files\nodejs\node_modules\ts-node" />
+    <option name="tsnodePackage" value="~\WebstormProjects\smsgwtester\node_modules\ts-node" />
     <method v="2" />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/src/Center/Center.ts b/src/Center/Center.ts
index 73c2444..8698be2 100644
--- a/src/Center/Center.ts
+++ b/src/Center/Center.ts
@@ -1,3 +1,4 @@
+import {PDU} from "../CommonObjects";
 import {Job} from "../Job/Job";
 import Logger from "../Logger";
 import {DebugPduProcessor} from "../PDUProcessor/DebugPduProcessor";
@@ -136,21 +137,25 @@ export class Center extends SmppSession {
 		return session;
 	}
 
-	private eventBindTransceiver(session: any, pdu: any) {
+	private eventBindTransceiver(session: any, pdu: PDU) {
 		this.logger.log1(`Center-${this.getId()} got a bind_transciever with system_id ${pdu.system_id} and password ${pdu.password}`);
 		session.pause();
 		if (pdu.system_id === this.username && pdu.password === this.password) {
 			this.logger.log1(`Center-${this.getId()} client connection successful`);
-			session.send(pdu.response());
+			if (pdu.response) {
+				session.send(pdu.response());
+			}
 			session.resume();
 			this.pendingSessions = this.pendingSessions.filter((s) => s !== session);
 			this.sessions.push(session);
 			this.updateStatus();
 		} else {
 			this.logger.log1(`Center-${this.getId()} client connection failed, invalid credentials (expected: ${this.username}, ${this.password})`);
-			session.send(pdu.response({
-				command_status: smpp.ESME_RBINDFAIL
-			}));
+			if (pdu.response) {
+				session.send(pdu.response({
+					command_status: smpp.ESME_RBINDFAIL
+				}));
+			}
 			this.pendingSessions = this.pendingSessions.filter((s) => s !== session);
 			this.updateStatus();
 			session.close();
diff --git a/src/Center/CenterSessionManager.ts b/src/Center/CenterSessionManager.ts
index 6142fd8..d09f2f8 100644
--- a/src/Center/CenterSessionManager.ts
+++ b/src/Center/CenterSessionManager.ts
@@ -7,7 +7,7 @@ const CENTER_SESSIONS_FILE: string = process.env.CENTER_SESSIONS_FILE || "center
 
 export class CenterSessionManager extends SessionManager {
 	StorageFile: string = CENTER_SESSIONS_FILE
-	ManagedSessionClass: any = Center;
+	ManagedSessionClass: typeof Center = Center;
 	sessionId: number = 0;
 	sessions: Center[] = [];
 	identifier: string = "center";
diff --git a/src/Client/Client.ts b/src/Client/Client.ts
index 14b0fd7..bc916a4 100644
--- a/src/Client/Client.ts
+++ b/src/Client/Client.ts
@@ -1,3 +1,4 @@
+import {PDU} from "../CommonObjects";
 import {Job} from "../Job/Job";
 import Logger from "../Logger";
 import {PduProcessor} from "../PDUProcessor/PduProcessor";
@@ -180,7 +181,7 @@ export class Client extends SmppSession {
 		}
 	}
 
-	private eventSessionError(pdu: any): void {
+	private eventSessionError(pdu: PDU): void {
 		this.logger.log1(`Client-${this.getId()} error on ${this.url}`);
 		this.setStatus(0);
 		this.rejectPromises();
@@ -192,7 +193,7 @@ export class Client extends SmppSession {
 		this.rejectPromises();
 	}
 
-	private eventBindReply(pdu: any): void {
+	private eventBindReply(pdu: PDU): void {
 		if (pdu.command_status === 0) {
 			this.logger.log1(`Client-${this.getId()} bound to ${this.url}`);
 			this.setStatus(4);
diff --git a/src/Client/ClientSessionManager.ts b/src/Client/ClientSessionManager.ts
index 652608b..ffea85f 100644
--- a/src/Client/ClientSessionManager.ts
+++ b/src/Client/ClientSessionManager.ts
@@ -7,7 +7,7 @@ const CLIENT_SESSIONS_FILE: string = process.env.CLIENT_SESSIONS_FILE || "client
 
 export default class ClientSessionManager extends SessionManager {
 	StorageFile: string = CLIENT_SESSIONS_FILE;
-	ManagedSessionClass: any = Client;
+	ManagedSessionClass: typeof Client = Client;
 	sessionId: number = 0;
 	sessions: Client[] = [];
 	// Identifier is used in websockets to identify the type of session this manager manages
diff --git a/src/CommonObjects.ts b/src/CommonObjects.ts
new file mode 100644
index 0000000..74cad1a
--- /dev/null
+++ b/src/CommonObjects.ts
@@ -0,0 +1,15 @@
+export type PDU = {
+	command?: string;
+	command_status?: number;
+	system_id?: string;
+	password?: string;
+	source_addr?: string;
+	destination_addr?: string;
+	short_message?: string;
+	response?: (...args: any[]) => PDU;
+}
+export type SerializedJob = {
+	pdu: PDU;
+	perSecond?: number;
+	count?: number;
+}
\ No newline at end of file
diff --git a/src/Job/Job.ts b/src/Job/Job.ts
index 245e99c..8f545b5 100644
--- a/src/Job/Job.ts
+++ b/src/Job/Job.ts
@@ -1,4 +1,5 @@
 import EventEmitter from "events";
+import {PDU, SerializedJob} from "../CommonObjects";
 
 const smpp = require("smpp");
 
@@ -6,19 +7,19 @@ export class Job {
 	static readonly STATE_CHANGED: string = "STATE_CHANGED";
 	private eventEmitter: EventEmitter = new EventEmitter();
 
-	constructor(pdu: any, perSecond?: number, count?: number) {
+	constructor(pdu: PDU, perSecond?: number, count?: number) {
 		this._pdu = pdu;
 		this._perSecond = perSecond;
 		this._count = count;
 	}
 
-	private _pdu: any;
+	private _pdu: PDU;
 
-	get pdu(): any {
+	get pdu(): PDU {
 		return this._pdu;
 	}
 
-	set pdu(value: any) {
+	set pdu(value: PDU) {
 		this._pdu = value;
 		this.eventEmitter.emit(Job.STATE_CHANGED, {});
 	}
@@ -45,7 +46,7 @@ export class Job {
 		this.eventEmitter.emit(Job.STATE_CHANGED, {});
 	}
 
-	static deserialize(serialized: any): Job {
+	static deserialize(serialized: SerializedJob): Job {
 		if (!serialized.pdu || !serialized.pdu.command) {
 			if (!serialized.perSecond && !serialized.count) {
 				return Job.createEmptySingle();
@@ -53,7 +54,7 @@ export class Job {
 				return Job.createEmptyMultiple();
 			}
 		}
-		let pdu: any = new smpp.PDU(serialized.pdu.command, serialized.pdu);
+		let pdu: PDU = new smpp.PDU(serialized.pdu.command, serialized.pdu);
 		return new Job(pdu, serialized.perSecond, serialized.count);
 	}
 
@@ -83,7 +84,7 @@ export class Job {
 		}
 	}
 
-	serialize(): object {
+	serialize(): SerializedJob {
 		return {
 			pdu: this.pdu,
 			perSecond: this.perSecond,
diff --git a/src/PDUProcessor/DebugPduProcessor.ts b/src/PDUProcessor/DebugPduProcessor.ts
index 09c9432..242359c 100644
--- a/src/PDUProcessor/DebugPduProcessor.ts
+++ b/src/PDUProcessor/DebugPduProcessor.ts
@@ -1,14 +1,17 @@
 import {Center} from "../Center/Center";
+import {PDU} from "../CommonObjects";
 import {PduProcessor} from "./PduProcessor";
 
 export class DebugPduProcessor extends PduProcessor {
-    servesSessionType: string = Center.name;
+	serverSessionType: string = Center.name;
 
-	processPdu(session: any, pdu: any, ...args: any[]): Promise<any> {
+	processPdu(session: any, pdu: PDU, ...args: any[]): Promise<any> {
 		return new Promise<any>((resolve, reject) => {
-			session.send(pdu.response(), (replyPdu: any) => {
-				resolve(replyPdu);
-			});
+			if (pdu.response) {
+				session.send(pdu.response(), (replyPdu: any) => {
+					resolve(replyPdu);
+				});
+			}
 		})
 	}
 }
\ No newline at end of file
diff --git a/src/PDUProcessor/EchoPduProcessor.ts b/src/PDUProcessor/EchoPduProcessor.ts
index 6b6b244..c578c42 100644
--- a/src/PDUProcessor/EchoPduProcessor.ts
+++ b/src/PDUProcessor/EchoPduProcessor.ts
@@ -1,20 +1,25 @@
 import {Center} from "../Center/Center";
+import {PDU} from "../CommonObjects";
 import {PduProcessor} from "./PduProcessor";
+
 const smpp = require("smpp");
 
 export class EchoPduProcessor extends PduProcessor {
-    servesSessionType: string = Center.name;
-	processPdu(session: any, pdu: any, ...args: any[]): Promise<any> {
+	serverSessionType: string = Center.name;
+
+	processPdu(session: any, pdu: PDU, ...args: any[]): Promise<any> {
 		return new Promise<any>((resolve, reject) => {
 			let promises = [];
-			let replyPromise = session.send(pdu.response());
-			let sendPromise = session.send(new smpp.PDU('deliver_sm', {
-				source_addr: pdu.destination_addr,
-				destination_addr: pdu.source_addr,
-				short_message: pdu.short_message
-			}));
-			promises.push(replyPromise);
-			promises.push(sendPromise);
+			if (pdu.response) {
+				let replyPromise = session.send(pdu.response());
+				let sendPromise = session.send(new smpp.PDU('deliver_sm', {
+					source_addr: pdu.destination_addr,
+					destination_addr: pdu.source_addr,
+					short_message: pdu.short_message
+				}));
+				promises.push(replyPromise);
+				promises.push(sendPromise);
+			}
 			Promise.all(promises).then((replyPdus: any) => {
 				resolve(replyPdus);
 			}).catch((error: any) => {
diff --git a/src/PDUProcessor/PduProcessor.ts b/src/PDUProcessor/PduProcessor.ts
index 365e42e..71b0f84 100644
--- a/src/PDUProcessor/PduProcessor.ts
+++ b/src/PDUProcessor/PduProcessor.ts
@@ -1,17 +1,17 @@
+import {PDU} from "../CommonObjects";
 import Logger from "../Logger";
 import {SmppSession} from "../SmppSession";
-import {DebugPduProcessor} from "./DebugPduProcessor";
 
 export abstract class PduProcessor {
 	static processors: PduProcessor[] = [];
-	abstract readonly servesSessionType: string;
+	abstract readonly serverSessionType: string;
 	readonly name: string = this.constructor.name;
 	readonly logger: Logger = new Logger(`PduProcessor: ${this.name}`);
 	private static logger: Logger = new Logger("PduProcessor");
 
 	static getProcessor(name: string): PduProcessor {
 		this.logger.log1(`Looking for processor with name ${name}...`);
-		let pduProcessor = this.processors.find((processor: any) => processor.name === name);
+		let pduProcessor = this.processors.find((processor: PduProcessor) => processor.name === name);
 		if (pduProcessor) {
 			this.logger.log1(`Found processor with name ${name}`);
 			return pduProcessor;
@@ -35,22 +35,22 @@ export abstract class PduProcessor {
 
 	static areCompatible(session: SmppSession, processor: PduProcessor): boolean {
 		this.logger.log1(`Checking compatibility between session ${session.constructor.name}-${session.getId()} and processor ${processor.name}`);
-		return session.constructor.name === processor.servesSessionType;
+		return session.constructor.name === processor.serverSessionType;
 	}
 
-	static addProcessor(processor: any): void {
+	static addProcessor(processor: new () => PduProcessor): void {
 		PduProcessor.processors.push(new processor());
 	}
 
 	static getProcessorsForType(type: string): PduProcessor[] {
-		return this.processors.filter((processor: any) => processor.servesSessionType === type);
+		return this.processors.filter((processor: PduProcessor) => processor.serverSessionType === type);
 	}
 
-	abstract processPdu(session: any, pdu: any, ...args: any[]): Promise<any>;
+	abstract processPdu(session: any, pdu: PDU, ...args: any[]): Promise<any>;
 
 	serialize(): object {
 		return {
-			servesSessionType: this.servesSessionType,
+			servesSessionType: this.serverSessionType,
 			name: this.name
 		};
 	}