Komodo / komodo-center-smstools

Download as
Browse Code ยป

Commit 9b503f9a174c5a1167890b71fea7d46ecaa130fa

Authored by Adhidarma Hadiwinoto
1 parent 7d16c37376
Exists in master

/smstools/modems include imsi, imei, and cops

Showing 1 changed file with 13 additions and 2 deletions Side-by-side Diff

lib/apiserver/routers/smstools.js
Diff comments   View file @ 9b503f9
... ... @@ -9,6 +9,7 @@ const smstoolsUtil = require('../../smstools-util');
9 9 const smstoolsStatus = require('../../smstools-status');
10 10 const smstoolsStatusParsed = require('../../smstools-status-parsed');
11 11 const smstoolsConfigData = require('../../smstools-config/config-file');
  12 +const modemInfo = require('../../smstools-modem-info');
12 13  
13 14 const router = express.Router();
14 15 module.exports = router;
... ... @@ -29,14 +30,24 @@ async function pageRestart(req, res) {
29 30 res.json(await smstoolsUtil.restart());
30 31 }
31 32  
32   -async function pageModemList(req, res) {
  33 +async function pageModems(req, res) {
33 34 const modems = [];
34 35 // eslint-disable-next-line no-restricted-syntax
35 36 for (const [key, value] of Object.entries(smstoolsConfigData.modems || {})) {
  37 + const regularRunResultFile = config.smstools_regular_run_result_file || '/var/spool/sms/regular_run/<MODEMNAME>';
  38 +
  39 + // eslint-disable-next-line no-await-in-loop
  40 + const { imsi, imei, cops } = (await modemInfo.get(key, regularRunResultFile)) || {};
  41 +
36 42 modems.push({
37 43 label: `${key}: ${value.device}, INCOMING${value.outgoing ? ' and OUTGOING' : ''}`,
38 44 value: key,
39 45 data: value,
  46 + status: {
  47 + imsi,
  48 + imei,
  49 + cops,
  50 + },
40 51 });
41 52 }
42 53  
... ... @@ -83,4 +94,4 @@ router.get(&#39;/status/raw&#39;, pageStatusRaw);
83 94 router.get('/restart', pageRestart);
84 95 router.get('/log', pageLog);
85 96 router.get('/spool-count', pageSpoolCount);
86   -router.get('/modems', pageModemList);
  97 +router.get('/modems', pageModems);