From 2628445422e1f43a07a63ae7c27fca1f8778fe2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Majdand=C5=BEi=C4=87?= Date: Wed, 5 Apr 2023 17:25:27 +0200 Subject: [PATCH] Cleanup code --- src/PDUProcessor/PduProcessor.ts | 7 +++---- src/PDUProcessor/Postprocessor/Center/DebugPduProcessor.ts | 4 ---- src/PDUProcessor/Postprocessor/Center/EchoPduProcessor.ts | 3 --- .../Postprocessor/Client/DeliverSmReplyProcessor.ts | 3 --- src/PDUProcessor/Postprocessor/Postprocessor.ts | 2 +- .../Preprocessor/Client/DestinationEnumeratorProcessor.ts | 3 --- .../Preprocessor/Client/SourceEnumeratorProcessor.ts | 3 --- src/PDUProcessor/Preprocessor/Preprocessor.ts | 2 +- src/PDUProcessor/ProcessorManager.ts | 4 ++-- 9 files changed, 7 insertions(+), 24 deletions(-) diff --git a/src/PDUProcessor/PduProcessor.ts b/src/PDUProcessor/PduProcessor.ts index 0872730..1ff5d93 100644 --- a/src/PDUProcessor/PduProcessor.ts +++ b/src/PDUProcessor/PduProcessor.ts @@ -1,21 +1,20 @@ import {PDU} from "../CommonObjects"; import Logger from "../Logger"; -import SmppSession from "../SmppSession"; export default abstract class PduProcessor { - readonly serverSessionType: string; + readonly sessionType: string; readonly name: string = this.constructor.name; readonly logger: Logger = new Logger(`PduProcessor: ${this.name}`); constructor(type: string) { - this.serverSessionType = type; + this.sessionType = type; } abstract processPdu(session: any, pdu: PDU, ...args: any[]): Promise; serialize(): object { return { - servesSessionType: this.serverSessionType, + servesSessionType: this.sessionType, name: this.name }; } diff --git a/src/PDUProcessor/Postprocessor/Center/DebugPduProcessor.ts b/src/PDUProcessor/Postprocessor/Center/DebugPduProcessor.ts index a0f3c63..fbedebc 100644 --- a/src/PDUProcessor/Postprocessor/Center/DebugPduProcessor.ts +++ b/src/PDUProcessor/Postprocessor/Center/DebugPduProcessor.ts @@ -1,13 +1,9 @@ -import Center from "../../../Center/Center"; -import Client from "../../../Client/Client"; import {PDU} from "../../../CommonObjects"; -import SmppSession from "../../../SmppSession"; import Postprocessor from "../Postprocessor"; export default class DebugPduProcessor extends Postprocessor { constructor(type: string) { super(type); - console.log(this.serverSessionType); } processPdu(session: any, pdu: PDU, ...args: any[]): Promise { diff --git a/src/PDUProcessor/Postprocessor/Center/EchoPduProcessor.ts b/src/PDUProcessor/Postprocessor/Center/EchoPduProcessor.ts index 590296d..8e58d0d 100644 --- a/src/PDUProcessor/Postprocessor/Center/EchoPduProcessor.ts +++ b/src/PDUProcessor/Postprocessor/Center/EchoPduProcessor.ts @@ -1,6 +1,4 @@ -import Center from "../../../Center/Center"; import {PDU} from "../../../CommonObjects"; -import SmppSession from "../../../SmppSession"; import Postprocessor from "../Postprocessor"; const smpp = require("smpp"); @@ -8,7 +6,6 @@ const smpp = require("smpp"); export default class EchoPduProcessor extends Postprocessor { constructor(type: string) { super(type); - console.log(this.serverSessionType); } processPdu(session: any, pdu: PDU, ...args: any[]): Promise { diff --git a/src/PDUProcessor/Postprocessor/Client/DeliverSmReplyProcessor.ts b/src/PDUProcessor/Postprocessor/Client/DeliverSmReplyProcessor.ts index bfb58ed..193842a 100644 --- a/src/PDUProcessor/Postprocessor/Client/DeliverSmReplyProcessor.ts +++ b/src/PDUProcessor/Postprocessor/Client/DeliverSmReplyProcessor.ts @@ -1,12 +1,9 @@ -import Client from "../../../Client/Client"; import {PDU} from "../../../CommonObjects"; -import SmppSession from "../../../SmppSession"; import Postprocessor from "../Postprocessor"; export default class DeliverSmReplyProcessor extends Postprocessor { constructor(type: string) { super(type); - console.log(this.serverSessionType); } processPdu(session: any, pdu: PDU, ...args: any[]): Promise { diff --git a/src/PDUProcessor/Postprocessor/Postprocessor.ts b/src/PDUProcessor/Postprocessor/Postprocessor.ts index 9051bb1..f9b355b 100644 --- a/src/PDUProcessor/Postprocessor/Postprocessor.ts +++ b/src/PDUProcessor/Postprocessor/Postprocessor.ts @@ -1,5 +1,5 @@ import PduProcessor from "../PduProcessor"; export default abstract class Postprocessor extends PduProcessor { - readonly type: string = this.name; + readonly type: string = Postprocessor.name; } \ No newline at end of file diff --git a/src/PDUProcessor/Preprocessor/Client/DestinationEnumeratorProcessor.ts b/src/PDUProcessor/Preprocessor/Client/DestinationEnumeratorProcessor.ts index da3ac37..e5914c2 100644 --- a/src/PDUProcessor/Preprocessor/Client/DestinationEnumeratorProcessor.ts +++ b/src/PDUProcessor/Preprocessor/Client/DestinationEnumeratorProcessor.ts @@ -1,13 +1,10 @@ -import Client from "../../../Client/Client"; import {PDU} from "../../../CommonObjects"; -import SmppSession from "../../../SmppSession"; import Preprocessor from "../Preprocessor"; export default class DestinationEnumeratorProcessor extends Preprocessor { private iterator: number = 0; constructor(type: string) { super(type); - console.log(this.serverSessionType); } processPdu(session: any, pdu: PDU, ...args: any[]): Promise { diff --git a/src/PDUProcessor/Preprocessor/Client/SourceEnumeratorProcessor.ts b/src/PDUProcessor/Preprocessor/Client/SourceEnumeratorProcessor.ts index ec91f1a..cae27e7 100644 --- a/src/PDUProcessor/Preprocessor/Client/SourceEnumeratorProcessor.ts +++ b/src/PDUProcessor/Preprocessor/Client/SourceEnumeratorProcessor.ts @@ -1,13 +1,10 @@ -import Client from "../../../Client/Client"; import {PDU} from "../../../CommonObjects"; -import SmppSession from "../../../SmppSession"; import Preprocessor from "../Preprocessor"; export default class SourceEnumeratorProcessor extends Preprocessor { private iterator: number = 0; constructor(type: string) { super(type); - console.log(this.serverSessionType); } processPdu(session: any, pdu: PDU, ...args: any[]): Promise { diff --git a/src/PDUProcessor/Preprocessor/Preprocessor.ts b/src/PDUProcessor/Preprocessor/Preprocessor.ts index d187025..3357e86 100644 --- a/src/PDUProcessor/Preprocessor/Preprocessor.ts +++ b/src/PDUProcessor/Preprocessor/Preprocessor.ts @@ -1,5 +1,5 @@ import PduProcessor from "../PduProcessor"; export default abstract class Preprocessor extends PduProcessor { - readonly type: string = this.name; + readonly type: string = Preprocessor.name; } \ No newline at end of file diff --git a/src/PDUProcessor/ProcessorManager.ts b/src/PDUProcessor/ProcessorManager.ts index f0a5561..4a38f59 100644 --- a/src/PDUProcessor/ProcessorManager.ts +++ b/src/PDUProcessor/ProcessorManager.ts @@ -58,10 +58,10 @@ export default class ProcessorManager { static areCompatible(session: SmppSession, processor: PduProcessor): boolean { this.logger.log1(`Checking compatibility between session ${session.constructor.name}-${session.id} and processor ${processor.name}`); - return session.constructor.name === processor.serverSessionType; + return session.constructor.name === processor.sessionType; } static getProcessorsForType(type: string): PduProcessor[] { - return this.processors.filter((processor: PduProcessor) => processor.serverSessionType === type); + return this.processors.filter((processor: PduProcessor) => processor.sessionType === type); } } \ No newline at end of file