Refactor sessionManagers

src/Client/ClientSessionManager.ts

@@ -1,52 +1,24 @@
 import EventEmitter from "events";
 import fs from "fs";
-import {Client} from "./Client";
 import {Job} from "../Job/Job";
 import Logger from "../Logger";
-import SessionManager from "../SessionManager";
+import {SessionManager} from "../SessionManager";
 import {SmppSession} from "../SmppSession";
+import {Client} from "./Client";
 
 const CLIENT_SESSIONS_FILE: string = process.env.CLIENT_SESSIONS_FILE || "client_sessions.json";
 
-export default class ClientSessionManager implements SessionManager {
-	sessionId: number;
-	sessions: Client[];
+export default class ClientSessionManager extends SessionManager {
+	sessionId: number = 0;
+	sessions: Client[] = [];
+	// Identifier is used in websockets to identify the type of session this manager manages
 	identifier: string = "client";
-	private readonly logger: any;
-	readonly SESSION_ADDED_EVENT: string = "SESSION ADDED";
-	private readonly eventEmitter: EventEmitter = new EventEmitter();
+	readonly logger: Logger = new Logger("ClientSessionManager");
+	readonly eventEmitter: EventEmitter = new EventEmitter();
 
 	constructor() {
-		this.sessionId = 0;
-		this.sessions = [];
-		this.logger = new Logger("ClientSessionManager");
-	}
-
-	on(event: string, listener: (...args: any[]) => void): void {
-        this.eventEmitter.on(event, listener);
-    }
-
-	getSessions(): Promise<SmppSession[]> {
-        return new Promise<SmppSession[]>(resolve => {
-			resolve(this.sessions);
-        });
-    }
-
-	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);
-			this.eventEmitter.emit(this.SESSION_ADDED_EVENT, session.getId());
-			resolve();
-		});
-	}
-
-	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();
-		});
+		super();
+		// super.eventEmitter.on(super.SESSION_ADDED_EVENT, (session: SmppSession) => this.eventEmitter.emit(this.SESSION_ADDED_EVENT, session));
 	}
 
 	createSession(url: string, username: string, password: string): Promise<SmppSession> {
@@ -54,7 +26,8 @@ export default class ClientSessionManager implements SessionManager {
 			this.logger.log1(`Creating session with url ${url}`);
 			this.getSessionByUrl(url).then(s => {
 				resolve(s);
-			}, err => {});
+			}, err => {
+			});
 			this.verifyUrl(url, reject);
 			this.verifyUsername(username, reject);
 			this.verifyPassword(password, reject);
@@ -66,24 +39,10 @@ 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`);
-			}
-		});
-	}
-
 	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);
+			let session: SmppSession | undefined = this.sessions.find((s: Client) => s.getUrl() === url);
 			if (session) {
 				this.logger.log1(`Found session with url ${url}`);
 				resolve(session);
@@ -94,13 +53,6 @@ export default class ClientSessionManager implements SessionManager {
 		});
 	}
 
-	serialize(): object {
-		this.logger.log1(`Serializing ${this.sessions.length} clients`)
-		return this.sessions.map((session: SmppSession) => {
-			return session.serialize();
-		});
-	}
-
 	setup(): void {
 		try {
 			this.logger.log1(`Loading clients from ${CLIENT_SESSIONS_FILE}`)
@@ -131,20 +83,4 @@ export default class ClientSessionManager implements SessionManager {
 			reject(error);
 		}
 	}
-
-	private verifyUsername(username: string, reject: (reason?: any) => void) {
-		if (!username) {
-			let error = `Request to make a new client failed because of missing username.`;
-			this.logger.log1(error);
-			reject(error);
-		}
-	}
-
-	private verifyPassword(password: string, reject: (reason?: any) => void) {
-		if (!password) {
-			let error = `Request to make a new client failed because of missing password.`;
-			this.logger.log1(error);
-			reject(error);
-		}
-	}
 }