Komodo / komodo-modem-sms

Browse Code »

Commit 3915d32894c5e1b28f422a5b55b4260a8c60b45c

Authored by Adhidarma Hadiwinoto 6 years ago

1 parent 19788e2dc0

Exists in master

Tambahan data registrasi modem

Showing 2 changed files with 7 additions and 1 deletions Inline Diff

lib/register-modem.js
lib/report-sender.js

lib/register-modem.js

Diff comments View file @ 3915d32

 'use strict';
 const path = require('path');
 const request = require('request');
 const config = require('komodo-sdk/config');
 const logger = require('komodo-sdk/logger');
 function reportUrl() {
     if (config.report_url.register_modem) {
         return config.report_url.register_modem;
     }
     const baseUrl = path.dirname(config.report_url.incoming_sms);
     return `${baseUrl}/modems/set`;
 }
 module.exports = (modemInfo) => {
     const requestOptions = {
         url: reportUrl(),
         qs: {
             modem: config.name,
+            modem_device: config.modem.device,
             modem_imsi: modemInfo.imsi,
             modem_msisdn: modemInfo.msisdn,
-            modem_device: config.modem.device,
+            modem_network_id: modemInfo.networkId,
+            modem_network_name: modemInfo.networkName,
+            modem_signal_strength: modemInfo.signalStrength,
             uptime: Math.floor(process.uptime()),
             report_port: config.http_command_server.listen_port,
             report_apikey: config.http_command_server.apikey,
             report_path_sms: '/sms',
         },
     };
     logger.info('Sending modem registration to center');
     request(requestOptions, (err, res) => {
         if (err) {
             logger.warn(`Error registering modem. ${err.toString()}`);
         } else if (res.statusCode !== 200) {
             logger.warn(`SMS center respond with HTTP status code ${res.statusCode}.`);
         }
     });
 };

lib/report-sender.js

Diff comments View file @ 3915d32

 'use strict';
 const request = require('request');
 const config = require('komodo-sdk/config');
 const logger = require('komodo-sdk/logger');
 function incomingSMS(message, modemInfo) {
     if (!message || !config || !config.report_url || !config.report_url.incoming_sms) return;
     if (!message.metadata) {
         const e = new Error('Missing metadata on incoming sms');
         e.smsObj = message;
         throw e;
     }
     if (!message.metadata.from) {
         const e = new Error('Missing metadata.from on incoming sms');
         e.smsObj = message;
         throw e;
     }
     if (!message.message) {
         const e = new Error('Missing message on incoming sms');
         e.smsObj = message;
         throw e;
     }
     const requestOptions = {
         url: config.report_url.incoming_sms,
         qs: {
             ts: message.metadata.ts,
             status: message.metadata.status,
             number: message.metadata.from,
             msg: message.message,
             modem: config.name,
             modem_imsi: modemInfo.imsi,
             modem_msisdn: modemInfo.msisdn,
             modem_device: config.modem.device,
+            modem_network_id: modemInfo.networkId,
+            modem_network_name: modemInfo.networkName,
+            modem_signal_strength: modemInfo.signalStrength,
             uptime: Math.floor(process.uptime()),
             report_port: config.http_command_server.listen_port,
             report_apikey: config.http_command_server.apikey,
             report_path_sms: '/sms',
         },
     };
     logger.info('Sending report via HTTP', requestOptions);
     request(requestOptions, (err, res, body) => {
         if (err) {
             logger.warn(`Error sending report via HTTP. ${err.toString()}`);
             return;
         }
         if (res.statusCode !== 200) {
             logger.warn(`Error sending report via HTTP. Server respond with HTTP status code ${res.statusCode}`, { http_status_code: res.statusCode, body });
         }
     });
 }
 exports.incomingSMS = incomingSMS;