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

Fix issues with events

Browse Source
This commit is contained in:
David Majdandžić
2023-03-29 16:30:06 +02:00
parent 44348e7a85
commit 260ce81b76
4 changed files with 50 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/Center/Center.ts
View File

@@ -1,10 +1,8 @@
import EventEmitter from "events"; import EventEmitter from "events";
import {ClientEvent} from "../Client/ClientEvent";
import {Job} from "../Job/Job"; import {Job} from "../Job/Job";
import {JobEvents} from "../Job/JobEvents"; import {JobEvents} from "../Job/JobEvents";
import Logger from "../Logger"; import Logger from "../Logger";
import {SmppSession} from "../SmppSession"; import {SmppSession} from "../SmppSession";
import {CenterEvent} from "./CenterEvent";
import CenterStatus from "./CenterStatus"; import CenterStatus from "./CenterStatus";
import {CenterPDUProcessor} from "./PDUProcessors/CenterPDUProcessor"; import {CenterPDUProcessor} from "./PDUProcessors/CenterPDUProcessor";
import {DebugProcessor} from "./PDUProcessors/DebugProcessor"; import {DebugProcessor} from "./PDUProcessors/DebugProcessor";
@@ -15,6 +13,12 @@ const smpp = require("smpp");
const MESSAGE_SEND_UPDATE_DELAY: number = Number(process.env.MESSAGE_SEND_UPDATE_DELAY) || 500; const MESSAGE_SEND_UPDATE_DELAY: number = Number(process.env.MESSAGE_SEND_UPDATE_DELAY) || 500;
export class Center implements SmppSession { export class Center implements SmppSession {
static EVENTS: any = {
STATUS_CHANGED: "STATUS_CHANGED",
STATE_CHANGED: "STATE_CHANGED",
ANY_PDU: "ANY_PDU",
MESSAGE_SEND_COUNTER_UPDATE_EVENT: "MESSAGE_SEND_COUNTER_UPDATE_EVENT",
}
UPDATE_WS: string = "UPDATE_WS"; UPDATE_WS: string = "UPDATE_WS";
private pendingSessions: any[] = []; private pendingSessions: any[] = [];
private sessions: any[] = []; private sessions: any[] = [];
@@ -34,16 +38,10 @@ export class Center implements SmppSession {
this.logger = new Logger(`Center-${id}`); this.logger = new Logger(`Center-${id}`);
// This does not work and I have not a clue as to why this.eventEmitter.on(Center.EVENTS.STATE_CHANGED, () => this.updateWs(Center.EVENTS.STATE_CHANGED));
// CenterEvent is undefined in fucking everywhere ever this.eventEmitter.on(Center.EVENTS.STATUS_CHANGED, () => this.updateWs(Center.EVENTS.STATUS_CHANGED));
// I don't get it at all this.eventEmitter.on(Center.EVENTS.ANY_PDU, (pdu: any) => this.updateWs(Center.EVENTS.ANY_PDU, [pdu]));
// I tried to bind the functions to this this.eventEmitter.on(Center.EVENTS.MESSAGE_SEND_COUNTER_UPDATE_EVENT, (count: number) => this.updateWs(Center.EVENTS.MESSAGE_SEND_COUNTER_UPDATE_EVENT, [count]));
// I tried to bind them to the event
// TODO: Fix this shit...
this.eventEmitter.on(CenterEvent.STATE_CHANGED, () => this.updateWs(CenterEvent.STATE_CHANGED));
this.eventEmitter.on(CenterEvent.STATUS_CHANGED, () => this.updateWs(CenterEvent.STATUS_CHANGED));
this.eventEmitter.on(CenterEvent.ANY_PDU, (pdu: any) => this.updateWs(CenterEvent.ANY_PDU, [pdu]));
this.eventEmitter.on(CenterEvent.MESSAGE_SEND_COUNTER_UPDATE_EVENT, (count: number) => this.updateWs(CenterEvent.MESSAGE_SEND_COUNTER_UPDATE_EVENT, [count]));
this.initialize(); this.initialize();
} }
@@ -67,7 +65,7 @@ export class Center implements SmppSession {
set processor(value: CenterPDUProcessor) { set processor(value: CenterPDUProcessor) {
this._processor = value; this._processor = value;
this.eventEmitter.emit(CenterEvent.STATE_CHANGED, this.serialize()); this.eventEmitter.emit(Center.EVENTS.STATE_CHANGED, this.serialize());
} }
private _defaultMultipleJob!: Job; private _defaultMultipleJob!: Job;
@@ -78,7 +76,7 @@ export class Center implements SmppSession {
set defaultMultipleJob(value: Job) { set defaultMultipleJob(value: Job) {
this._defaultMultipleJob = value; this._defaultMultipleJob = value;
this.eventEmitter.emit(CenterEvent.STATE_CHANGED, this.serialize()); this.eventEmitter.emit(Center.EVENTS.STATE_CHANGED, this.serialize());
} }
private _defaultSingleJob!: Job; private _defaultSingleJob!: Job;
@@ -89,7 +87,7 @@ export class Center implements SmppSession {
set defaultSingleJob(value: Job) { set defaultSingleJob(value: Job) {
this._defaultSingleJob = value; this._defaultSingleJob = value;
this.eventEmitter.emit(CenterEvent.STATE_CHANGED, this.serialize()); this.eventEmitter.emit(Center.EVENTS.STATE_CHANGED, this.serialize());
} }
private _password: string; private _password: string;
@@ -100,7 +98,7 @@ export class Center implements SmppSession {
set password(value: string) { set password(value: string) {
this._password = value; this._password = value;
this.eventEmitter.emit(CenterEvent.STATE_CHANGED, this.serialize()); this.eventEmitter.emit(Center.EVENTS.STATE_CHANGED, this.serialize());
} }
private _username: string; private _username: string;
@@ -111,7 +109,7 @@ export class Center implements SmppSession {
set username(value: string) { set username(value: string) {
this._username = value; this._username = value;
this.eventEmitter.emit(CenterEvent.STATE_CHANGED, this.serialize()); this.eventEmitter.emit(Center.EVENTS.STATE_CHANGED, this.serialize());
} }
private _status: CenterStatus = CenterStatus.WAITING_CONNECTION; private _status: CenterStatus = CenterStatus.WAITING_CONNECTION;
@@ -122,8 +120,8 @@ export class Center implements SmppSession {
set status(value: CenterStatus) { set status(value: CenterStatus) {
this._status = value; this._status = value;
this.eventEmitter.emit(CenterEvent.STATUS_CHANGED, this._status); this.eventEmitter.emit(Center.EVENTS.STATUS_CHANGED, this._status);
this.eventEmitter.emit(CenterEvent.STATE_CHANGED, this.serialize()); this.eventEmitter.emit(Center.EVENTS.STATE_CHANGED, this.serialize());
} }
on(event: string, callback: (...args: any[]) => void): void { on(event: string, callback: (...args: any[]) => void): void {
@@ -139,16 +137,16 @@ export class Center implements SmppSession {
type: event, type: event,
}; };
switch (event) { switch (event) {
case CenterEvent.STATE_CHANGED: case Center.EVENTS.STATE_CHANGED:
message.data = JSON.stringify(this.serialize()); message.data = JSON.stringify(this.serialize());
break; break;
case CenterEvent.STATUS_CHANGED: case Center.EVENTS.STATUS_CHANGED:
message.data = JSON.stringify(this._status); message.data = JSON.stringify(this._status);
break; break;
case CenterEvent.ANY_PDU: case Center.EVENTS.ANY_PDU:
message.data = JSON.stringify(args![0]); message.data = JSON.stringify(args![0]);
break; break;
case CenterEvent.MESSAGE_SEND_COUNTER_UPDATE_EVENT: case Center.EVENTS.MESSAGE_SEND_COUNTER_UPDATE_EVENT:
message.data = JSON.stringify(args![0]); message.data = JSON.stringify(args![0]);
break; break;
} }
@@ -158,8 +156,8 @@ export class Center implements SmppSession {
initialize(): void { initialize(): void {
this._defaultSingleJob = Job.createEmptySingle(); this._defaultSingleJob = Job.createEmptySingle();
this._defaultMultipleJob = Job.createEmptyMultiple(); this._defaultMultipleJob = Job.createEmptyMultiple();
this._defaultSingleJob.on(JobEvents.STATE_CHANGED, () => this.eventEmitter.emit(CenterEvent.STATE_CHANGED, this.serialize())); this._defaultSingleJob.on(JobEvents.STATE_CHANGED, () => this.eventEmitter.emit(Center.EVENTS.STATE_CHANGED, this.serialize()));
this._defaultMultipleJob.on(JobEvents.STATE_CHANGED, () => this.eventEmitter.emit(CenterEvent.STATE_CHANGED, this.serialize())); this._defaultMultipleJob.on(JobEvents.STATE_CHANGED, () => this.eventEmitter.emit(Center.EVENTS.STATE_CHANGED, this.serialize()));
this.server = smpp.createServer({}, this.eventSessionConnected.bind(this)); this.server = smpp.createServer({}, this.eventSessionConnected.bind(this));
this.server.listen(this._port); this.server.listen(this._port);
@@ -210,7 +208,7 @@ export class Center implements SmppSession {
this.counterUpdateTimer = new NanoTimer(); this.counterUpdateTimer = new NanoTimer();
this.counterUpdateTimer.setInterval(() => { this.counterUpdateTimer.setInterval(() => {
if (previousUpdateCounter !== counter) { if (previousUpdateCounter !== counter) {
this.eventEmitter.emit(ClientEvent.MESSAGE_SEND_COUNTER_UPDATE_EVENT, counter); this.eventEmitter.emit(Center.EVENTS.MESSAGE_SEND_COUNTER_UPDATE_EVENT, counter);
previousUpdateCounter = counter; previousUpdateCounter = counter;
} }
}, '', `${MESSAGE_SEND_UPDATE_DELAY / 1000} s`); }, '', `${MESSAGE_SEND_UPDATE_DELAY / 1000} s`);
@@ -318,7 +316,7 @@ export class Center implements SmppSession {
session.on('bind_transceiver', this.eventBindTransceiver.bind(this, session)); session.on('bind_transceiver', this.eventBindTransceiver.bind(this, session));
session.on('pdu', this.eventAnyPdu.bind(this, session)); session.on('pdu', this.eventAnyPdu.bind(this, session));
this.updateStatus(); this.updateStatus();
this.eventEmitter.emit(CenterEvent.STATE_CHANGED, this.serialize()); this.eventEmitter.emit(Center.EVENTS.STATE_CHANGED, this.serialize());
} }
private eventSessionError(session: any): void { private eventSessionError(session: any): void {
@@ -344,7 +342,7 @@ export class Center implements SmppSession {
} }
private eventAnyPdu(session: any, pdu: any): void { private eventAnyPdu(session: any, pdu: any): void {
this.eventEmitter.emit(CenterEvent.ANY_PDU, pdu); this.eventEmitter.emit(Center.EVENTS.ANY_PDU, pdu);
this.processor.processPdu(session, pdu).then(() => { this.processor.processPdu(session, pdu).then(() => {
}, () => { }, () => {
}); });

6
src/Center/CenterEvent.ts
View File

@@ -1,6 +0,0 @@
export class CenterEvent {
static STATUS_CHANGED: "STATUS_CHANGED";
static STATE_CHANGED: "STATE_CHANGED";
static ANY_PDU: "ANY_PDU";
static MESSAGE_SEND_COUNTER_UPDATE_EVENT: "MESSAGE_SEND_COUNTER_UPDATE_EVENT";
}

43
src/Client/Client.ts
View File

@@ -4,7 +4,6 @@ import {JobEvents} from "../Job/JobEvents";
import Logger from "../Logger"; import Logger from "../Logger";
import PersistentPromise from "../PersistentPromise"; import PersistentPromise from "../PersistentPromise";
import {SmppSession} from "../SmppSession"; import {SmppSession} from "../SmppSession";
import {ClientEvent} from "./ClientEvent";
import ClientStatus from "./ClientStatus"; import ClientStatus from "./ClientStatus";
const NanoTimer = require('nanotimer'); const NanoTimer = require('nanotimer');
@@ -14,6 +13,12 @@ const AUTO_ENQUIRE_LINK_PERIOD: number = Number(process.env.AUTO_ENQUIRE_LINK_PE
const MESSAGE_SEND_UPDATE_DELAY: number = Number(process.env.MESSAGE_SEND_UPDATE_DELAY) || 500; const MESSAGE_SEND_UPDATE_DELAY: number = Number(process.env.MESSAGE_SEND_UPDATE_DELAY) || 500;
export class Client implements SmppSession { export class Client implements SmppSession {
static EVENTS: any = {
STATUS_CHANGED: "STATUS_CHANGED",
STATE_CHANGED: "STATE_CHANGED",
ANY_PDU: "ANY_PDU",
MESSAGE_SEND_COUNTER_UPDATE_EVENT: "MESSAGE_SEND_COUNTER_UPDATE_EVENT",
}
defaultSingleJob!: Job; defaultSingleJob!: Job;
defaultMultipleJob!: Job; defaultMultipleJob!: Job;
UPDATE_WS: string = "UPDATE_WS"; UPDATE_WS: string = "UPDATE_WS";
@@ -37,10 +42,10 @@ export class Client implements SmppSession {
this.logger = new Logger(`Client-${id}`); this.logger = new Logger(`Client-${id}`);
this.status = ClientStatus.NOT_CONNECTED; this.status = ClientStatus.NOT_CONNECTED;
this.eventEmitter.on(ClientEvent.STATE_CHANGED, () => this.updateWs(ClientEvent.STATE_CHANGED)); this.eventEmitter.on(Client.EVENTS.STATE_CHANGED, () => this.updateWs(Client.EVENTS.STATE_CHANGED));
this.eventEmitter.on(ClientEvent.STATUS_CHANGED, () => this.updateWs(ClientEvent.STATUS_CHANGED)); this.eventEmitter.on(Client.EVENTS.STATUS_CHANGED, () => this.updateWs(Client.EVENTS.STATUS_CHANGED));
this.eventEmitter.on(ClientEvent.ANY_PDU, (pdu: any) => this.updateWs(ClientEvent.ANY_PDU, [pdu])); this.eventEmitter.on(Client.EVENTS.ANY_PDU, (pdu: any) => this.updateWs(Client.EVENTS.ANY_PDU, [pdu]));
this.eventEmitter.on(ClientEvent.MESSAGE_SEND_COUNTER_UPDATE_EVENT, (count: number) => this.updateWs(ClientEvent.MESSAGE_SEND_COUNTER_UPDATE_EVENT, [count])); this.eventEmitter.on(Client.EVENTS.MESSAGE_SEND_COUNTER_UPDATE_EVENT, (count: number) => this.updateWs(Client.EVENTS.MESSAGE_SEND_COUNTER_UPDATE_EVENT, [count]));
this.initialize(); this.initialize();
} }
@@ -67,8 +72,8 @@ export class Client implements SmppSession {
set status(value: ClientStatus) { set status(value: ClientStatus) {
this._status = value; this._status = value;
this.eventEmitter.emit(ClientEvent.STATUS_CHANGED, this._status); this.eventEmitter.emit(Client.EVENTS.STATUS_CHANGED, this._status);
this.eventEmitter.emit(ClientEvent.STATE_CHANGED, this.serialize()); this.eventEmitter.emit(Client.EVENTS.STATE_CHANGED, this.serialize());
} }
updateWs(event: string, args?: any[]): void { updateWs(event: string, args?: any[]): void {
@@ -80,16 +85,16 @@ export class Client implements SmppSession {
type: event, type: event,
}; };
switch (event) { switch (event) {
case ClientEvent.STATE_CHANGED: case Client.EVENTS.STATE_CHANGED:
message.data = JSON.stringify(this.serialize()); message.data = JSON.stringify(this.serialize());
break; break;
case ClientEvent.STATUS_CHANGED: case Client.EVENTS.STATUS_CHANGED:
message.data = JSON.stringify(this._status); message.data = JSON.stringify(this._status);
break; break;
case ClientEvent.ANY_PDU: case Client.EVENTS.ANY_PDU:
message.data = JSON.stringify(args![0]); message.data = JSON.stringify(args![0]);
break; break;
case ClientEvent.MESSAGE_SEND_COUNTER_UPDATE_EVENT: case Client.EVENTS.MESSAGE_SEND_COUNTER_UPDATE_EVENT:
message.data = JSON.stringify(args![0]); message.data = JSON.stringify(args![0]);
break; break;
} }
@@ -102,14 +107,14 @@ export class Client implements SmppSession {
setDefaultSingleJob(job: Job): void { setDefaultSingleJob(job: Job): void {
this.defaultSingleJob = job; this.defaultSingleJob = job;
this.eventEmitter.emit(ClientEvent.STATE_CHANGED, this.serialize()); this.eventEmitter.emit(Client.EVENTS.STATE_CHANGED, this.serialize());
job.on(JobEvents.STATE_CHANGED, () => this.eventEmitter.emit(ClientEvent.STATE_CHANGED, this.serialize())); job.on(JobEvents.STATE_CHANGED, () => this.eventEmitter.emit(Client.EVENTS.STATE_CHANGED, this.serialize()));
} }
setDefaultMultipleJob(job: Job): void { setDefaultMultipleJob(job: Job): void {
this.defaultMultipleJob = job; this.defaultMultipleJob = job;
this.eventEmitter.emit(ClientEvent.STATE_CHANGED, this.serialize()); this.eventEmitter.emit(Client.EVENTS.STATE_CHANGED, this.serialize());
job.on(JobEvents.STATE_CHANGED, () => this.eventEmitter.emit(ClientEvent.STATE_CHANGED, this.serialize())); job.on(JobEvents.STATE_CHANGED, () => this.eventEmitter.emit(Client.EVENTS.STATE_CHANGED, this.serialize()));
} }
getDefaultSingleJob(): Job { getDefaultSingleJob(): Job {
@@ -123,8 +128,8 @@ export class Client implements SmppSession {
initialize(): void { initialize(): void {
this.defaultSingleJob = Job.createEmptySingle(); this.defaultSingleJob = Job.createEmptySingle();
this.defaultMultipleJob = Job.createEmptyMultiple(); this.defaultMultipleJob = Job.createEmptyMultiple();
this.defaultSingleJob.on(JobEvents.STATE_CHANGED, () => this.eventEmitter.emit(ClientEvent.STATE_CHANGED, this.serialize())); this.defaultSingleJob.on(JobEvents.STATE_CHANGED, () => this.eventEmitter.emit(Client.EVENTS.STATE_CHANGED, this.serialize()));
this.defaultMultipleJob.on(JobEvents.STATE_CHANGED, () => this.eventEmitter.emit(ClientEvent.STATE_CHANGED, this.serialize())); this.defaultMultipleJob.on(JobEvents.STATE_CHANGED, () => this.eventEmitter.emit(Client.EVENTS.STATE_CHANGED, this.serialize()));
} }
doConnect(): PersistentPromise { doConnect(): PersistentPromise {
@@ -210,7 +215,7 @@ export class Client implements SmppSession {
this.counterUpdateTimer = new NanoTimer(); this.counterUpdateTimer = new NanoTimer();
this.counterUpdateTimer.setInterval(() => { this.counterUpdateTimer.setInterval(() => {
if (previousUpdateCounter !== counter) { if (previousUpdateCounter !== counter) {
this.eventEmitter.emit(ClientEvent.MESSAGE_SEND_COUNTER_UPDATE_EVENT, counter); this.eventEmitter.emit(Client.EVENTS.MESSAGE_SEND_COUNTER_UPDATE_EVENT, counter);
previousUpdateCounter = counter; previousUpdateCounter = counter;
} }
}, '', `${MESSAGE_SEND_UPDATE_DELAY / 1000} s`); }, '', `${MESSAGE_SEND_UPDATE_DELAY / 1000} s`);
@@ -285,7 +290,7 @@ export class Client implements SmppSession {
private eventAnyPdu(pdu: any): void { private eventAnyPdu(pdu: any): void {
this.logger.log6(`Client-${this._id} received PDU: ${JSON.stringify(pdu)}`); this.logger.log6(`Client-${this._id} received PDU: ${JSON.stringify(pdu)}`);
this.eventEmitter.emit(ClientEvent.ANY_PDU, pdu); this.eventEmitter.emit(Client.EVENTS.ANY_PDU, pdu);
} }
private eventSessionError(pdu: any): void { private eventSessionError(pdu: any): void {

6
src/Client/ClientEvent.ts
View File

@@ -1,6 +0,0 @@
export class ClientEvent {
static STATUS_CHANGED: "STATUS_CHANGED";
static STATE_CHANGED: "STATE_CHANGED";
static ANY_PDU: "ANY_PDU";
static MESSAGE_SEND_COUNTER_UPDATE_EVENT: "MESSAGE_SEND_COUNTER_UPDATE_EVENT";
}