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

Implement sending messages on interval

Browse Source
This commit is contained in:
David Majdandžić
2023-03-24 21:20:37 +01:00
parent 401497bee0
commit b6e50f5e1b
2 changed files with 69 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
main.js
View File

@@ -3,6 +3,7 @@ const keyboard = require("keyboardjs");
const fs = require("fs");
const path = require("path");
const EventEmitter = require("events");
const NanoTimer = require('nanotimer');
const express = require("express");
const app = express();
@@ -115,6 +116,7 @@ class SessionStatus {
class Session {
auto_enquire_link_period = 500;
eventEmitter = new EventEmitter();
busy = false;
connectingPromise = {
promise: null,
@@ -244,9 +246,9 @@ class Session {
send(source, destination, message) {
return new Promise((resolve, reject) => {
if (this.status !== SessionStatus.BOUND) {
this.logger.log1(`Cannot send message, not bound to ${this.url}`);
reject(`Cannot send message, not bound to ${this.url}`);
if (!this.canSend()) {
this.logger.log1(`Cannot send message, not bound to ${this.url} or busy`);
reject(`Cannot send message, not bound to ${this.url} or busy`);
return;
}
this.logger.log1(`Sending message from ${source} to ${destination} with message ${message}`);
@@ -260,6 +262,33 @@ class Session {
});
}
sendOnInterval(source, destination, message, interval, count) {
// TODO: Create method for stopping sending messages
return new Promise((resolve, reject) => {
if (!this.canSend() || this.busy) {
this.logger.log1(`Cannot send many message, not bound to ${this.url} or busy`);
reject(`Cannot send many message, not bound to ${this.url} or busy`);
return;
}
// TODO: Remember to update busy when cancelling the timer
// TODO: Create event for counter update
this.busy = true;
this.timer = new NanoTimer();
let counter = 0;
this.timer.setInterval(() => {
if (count > 0 && counter >= count) {
this.timer.clearInterval();
this.busy = false;
} else {
this.send(source, destination, message)
.catch(e => this.logger.log1(`Error sending message: ${e}`));
counter++;
}
}, '', `${interval} s`);
resolve();
});
}
close() {
this.disconnectingPromise.promise = new Promise((resolve, reject) => {
if (this.status !== SessionStatus.BOUND && this.status !== SessionStatus.CONNECTED) {
@@ -287,6 +316,10 @@ class Session {
status: this.status
}
}
canSend() {
return this.status === SessionStatus.BOUND;
}
}
class SessionManager {
@@ -295,11 +328,11 @@ class SessionManager {
constructor() {
this.sessions = {};
process.on('exit', this.cleanup.bind(this));
process.on('SIGINT', this.cleanup.bind(this));
process.on('SIGUSR1', this.cleanup.bind(this));
process.on('SIGUSR2', this.cleanup.bind(this));
process.on('uncaughtException', this.cleanup.bind(this));
// process.on('exit', this.cleanup.bind(this));
// process.on('SIGINT', this.cleanup.bind(this));
// process.on('SIGUSR1', this.cleanup.bind(this));
// process.on('SIGUSR2', this.cleanup.bind(this));
// process.on('uncaughtException', this.cleanup.bind(this));
}
createSession(url, username, password) {
@@ -365,6 +398,7 @@ class HTTPServer {
app.post('/api/sessions', this.createSession.bind(this));
app.get('/api/sessions/:id', this.getById.bind(this));
app.post('/api/sessions/:id/send', this.send.bind(this));
app.post('/api/sessions/:id/sendMany', this.sendMany.bind(this));
app.post('/api/sessions/:id/bind', this.bind.bind(this));
app.post('/api/sessions/:id/connect', this.connect.bind(this));
app.delete('/api/sessions/:id/connect', this.disconnect.bind(this));
@@ -414,6 +448,30 @@ class HTTPServer {
}
}
sendMany(req, res) {
// TODO: These requests deserve error handling
let session = sessionManager.getSession(req.params.id);
let source = req.body.source;
let destination = req.body.destination;
let message = req.body.message;
let interval = req.body.interval / 1000;
let count = req.body.count;
if (!!req.body.perSecond) {
interval = 1 / req.body.perSecond;
}
let perSecond = 1 / interval;
this.logger.log1(
`Sending ${count} messages from ${source} to ${destination} with message ${message} on session with ID ${req.params.id} at a rate of ${perSecond} per second.`);
if (session) {
session.sendOnInterval(source, destination, message, interval, count)
.then(pdu => res.send(JSON.stringify(pdu)))
.catch(err => res.status(400).send(JSON.stringify(err)));
} else {
this.logger.log1(`No session found with ID ${req.params.id}`);
res.status(404).send();
}
}
bind(req, res) {
this.logger.log1(`Binding session with ID ${req.params.id}`)
// Maybe make this async?
@@ -558,5 +616,7 @@ class WSServer {
let sessionManager = new SessionManager();
sessionManager.startup();
let session = sessionManager.getSession(0);
session.connect().then(() => session.bind());
new WSServer();
new HTTPServer();