diff --git a/lib/modem.js b/lib/modem.js index 2532504..431000c 100644 --- a/lib/modem.js +++ b/lib/modem.js @@ -21,7 +21,7 @@ const dbCops = require('./db-cops'); const reportSender = require('./report-sender'); // const msisdn = require('./msisdn'); const registerModem = require('./register-modem'); -const counters = require('./counters'); +// const counters = require('./counters'); const modemInfo = { device: config.modem.device, @@ -36,8 +36,8 @@ const modemInfo = { signalStrength: null, signalStrengthTs: null, signalStrengthTsReadable: null, - messageSentCounter: null, - messageReceivedCounter: null, + // messageSentCounter: null, + // messageReceivedCounter: null, }; let lastTs = new Date(); @@ -61,17 +61,6 @@ function writeToPort(data) { }); } -// eslint-disable-next-line no-unused-vars -async function writeToPortAndWaitForOK(data) { - await mutex.setLockWaitForCommand(); - const result = await writeToPort(data); - - await mutex.setLockWaitForCommand(); - mutex.releaseLockWaitForCommand(); - - return result; -} - async function readSMS(slot) { const parserCMGR = new ParserRegex({ regex: REGEX_WAIT_FOR_OK_OR_ERROR }); parserCMGR.on('data', (data) => { @@ -148,7 +137,7 @@ parserReadLine.on('data', (data) => { registerModem(modemInfo); } } else if (data.indexOf('+CMTI: ') === 0) { - counters.increment('MESSAGE_RECEIVED', modemInfo); + // counters.increment('MESSAGE_RECEIVED', modemInfo); onIncomingSMS(data); } else if (data.indexOf('+COPS: ') === 0) { onCOPS(data); @@ -292,7 +281,7 @@ async function sendSMS(destination, msg) { await mutex.setLockWaitForCommand(); logger.info('Sending message', { destination, msg }); - counters.increment('MESSAGE_SENT', modemInfo); + // counters.increment('MESSAGE_SENT', modemInfo); const correctedDestination = `+${destination}`.replace(/^0/, '62').replace(/^\++/, '+'); diff --git a/lib/register-modem.js b/lib/register-modem.js index 5c37565..7302503 100644 --- a/lib/register-modem.js +++ b/lib/register-modem.js @@ -8,7 +8,7 @@ const locks = require('locks'); const config = require('komodo-sdk/config'); const logger = require('komodo-sdk/logger'); -const counters = require('./counters'); +// const counters = require('./counters'); const mutex = locks.createMutex(); @@ -26,9 +26,9 @@ async function sender(modemInfo) { logger.info('Getting message counters before registering modem'); // eslint-disable-next-line no-param-reassign - modemInfo.messageSentCounter = await counters.get('MESSAGE_SENT', modemInfo); + // modemInfo.messageSentCounter = await counters.get('MESSAGE_SENT', modemInfo); // eslint-disable-next-line no-param-reassign - modemInfo.messageReceivedCounter = await counters.get('MESSAGE_RECEIVED', modemInfo); + // modemInfo.messageReceivedCounter = await counters.get('MESSAGE_RECEIVED', modemInfo); const requestOptions = { url: reportUrl(), @@ -44,8 +44,8 @@ async function sender(modemInfo) { report_port: config.http_command_server.listen_port, report_apikey: config.http_command_server.apikey, report_path_sms: '/sms', - counter_sent: modemInfo.messageSentCounter, - counter_received: modemInfo.messageReceivedCounter, + // counter_sent: modemInfo.messageSentCounter, + // counter_received: modemInfo.messageReceivedCounter, }, };