biz-a-cli 2.3.36 → 2.3.38

package/callbackController.js

@@ -20,39 +20,8 @@ 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, 'ID', req.body.query.scriptid);
         let functions = await extractFunctionScript(selectedConfig, script);

package/envs/env.dev.js

@@ -7,11 +7,4 @@ export const envDev = {
   COMPANY_REGISTER: 'companyregister-dev',
   BIZA_SERVER_LINK: 'https://biz-a-dev-41e7c93a25e5.herokuapp.com',
   // BIZA_SERVER_LINK: 'http://localhost:3000',
-  ESPAY_INQUIRY_LINK: 'http://localhost:3006/cb?subdomain=anejandev&companyid=anejandev&scriptid=5',
-  ESPAY_PAYMENT_LINK: 'http://localhost:3004/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

@@ -6,9 +6,4 @@ export const env = {
     encodeURIComponent('imm@2019') + '@imm-cdm.ohcqt.mongodb.net/?retryWrites=true&w=majority',
   COMPANY_REGISTER: 'companyregister',
   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:3008/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,21 +1,20 @@
 {
   "name": "biz-a-cli",
   "nameDev": "biz-a-cli-dev",
-  "version": "2.3.36",
+  "version": "2.3.38",
   "versionDev": "0.0.30",
   "description": "",
   "main": "bin/index.js",
   "type": "module",
   "engines": {
-    "node": "20.16.0",
-    "npm": "10.8.1"
+    "node": "^20.16.0",
+    "npm": "^10.8.1"
   },
   "scripts": {
     "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js --watch a",
     "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",
@@ -26,8 +25,7 @@
     "watcher": "bin/watcher.js",
     "uploadapp": "bin/uploadApp.js",
     "deleteapp": "bin/deleteApp.js",
-    "biza": "bin/app.js",
-    "pmtGateway": "bin/pmtGateway.js"
+    "biza": "bin/app.js"
   },
   "dependencies": {
     "axios": "^1.6.8",
@@ -57,4 +55,4 @@
       "!<rootDir>/tests/mockData/**"
     ]
   }
-}
+}

package/scheduler/datalib.js

@@ -151,12 +151,12 @@ function runScriptInThisContext(script) {
     return runInThisContext(script, { importModuleDynamically: constants.USE_MAIN_CONTEXT_DEFAULT_LOADER });
 }
 
-export async function setLibrary(config, libraries) {
+export async function setLibrary(config, libraries, defaultLib) {
     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 });
+        Object.assign(libs, { lib: libFn(defaultLib).functions });
     }
 
     return libs;
@@ -182,7 +182,7 @@ export async function extractFunctionScript(selectedConfig, data) {
     }
 
     if (scriptFn().functions.useLibrary) {
-        Object.assign(lib, await setLibrary(config, scriptFn().functions.useLibrary()));
+        Object.assign(lib, await setLibrary(config, scriptFn().functions.useLibrary(), lib));
     }
     return scriptFn(lib).functions;
 }

package/scheduler/timer.js

@@ -58,10 +58,13 @@ export const runScheduler = async (companyName) => {
             runHistory(histories, config, watchers, new Date());
         });
 
