biz-a-cli 2.3.15 → 2.3.16

package/bin/hubEvent.js

@@ -1,4 +1,4 @@
-import { Axios } from 'axios-observable';
+import axios from 'axios';
 import net from 'node:net';
 import { createRequire } from "module";
 const require = createRequire(import.meta.url);
@@ -57,16 +57,17 @@ export default async (socket, argv) => new Promise((resolve, reject) => {
             s.end();
         });
     }
-    const cliReqCb = (data, callback) => {
+    const cliReqCb = async (data, callback) => {
         const { path, method, ...remainData } = data;
 
-        Axios.request({
+        const result = await axios.request({
             method: data.method,
             url: `${process.env.HOST || 'http://localhost'}:${argv.serverport}/cb${path || ''}`,
             data: remainData
-        }).subscribe(result => callback(result.data));
+        })
+        callback(result.data);
     }
     socket.on('connect', connectCb);
     socket.on('incomingClient', incomingHubCb)
-    socket.on('cli-req', cliReqCb );
+    socket.on('cli-req', cliReqCb);
 })

package/callbackController.js

@@ -10,7 +10,7 @@ export function getInputScript(req) {
             path: req.path,
             query: req.body.query,
             headers: req.body.headers,
-            socket : req.app.settings.socket,
+            socket: req.app.settings.socket,
         },
         selectedConfig: {
             url: `http://${args.hostname}:${args.port}`,
@@ -21,22 +21,19 @@ export function getInputScript(req) {
 }
 
 export async function runCliScript(req, res) {
-    
-    const { data, selectedConfig } = getInputScript(req);
-    loadCliScript(selectedConfig, req.body.query).subscribe({
-        next: async script => {
-            let functions = extractFunctionScript(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.');
-            }
-        },
-        error: error => {
-            console.error(error);
-            throw new Error(error);
+    try {
+        const { data, selectedConfig } = getInputScript(req);
+        let script = await loadCliScript(selectedConfig, req.body.query);
+        let functions = extractFunctionScript(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.');
         }
-    })
+    } catch (error) {
+        console.error(error);
+        throw new Error(error);
+    }
 }

package/mailController.js

@@ -15,12 +15,12 @@ export function sendMailWatcher(req) {
                 console.log(err.message);
                 return err.message;
             } else {
-                console.log(info);
+                console.log('Info:' + info);
                 return info;
             }
         })
     } catch (err) {
-        console.log(err.message);
+        console.log('Error: ' + err.message);
         return err.message;
     }
 }

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "biz-a-cli",
   "nameDev": "biz-a-cli-dev",
-  "version": "2.3.15",
-  "versionDev": "0.0.29",
+  "version": "2.3.16",
+  "versionDev": "0.0.30",
   "description": "",
   "main": "bin/index.js",
   "type": "module",
@@ -28,7 +28,6 @@
   },
   "dependencies": {
     "axios": "^1.6.8",
-    "axios-observable": "^2.0.0",
     "cors": "^2.8.5",
     "dayjs": "^1.11.10",
     "express": "^4.18.3",

package/scheduler/datalib.js

@@ -1,5 +1,3 @@
-import { map, tap } from "rxjs";
-import { Axios } from 'axios-observable';
 import { runInThisContext, constants } from "vm";
 import { insertHistory } from "./watcherController.js";
 import axios from "axios";
@@ -7,7 +5,7 @@ import * as dayjs from "dayjs";
 import timezone from "dayjs/plugin/timezone.js";
 import utc from "dayjs/plugin/utc.js"
 import crypto from "crypto";
-import {createLogger, transports, format, config}  from "winston";
+import { createLogger, transports, format } from "winston";
 
 import customParseFormat from 'dayjs/plugin/customParseFormat.js'
 dayjs.default.extend(customParseFormat)
@@ -15,16 +13,16 @@ dayjs.default.extend(timezone)
 dayjs.default.extend(utc)
 
 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'}),
-        new transports.File({filename:'log/exception.log', handleExceptions:true})
+    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' }),
+        new transports.File({ filename: 'log/exception.log', handleExceptions: true })
     ],
 })
-if (process.env.NODE_ENV !== 'production'){
-    logger.add(new transports.Console({format: format.simple(), level:'info'}))
+if (process.env.NODE_ENV !== 'production') {
+    logger.add(new transports.Console({ format: format.simple(), level: 'info' }))
 }
 
 
@@ -40,7 +38,7 @@ if (process.env.NODE_ENV !== 'production'){
 
 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;
         }, {})
