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

Refactor splitToParts function to use slice

Browse Source 
instead of substr
This commit is contained in:
David Majdandžić
2023-12-11 21:50:18 +01:00
parent ba0d9bf430
commit c873628abc
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
utils.js
View File

@@ -44,13 +44,12 @@ function splitToParts(pdu) {
const splitMessage = []; const splitMessage = [];
const message = pdu.short_message; const message = pdu.short_message;
const messageLength = message.length; const messageLength = message.length;
const messageCount = Math.ceil(messageLength / maxMessageLength); const messageCount = (messageLength / maxMessageLength) | 0;
for (let i = 0; i < messageCount; i++) { for (let i = 0; i < messageCount; i++) {
splitMessage.push(message.substr(i * maxMessageLength, maxMessageLength)); splitMessage.push(message.slice(i * maxMessageLength, i * maxMessageLength + maxMessageLength));
} }
const pdus = []; const pdus = splitMessage.map((messagePart, index) => {
splitMessage.forEach((messagePart, index) => {
let udh = Buffer.from([0x05, 0x00, 0x03, this.iterator++, messageCount, index + 1]); let udh = Buffer.from([0x05, 0x00, 0x03, this.iterator++, messageCount, index + 1]);
let partPdu = new smpp.PDU(pdu.command, { ...pdu }); let partPdu = new smpp.PDU(pdu.command, { ...pdu });
@@ -58,7 +57,7 @@ function splitToParts(pdu) {
udh: udh, udh: udh,
message: messagePart, message: messagePart,
}; };
pdus.push(partPdu); return partPdu;
}); });
return pdus; return pdus;
} }
@@ -72,21 +71,24 @@ async function sendPdu(session, pdu, logger, uselongsms) {
const total = pdus.length; const total = pdus.length;
let success = 0; let success = 0;
let failed = 0; let failed = 0;
for (const pdu of pdus) { const promises = pdus.map((pdu) => {
return new Promise((resolve, reject) => {
session.send(pdu, (respPdu) => { session.send(pdu, (respPdu) => {
if (respPdu.command_status === 0) { if (respPdu.command_status === 0) {
success++;
if (success + failed === total) {
resolve(respPdu); resolve(respPdu);
}
} else { } else {
failed++;
if (success + failed === total) {
reject(respPdu); reject(respPdu);
} }
}
}); });
} });
});
Promise.all(promises)
.then((responses) => {
resolve(responses[0]);
})
.catch((error) => {
reject(error);
});
} else { } else {
session.send(pdu, (respPdu) => { session.send(pdu, (respPdu) => {
if (respPdu.command_status === 0) { if (respPdu.command_status === 0) {