dave/smsgw-tester
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup code

Browse Source
This commit is contained in:
David Majdandžić
2023-04-05 17:25:27 +02:00
parent d032239105
commit 2628445422
9 changed files with 7 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/PDUProcessor/PduProcessor.ts
View File

@@ -1,21 +1,20 @@
import {PDU} from "../CommonObjects"; import {PDU} from "../CommonObjects";
import Logger from "../Logger"; import Logger from "../Logger";
import SmppSession from "../SmppSession";
export default abstract class PduProcessor { export default abstract class PduProcessor {
readonly serverSessionType: string; readonly sessionType: string;
readonly name: string = this.constructor.name; readonly name: string = this.constructor.name;
readonly logger: Logger = new Logger(`PduProcessor: ${this.name}`); readonly logger: Logger = new Logger(`PduProcessor: ${this.name}`);
constructor(type: string) { constructor(type: string) {
this.serverSessionType = type; this.sessionType = type;
} }
abstract processPdu(session: any, pdu: PDU, ...args: any[]): Promise<any>; abstract processPdu(session: any, pdu: PDU, ...args: any[]): Promise<any>;
serialize(): object { serialize(): object {
return { return {
servesSessionType: this.serverSessionType, servesSessionType: this.sessionType,
name: this.name name: this.name
}; };
} }

4
src/PDUProcessor/Postprocessor/Center/DebugPduProcessor.ts
View File

@@ -1,13 +1,9 @@
import Center from "../../../Center/Center";
import Client from "../../../Client/Client";
import {PDU} from "../../../CommonObjects"; import {PDU} from "../../../CommonObjects";
import SmppSession from "../../../SmppSession";
import Postprocessor from "../Postprocessor"; import Postprocessor from "../Postprocessor";
export default class DebugPduProcessor extends Postprocessor { export default class DebugPduProcessor extends Postprocessor {
constructor(type: string) { constructor(type: string) {
super(type); super(type);
console.log(this.serverSessionType);
} }
processPdu(session: any, pdu: PDU, ...args: any[]): Promise<any> { processPdu(session: any, pdu: PDU, ...args: any[]): Promise<any> {

3
src/PDUProcessor/Postprocessor/Center/EchoPduProcessor.ts
View File

@@ -1,6 +1,4 @@
import Center from "../../../Center/Center";
import {PDU} from "../../../CommonObjects"; import {PDU} from "../../../CommonObjects";
import SmppSession from "../../../SmppSession";
import Postprocessor from "../Postprocessor"; import Postprocessor from "../Postprocessor";
const smpp = require("smpp"); const smpp = require("smpp");
@@ -8,7 +6,6 @@ const smpp = require("smpp");
export default class EchoPduProcessor extends Postprocessor { export default class EchoPduProcessor extends Postprocessor {
constructor(type: string) { constructor(type: string) {
super(type); super(type);
console.log(this.serverSessionType);
} }
processPdu(session: any, pdu: PDU, ...args: any[]): Promise<any> { processPdu(session: any, pdu: PDU, ...args: any[]): Promise<any> {

3
src/PDUProcessor/Postprocessor/Client/DeliverSmReplyProcessor.ts
View File

@@ -1,12 +1,9 @@
import Client from "../../../Client/Client";
import {PDU} from "../../../CommonObjects"; import {PDU} from "../../../CommonObjects";
import SmppSession from "../../../SmppSession";
import Postprocessor from "../Postprocessor"; import Postprocessor from "../Postprocessor";
export default class DeliverSmReplyProcessor extends Postprocessor { export default class DeliverSmReplyProcessor extends Postprocessor {
constructor(type: string) { constructor(type: string) {
super(type); super(type);
console.log(this.serverSessionType);
} }
processPdu(session: any, pdu: PDU, ...args: any[]): Promise<any> { processPdu(session: any, pdu: PDU, ...args: any[]): Promise<any> {

2
src/PDUProcessor/Postprocessor/Postprocessor.ts
View File

@@ -1,5 +1,5 @@
import PduProcessor from "../PduProcessor"; import PduProcessor from "../PduProcessor";
export default abstract class Postprocessor extends PduProcessor { export default abstract class Postprocessor extends PduProcessor {
readonly type: string = this.name; readonly type: string = Postprocessor.name;
} }

3
src/PDUProcessor/Preprocessor/Client/DestinationEnumeratorProcessor.ts
View File

@@ -1,13 +1,10 @@
import Client from "../../../Client/Client";
import {PDU} from "../../../CommonObjects"; import {PDU} from "../../../CommonObjects";
import SmppSession from "../../../SmppSession";
import Preprocessor from "../Preprocessor"; import Preprocessor from "../Preprocessor";
export default class DestinationEnumeratorProcessor extends Preprocessor { export default class DestinationEnumeratorProcessor extends Preprocessor {
private iterator: number = 0; private iterator: number = 0;
constructor(type: string) { constructor(type: string) {
super(type); super(type);
console.log(this.serverSessionType);
} }
processPdu(session: any, pdu: PDU, ...args: any[]): Promise<any> { processPdu(session: any, pdu: PDU, ...args: any[]): Promise<any> {

3
src/PDUProcessor/Preprocessor/Client/SourceEnumeratorProcessor.ts
View File

@@ -1,13 +1,10 @@
import Client from "../../../Client/Client";
import {PDU} from "../../../CommonObjects"; import {PDU} from "../../../CommonObjects";
import SmppSession from "../../../SmppSession";
import Preprocessor from "../Preprocessor"; import Preprocessor from "../Preprocessor";
export default class SourceEnumeratorProcessor extends Preprocessor { export default class SourceEnumeratorProcessor extends Preprocessor {
private iterator: number = 0; private iterator: number = 0;
constructor(type: string) { constructor(type: string) {
super(type); super(type);
console.log(this.serverSessionType);
} }
processPdu(session: any, pdu: PDU, ...args: any[]): Promise<any> { processPdu(session: any, pdu: PDU, ...args: any[]): Promise<any> {

2
src/PDUProcessor/Preprocessor/Preprocessor.ts
View File

@@ -1,5 +1,5 @@
import PduProcessor from "../PduProcessor"; import PduProcessor from "../PduProcessor";
export default abstract class Preprocessor extends PduProcessor { export default abstract class Preprocessor extends PduProcessor {
readonly type: string = this.name; readonly type: string = Preprocessor.name;
} }

4
src/PDUProcessor/ProcessorManager.ts
View File

@@ -58,10 +58,10 @@ export default class ProcessorManager {
static areCompatible(session: SmppSession, processor: PduProcessor): boolean { static areCompatible(session: SmppSession, processor: PduProcessor): boolean {
this.logger.log1(`Checking compatibility between session ${session.constructor.name}-${session.id} and processor ${processor.name}`); 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[] { static getProcessorsForType(type: string): PduProcessor[] {
return this.processors.filter((processor: PduProcessor) => processor.serverSessionType === type); return this.processors.filter((processor: PduProcessor) => processor.sessionType === type);
} }
} }