Komodo / komodo-center-sms

Browse Code »

Commit 527c38f99710f8eb446c5cfbff15d2567ed718a1

Authored by Adhidarma Hadiwinoto 6 years ago

1 parent 2f33e12d0e

Exists in master

ModemData._ts

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

lib/apiserver/index.js
lib/modems2.js

lib/apiserver/index.js

Diff comments View file @ 527c38f

 "use strict";
 /**
  * Modul untuk menerima callback dari modem handler jika ada SMS masuk.
  */
 const express = require('express');
 const moment = require('moment');
 const messagingService = require('komodo-center-messaging-client-lib');
 const config = require('komodo-sdk/config');
 const logger = require('komodo-sdk/logger');
 const transport = require('../transport');
 const partnerLastSeen = require('../partner-last-seen');
 const history = require('../history');
 const modems = require('../modems2');
 const app = express();
 messagingService.setTransport(transport);
 function apikeyChecker(req, res, next) {
     res.locals.has_valid_apikey = req.params.apikey === config.handler_callback_server.apikey;
     if (res.locals.has_valid_apikey) {
         next();
     }
     else {
         res.end('APISERVER: Invalid apikey');
     }
 }
 function onIncomingSms(req, res) {
     res.end('OK');
     if (!req.query.number) return;
     if (req.query.number.indexOf('+') !== 0) return;
     const numberWithSuffix = req.query.number.replace(/^\+/, '') + (config.number_suffix || '');
     partnerLastSeen.set(req.query.number, req.query.modem);
     history.push({
         ts: req.query.ts || moment().format('YYYY-MM-DD HH:mm:ss'),
         modem: {
             name: req.query.modem,
             imsi: req.query.modem_imsi,
             msisdn: req.query.modem_msisdn,
         },
         direction: 'INCOMING',
         partner: req.query.number,
         message: req.query.msg,
     });
     modems.set({
         name: req.query.modem,
         imsi: req.query.modem_imsi,
         msisdn: req.query.modem_msisdn,
+        device: req.query.modem_device,
+        uptime: req.query.uptime,
         reportIp: req.query.report_ip || req.ip,
         reportPort: req.query.report_port,
         reportApikey: req.query.report_apikey,
         reportPathSms: req.query.report_path_sms || '/sms',
     });
     logger.info('APISERVER: Incoming SMS', { modem: req.query.modem, from: req.query.number, from_with_suffix: numberWithSuffix, msg: req.query.msg });
     messagingService.onIncomingMessage({
         me: req.query.modem,
         partner: numberWithSuffix,
         msg: req.query.msg
     })
 }
 async function pageHistory(req, res) {
     res.json(await history.dump());
 }
 app.use(function(req, res, next) {
     logger.verbose('APISERVER: Incoming http request', { ip: req.ip, url: req.url });
     next();
 })
 app.use('/apikey/:apikey', apikeyChecker);
 app.get('/apikey/:apikey/on-sms', onIncomingSms);
 app.get('/apikey/:apikey/inbox', onIncomingSms);
 app.get('/apikey/:apikey/on-sms/inbox', onIncomingSms);
 app.get('/apikey/:apikey/history', pageHistory);
 const listenPort = config && config.handler_callback_server ? config.handler_callback_server.listen_port : null;
 listenPort && app.listen(listenPort, () => {
     logger.info('HTTP Handler Callback server listening on port ' + listenPort);
 })

lib/modems2.js

Diff comments View file @ 527c38f

 'use strict';
 const modemList = {
     by_name: {},
     by_imsi: {},
     by_msisdn: {},
 };
 /**
  * Objek data sebuah modem.
  *
  * @typedef   {Object} ModemData
  * @property  {string} name - nama modem
  * @property  {string} imsi - IMSI modem
  * @property  {string} msisdn - MSISDN modem
+ * @property  {number} uptime - modem uptime in seconds
+ * @property  {string} device - modem device path
  * @property  {string} reportIp - IP modem
  * @property  {number} reportPort - TCP port modem
  * @property  {string} reportApikey - APIKEY modem
  * @property  {string} reportPathSms - url path untuk pengiriman SMS
  */
 /**
  * Update data sebuah modem berdasarkan nama modem.
  *
  * @param  {ModemData} val - objek data modem
  */
 function touchByName(val) {
     if (!val || !val.name) return;
     if (typeof val.name !== 'string') return;
     if (!val.name.trim()) return;
     modemList.by_name[val.name] = val;
 }
 /**
  * Update data sebuah modem berdasarkan IMSI.
  *
  * @param  {ModemData} val - objek data modem
  */
 function touchByIMSI(val) {
     if (!val || !val.imsi) return;
     if (typeof val.imsi !== 'string') return;
     if (!val.imsi.trim()) return;
     modemList.by_imsi[val.imsi] = val;
 }
 /**
  * Update data sebuah modem berdasarkan MSISDN.
  *
  * @param  {ModemData} val - objek data modem
  */
 function touchByMSISDN(val) {
     if (!val || !val.msisdn) return;
     if (typeof val.msisdn !== 'string') return;
     if (!val.msisdn.trim()) return;
     modemList.by_msisdn[val.msisdn] = val;
 }
 /**
  * Update data sebuah modem.
  *
  * @param  {ModemData} val - objek data modem
  * @see ModemData
  */
 function touch(val) {
-    if (!val) return;
+    if (!val || typeof val !== 'object') return;
+    val._ts = new Date();
     if (!val.reportIp) {
         val.reportIp = '127.0.0.1';
     }
     touchByName(val);
     touchByIMSI(val);
     touchByMSISDN(val);
 }
 /**
  * Ambil data sebuah modem.
  *
  * @param  {string} selector - selector pencarian, valid jika bernilai salah satu dari: name, imsi, msisdn
  * @param  {string} keyword - kata kunci modem yang ingin diambil
  * @returns {ModemData} data modem terkait
  */
 function get(selector, keyword) {
     if (!selector || !keyword) return null;
     return modemList[`by_${selector}`] ? modemList[`by_${selector}`][keyword] : null;
 }
 exports.touch = touch;
 exports.set = touch;
 exports.get = get;