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

Minor refactoring

Browse Source
This commit is contained in:
David Majdandžić
2023-03-28 04:08:07 +02:00
parent bb363deb2a
commit 4409a6fec8
4 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Client.ts → src/Client/Client.ts
View File

@@ -1,9 +1,9 @@
import EventEmitter from "events";
import ClientStatus from "./ClientStatus";
import {Job} from "./Job";
import Logger from "./Logger";
import PersistentPromise from "./PersistentPromise";
import {SmppSession} from "./SmppSession";
import {Job} from "../Job";
import Logger from "../Logger";
import PersistentPromise from "../PersistentPromise";
import {SmppSession} from "../SmppSession";
const NanoTimer = require('nanotimer');
const smpp = require("smpp");

26
src/ClientSessionManager.ts → src/Client/ClientSessionManager.ts
View File

@@ -1,9 +1,9 @@
import fs from "fs";
import {Client} from "./Client";
import {Job} from "./Job";
import Logger from "./Logger";
import SessionManager from "./SessionManager";
import {SmppSession} from "./SmppSession";
import {Job} from "../Job";
import Logger from "../Logger";
import SessionManager from "../SessionManager";
import {SmppSession} from "../SmppSession";
const CLIENT_SESSIONS_FILE: string = process.env.CLIENT_SESSIONS_FILE || "client_sessions.json";
@@ -20,6 +20,7 @@ export default class ClientSessionManager implements SessionManager {
addSession(session: SmppSession): Promise<void> {
return new Promise<void>((resolve, reject) => {
this.logger.log1(`Adding session with id ${session.getId()}`);
this.sessions.push(session as Client);
resolve();
});
@@ -27,14 +28,18 @@ export default class ClientSessionManager implements SessionManager {
removeSession(session: SmppSession): Promise<void> {
return new Promise<void>((resolve, reject) => {
this.logger.log1(`Removing session with id ${session.getId()}`);
this.sessions = this.sessions.filter(s => s.getId() !== session.getId());
resolve();
});
}
// TODO: Make sure no url duplicates exist
createSession(url: string, username: string, password: string): Promise<SmppSession> {
return new Promise<SmppSession>((resolve, reject) => {
this.logger.log1(`Creating session with url ${url}`);
this.getSessionByUrl(url).then(s => {
resolve(s);
}, err => {});
this.verifyUrl(url, reject);
this.verifyUsername(username, reject);
this.verifyPassword(password, reject);
@@ -48,10 +53,13 @@ export default class ClientSessionManager implements SessionManager {
getSession(id: number): Promise<SmppSession> {
return new Promise<SmppSession>((resolve, reject) => {
this.logger.log1(`Looking for session with id ${id}...`);
let session: SmppSession | undefined = this.sessions.find(s => s.getId() === id);
if (session) {
this.logger.log1(`Found session with id ${id}`);
resolve(session);
} else {
this.logger.log1(`Session with id ${id} not found`);
reject(`Session with id ${id} not found`);
}
});
@@ -59,16 +67,20 @@ export default class ClientSessionManager implements SessionManager {
getSessionByUrl(url: string): Promise<SmppSession> {
return new Promise<SmppSession>((resolve, reject) => {
this.logger.log1(`Looking for session with url ${url}...`);
let session: SmppSession | undefined = this.sessions.find(s => s.getUrl() === url);
if (session) {
this.logger.log1(`Found session with url ${url}`);
resolve(session);
} else {
this.logger.log1(`Session with url ${url} not found`);
reject(`Session with url ${url} not found`);
}
});
}
serialize(): object {
this.logger.log1(`Serializing ${this.sessions.length} clients`)
return this.sessions.map((session: SmppSession) => {
return session.serialize();
});
@@ -76,9 +88,10 @@ export default class ClientSessionManager implements SessionManager {
setup(): void {
try {
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 ${sessions.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));
@@ -87,6 +100,7 @@ export default class ClientSessionManager implements SessionManager {
});
} catch (e) {
this.logger.log1(`Error loading clients from ${CLIENT_SESSIONS_FILE}: ${e}`);
return;
}
}

0
src/ClientStatus.ts → src/Client/ClientStatus.ts
View File

4
src/main.ts
View File

@@ -1,5 +1,5 @@
import {Client} from "./Client";
import ClientSessionManager from "./ClientSessionManager";
import {Client} from "./Client/Client";
import ClientSessionManager from "./Client/ClientSessionManager";
import {Job} from "./Job";
import Logger from "./Logger";