biz-a-cli 2.3.33 → 2.3.35

package/bin/pmtGateway.js

@@ -0,0 +1,68 @@
+#!/usr/bin/env node
+
+import yargs from 'yargs';
+import { createLogger, transports, format } from "winston";
+import {
+    sendInquiry,
+    sendPaymentNotif,
+} from "../pmtGatewayController.js";
+
+
+const logger = createLogger({
+    level: 'info',
+    transports: [
+        new transports.File({ filename: 'log/error.log', level: 'error' }),
+        new transports.File({ filename: 'log/debug.log', level: 'debug' }),
+        new transports.File({ filename: 'log/info.log', level: 'info' }),
+    ],
+})
+if (process.env.NODE_ENV !== 'production') {
+    logger.add(new transports.Console({ format: format.simple(), level: 'info' }))
+}
+
+process.on('uncaughtException', (err) => {  //debug
+    console.log('Unhandled Exception:', err);
+    logger.error('Unhandled Exception:', err)
+});
+
+process.on('unhandledRejection', (err) => {  //debug
+    console.log('Unhandled Rejection:', err);
+    logger.error('Unhandled Rejection:', err)
+});
+
+const port = 3003;
+const argv = yargs(process.argv.slice(2))
+    .usage('Usage: $0 [options]')
+    .options('sp', {
+        alias: 'serverport',
+        default: port,
+        describe: 'Express Port (Callback Feature)',
+        type: 'number',
+        demandOption: false
+    })
+    .argv;
+
+if (argv.help) {
+    yargs().showHelp();
+    process.exit();
+}
+
+//
+import express from 'express';
+import cors from 'cors';
+const app = express();
+
+app.use(cors());
+app.use(express.json());
+
+app.set('args', argv);
+
+app.use('/v1.0/transfer-va/inquiry', sendInquiry);
+app.use('/v1.0/transfer-va/payment', sendPaymentNotif);
+
+app.listen((argv.serverport || port), () => {
+    console.log(`Biz-A is listening at ${process.env.HOST || 'http://localhost'}:${argv.serverport || port} `);
+});
+//
+
+export { app }

package/bin/watcher.js

@@ -4,15 +4,29 @@ import express from 'express';
 import cors from 'cors';
 const app = express();
 import yargs from 'yargs';
-
 import * as timer from '../scheduler/timer.js'
+import { createLogger, transports, format } from "winston";
+
+const logger = createLogger({
+    level: 'info',
+    transports: [
+        new transports.File({ filename: 'log/error.log', level: 'error' }),
+        new transports.File({ filename: 'log/debug.log', level: 'debug' }),
+        new transports.File({ filename: 'log/info.log', level: 'info' }),
+    ],
+})
+if (process.env.NODE_ENV !== 'production') {
+    logger.add(new transports.Console({ format: format.simple(), level: 'info' }))
+}
 
 process.on('uncaughtException', (err) => {  //debug
     console.log('Unhandled Exception:', err);
+    logger.error('Unhandled Exception:', err)
 });
 
 process.on('unhandledRejection', (err) => {  //debug
     console.log('Unhandled Rejection:', err);
+    logger.error('Unhandled Rejection:', err)
 });
 
 const port = 3001;

package/callbackController.js

@@ -20,14 +20,46 @@ export function getInputScript(req) {
     }
 }
 
