Komodo / komodo-center-httpget-x

Browse Code »

Commit 56ec0ab1f742a3313a7f611a1a08101c534cce6d

Authored by Adhidarma Hadiwinoto 4 years ago

1 parent 9693703099

Exists in master and in 1 other branch

Tune on callback-sender

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

lib/core-callback/index.js
lib/core-callback/sender.js

lib/core-callback/index.js

Diff comments View file @ 56ec0ab

+const MODULE_NAME = 'CORE-CALLBACK';
 const DEFAULT_LISTENER_FROM_CORE = 25613;
 const express = require('express');
 const config = require('komodo-sdk/config');
 const logger = require('komodo-sdk/logger');
 const middlewareCommon = require('../middlewares/common');
 const sender = require('./sender');
 const app = express();
 app.use(express.json({ extended: true }));
 app.use(express.urlencoded({ extended: true }));
 app.use((req, res, next) => {
-    res.locals.httpgetx_subsystem = 'CORE-CALLBACK';
+    res.locals.httpgetx_subsystem = MODULE_NAME;
     next();
 });
 app.use(middlewareCommon);
 app.use((req, res) => {
     res.end('OK');
     sender(req.query, res.locals.xid);
 });
 const port = (config.listener && config.listener.core && config.listener.core.port)
     || DEFAULT_LISTENER_FROM_CORE;
 app.listen(port, () => {
-    logger.info(`Listen from CORE callback on port ${port}`);
+    logger.info(`${MODULE_NAME} 0375DC4E: Listen from CORE callback on port ${port}`);
 }).on('error', (e) => {
-    logger.error(`Can not listen CORE callback on port ${port}. ${e.toString()}`);
+    logger.error(`${MODULE_NAME} A90E42D5: Can not listen CORE callback on port ${port}. ${e.toString()}`);
     process.exit(1);
 });

lib/core-callback/sender.js

Diff comments View file @ 56ec0ab

 const MODULE_NAME = 'CORE-CALLBACK-SENDER';
 const MAX_RETRY = 10;
 const SLEEP_BEFORE_RETRY_MS = 60 * 1000;
 const axios = require('axios').default;
 const logger = require('komodo-sdk/logger');
 const sleep = require('../sleep');
 const urlConcatQs = require('../url-concat-qs');
 const sender = async (data, xid, retry) => {
     if (!data.reverse_url) return;
     const params = {
         httpgetx_xid: xid,
         command: data.command,
         request_id: data.request_id && data.request_id.toString(),
         transaction_id: data.transaction_id && data.transaction_id.toString(),
         transaction_date: data.transaction_date,
         store_name: data.store_name,
         terminal_name: data.terminal_name,
         product_name: data.product_name,
         destination: data.destination,
         rc: data.rc,
         sn: data.sn,
+        amount: Number(data.amount) || undefined,
+        ending_balance: Number(data.ending_balance) || undefined,
         message: data.message,
-        amount: data.amount,
-        ending_balance: data.ending_balance,
     };
-    if (data.command === 'INQUIRY' && data.amount_to_charge) {
+    if (data.command === 'INQUIRY' && Number(data.amount_to_charge)) {
-        params.amount_to_charge = data.amount_to_charge;
+        params.amount_to_charge = Number(data.amount_to_charge);
     }
     const fullUrl = urlConcatQs(data.reverse_url, params);
     logger.info(`${MODULE_NAME} 8B6A4CEC: Sending CORE-CALLBACK to PARTNER`, {
         xid, retry, params, fullUrl,
     });
     try {
         const result = await axios.get(data.reverse_url, {
             params,
             timeout: 60 * 1000,
         });
         logger.info(`${MODULE_NAME} 3641FBD7: CORE-CALLBACK has been sent to PARTNER successfully`, {
             xid, retry, fullUrl, body: result && result.data,
         });
     } catch (e) {
         logger.warn(`${MODULE_NAME} A1EC9E70: Failed on sending CORE-CALLBACK to PARTNER`, {
             xid,
             retry,
             maxRetry: MAX_RETRY,
             errCode: e.code,
             errMessage: e.message,
             reverseUrl: data.reverse_url,
             fullUrl,
             httpStatus: e.response && e.response.status,
             body: e.response && e.response.data,
         });
         if ((retry || 0) < MAX_RETRY) {
             await sleep(SLEEP_BEFORE_RETRY_MS);
             logger.verbose(`${MODULE_NAME} D8958695: Going to retry sending CORE-CALLBACK TO PARTNER`, {
                 xid, sleepTime: SLEEP_BEFORE_RETRY_MS,
             });
             sender(data, xid, (retry || 0) + 1);
         }
     }
 };