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

Fixed issue that caused sessions to be too busy to send messages that made them busy in the first place

Browse Source
This commit is contained in:
David Majdandžić
2023-03-27 17:44:06 +02:00
parent eb9c8468e2
commit 630c8a1004
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
main.js
View File

@@ -300,9 +300,9 @@ class ClientSession {
} }
} }
send(source, destination, message) { send(source, destination, message, force=false) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if (!this.canSend()) { if (!force && !this.canSend()) {
this.logger.log1(`Client cannot send message, not bound to ${this.url} or busy`); this.logger.log1(`Client cannot send message, not bound to ${this.url} or busy`);
reject(`Client cannot send message, not bound to ${this.url} or busy`); reject(`Client cannot send message, not bound to ${this.url} or busy`);
return; return;
@@ -356,7 +356,7 @@ class ClientSession {
if (count > 0 && counter >= count) { if (count > 0 && counter >= count) {
this.cancelSendInterval(); this.cancelSendInterval();
} else { } else {
this.send(source, destination, message) this.send(source, destination, message, true)
.catch(e => this.logger.log1(`Error sending message: ${e}`)); .catch(e => this.logger.log1(`Error sending message: ${e}`));
counter++; counter++;
} }
@@ -678,9 +678,9 @@ class CenterSession {
return this.notify(this.configuredMessageJob.source, this.configuredMessageJob.destination, this.configuredMessageJob.message); return this.notify(this.configuredMessageJob.source, this.configuredMessageJob.destination, this.configuredMessageJob.message);
} }
notify(source, destination, message) { notify(source, destination, message, force=false) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if (!this.canSend()) { if (!force && !this.canSend()) {
this.logger.log1(`Center cannot send message, no sessions active on ${this.port} or busy`); this.logger.log1(`Center cannot send message, no sessions active on ${this.port} or busy`);
reject(`Center cannot send message, no sessions active on ${this.port} or busy`); reject(`Center cannot send message, no sessions active on ${this.port} or busy`);
return; return;
@@ -748,7 +748,7 @@ class CenterSession {
if (count > 0 && counter >= count) { if (count > 0 && counter >= count) {
this.cancelNotifyInterval(); this.cancelNotifyInterval();
} else { } else {
this.notify(source, destination, message) this.notify(source, destination, message, true)
.catch(e => this.logger.log1(`Error sending message: ${e}`)); .catch(e => this.logger.log1(`Error sending message: ${e}`));
counter++; counter++;
} }