Compare View
Commits (2)
Changes
Showing 22 changed files Side-by-side Diff
- CHANGELOG.md
- center/http-response-server.js
- center/messaging/trx-center.js
- config-reload.js
- control-panel/lib/express-init.js
- control-panel/lib/request-to-core.js
- control-panel/lib/router-config.js
- control-panel/lib/router-login.js
- control-panel/lib/router-main.js
- core-url.js
- coreapi/index.js
- gateway/advice-push-server.js
- gateway/cancel-push-server.js
- gateway/pull.js
- gateway/resend-delay.js
- gateway/task-archive.js
- heartbeat.js
- heartbeat2/index.js
- logger-circular-buffer-web.js
- logger.js
- package-lock.json
- package.json
CHANGELOG.md
... | ... | @@ -4,8 +4,14 @@ All notable changes to this project will be documented in this file. Dates are d |
4 | 4 | |
5 | 5 | Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). |
6 | 6 | |
7 | +#### [v1.43.0](https://gitlab.kodesumber.com/komodo/komodo-sdk/compare/v1.42.3...v1.43.0) | |
8 | + | |
9 | +- Remove reference to komodo-sdk/logger [`003038b`](https://gitlab.kodesumber.com/komodo/komodo-sdk/commit/003038ba0b0829fde47637bc38d831c6ef33da6b) | |
10 | + | |
7 | 11 | #### [v1.42.3](https://gitlab.kodesumber.com/komodo/komodo-sdk/compare/v1.42.2...v1.42.3) |
8 | 12 | |
13 | +> 11 September 2021 | |
14 | + | |
9 | 15 | - Update repository url to https [`f66fcdc`](https://gitlab.kodesumber.com/komodo/komodo-sdk/commit/f66fcdc1a87930a9acdad980ea15156cab87d9c7) |
10 | 16 | |
11 | 17 | #### [v1.42.2](https://gitlab.kodesumber.com/komodo/komodo-sdk/compare/v1.42.1...v1.42.2) |
center/http-response-server.js
1 | -"use strict"; | |
2 | - | |
3 | 1 | /** |
4 | 2 | * HTTP Response Server |
5 | 3 | * |
... | ... | @@ -13,7 +11,7 @@ const http = require('http'); |
13 | 11 | const url = require('url'); |
14 | 12 | |
15 | 13 | const config = require('../config'); |
16 | -const logger = require('../logger'); | |
14 | +const logger = require('tektrans-logger'); | |
17 | 15 | |
18 | 16 | let transport; |
19 | 17 | |
... | ... | @@ -47,7 +45,7 @@ function create() { |
47 | 45 | |
48 | 46 | http.createServer(onRequest).listen(listenPort, function() { |
49 | 47 | logger.info('HTTP Reverse/Report server listen on port ' + listenPort + ' to process CORE message'); |
50 | - });; | |
48 | + }); | |
51 | 49 | } |
52 | 50 | |
53 | 51 | create(); |
center/messaging/trx-center.js
1 | -"use strict"; | |
2 | - | |
3 | 1 | /** |
4 | 2 | * Trx Handler untuk center messaging |
5 | 3 | */ |
6 | 4 | |
7 | 5 | const module_name = require('path').basename(__filename); |
8 | 6 | |
7 | +const logger = require('tektrans-logger'); | |
9 | 8 | const request = require('request'); |
10 | 9 | const strftime = require('strftime'); |
11 | 10 | const config = require('../../config'); |
12 | -const logger = require('../../logger'); | |
13 | 11 | const httpResponseServer = require('../http-response-server'); |
14 | -const controlPanel = require('../../control-panel'); | |
15 | 12 | const heartbeat = require('../../heartbeat'); |
16 | 13 | |
17 | 14 | let transport; |
... | ... | @@ -22,7 +19,7 @@ if (config.origin) { |
22 | 19 | |
23 | 20 | heartbeat.setModuleType('center') |
24 | 21 | |
25 | -function onOnline(params) { | |
22 | +function onOnline() { | |
26 | 23 | logger.info('CENTER is ONLINE, ready to communicate'); |
27 | 24 | } |
28 | 25 | |
... | ... | @@ -33,7 +30,7 @@ function onIncomingMessage(paramsFromTransport, cb) { |
33 | 30 | msg: paramsFromTransport ? paramsFromTransport.msg : null |
34 | 31 | }); |
35 | 32 | |
36 | - const command = paramsFromTransport.msg.split(/[\., ]+/)[0].toUpperCase(); | |
33 | + const command = paramsFromTransport.msg.split(/[., ]+/)[0].toUpperCase(); | |
37 | 34 | |
38 | 35 | if (config.commands && config.commands.balance && config.commands.balance.indexOf(command) >= 0) { |
39 | 36 | executeBalanceCheck(paramsFromTransport, cb); |
... | ... | @@ -55,7 +52,7 @@ function onIncomingMessage(paramsFromTransport, cb) { |
55 | 52 | |
56 | 53 | function executeBalanceCheck(paramsFromTransport) { |
57 | 54 | const terminal_name = paramsFromTransport.partner.toLowerCase(); |
58 | - const password = paramsFromTransport.msg.trim().split(/[\., ]+/)[1]; | |
55 | + const password = paramsFromTransport.msg.trim().split(/[., ]+/)[1]; | |
59 | 56 | |
60 | 57 | const requestOptions = { |
61 | 58 | url: config.core_url + '/services/balance', |
... | ... | @@ -74,8 +71,8 @@ function executePriceCheck(paramsFromTransport) { |
74 | 71 | url: config.core_url + '/services/pricelist', |
75 | 72 | qs: { |
76 | 73 | terminal_name: paramsFromTransport.partner.toLowerCase(), |
77 | - keyword: paramsFromTransport.msg.trim().split(/[\., ]+/)[1], | |
78 | - password: paramsFromTransport.msg.trim().split(/[\., ]+/)[2], | |
74 | + keyword: paramsFromTransport.msg.trim().split(/[., ]+/)[1], | |
75 | + password: paramsFromTransport.msg.trim().split(/[., ]+/)[2], | |
79 | 76 | postpaid: 0, |
80 | 77 | msg: paramsFromTransport.msg |
81 | 78 | } |
... | ... | @@ -103,7 +100,7 @@ function generateRequestId(req) { |
103 | 100 | } |
104 | 101 | |
105 | 102 | function executePrepaidBuy(paramsFromTransport, cb) { |
106 | - const tokens = paramsFromTransport.msg.trim().split(/[\., ]+/); | |
103 | + const tokens = paramsFromTransport.msg.trim().split(/[., ]+/); | |
107 | 104 | |
108 | 105 | if (!tokens || tokens.length < 3) { |
109 | 106 | if (transport && transport.send && paramsFromTransport.partner) { |
... | ... | @@ -143,7 +140,7 @@ function executePrepaidBuy(paramsFromTransport, cb) { |
143 | 140 | function executePostpaidInquiry(paramsFromTransport, cb) { |
144 | 141 | // PAY.PLN.1234567890.PIN |
145 | 142 | |
146 | - let tokens = paramsFromTransport.msg.trim().split(/[\., ]+/); | |
143 | + let tokens = paramsFromTransport.msg.trim().split(/[., ]+/); | |
147 | 144 | |
148 | 145 | let qs = { |
149 | 146 | request_id: tokens[4], |
... | ... | @@ -173,7 +170,7 @@ function executePostpaidInquiry(paramsFromTransport, cb) { |
173 | 170 | } |
174 | 171 | |
175 | 172 | function executePostpaidPay(paramsFromTransport, cb) { |
176 | - let tokens = paramsFromTransport.msg.trim().split(/[\., ]+/); | |
173 | + let tokens = paramsFromTransport.msg.trim().split(/[., ]+/); | |
177 | 174 | |
178 | 175 | let qs = { |
179 | 176 | request_id: tokens[4], |
config-reload.js
control-panel/lib/express-init.js
1 | -"use strict"; | |
2 | - | |
3 | 1 | const path = require('path'); |
4 | 2 | |
5 | 3 | const express = require('express'); |
... | ... | @@ -9,7 +7,7 @@ const uniqid = require('uniqid'); |
9 | 7 | const numeral = require('numeral'); |
10 | 8 | |
11 | 9 | const config = require('komodo-sdk/config'); |
12 | -const logger = require('komodo-sdk/logger'); | |
10 | +const logger = require('tektrans-logger'); | |
13 | 11 | |
14 | 12 | const routers = require('./routers'); |
15 | 13 |
control-panel/lib/request-to-core.js
control-panel/lib/router-config.js
1 | -"use strict"; | |
2 | - | |
3 | -const module_name = 'CONTROL_PANEL_' + require('path').basename(__filename); | |
4 | - | |
5 | -const os = require('os'); | |
6 | 1 | const fs = require('fs'); |
7 | 2 | |
8 | 3 | const moment = require('moment'); |
... | ... | @@ -11,14 +6,14 @@ const bodyParser = require('body-parser'); |
11 | 6 | const uuidv1 = require('uuid/v1'); |
12 | 7 | |
13 | 8 | const config = require('komodo-sdk/config'); |
14 | -const logger = require('komodo-sdk/logger'); | |
9 | +const logger = require('tektrans-logger'); | |
15 | 10 | const configReload = require('komodo-sdk/config-reload'); |
16 | 11 | |
17 | 12 | const misc = require('./misc'); |
18 | 13 | |
19 | 14 | const router = express.Router(); |
20 | 15 | |
21 | -function pageJsonEditor(req, res, next) { | |
16 | +function pageJsonEditor(req, res) { | |
22 | 17 | res.render( |
23 | 18 | req.app.locals.cp_views_dir + '/config.jsoneditor.html', |
24 | 19 | { |
... | ... | @@ -28,11 +23,11 @@ function pageJsonEditor(req, res, next) { |
28 | 23 | ) |
29 | 24 | } |
30 | 25 | |
31 | -function pageData(req, res, next) { | |
26 | +function pageData(req, res) { | |
32 | 27 | res.json(config); |
33 | 28 | } |
34 | 29 | |
35 | -function pageDataSubmit(req, res, next) { | |
30 | +function pageDataSubmit(req, res) { | |
36 | 31 | const backupDir = 'config-backup/'; |
37 | 32 | const backupFile = backupDir + 'config.backup_' + moment().format('YYYYMMDD_HHmmss') + '_' + uuidv1() + '.json'; |
38 | 33 | |
... | ... | @@ -46,12 +41,12 @@ function pageDataSubmit(req, res, next) { |
46 | 41 | return res.end('Failed, data is empty'); |
47 | 42 | } |
48 | 43 | |
49 | - fs.mkdir(backupDir, function(errMkdir) { | |
50 | - fs.writeFile(backupFile, JSON.stringify(config, null, 4), function(errBackup) { | |
44 | + fs.mkdir(backupDir, function() { | |
45 | + fs.writeFile(backupFile, JSON.stringify(config, null, 4), function() { | |
51 | 46 | fs.writeFile("config.json", JSON.stringify(req.body, null, 4), function(errWriteNewConfig) { |
52 | 47 | |
53 | 48 | if (errWriteNewConfig) { |
54 | - return res.end('Update failed: ' + err); | |
49 | + return res.end('Update failed: ' + errWriteNewConfig); | |
55 | 50 | } |
56 | 51 | |
57 | 52 | configReload.replace(req.body); |
control-panel/lib/router-login.js
1 | -"use strict"; | |
2 | - | |
3 | 1 | const module_name = 'CONTROL_PANEL_' + require('path').basename(__filename); |
4 | 2 | |
5 | 3 | const querystring = require('querystring'); |
... | ... | @@ -8,11 +6,11 @@ const bodyParser = require('body-parser'); |
8 | 6 | const router = express.Router(); |
9 | 7 | |
10 | 8 | const config = require('komodo-sdk/config'); |
11 | -const logger = require('komodo-sdk/logger'); | |
9 | +const logger = require('tektrans-logger'); | |
12 | 10 | |
13 | 11 | const requestToCore = require('./request-to-core'); |
14 | 12 | |
15 | -function pageLogin(req, res, next) { | |
13 | +function pageLogin(req, res) { | |
16 | 14 | if (req.session && req.session.username && req.session.terminal) { |
17 | 15 | res.redirect('/'); |
18 | 16 | return; |
... | ... | @@ -27,7 +25,7 @@ function pageLogin(req, res, next) { |
27 | 25 | ) |
28 | 26 | } |
29 | 27 | |
30 | -function pageLoginSubmitted(req, res, next) { | |
28 | +function pageLoginSubmitted(req, res) { | |
31 | 29 | const method_name = 'pageLoginSubmitted'; |
32 | 30 | |
33 | 31 | if (!req || !req.body || !req.body.terminal_name || !req.body.password) { |
... | ... | @@ -87,7 +85,7 @@ function pageLoginSubmitted(req, res, next) { |
87 | 85 | }); |
88 | 86 | } |
89 | 87 | |
90 | -function pageLogout(req, res, next) { | |
88 | +function pageLogout(req, res) { | |
91 | 89 | req.session.username = null; |
92 | 90 | req.session.terminal = null; |
93 | 91 |
control-panel/lib/router-main.js
1 | -"use strict"; | |
2 | - | |
3 | 1 | const os = require('os'); |
4 | 2 | |
5 | 3 | const express = require('express'); |
... | ... | @@ -7,7 +5,7 @@ const router = express.Router(); |
7 | 5 | |
8 | 6 | const numeral = require('numeral'); |
9 | 7 | |
10 | -const logger = require('komodo-sdk/logger'); | |
8 | +const logger = require('tektrans-logger'); | |
11 | 9 | const matrix = require('komodo-sdk/matrix'); |
12 | 10 | |
13 | 11 | const misc = require('./misc'); |
core-url.js
coreapi/index.js
gateway/advice-push-server.js
1 | -"use strict"; | |
2 | - | |
3 | 1 | const express = require('express'); |
4 | 2 | const bodyParser = require('body-parser'); |
3 | +const logger = require('tektrans-logger'); | |
5 | 4 | |
6 | 5 | const pull = require('./pull'); |
7 | 6 | const config = require('../config'); |
8 | -const logger = require('../logger'); | |
9 | -const matrix = require('../matrix'); | |
10 | 7 | |
11 | 8 | const app = express(); |
12 | 9 | |
... | ... | @@ -33,7 +30,7 @@ function isValidApikey(req, res, next) { |
33 | 30 | } |
34 | 31 | } |
35 | 32 | |
36 | -function adviceHandler(req, res, next) { | |
33 | +function adviceHandler(req, res) { | |
37 | 34 | |
38 | 35 | if (!partner) { |
39 | 36 | logger.warn('PUSH-ADVICE: Undefined partner, skipped'); |
gateway/cancel-push-server.js
1 | -"use strict"; | |
2 | - | |
3 | 1 | const express = require('express'); |
4 | -const bodyParser = require('body-parser'); | |
2 | +const logger = require('tektrans-logger'); | |
5 | 3 | |
6 | -const pull = require('./pull'); | |
7 | 4 | const config = require('../config'); |
8 | -const logger = require('../logger'); | |
9 | -const matrix = require('../matrix'); | |
10 | 5 | |
11 | 6 | const resendDelay = require('./resend-delay'); |
12 | 7 | |
... | ... | @@ -32,14 +27,7 @@ function isValidApikey(req, res, next) { |
32 | 27 | } |
33 | 28 | } |
34 | 29 | |
35 | -function cancelHandler(req, res, next) { | |
36 | - | |
37 | - if (!partner) { | |
38 | - logger.warn('PUSH-CANCEL: Undefined partner, skipped'); | |
39 | - res.end('UNDEFINED_PARTNER'); | |
40 | - return; | |
41 | - } | |
42 | - | |
30 | +function cancelHandler(req, res) { | |
43 | 31 | let task = req.body; |
44 | 32 | |
45 | 33 | if (!task || !task.trx_id) { |
... | ... | @@ -53,6 +41,6 @@ function cancelHandler(req, res, next) { |
53 | 41 | resendDelay.cancel(task.trx_id); |
54 | 42 | } |
55 | 43 | |
56 | -app.use(bodyParser.json()); | |
44 | +app.use(express.json()); | |
57 | 45 | app.use('/apikey/:apikey', isValidApikey); |
58 | 46 | app.use('/apikey/:apikey/cancel', cancelHandler); |
gateway/pull.js
1 | 1 | const IS_DEBUG = process.env.KOMODO_SDK_DEBUG_PULL; |
2 | 2 | |
3 | 3 | const request = require('request'); |
4 | +const logger = require('tektrans-logger'); | |
4 | 5 | |
5 | 6 | const config = require('../config'); |
6 | -const logger = require('../logger'); | |
7 | 7 | const matrix = require('../matrix'); |
8 | 8 | |
9 | 9 | if (config.control_panel && (config.control_panel.listen_port || config.control_panel.port)) { |
gateway/resend-delay.js
1 | -"use strict"; | |
2 | - | |
3 | 1 | const LRU = require('lru-cache'); |
4 | 2 | const moment = require('moment'); |
3 | +const logger = require('tektrans-logger'); | |
5 | 4 | |
6 | 5 | const config = require('../config'); |
7 | -const logger = require('../logger'); | |
8 | 6 | |
9 | 7 | const resendHandlers = LRU({ |
10 | 8 | max: (( config && config.auto_resend && config.auto_resend.max_handler ) ? Number(config.auto_resend.max_handler) : 0) || 5000, |
gateway/task-archive.js
heartbeat.js
1 | -"use strict"; | |
2 | - | |
3 | -const request = require('request'); | |
4 | - | |
1 | +const logger = require('tektrans-logger'); | |
5 | 2 | const config = require('./config'); |
6 | -const logger = require('./logger'); | |
7 | -const matrix = require('./matrix'); | |
3 | +// const matrix = require('./matrix'); | |
8 | 4 | const core_url = require('./core-url'); |
9 | 5 | |
10 | 6 | let module_type; |
... | ... | @@ -22,16 +18,16 @@ function sendHeartbeat() { |
22 | 18 | return; |
23 | 19 | } |
24 | 20 | |
25 | - const requestOptions = { | |
26 | - uri: core_url + '/heartbeats', | |
27 | - method: 'POST', | |
28 | - json: { | |
29 | - name: heartbeat_name, | |
30 | - module_type: module_type, | |
31 | - config: config, | |
32 | - matrix: matrix | |
33 | - } | |
34 | - } | |
21 | + // const requestOptions = { | |
22 | + // uri: core_url + '/heartbeats', | |
23 | + // method: 'POST', | |
24 | + // json: { | |
25 | + // name: heartbeat_name, | |
26 | + // module_type: module_type, | |
27 | + // config: config, | |
28 | + // matrix: matrix | |
29 | + // } | |
30 | + // } | |
35 | 31 | |
36 | 32 | //request.post(requestOptions, function(err, res, body) { }); |
37 | 33 | } |
heartbeat2/index.js
1 | -"use strict"; | |
2 | - | |
3 | 1 | /** |
4 | 2 | * heartbeat2, blm ready |
5 | 3 | */ |
6 | 4 | |
7 | -const request = require('request'); | |
8 | 5 | |
9 | 6 | const config = require('../config'); |
10 | -const logger = require('../logger'); | |
11 | -const matrix = require('../matrix'); | |
12 | -const core_url = require('../core-url'); | |
13 | 7 | |
14 | 8 | let module_type; |
15 | 9 |
logger-circular-buffer-web.js
... | ... | @@ -5,7 +5,7 @@ require('winston-circular-buffer'); |
5 | 5 | const http = require('http'); |
6 | 6 | const auth = require('basic-auth'); |
7 | 7 | |
8 | -const logger = require('./logger'); | |
8 | +const logger = require('tektrans-logger'); | |
9 | 9 | |
10 | 10 | function listen(options) { |
11 | 11 | if (options && options.port && options.username && options.password) { |
logger.js
1 | +/** | |
2 | + * Logger for komodo environment. It just an alias for tektrans-logger. | |
3 | + * This is a deprecated module. | |
4 | + * Please use tektrans-logger directly | |
5 | + * | |
6 | + * @deprecated 2021-09-12 please use tektrans-logger directly | |
7 | + */ | |
8 | + | |
9 | +/** | |
10 | + * tektrans-logger | |
11 | + */ | |
1 | 12 | const logger = require('tektrans-logger'); |
2 | 13 | |
3 | 14 | logger.verbose('KOMODO-SDK.LOGGER 7784B11E: This module is deprecated, please use TEKTRANS-LOGGER directly.'); |
package-lock.json