+function rawHeadersToHeaders(rawHeaders) {
+    const headers = {};
+
+    for (let headerIdx = 0; headerIdx < rawHeaders.length; headerIdx += 2) {
+        const key = rawHeaders[headerIdx].toLowerCase();
+        const value = rawHeaders[headerIdx + 1];
+
+        if (headers[key]) {
+            headers[key] += `, ${value}`;
+        } else {
+            headers[key] = value;
+        }
+    }
+
+    return headers;
+}
+
+export function setDirectHubData(req) {
+    return {
+        body: {
+            query: req.query,
+            body: req.body,
+            headers: rawHeadersToHeaders(req.rawHeaders)
+        }
+    }
+}
+
 export async function runCliScript(req, res) {
     try {
+        if (!req.body.query) {
+            Object.assign(req, setDirectHubData(req))
+        };
+
         const { data, selectedConfig } = getInputScript(req);
-        let script = await loadCliScript(selectedConfig, req.body.query);
-        let functions = extractFunctionScript(script);
+        let script = await loadCliScript(selectedConfig, 'ID', req.body.query.scriptid);
+        let functions = await extractFunctionScript(selectedConfig, script);
         if (functions) {
             let respon = await functions.onInit(data);
             res.send(respon);
+
             console.log(`Run Callback Successfully!`);
         } else {
             res.send('CLI Script does not exist.');

package/envs/env.dev.js

@@ -5,7 +5,13 @@ export const envDev = {
   CDM_MONGO_LINK: 'mongodb+srv://imm_cdm:' +
     encodeURIComponent('imm@2019') + '@imm-cdm-dev.rf6wr.mongodb.net/?retryWrites=true&w=majority',
   COMPANY_REGISTER: 'companyregister-dev',
-  BIZA_SERVER_LINK: 'https://biz-a-dev-41e7c93a25e5.herokuapp.com'
-  // BIZA_SERVER_LINK: 'https://www.ptimf.id/biz-a-dev.com'
-  // BIZA_SERVER_LINK: 'http://localhost:3000'
+  BIZA_SERVER_LINK: 'https://biz-a-dev-41e7c93a25e5.herokuapp.com',
+  // BIZA_SERVER_LINK: 'http://localhost:3000',
+  ESPAY_INQUIRY_LINK: 'http://localhost:3002/cb?subdomain=anejandev&companyid=anejandev&scriptid=5',
+  ESPAY_PAYMENT_LINK: 'http://localhost:3002/cb?subdomain=SACHLI&companyid=immdev&scriptid=6',
+  // ESPAY_INQUIRY_LINK: 'https://biz-a.herokuapp.com/cb?subdomain=anejandev&companyid=anejandev&scriptid=5',
+  // ESPAY_PAYMENT_LINK: 'https://biz-a.herokuapp.com/cb?subdomain=SACHLI&companyid=immdev&scriptid=6',
+
+
+  
 };

package/envs/env.js

@@ -5,5 +5,10 @@ export const env = {
   CDM_MONGO_LINK: 'mongodb+srv://imm_cdm:' +
     encodeURIComponent('imm@2019') + '@imm-cdm.ohcqt.mongodb.net/?retryWrites=true&w=majority',
   COMPANY_REGISTER: 'companyregister',
-  BIZA_SERVER_LINK: 'https://biz-a.herokuapp.com'
+  BIZA_SERVER_LINK: 'https://biz-a.herokuapp.com',
+  // ESPAY_INQUIRY_LINK: 'http://localhost:3002/cb?subdomain=scya&companyid=scy&scriptid=5',
+  ESPAY_INQUIRY_LINK: 'http://localhost:3002/cb?subdomain=anejan&companyid=anejan&scriptid=4',
+  ESPAY_PAYMENT_LINK: 'http://localhost:3002/cb?subdomain=imm&companyid=imamatek&scriptid=7',
+  // ESPAY_INQUIRY_LINK: 'https://biz-a.herokuapp.com/cb?subdomain=anejandev&companyid=anejandev&scriptid=5',
+  // ESPAY_PAYMENT_LINK: 'https://biz-a.herokuapp.com/cb?subdomain=SACHLI&companyid=immdev&scriptid=6',
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "biz-a-cli",
   "nameDev": "biz-a-cli-dev",
-  "version": "2.3.33",
+  "version": "2.3.35",
   "versionDev": "0.0.30",
   "description": "",
   "main": "bin/index.js",
@@ -15,6 +15,7 @@
     "test1": "node --experimental-vm-modules node_modules/jest/bin/jest.js",
     "dev": "node --watch server.js",
     "hub": "node --experimental-vm-modules bin/hub.js"
+
   },
   "author": "Imamatek",
   "license": "ISC",
@@ -25,7 +26,8 @@
     "watcher": "bin/watcher.js",
     "uploadapp": "bin/uploadApp.js",
     "deleteapp": "bin/deleteApp.js",
-    "biza": "bin/app.js"
+    "biza": "bin/app.js",
+    "pmtGateway": "bin/pmtGateway.js"
   },
   "dependencies": {
     "axios": "^1.6.8",

package/pmtGatewayController.js

@@ -0,0 +1,55 @@
+import { default as axios } from 'axios';
+import { envDev } from './envs/env.dev.js';
+import { env } from './envs/env.js';
+
+import dayjs from "dayjs";
+import utc from "dayjs/plugin/utc.js";
+import timezone from "dayjs/plugin/timezone.js"
+
+dayjs.extend(timezone)
+dayjs.extend(utc)
+
+const TIME_FORMAT = 'YYYY-MM-DDTHH:mm:ssZ'
+let ESPAY_INQUIRY_LINK;
+let ESPAY_PAYMENT_LINK;
+
+if ((process.env.NODE_ENV == undefined) || (process.env.NODE_ENV == 'development')) {
+    ESPAY_INQUIRY_LINK = envDev.ESPAY_INQUIRY_LINK;
+    ESPAY_PAYMENT_LINK = envDev.ESPAY_PAYMENT_LINK;
+
+    console.log('ESPAY_INQUIRY_LINK =>', ESPAY_INQUIRY_LINK);
+    console.log('ESPAY_PAYMENT_LINK =>', ESPAY_PAYMENT_LINK);
+} else {
+    ESPAY_INQUIRY_LINK = env.ESPAY_INQUIRY_LINK;
+    ESPAY_PAYMENT_LINK = env.ESPAY_PAYMENT_LINK;
+}
+
+async function sendData(req, res, url) {
+    const headers = {
+        'content-type': req.headers['content-type'],
+        'x-timestamp': req.headers['x-timestamp'],
+        'x-signature': req.headers['x-signature'],
+        'channel-id': req.headers['channel-id'],
+        'x-external-id': req.headers['x-external-id'],
+        'x-partner-id': req.headers['x-partner-id'],
+        'imm-original-url': req.originalUrl
+    }
+
+    res.setHeader('x-timestamp', dayjs().tz('Asia/jakarta').format(TIME_FORMAT));
+
+    const result = await axios.post(url, req.body, { headers });
+    res.send(result.data);
+}
+
+async function sendInquiry(req, res) {
+    await sendData(req, res, ESPAY_INQUIRY_LINK);
+}
+
+async function sendPaymentNotif(req, res) {
+    await sendData(req, res, ESPAY_PAYMENT_LINK);
+}
+
+export {
+    sendInquiry,
+    sendPaymentNotif
+};

package/scheduler/datalib.js

@@ -147,46 +147,69 @@ export async function genId(apiConfig, genName) {
     return res.data?.data ? JSON.parse(res.data.data) : res.data;
 }
 
-export function extractFunctionScript(data) {
+function runScriptInThisContext(script) {
+    return runInThisContext(script, { importModuleDynamically: constants.USE_MAIN_CONTEXT_DEFAULT_LOADER });
+}
+
+export async function setLibrary(config, libraries) {
+    let libs = {};
+    for (const lib of libraries) {
+        const data = await loadCliScript(config, 'SCRIPT_NAME', lib);
+        const libFn = runScriptInThisContext(data[0].script);
+        Object.assign(libs, { lib: libFn().functions });
+    }
+
+    return libs;
+}
+
+export async function extractFunctionScript(selectedConfig, data) {
+    const config = getConfig(selectedConfig);
+
     if (data.error) {
         console.log(data.error, 'error')
         return
     }
     if (data.length == 0) return
 
-    const scriptFn = runInThisContext(data[0].script, { importModuleDynamically: constants.USE_MAIN_CONTEXT_DEFAULT_LOADER });
+    const scriptFn = runScriptInThisContext(data[0].script);
     if (!scriptFn().functions) return
+
     let lib = {
         axios: axios.default,
         dayjs: dayjs.default,
         crypto: crypto,
-        log: logger,
+        log: logger
+    }
+
+    if (scriptFn().functions.useLibrary) {
+        Object.assign(lib, await setLibrary(config, scriptFn().functions.useLibrary()));
     }
     return scriptFn(lib).functions;
 }
 
-export function getQueryDataObsParameters(trigger) {
+export function getQueryDataPrmsParameters(column, value) {
     return {
         length: 1,
-        filter: [{ junction: '', column: 'ID', operator: '=', value1: `${trigger.scriptid}` }],
+        filter: [{ junction: '', column: column, operator: '=', value1: `'${value}'` }],
         columns: [{ data: "SYS$CLI_SCRIPT.SCRIPT", key: 'script' }]
     }
 }
 
-export function queryDataPromise(config, trigger) {
-    let param = getQueryDataObsParameters(trigger);
+export async function queryDataPromise(config, column, value) {
+    let param = getQueryDataPrmsParameters(column, value);
+    // let param = getQueryDataPrmsParameters(d);
 
-    return queryData(param, config, true);
+    return await queryData(param, config, true);
 }
 
 export function getConfig(config) {
     return (Array.isArray(config)) ? config[0] : config;
 }
 
-export function loadCliScript(selectedConfig, trigger) {
+export async function loadCliScript(selectedConfig, column, value) {
     const config = getConfig(selectedConfig);
 
-    return queryDataPromise(config, trigger);
+    return await queryDataPromise(config, column, value);
 }
 
 export function getInputData(config, trigger) {
@@ -212,7 +235,8 @@ export function getInputData(config, trigger) {
 
 export async function scheduleSubscription(config, data, trigger, needSetHistory, isTest = false) {
     try {
-        let functions = extractFunctionScript(data);
+        let functions = extractFunctionScript(config, data);
+
         if (functions) {
             if (!isTest) {  // next, change isTest to test better
                 functions.onInit(getInputData(config, trigger));
@@ -235,7 +259,7 @@ export async function scheduleSubscription(config, data, trigger, needSetHistory
 
 export async function checkSchedule(selectedConfig, trigger, needSetHistory) {
     try {
-        const data = await loadCliScript(selectedConfig, trigger);
+        const data = await loadCliScript(selectedConfig, 'ID', trigger.scriptid);
         await scheduleSubscription(selectedConfig, data, trigger, needSetHistory);
     } catch (error) {
         console.error(error);

package/tests/app.test.js

@@ -294,7 +294,7 @@ describe('Biz-A Apps CLI', ()=>{
                     expect(logSpy.mock.calls[0][0]).toBe('===================\nA.JS\n===================')
 
                     expect(errorSpy.mock.calls.length).toBe(1)
-                    expect(errorSpy.mock.calls[0][0]).toBe('a.js : SyntaxError: Unexpected token: eof, expected: punc «}»')
+                    expect(errorSpy.mock.calls[0][0]).toStrictEqual({e: 'a.js:1:38: SyntaxError: Unexpected token: eof, expected: punc «}»'})
                 }
             ],
             [
@@ -305,11 +305,11 @@ describe('Biz-A Apps CLI', ()=>{
                     expect(logSpy.mock.calls[0][0]).toBe('===================\nA.JS\n===================')
                     expect(logSpy.mock.calls[1][0]).toBe('Minify : \nget=function(){return{modelA:{}}};modul.expor=get;')
                     expect(logSpy.mock.calls[2][0]).toBe('Running script with VM') // node sandbox (VN) error as console.log
-                    expect(logSpy.mock.calls[3][0]).toBe('a.js : ReferenceError: modul is not defined')
+                    expect(logSpy.mock.calls[3][0]).toBe("a.js : ReferenceError: modul is not defined")
                     expect(logSpy.mock.calls[4][0]).toBe('Running script with Import function')
 
                     expect(errorSpy.mock.calls.length).toBe(1)
-                    expect(errorSpy.mock.calls[0][0]).toBe("a.js : ReferenceError: modul is not defined") // ES6 import error
+                    expect(errorSpy.mock.calls[0][0]).toStrictEqual({e: 'a.js : ReferenceError: modul is not defined'}) // ES6 import error
                 }
             ],
             [
@@ -323,7 +323,7 @@ describe('Biz-A Apps CLI', ()=>{
                     expect(logSpy.mock.calls[3][0]).toBe('Running script with Import function')
 
                     expect(errorSpy.mock.calls.length).toBe(1)
-                    expect(errorSpy.mock.calls[0][0]).toBe('a.js : Failed to compile template script.\nPlease make sure the script is correct and not returning empty result')
+                    expect(errorSpy.mock.calls[0][0]).toStrictEqual({e: 'a.js : Failed to compile template script.\nPlease make sure the script is correct and not returning empty result'})
                 }
             ],
         ]

package/tests/callback.test.js

@@ -1,5 +1,6 @@
 const {
-    getInputScript
+    getInputScript,
+    setDirectHubData
 } = await import('../callbackController.js');
 
 describe('callback test', () => {
@@ -40,5 +41,19 @@ describe('callback test', () => {
         });
     });
 
-})
+    test('get input script', () => {
+        const req = {
+            query: { 'a': 1 },
+            body: { 'b': 2 },
+            rawHeaders: ['Abc-Xyz', 'def']
+        }
 
+        expect(setDirectHubData(req)).toStrictEqual({
+            body: {
+                query: { 'a': 1 },
+                body: { 'b': 2 },
+                headers: { 'abc-xyz': 'def' }
+            }
+        })
+    });
+})

package/tests/data.test.js

@@ -2,20 +2,27 @@ import { jest } from '@jest/globals'
 
 const mockInsertHistory = jest.fn();
 jest.unstable_mockModule("../scheduler/watcherController.js", () => ({
-    insertHistory: mockInsertHistory.mockResolvedValue('OK')
+    insertHistory: mockInsertHistory.mockResolvedValue('OK'),
 }))
 
+jest.unstable_mockModule('axios', () => { return { default: jest.fn() } })
+let axios = (await import('axios')).default
+
+axios.get = jest.fn()
+axios.post = jest.fn()
+
 const {
     scheduleSubscription,
     getConfig,
     getInputData,
-    getQueryDataObsParameters,
+    getQueryDataPrmsParameters,
     mapData2Key,
     getUrlApi,
     json2Parameters,
     getUrlAndParam,
     getTableObj,
-    options
+    options,
+    setLibrary
 } = await import('../scheduler/datalib.js');
 
 describe('data test', () => {
@@ -141,13 +148,9 @@ describe('data test', () => {
     });
 
     test('get query data parameter', () => {
-        const trigger = {
-            scriptid: 12
-        }
-
-        expect(getQueryDataObsParameters(trigger)).toStrictEqual({
+        expect(getQueryDataPrmsParameters('ID', 12)).toStrictEqual({
             length: 1,
-            filter: [{ junction: '', column: 'ID', operator: '=', value1: '12' }],
+            filter: [{ junction: '', column: 'ID', operator: '=', value1: "'12'" }],
             columns: [{ data: "SYS$CLI_SCRIPT.SCRIPT", key: 'script' }]
         });
     });
@@ -306,5 +309,40 @@ describe('data test', () => {
         expect(result).toEqual(expectedResult);
     });
 
+    test('should set library if any', async () => {
+        axios.post.mockResolvedValueOnce(axios.post.mockResolvedValueOnce({
+            data: [
+                {
+                    'SYS$CLI_SCRIPT.SCRIPT': 'get = function () {\n' +
+                        '    return {\n' +
+                        '        functions: {\n' +
+                        '            yyy: function (data) {\n' +
+                        '                function doit() {\n' +
+                        '                    return {\n' +
+                        "                        abc: function () { return 'abc'; console.log('abc') },\n" +
+                        '                    }\n' +
+                        '                }\n' +
+                        '                return doit()\n' +
+                        '            },\n' +
+                        '            zzz: function () {\n' +
+                        "                return 'aaabbbccc';\n" +
+                        '            }\n' +
+                        '        }\n' +
+                        '    }\n' +
+                        '}'
+                }
+            ]
+        }))
+
+        const config = {};
+        const libraries = ['lib'];
+
+        const result = await setLibrary(config, libraries);
+
+        expect(result.lib.yyy().abc()).toStrictEqual('abc');
+        expect(result.lib.zzz()).toStrictEqual('aaabbbccc');
+    });
+
+
 })