biz-a-cli 2.3.6 → 2.3.8

package/bin/hubEvent.js

@@ -65,7 +65,7 @@ export default async (socket, argv) => new Promise((resolve, reject) => {
 
         Axios.request({
             method: data.method,
-            url: `${process.env.HOST || 'http://localhost'}:${argv.serverport}/cb${path}`,
+            url: `${process.env.HOST || 'http://localhost'}:${argv.serverport}/cb${path || ''}`,
             data: remainData
         }).subscribe(result => callback(result.data));
     });

package/callbackController.js

@@ -20,10 +20,10 @@ export async function runCliScript(req, res) {
     const { data, selectedConfig } = getInputScript(req);
 
     loadCliScript(selectedConfig, req.body.query).subscribe({
-        next: script => {
+        next: async script => {
             let functions = extractFunctionScript(script);
             if (functions) {
-                res.send(functions.onInit(data));
+                res.send(await functions.onInit(data));
                 console.log(`Run Callback Successfully!`);
             } else {
                 res.send('CLI Script does not exist.');

package/package.json

@@ -1,19 +1,20 @@
 {
   "name": "biz-a-cli",
   "nameDev": "biz-a-cli-dev",
-  "version": "2.3.6",
-  "versionDev": "0.0.24",
+  "version": "2.3.8",
+  "versionDev": "0.0.27",
   "description": "",
   "main": "bin/index.js",
   "type": "module",
   "engines": {
-    "node": "20.9.0",
-    "npm": "10.1.0"
+    "node": "20.12.1",
+    "npm": "10.5.0"
   },
   "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"
+    "dev": "node --watch server.js",
+    "hub": "node --experimental-vm-modules bin/hub.js"
   },
   "author": "Imamatek",
   "license": "ISC",
@@ -34,6 +35,7 @@
     "nodemailer": "^6.9.12",
     "socket.io-client": "^4.7.5",
     "socket.io-stream": "^0.9.1",
+    "web-push": "^3.6.7",
     "yargs": "^17.7.2"
   },
   "devDependencies": {
@@ -43,4 +45,4 @@
   "jest": {
     "transform": {}
   }
-}
+}

package/scheduler/datalib.js

@@ -1,6 +1,17 @@
 import { map, tap } from "rxjs";
 import { Axios } from 'axios-observable';
+import { runInThisContext, constants } from "vm";
 import { insertHistory } from "./watcherController.js";
+import axios from "axios";
+import * as dayjs from "dayjs";
+import timezone from "dayjs/plugin/timezone.js";
+import utc from "dayjs/plugin/utc.js"
+import crypto from "crypto";
+
+import customParseFormat from 'dayjs/plugin/customParseFormat.js'
+dayjs.default.extend(customParseFormat)
+dayjs.default.extend(timezone)
+dayjs.default.extend(utc)
 
 // let BIZA_SERVER_LINK;
 
@@ -13,32 +24,32 @@ import { insertHistory } from "./watcherController.js";
 
 function mapData2Key(res, cols) {
     return res.map(e => {
-        return cols.reduce((o, k) => {
+        return cols.reduce((o, k) => { 
             o[k.key ? k.key : k.data] = e[k.data]
             return o;
         }, {})
     })
 }
 
-function hex2a(hexx) {
-    let hex = hexx.toString();//force conversion
-    let str = '';
-    for (let i = 0; i < hex.length; i += 2)
-        str += String.fromCharCode(parseInt(hex.slice(i, i + 2), 16));
-    return str;
-}
+// function hex2a(hexx) {
+//     let hex = hexx.toString();//force conversion
+//     let str = '';
+//     for (let i = 0; i < hex.length; i += 2)
+//         str += String.fromCharCode(parseInt(hex.slice(i, i + 2), 16));
+//     return str;
+// }
 
-function deserialise(key, data) {
-    if (data instanceof Array && data[0] == 'window.Function') {
-        let f = Function(data[1], data[2].join("\r\n"));
-        return f;
-    } else {
-        return data;
-    }
-};
+// function deserialise(key, data) {
+//     if (data instanceof Array && data[0] == 'window.Function') {
+//         let f = Function(data[1], data[2].join("\r\n"));
+//         return f;
+//     } else {
+//         return data;
+//     }
+// };
 
 function getUrlApi(config, methodName, isPost = true) {
-    return `${config.API_URL}/fina/rest/TOrmMethod/` +
+    return `${config.url}/fina/rest/TOrmMethod/` +
         `${isPost ? '%22' : ''}${methodName}${isPost ? '%22' : ''}`
 }
 
@@ -63,6 +74,28 @@ function getUrlAndParam(config, method, obj, path) {
     }
 }
 
+function getTableObj(model, tableName) {
+    let obj = {};
+    obj[tableName] = model;
+    return obj;
+}
+
+export function sendModel(model, apiConfig, tableName) {
+    const { url, params } = getUrlAndParam(
+        apiConfig,
+        'put',
+        getTableObj(model, tableName),
+        'orm'
+    );
+
+    const options = {
+        headers: { 'content-type': 'text/plain' },
+        params: { subdomain: apiConfig.subdomain }
+    }
+
+    return Axios.post(url, params, options)
+}
+
 // export function getSelectedCompConfig(companyName) {
 //     const url = `${BIZA_SERVER_LINK}/config/%22getSelectedCompConfig%22`;
 //     const param = { companyName };
@@ -134,9 +167,16 @@ export function extractFunctionScript(data) {
         return
     }
     if (data.length == 0) return
-    let hex = JSON.parse(hex2a(data[0].script))
-    if (!hex.functions) return
-    return JSON.parse(JSON.stringify(hex.functions), deserialise)
+
+    const scriptFn = runInThisContext(data[0].script, { importModuleDynamically: constants.USE_MAIN_CONTEXT_DEFAULT_LOADER });
+    if (!scriptFn().functions) return
+    let lib = {
+        axios : axios.default,
+        dayjs : dayjs.default,
+        crypto: crypto
+    }
+    return scriptFn(lib).functions;
+    // return JSON.parse(JSON.stringify(scriptFn.functions), deserialise)
 }
 
 export function getQueryDataObsParameters(trigger) {
@@ -166,7 +206,7 @@ export function loadCliScript(selectedConfig, trigger) {
 }
 
 export function getInputData(config, trigger) {
-    const urlAndPort = config.API_URL.split(':');
+    const urlAndPort = config.url.split(':');
     return {
         arguments: {
             hostname: urlAndPort[1].split('//')[1],

package/tests/data.test.js

@@ -5,13 +5,6 @@ jest.unstable_mockModule("../scheduler/watcherController.js", () => ({
     insertHistory: mockInsertHistory.mockResolvedValue('OK')
 }))
 
-// const mockModule = await import('../scheduler/datalib.js');
-// const mockExtractFunctionScript = jest.fn();
-// jest.unstable_mockModule("../scheduler/datalib.js", () => ({
-//     ...mockModule,
-//     extractFunctionScript: mockExtractFunctionScript
-// }))
-
 const {
     scheduleSubscription,
     getConfig,
@@ -20,14 +13,34 @@ const {
 } = await import('../scheduler/datalib.js');
 
 describe('data test', () => {
+    const SCRIPT = "get = function () {" +
+        "    return {" +
+        "        functions: {" +
+        "            onInit: function (data) {" +
+        "                const doit = async () => {" +
+        "                    const config = {" +
+        "                        url: `http://${data.arguments.hostname}:${data.arguments.port}`," +
+        "                        dbindex: data.arguments.dbindex," +
+        "                        subdomain: data.arguments.subdomain" +
+        "                    };" +
+        "                };" +
+        "                doit();" +
+        "                return 'OK';" +
+        "            }" +
+        "        }" +
+        "    }" +
+        "}";
+
     test('check schedule subscription no history', () => {
         const config = {
             _id: 'ffffffff2ae49fab9ea654e1',
-            API_URL: 'http://localhost:212',
+            url: 'http://localhost:212',
             dbindex: 2,
             subdomain: 'abc'
         }
-        const data = [{ script: '7b2266756e6374696f6e73223a7b226f6e496e6974223a5b2277696e646f772e46756e6374696f6e222c5b22636f6e666967222c222064617461225d2c5b2220202020202020202020202020202020636f6e737420646f6974203d206173796e63202829203d3e207b222c222020202020202020202020202020202020202020636f6e7374207b20746170207d203d20617761697420696d706f7274282772786a732729222c222020202020202020202020202020202020202020636f6e7374207b20717565727944617461207d203d20617761697420696d706f727428272e2f646174616c69622e6a732729222c222020202020202020202020202020202020202020636f6e737420706172616d203d207b222c222020202020202020202020202020202020202020202020206c656e6774683a2031302c222c22202020202020202020202020202020202020202020202020636f6c756d6e733a205b222c22202020202020202020202020202020202020202020202020202020207b20646174613a202755534552532e555345524944272c206b65793a202775736572696427207d222c222020202020202020202020202020202020202020202020205d2c222c222020202020202020202020202020202020202020202020206462496e6465783a2031222c2220202020202020202020202020202020202020207d222c22202020202020202020202020202020202020202071756572794461746128706172616d2c20636f6e6669672c2074727565292e7069706528222c2220202020202020202020202020202020202020202020202074617028726573203d3e20636f6e736f6c652e6c6f672872657329292c222c222020202020202020202020202020202020202020292e73756273637269626528726573203d3e207b222c22202020202020202020202020202020202020202020202020636f6e736f6c652e6c6f67287265732c20277375627363726962652729222c2220202020202020202020202020202020202020207d29222c22202020202020202020202020202020207d222c2220202020202020202020202020202020646f69742829222c222020202020202020202020202020202072657475726e20276f6b20646172692063656b55736572273b225d5d7d7d' }]
+        // const data = [{ script: '7b2266756e6374696f6e73223a7b226f6e496e6974223a5b2277696e646f772e46756e6374696f6e222c5b22636f6e666967222c222064617461225d2c5b2220202020202020202020202020202020636f6e737420646f6974203d206173796e63202829203d3e207b222c222020202020202020202020202020202020202020636f6e7374207b20746170207d203d20617761697420696d706f7274282772786a732729222c222020202020202020202020202020202020202020636f6e7374207b20717565727944617461207d203d20617761697420696d706f727428272e2f646174616c69622e6a732729222c222020202020202020202020202020202020202020636f6e737420706172616d203d207b222c222020202020202020202020202020202020202020202020206c656e6774683a2031302c222c22202020202020202020202020202020202020202020202020636f6c756d6e733a205b222c22202020202020202020202020202020202020202020202020202020207b20646174613a202755534552532e555345524944272c206b65793a202775736572696427207d222c222020202020202020202020202020202020202020202020205d2c222c222020202020202020202020202020202020202020202020206462496e6465783a2031222c2220202020202020202020202020202020202020207d222c22202020202020202020202020202020202020202071756572794461746128706172616d2c20636f6e6669672c2074727565292e7069706528222c2220202020202020202020202020202020202020202020202074617028726573203d3e20636f6e736f6c652e6c6f672872657329292c222c222020202020202020202020202020202020202020292e73756273637269626528726573203d3e207b222c22202020202020202020202020202020202020202020202020636f6e736f6c652e6c6f67287265732c20277375627363726962652729222c2220202020202020202020202020202020202020207d29222c22202020202020202020202020202020207d222c2220202020202020202020202020202020646f69742829222c222020202020202020202020202020202072657475726e20276f6b20646172692063656b55736572273b225d5d7d7d' }]
+        const data = [{ script: SCRIPT }];
+
         const trigger = {
             _id: 1,
             name: 'New Watcher 1',
@@ -40,12 +53,14 @@ describe('data test', () => {
     test('check schedule subscription with history', () => {
         const config = {
             _id: 'ffffffff2ae49fab9ea654e1',
-            API_URL: 'http://localhost:212',
+            url: 'http://localhost:212',
             dbindex: 2,
             subdomain: 'abc'
         }
 
-        const data = [{ script: '7b2266756e6374696f6e73223a7b226f6e496e6974223a5b2277696e646f772e46756e6374696f6e222c5b22636f6e666967222c222064617461225d2c5b2220202020202020202020202020202020636f6e737420646f6974203d206173796e63202829203d3e207b222c222020202020202020202020202020202020202020636f6e7374207b20746170207d203d20617761697420696d706f7274282772786a732729222c222020202020202020202020202020202020202020636f6e7374207b20717565727944617461207d203d20617761697420696d706f727428272e2f646174616c69622e6a732729222c222020202020202020202020202020202020202020636f6e737420706172616d203d207b222c222020202020202020202020202020202020202020202020206c656e6774683a2031302c222c22202020202020202020202020202020202020202020202020636f6c756d6e733a205b222c22202020202020202020202020202020202020202020202020202020207b20646174613a202755534552532e555345524944272c206b65793a202775736572696427207d222c222020202020202020202020202020202020202020202020205d2c222c222020202020202020202020202020202020202020202020206462496e6465783a2031222c2220202020202020202020202020202020202020207d222c22202020202020202020202020202020202020202071756572794461746128706172616d2c20636f6e6669672c2074727565292e7069706528222c2220202020202020202020202020202020202020202020202074617028726573203d3e20636f6e736f6c652e6c6f672872657329292c222c222020202020202020202020202020202020202020292e73756273637269626528726573203d3e207b222c22202020202020202020202020202020202020202020202020636f6e736f6c652e6c6f67287265732c20277375627363726962652729222c2220202020202020202020202020202020202020207d29222c22202020202020202020202020202020207d222c2220202020202020202020202020202020646f69742829222c222020202020202020202020202020202072657475726e20276f6b20646172692063656b55736572273b225d5d7d7d' }]
+        // const data = [{ script: '7b2266756e6374696f6e73223a7b226f6e496e6974223a5b2277696e646f772e46756e6374696f6e222c5b22636f6e666967222c222064617461225d2c5b2220202020202020202020202020202020636f6e737420646f6974203d206173796e63202829203d3e207b222c222020202020202020202020202020202020202020636f6e7374207b20746170207d203d20617761697420696d706f7274282772786a732729222c222020202020202020202020202020202020202020636f6e7374207b20717565727944617461207d203d20617761697420696d706f727428272e2f646174616c69622e6a732729222c222020202020202020202020202020202020202020636f6e737420706172616d203d207b222c222020202020202020202020202020202020202020202020206c656e6774683a2031302c222c22202020202020202020202020202020202020202020202020636f6c756d6e733a205b222c22202020202020202020202020202020202020202020202020202020207b20646174613a202755534552532e555345524944272c206b65793a202775736572696427207d222c222020202020202020202020202020202020202020202020205d2c222c222020202020202020202020202020202020202020202020206462496e6465783a2031222c2220202020202020202020202020202020202020207d222c22202020202020202020202020202020202020202071756572794461746128706172616d2c20636f6e6669672c2074727565292e7069706528222c2220202020202020202020202020202020202020202020202074617028726573203d3e20636f6e736f6c652e6c6f672872657329292c222c222020202020202020202020202020202020202020292e73756273637269626528726573203d3e207b222c22202020202020202020202020202020202020202020202020636f6e736f6c652e6c6f67287265732c20277375627363726962652729222c2220202020202020202020202020202020202020207d29222c22202020202020202020202020202020207d222c2220202020202020202020202020202020646f69742829222c222020202020202020202020202020202072657475726e20276f6b20646172692063656b55736572273b225d5d7d7d' }]
+        const data = [{ script: SCRIPT }];
+
         const trigger = {
             _id: 1,
             name: 'New Watcher 1'
@@ -58,7 +73,7 @@ describe('data test', () => {
     test('get input data', () => {
         const config = {
             _id: 'ffffffff2ae49fab9ea654e1',
-            API_URL: 'http://localhost:212',
+            url: 'http://localhost:212',
             dbindex: 2,
             subdomain: 'abc'
         }
@@ -86,7 +101,7 @@ describe('data test', () => {
     test('get config', () => {
         const config = {
             _id: 'ffffffff2ae49fab9ea654e1',
-            API_URL: 'localhost'
+            url: 'localhost'
         }
 
         expect(getConfig(config)).toStrictEqual(config);
@@ -95,18 +110,23 @@ describe('data test', () => {
     test('get config array', () => {
         const config = [{
             _id: 'ffffffff2ae49fab9ea654e1',
-            API_URL: 'localhost'
+            url: 'localhost'
         }]
 
         expect(getConfig(config)).toStrictEqual(config[0]);
     });
 
-    // test('get config array', () => {
-    //     const trigger = {
-    //         _id: 'abc'
-    //     }
+    test('get query data parameter', () => {
+        const trigger = {
+            scriptid: 12
+        }
+
+        expect(getQueryDataObsParameters(trigger)).toStrictEqual({
+            length: 1,
+            filter: [{ junction: '', column: 'ID', operator: '=', value1: '12' }],
+            columns: [{ data: "SYS$CLI_SCRIPT.SCRIPT", key: 'script' }]
+        });
+    });
 
-    //     expect(getQueryDataObsParameters(trigger)).toStrictEqual();
-    // });
 })
 

package/tests/hub.test.js

@@ -61,24 +61,49 @@ describe('cli req test', () => {
   })
 
   test('request to cli', async () => {
-    jest.spyOn(Axios, 'request').mockReturnValue(of({ data: 'OK' }));
+    let mockedRequest = jest.spyOn(Axios, 'request').mockReturnValue(of({ data: 'OK' }));
 
     let socket;
     try {
       socket = ioc(`http://localhost:${port}`);
-
       await hubEvent(socket, {
         server: `http://localhost:${port}`,
         subdomain: 'scy',
         hostname: 'localhost',
         port: 212,
+        serverport: 3002
+      });
+
+      let result = await toPromise(resolve => socketsBySubdomain['scy'].emit(
+        'cli-req', {
+        // path: '/a/b',
+        method: 'POST',
+        query: { subdomain: 'abc' }, body: { data: 'xyz' }
+      }, cb => resolve(cb)
+      ))
+
+      expect(result).toStrictEqual('OK');
+      expect(mockedRequest).toHaveBeenCalledWith({
+        data: { body: { data: "xyz" }, query: { subdomain: "abc" } },
+        method: "POST",
+        url: "http://localhost:3002/cb"
       });
 
-      const result = await toPromise(resolve => socketsBySubdomain['scy'].emit(
-        'cli-req', { d: 1 }, cb => resolve(cb)
+      result = await toPromise(resolve => socketsBySubdomain['scy'].emit(
+        'cli-req', {
+        path: '/a/b',
+        method: 'POST',
+        query: { subdomain: 'abc' }, body: { data: 'xyz' }
+      }, cb => resolve(cb)
       ))
 
       expect(result).toStrictEqual('OK');
+      expect(mockedRequest).toHaveBeenCalledWith({
+        data: { body: { data: "xyz" }, query: { subdomain: "abc" } },
+        method: "POST",
+        url: "http://localhost:3002/cb/a/b",
+      });
+
       socket.disconnect();
     } catch (error) {
       console.log(error);