@@ -92,10 +90,10 @@ export function sendModel(model, apiConfig, tableName) {
         params: { subdomain: apiConfig.subdomain }
     }
 
-    return Axios.post(url, params, options)
+    return axios.post(url, params, options)
 }
 
-export function queryData(param, apiConfig, mapField) {
+export async function queryData(param, apiConfig, mapField) {
     const defaultParam = {
         start: 0, length: -1, order: [], filter: [], columns: []
     };
@@ -112,17 +110,12 @@ export function queryData(param, apiConfig, mapField) {
         params: { subdomain: apiConfig.subdomain }
     }
 
-    return Axios.post(url, params, options).pipe(
-        // tap(res=>console.log(res, 'res')),
-        map(res => res.data?.data ? JSON.parse(res.data.data) : res.data),
-        map(res => {
-            if (!mapField || res.error) return res;
-            return mapData2Key(res, param.columns)
-        })
-    )
+    let res = await axios.post(url, params, options);
+    res = res.data?.data ? JSON.parse(res.data.data) : res.data;
+    return (!mapField || res.error) ? res : mapData2Key(res, param.columns);
 }
 
-export function crudData(param, apiConfig, method, path) {
+export async function crudData(param, apiConfig, method, path) {
     const { url, params } = getUrlAndParam(
         apiConfig,
         method,
@@ -135,20 +128,18 @@ export function crudData(param, apiConfig, method, path) {
         params: { subdomain: apiConfig.subdomain }
     }
 
-    return Axios.post(url, params, options).pipe(
-        map(res => res.data?.data ? JSON.parse(res.data.data) : res.data),
-    )
+    const res = await axios.post(url, params, options);
+    return res.data?.data ? JSON.parse(res.data.data) : res.data;
 }
 
-export function genId(apiConfig, genName) {
+export async function genId(apiConfig, genName) {
     const url = `${getUrlApi(apiConfig, 'genId', false)}/${genName}/${apiConfig.dbindex}`;
     const options = {
         headers: { 'content-type': 'text/plain' },
         params: { subdomain: apiConfig.subdomain }
     }
-    return Axios.get(url, options).pipe(
-        map(res => res.data?.data ? JSON.parse(res.data.data) : res.data),
-    )
+    const res = await axios.get(url, options);
+    return res.data?.data ? JSON.parse(res.data.data) : res.data;
 }
 
 export function extractFunctionScript(data) {
@@ -161,13 +152,12 @@ export function extractFunctionScript(data) {
     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,
+        axios: axios.default,
+        dayjs: dayjs.default,
         crypto: crypto,
-        log : logger,
+        log: logger,
     }
     return scriptFn(lib).functions;
-    // return JSON.parse(JSON.stringify(scriptFn.functions), deserialise)
 }
 
 export function getQueryDataObsParameters(trigger) {
@@ -178,7 +168,7 @@ export function getQueryDataObsParameters(trigger) {
     }
 }
 
-export function queryDataObservable(config, trigger) {
+export function queryDataPromise(config, trigger) {
     let param = getQueryDataObsParameters(trigger);
 
     return queryData(param, config, true);
@@ -191,9 +181,7 @@ export function getConfig(config) {
 export function loadCliScript(selectedConfig, trigger) {
     const config = getConfig(selectedConfig);
 
-    return queryDataObservable(config, trigger).pipe(
-        // throttleTime(100)
-    )
+    return queryDataPromise(config, trigger);
 }
 
 export function getInputData(config, trigger) {
@@ -203,13 +191,21 @@ export function getInputData(config, trigger) {
             hostname: urlAndPort[1].split('//')[1],
             port: +urlAndPort[2],
             dbindex: config.dbindex,
-            subdomain: config.subdomain
+            finaDbIndex: config.finaDbIndex,
+            subdomain: config.subdomain,
+            smtp: {
+                user: config.smtp.auth.user,
+                pass:config.smtp.auth.pass,
+                host: config.smtp.host,
+                port: config.smtp.port,
+                secure: config.smtp.secure
+            }
         },
         body: trigger.data
     }
 }
 
-export function scheduleSubscription(config, data, trigger, needSetHistory, isTest = false) {
+export async function scheduleSubscription(config, data, trigger, needSetHistory, isTest = false) {
     try {
         let functions = extractFunctionScript(data);
         if (functions) {
@@ -218,7 +214,7 @@ export function scheduleSubscription(config, data, trigger, needSetHistory, isTe
             }
 
             if (needSetHistory) {
-                insertHistory(config, trigger._id, new Date());
+                await insertHistory(config, trigger._id, new Date());
                 console.log(`Run Recent Schedule : ${trigger.name}`);
             } else {
                 console.log(`Run Schedule : ${trigger.name}`);
@@ -232,12 +228,12 @@ export function scheduleSubscription(config, data, trigger, needSetHistory, isTe
     }
 }
 
-export function checkSchedule(selectedConfig, trigger, needSetHistory) {
-    loadCliScript(selectedConfig, trigger).subscribe({
-        next: data => scheduleSubscription(selectedConfig, data, trigger, needSetHistory),
-        error: error => {
-            console.error(error);
-            throw new Error(error);
-        }
-    })
+export async function checkSchedule(selectedConfig, trigger, needSetHistory) {
+    try {
+        const data = await loadCliScript(selectedConfig, trigger);
+        await scheduleSubscription(selectedConfig, data, trigger, needSetHistory);
+    } catch (error) {
+        console.error(error);
+        throw new Error(error);
+    }
 }

package/scheduler/timer.js

@@ -3,7 +3,6 @@ import { getWatchers, getHistories } from "./watcherController.js";
 import { isItTime, loopTimer } from "./watcherlib.js"
 import { setInterval } from 'timers/promises';
 import { getCompanyObjectId, getSelectedConfig } from "../scheduler/configController.js";
-import { forkJoin } from 'rxjs';
 import { historyRecordToJson, watcherRecordToJson, setUtcDate } from "./converter.js";
 
 export const delay = ms => new Promise(res => setTimeout(res, ms));
@@ -22,7 +21,6 @@ export function getSelectedData(data, field, compareData) {
 
 async function executeHistory(config, timer, rawLatestRun, currentTime) {
     let latestRun = setUtcDate(rawLatestRun);
-    console.log(latestRun);
 
     while ((latestRun < currentTime) &&
         ((currentTime - latestRun) >= SCHEDULE_INTERVAL)) {
@@ -53,26 +51,22 @@ export const runScheduler = async (companyName) => {
     const company = await getCompanyObjectId(companyName);
     const config = await getSelectedConfig(company._id);
 
-    forkJoin([getHistories(config), getWatchers(config)]).subscribe({
-        next: ([historyResult, watcherResult]) => {
+    Promise.all([getHistories(config), getWatchers(config)])
+        .then(([historyResult, watcherResult]) => {
             const histories = historyRecordToJson(historyResult);
             const watchers = watcherRecordToJson(watcherResult);
             runHistory(histories, config, watchers, new Date());
-        }
-    });
+        });
 
     for await (const startTime of setInterval(SCHEDULE_INTERVAL, Date.now())) {
         // if ((now - startTime) > 1000)
         //     break;
 
-        getWatchers(config).subscribe({
-            next: result => {
-                const watchers = watcherRecordToJson(result);
-                for (const watcher of watchers) {
-                    loopTimer(watcher.timer, Date.now(), config, true);
-                }
-            }
-        });
+        const result = await getWatchers(config);
+        const watchers = watcherRecordToJson(result);
+        for (const watcher of watchers) {
+            loopTimer(watcher.timer, Date.now(), config, true);
+        }
 
         // // reload == true ?
     }

package/scheduler/watcherController.js

@@ -1,6 +1,3 @@
-import { from, tap } from 'rxjs';
-import { concatMap, map, catchError } from 'rxjs/operators';
-
 import { crudData, genId, queryData } from '../scheduler/datalib.js';
 
 //LIST
@@ -15,7 +12,6 @@ export function getWatcherParameters(watcherFilter) {
             { data: "SYS$WATCHER.ID.WATCHER_ID.SYS$TIMER.NAME", key: 'name' },
             { data: "SYS$WATCHER.ID.WATCHER_ID.SYS$TIMER.ACTIVE", key: 'active' },
             { data: "SYS$WATCHER.ID.WATCHER_ID.SYS$TIMER.TIME_ZONE", key: 'timezone' },
-            // { data: "SYS$WATCHER.ID.WATCHER_ID.SYS$TIMER.SCRIPT_NAME", key: 'templateName' },
             { data: "SYS$WATCHER.ID.WATCHER_ID.SYS$TIMER.SEQ", key: 'seq' },
             { data: "SYS$WATCHER.ID.WATCHER_ID.SYS$TIMER.SCRIPT_ID", key: 'scriptid' },
             { data: "SYS$TIMER.ID.TIMER_ID.SYS$DAILY.DAYS", key: 'daily_days' },
@@ -66,25 +62,19 @@ export function getHistoryField(timerObjectId, historyId, currentDate) {
     }
 }
 
-export function insertHistory(config, timerObjectId, currentDate) {
-    const listData = getInsertHistoryParameters(timerObjectId);
-
-    queryData(listData, config, true, 'list', 'list')
-        .pipe(
-            concatMap(historyResponse => {
-                const history = historyResponse[0];
+export async function insertHistory(config, timerObjectId, currentDate) {
+    try {
+        const listData = getInsertHistoryParameters(timerObjectId);
 
-                return history ? from([parseInt(history.history_id)]) : genId(config, 'SYS$HISTORY_GEN');
-            }),
-            map(historyId => {
-                return getHistoryField(timerObjectId, historyId, currentDate);
-            }),
-            concatMap(param => crudData(param, config, 'put', 'orm')),
-            catchError(error => {
-                console.error(error);
-                return new Error(error);
-            })
-        ).subscribe();
+        const historyResponse = await queryData(listData, config, true, 'list', 'list')
+        const history = historyResponse[0];
+        const historyId = history ? parseInt(history.history_id) : await genId(config, 'SYS$HISTORY_GEN');
+        const param = getHistoryField(timerObjectId, historyId, currentDate);
+        await crudData(param, config, 'put', 'orm')
+    } catch (error) {
+        console.error(error);
+        return new Error(error);
+    }
 }
 
 export function getHistoryParameters() {

package/tests/callback.test.js

@@ -1,10 +1,3 @@
-// import { jest } from '@jest/globals'
-
-// const mockInsertHistory = jest.fn();
-// jest.unstable_mockModule("../scheduler/watcherController.js", () => ({
-//     insertHistory: mockInsertHistory.mockResolvedValue('OK')
-// }))
-
 const {
     getInputScript
 } = await import('../callbackController.js');
@@ -20,24 +13,23 @@ describe('callback test', () => {
 
         const request = {
             app: { settings: { args: args } },
-            body: { 
+            body: {
                 body: { body1: 'value1' },
-                headers:{connection:'keep-alive'} 
+                headers: { connection: 'keep-alive' }
             },
-            path:'pqr',
-            
+            path: 'pqr',
         }
 
         expect(getInputScript(request)).toStrictEqual({
             data: {
                 arguments: args,
                 body: { body1: 'value1' },
-                path:'pqr',
-                query:undefined,
-                headers:{
-                    connection:'keep-alive'
+                path: 'pqr',
+                query: undefined,
+                headers: {
+                    connection: 'keep-alive'
                 },
-                socket:undefined,
+                socket: undefined,
 
             },
             selectedConfig: {
@@ -48,6 +40,5 @@ describe('callback test', () => {
         });
     });
 
-
 })
 

package/tests/data.test.js

@@ -75,7 +75,17 @@ describe('data test', () => {
             _id: 'ffffffff2ae49fab9ea654e1',
             url: 'http://localhost:212',
             dbindex: 2,
-            subdomain: 'abc'
+            finaDbIndex: 1,
+            subdomain: 'abc',
+            smtp: {
+                auth: {
+                    user: 'abc',
+                    pass: '123'
+                },
+                host: 'mail.imamatek.com',
+                port: 465,
+                secure: true
+            }
         }
         const trigger = {
             data: {
@@ -89,7 +99,15 @@ describe('data test', () => {
                 hostname: 'localhost',
                 port: 212,
                 dbindex: 2,
-                subdomain: 'abc'
+                finaDbIndex: 1,
+                subdomain: 'abc',
+                smtp: {
+                    user: 'abc',
+                    pass: '123',
+                    host: 'mail.imamatek.com',
+                    port: 465,
+                    secure: true
+                }
             },
             body: {
                 _id: 1,

package/tests/hub.test.js

@@ -3,8 +3,7 @@ import { createServer } from 'node:http'
 import hubEvent from '../bin/hubEvent.js'
 import { io as ioc } from "socket.io-client";
 import { jest } from '@jest/globals';
-import { of } from "rxjs";
-import { Axios } from "axios-observable";
+import axios from "axios";
 
 let socketsBySubdomain = {};
 
@@ -15,7 +14,6 @@ const createSocket2CLI = (socket) => {
 
         socketsBySubdomain[subdomainStr] = socket;
         socket.subdomain = subdomainStr;
-        // console.log(new Date() + ': ' + subdomainStr + ' registered successfully');
 
         responseCallback(null);
     }
@@ -38,7 +36,6 @@ describe('cli req test', () => {
     const startSocket = function startSocket(server) {
         let io = new Server(server);
         io.on('connection', (socket) => {
-            // console.log('socket client connect')
             socket.on('createTunnel', createSocket2CLI(socket));
             socket.on('disconnect', deleteSubdomain(socket));
         });
@@ -61,7 +58,7 @@ describe('cli req test', () => {
     })
 
     test('request to cli', async () => {
-        let mockedRequest = jest.spyOn(Axios, 'request').mockReturnValue(of({ data: 'OK' }));
+        let mockedRequest = jest.spyOn(axios, 'request').mockReturnValue({ data: 'OK' });
 
         let socket;
         try {
@@ -75,12 +72,11 @@ describe('cli req test', () => {
             });
 
             let result = await toPromise(resolve => socketsBySubdomain['scy'].emit(
-                'cli-req', 
+                'cli-req',
                 {
-                    // path: '/a/b',
                     method: 'POST',
                     query: { subdomain: 'abc' }, body: { data: 'xyz' }
-                }, 
+                },
                 cb => resolve(cb)
             ))
 

package/tests/watcherCtl.test.js

@@ -1,12 +1,11 @@
 import { jest } from '@jest/globals';
-import { of } from "rxjs";
 
 let mockQueryData = jest.fn();
-let mockCrudData = jest.fn().mockImplementation(param => of(param));
+let mockCrudData = jest.fn().mockImplementation(param => param);
 
 jest.unstable_mockModule('../scheduler/datalib.js', () => ({
     queryData: mockQueryData,
-    genId: jest.fn().mockReturnValue(of(20)),
+    genId: jest.fn().mockReturnValue(20),
     crudData: mockCrudData
 }));
 
@@ -22,7 +21,6 @@ const {
 describe('Get Watcher Parameters', () => {
     test('get parameters', () => {
         expect(getWatcherParameters()).toStrictEqual({
-            // filter: [{ junction: '', column: 'ID', operator: '=', value1: `'${watcherFilter?.companyObjectId}'` }],
             columns: [
                 { data: "SYS$WATCHER.ID", key: 'watcher_id' },
                 { data: "SYS$WATCHER.COMPANY_OBJ_ID", key: 'company_id' },
@@ -31,7 +29,6 @@ describe('Get Watcher Parameters', () => {
                 { data: "SYS$WATCHER.ID.WATCHER_ID.SYS$TIMER.NAME", key: 'name' },
                 { data: "SYS$WATCHER.ID.WATCHER_ID.SYS$TIMER.ACTIVE", key: 'active' },
                 { data: "SYS$WATCHER.ID.WATCHER_ID.SYS$TIMER.TIME_ZONE", key: 'timezone' },
-                // { data: "SYS$WATCHER.ID.WATCHER_ID.SYS$TIMER.SCRIPT_NAME", key: 'templateName' },
                 { data: "SYS$WATCHER.ID.WATCHER_ID.SYS$TIMER.SEQ", key: 'seq' },
                 { data: "SYS$WATCHER.ID.WATCHER_ID.SYS$TIMER.SCRIPT_ID", key: 'scriptid' },
                 { data: "SYS$TIMER.ID.TIMER_ID.SYS$DAILY.DAYS", key: 'daily_days' },
@@ -95,10 +92,10 @@ describe('Get History Parameters', () => {
 })
 
 describe('Insert History', () => {
-    test('has history', () => {
-        mockQueryData.mockReturnValue(of([{ history_id: '10' }]));
+    test('has history', async() => {
+        mockQueryData.mockReturnValue([{ history_id: '10' }]);
 
-        insertHistory({}, '1', '2024-03-06T14:37:16.610Z');
+        await insertHistory({}, '1', '2024-03-06T14:37:16.610Z');
         expect(mockCrudData).toHaveBeenCalledWith(
             {
                 "SYS$HISTORY": {
@@ -109,11 +106,11 @@ describe('Insert History', () => {
             }, {}, "put", "orm");
     })
 
-    test('no history', () => {
+    test('no history', async () => {
         jest.clearAllMocks();
-        mockQueryData.mockReturnValue(of([]));
-
-        insertHistory({}, '1', '2024-03-06T14:37:16.610Z');
+        mockQueryData.mockReturnValue([]);
+        
+        await insertHistory({}, '1', '2024-03-06T14:37:16.610Z');
         expect(mockCrudData).toHaveBeenCalledWith(
             {
                 "SYS$HISTORY": {