+    let intervalStartTime = '';
     for await (const startTime of setInterval(SCHEDULE_INTERVAL, Date.now())) {
-        // if ((now - startTime) > 1000)
-        //     break;
-
+        if (!intervalStartTime) {
+            console.log('Interval Time starts at :', new Date(startTime));
+            intervalStartTime = new Date(startTime);
+        }
+        
         const result = await getWatchers(config);
         const watchers = watcherRecordToJson(result);
         for (const watcher of watchers) {

package/tests/callback.test.js

@@ -1,6 +1,5 @@
 const {
-    getInputScript,
-    setDirectHubData
+    getInputScript
 } = await import('../callbackController.js');
 
 describe('callback test', () => {
@@ -40,20 +39,4 @@ 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

@@ -313,19 +313,21 @@ describe('data test', () => {
         axios.post.mockResolvedValueOnce(axios.post.mockResolvedValueOnce({
             data: [
                 {
-                    'SYS$CLI_SCRIPT.SCRIPT': 'get = function () {\n' +
+                    'SYS$CLI_SCRIPT.SCRIPT': 'get = function (lib) {\n' +
                         '    return {\n' +
                         '        functions: {\n' +
                         '            yyy: function (data) {\n' +
                         '                function doit() {\n' +
                         '                    return {\n' +
-                        "                        abc: function () { return 'abc'; console.log('abc') },\n" +
+                        '                        abc: function () {\n' +
+                        "                            return 'abc';\n" +
+                        '                        },\n' +
                         '                    }\n' +
                         '                }\n' +
                         '                return doit()\n' +
                         '            },\n' +
                         '            zzz: function () {\n' +
-                        "                return 'aaabbbccc';\n" +
+                        "                return lib;\n" +
                         '            }\n' +
                         '        }\n' +
                         '    }\n' +
@@ -336,11 +338,12 @@ describe('data test', () => {
 
         const config = {};
         const libraries = ['lib'];
+        const defaultLib = { defA: 'A', defB: 'B' }
 
-        const result = await setLibrary(config, libraries);
+        const result = await setLibrary(config, libraries, defaultLib);
 
         expect(result.lib.yyy().abc()).toStrictEqual('abc');
-        expect(result.lib.zzz()).toStrictEqual('aaabbbccc');
+        expect(result.lib.zzz()).toStrictEqual({ "defA": "A", "defB": "B" });
     });
 
 

package/tests/mockData/mockApp/a.js

@@ -0,0 +1 @@
+get = function () {return {modelA: {}}}

package/tests/mockData/mockApp/b.js

@@ -0,0 +1,2 @@
+const get = function () {
+return {"modelB": {id: null}}};

package/tests/mockData/mockApp/c.js

@@ -0,0 +1,4 @@
+let get = function () {return {modelC: {}, function: {func: () => { 
+return ["lib"];
+}
+}}};

package/tests/mockData/mockApp/d.js

@@ -0,0 +1,2 @@
+var get = function () {return {model: {}, tableName: "", fields: [], function: {}}};
+module.exports = get;

package/tests/mockData/mockApp/menu.json

@@ -0,0 +1,49 @@
+[
+                        {"menuName": "", "caption": "Home", "link": ["./main"],"subMenu": []},
+                        {"menuName": "", "caption": "Personalia","link": [], "subMenu": [
+                            {"menuName": "","caption": "Data Master","link": [], "subMenu": []},
+                            {
+                                "menuName": "",
+                                "caption": "Gaji",
+                                "link": [],
+                                "subMenu": [
+                                    {
+                                        "menuName": "",
+                                        "caption": "Parameter",
+                                        "link": [
+                                            "./form",
+                                            "gajiparam",
+                                            null
+                                        ],
+                                        "subMenu": []
+                                    },
+                                    {
+                                        "menuName": "",
+                                        "caption": "Perubahan",
+                                        "link": [],
+                                        "subMenu": [
+                                            {
+                                                "menuName": "",
+                                                "caption": "Form Perubahan Gaji",
+                                                "link": [
+                                                    "./form",
+                                                    "gajiubah",
+                                                    null
+                                                ],
+                                                "subMenu": []
+                                            },
+                                            {
+                                                "menuName": "",
+                                                "caption": "Daftar Perubahan Gaji",
+                                                "link": [
+                                                    "./list",
+                                                    "gajiubahdaftar"
+                                                ],
+                                                "subMenu": []
+                                            }
+                                        ]
+                                    }
+                                ]
+                            }
+                        ]}
+                    ]

package/bin/pmtGateway.js

@@ -1,68 +0,0 @@
-#!/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/pmtGatewayController.js

@@ -1,55 +0,0 @@
-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
-};