HTTP command server: router-info

Adhidarma Hadiwinoto
1 parent 56758af444
Showing 3 changed files with 19 additions and 1 deletions Side-by-side Diff
lib/http-command-server/index.js
lib/http-command-server/router-info.js
lib/modem.js
@@ -5,6 +5,7 @@ const express = require(&#39;express&#39;);
 const config = require('komodo-sdk/config');
 const logger = require('komodo-sdk/logger');
  
+const routerInfo = require('./router-info');
 const routerSMS = require('./router-sms');
  
 const app = express();
@@ -28,6 +29,8 @@ function middlewareCheckApikey(req, res, next) {
  
 app.use(middlewareCustomLog);
 app.use(middlewareCheckApikey);
+
+app.use('/info', routerInfo);
 app.use('/sms', routerSMS);
  
  
@@ -0,0 +1,14 @@
+'use strict';
+
+const express = require('express');
+
+const modem = require('../modem');
+
+const router = express.Router();
+module.exports = router;
+
+function handlerMain(req, res) {
+    res.json(modem.modemInfo);
+}
+
+router.get('/', handlerMain);
@@ -18,6 +18,7 @@ const reportSender = require(&#39;./report-sender&#39;);
 const modemInfo = {
     manufacturer: null,
     model: null,
+    imei: null,
     imsi: null,
     signalStrength: null,
     config: config.modem,
@@ -89,7 +90,7 @@ parserReadLine.on(&#39;data&#39;, (data) =&gt; {
     logger.verbose(`* IN: ${data}`);
     if (data) {
         if (data.indexOf('+CSQ: ') === 0) {
-            modemInfo.signalStrength = common.extractValueFromReadLineData(data);
+            modemInfo.signalStrength = common.extractValueFromReadLineData(data).trim();
             logger.info(`Signal strength: ${modemInfo.signalStrength}`);
         } else if (data.indexOf('+CMTI: ') === 0) {
             onIncomingSMS(data);
...	...	@@ -5,6 +5,7 @@ const express = require('express');
5	5	const config = require('komodo-sdk/config');
6	6	const logger = require('komodo-sdk/logger');
7	7
	8	+const routerInfo = require('./router-info');
8	9	const routerSMS = require('./router-sms');
9	10
10	11	const app = express();
...	...	@@ -28,6 +29,8 @@ function middlewareCheckApikey(req, res, next) {
28	29
29	30	app.use(middlewareCustomLog);
30	31	app.use(middlewareCheckApikey);
	32	+
	33	+app.use('/info', routerInfo);
31	34	app.use('/sms', routerSMS);
32	35
33	36
...	...	@@ -0,0 +1,14 @@
	1	+'use strict';
	2	+
	3	+const express = require('express');
	4	+
	5	+const modem = require('../modem');
	6	+
	7	+const router = express.Router();
	8	+module.exports = router;
	9	+
	10	+function handlerMain(req, res) {
	11	+ res.json(modem.modemInfo);
	12	+}
	13	+
	14	+router.get('/', handlerMain);
...	...	@@ -18,6 +18,7 @@ const reportSender = require('./report-sender');
18	18	const modemInfo = {
19	19	manufacturer: null,
20	20	model: null,
	21	+ imei: null,
21	22	imsi: null,
22	23	signalStrength: null,
23	24	config: config.modem,
...	...	@@ -89,7 +90,7 @@ parserReadLine.on('data', (data) => {
89	90	logger.verbose(`* IN: ${data}`);
90	91	if (data) {
91	92	if (data.indexOf('+CSQ: ') === 0) {
92		- modemInfo.signalStrength = common.extractValueFromReadLineData(data);
	93	+ modemInfo.signalStrength = common.extractValueFromReadLineData(data).trim();
93	94	logger.info(`Signal strength: ${modemInfo.signalStrength}`);
94	95	} else if (data.indexOf('+CMTI: ') === 0) {
95	96	onIncomingSMS(data);