biz-a-cli 2.3.73 → 2.3.75

package/scheduler/datalib.js

@@ -3,255 +3,339 @@ 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 utc from "dayjs/plugin/utc.js";
 import crypto from "crypto";
 import { createLogger, transports, format } from "winston";
+import { execCLIScriptWorker } from "../worker/cliWorkerPool.js";
 
-import customParseFormat from 'dayjs/plugin/customParseFormat.js'
-dayjs.default.extend(customParseFormat)
-dayjs.default.extend(timezone)
-dayjs.default.extend(utc)
+import customParseFormat from "dayjs/plugin/customParseFormat.js";
+dayjs.default.extend(customParseFormat);
+dayjs.default.extend(timezone);
+dayjs.default.extend(utc);
 
 export const AXIOS_TIMEOUT = 30 * 1000;
 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 })
-    ],
-})
-if (process.env.NODE_ENV !== 'production') {
-    logger.add(new transports.Console({ format: format.simple(), level: 'info' }))
+	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" }),
+	);
 }
 
 export function mapData2Key(res, cols) {
-    return res.map(e => {
-        return cols.reduce((o, k) => {
-            // o[k.key ?? k.data] = e[k.data]
-            o[k.key ? k.key : k.data] = e[k.data]
-            return o;
-        }, {})
-    })
+	return res.map((e) => {
+		return cols.reduce((o, k) => {
+			// o[k.key ?? k.data] = e[k.data]
+			o[k.key ? k.key : k.data] = e[k.data];
+			return o;
+		}, {});
+	});
 }
 
 export function getUrlApi(config, methodName, isPost = true) {
-    return `${config.url}/fina/rest/${config.methodClass ?? 'TOrmMethod'}/` +
-        `${isPost ? '%22' : ''}${methodName}${isPost ? '%22' : ''}`
+	return (
+		`${config.url}/fina/rest/${config.methodClass ?? "TOrmMethod"}/` +
+		`${isPost ? "%22" : ""}${methodName}${isPost ? "%22" : ""}`
+	);
 }
 
 export function json2Parameters(obj) {
-    return JSON.stringify({ _parameters: obj.map((el) => JSON.stringify(el)) });
+	return JSON.stringify({
+		_parameters: obj.map((el) =>
+			typeof el === "string" ? el : JSON.stringify(el),
+		),
+	});
 }
 
 export function getUrlAndParam(config, method, obj, path) {
-    return {
-        url: getUrlApi(config, path),
-        params: json2Parameters([
-            {
-                dbIndex: config.dbindex,
-                method: method,
-                object: obj
-            }
-        ])
-    }
+	return {
+		url: getUrlApi(config, path),
+		params: json2Parameters([
+			{
+				dbIndex: config.dbindex,
+				method: method,
+				object: obj,
+			},
+		]),
+	};
 }
 
 export function getTableObj(model, tableName) {
-    let obj = {};
-    obj[tableName] = model;
-    return obj;
+	let obj = {};
+	obj[tableName] = model;
+	return obj;
 }
 
 export function options(apiConfig) {
-    return {
-        headers: { 'content-type': 'text/plain' },
-        params: { subdomain: apiConfig.subdomain },
-        timeout: apiConfig.timeout ?? AXIOS_TIMEOUT  //SCY BZ 4316
-    };
+	return {
+		headers: { "content-type": "text/plain" },
+		params: { subdomain: apiConfig.subdomain },
+		timeout: apiConfig.timeout ?? AXIOS_TIMEOUT, //SCY BZ 4316
+	};
 }
 
 export async function json2fina(obj, apiConfig, raiseError = false) {
-    const url = getUrlApi(
-        {
-            url: apiConfig.url,
-            dbIndex: obj.dbIndex,
-            methodClass: 'TFinaMethod'
-        },
-        'json2fina'
-    );
-
-    const params = json2Parameters([obj]);
-    const res = await axios.post(url, params, options(apiConfig));
-
-    if (res.data?.error && raiseError) {
-        throw new Error(res.data.error);
-    }
-    return res;
+	const url = getUrlApi(
+		{
+			url: apiConfig.url,
+			dbIndex: obj.dbIndex,
+			methodClass: "TFinaMethod",
+		},
+		"json2fina",
+	);
+
+	const params = json2Parameters([obj]);
+	const res = await axios.post(url, params, options(apiConfig));
+
+	if (res.data?.error && raiseError) {
+		throw new Error(res.data.error);
+	}
+	return res;
 }
 
 export function sendModel(model, apiConfig, tableName) {
-    const { url, params } = getUrlAndParam(
-        apiConfig,
-        'put',
-        getTableObj(model, tableName),
-        'orm'
-    );
-
-    return axios.post(url, params, options(apiConfig))
+	const { url, params } = getUrlAndParam(
+		apiConfig,
+		"put",
+		getTableObj(model, tableName),
+		"orm",
+	);
+
+	return axios.post(url, params, options(apiConfig));
 }
 
 export async function queryData(param, apiConfig, mapField) {
-    const defaultParam = {
-        start: 0, length: -1, order: [], filter: [], columns: []
-    };
-
-    const { url, params } = getUrlAndParam(
-        apiConfig,
-        'list',
-        { ...defaultParam, ...param },
-        'list'
-    );
-
-    let res = await axios.post(url, params, options(apiConfig));
-    res = res.data?.data ? JSON.parse(res.data.data) : res.data;
-    return (!mapField || res.error) ? res : mapData2Key(res, param.columns);
+	const defaultParam = {
+		start: 0,
+		length: -1,
+		order: [],
+		filter: [],
+		columns: [],
+	};
+
+	const { url, params } = getUrlAndParam(
+		apiConfig,
+		"list",
+		{ ...defaultParam, ...param },
+		"list",
+	);
+
+	let res = await axios.post(url, params, options(apiConfig));
+	res = res.data?.data ? JSON.parse(res.data.data) : res.data;
+	return !mapField || res.error ? res : mapData2Key(res, param.columns);
 }
 
 export async function crudData(param, apiConfig, method, path) {
-    const { url, params } = getUrlAndParam(
-        apiConfig,
-        method,
-        { ...param },
-        path
-    );
-
-    const res = await axios.post(url, params, options(apiConfig));
-    return res.data?.data ? JSON.parse(res.data.data) : res.data;
+	const { url, params } = getUrlAndParam(
+		apiConfig,
+		method,
+		{ ...param },
+		path,
+	);
+
+	const res = await axios.post(url, params, options(apiConfig));
+	// return res.data?.data ? JSON.parse(res.data.data) : res.data;
+	return res.data?.data
+		? typeof res.data.data === "string"
+			? JSON.parse(res.data.data)
+			: res.data.data
+		: res.data;
 }
 
 export async function genId(apiConfig, genName) {
-    const url = `${getUrlApi(apiConfig, 'genId', false)}/${genName}/${apiConfig.dbindex}`;
+	const url = `${getUrlApi(apiConfig, "genId", false)}/${genName}/${apiConfig.dbindex}`;
 
-    const res = await axios.get(url, options(apiConfig));
-    return res.data?.data ? JSON.parse(res.data.data) : res.data;
+	const res = await axios.get(url, options(apiConfig));
+	return res.data?.data ? JSON.parse(res.data.data) : res.data;
 }
 
 function runScriptInThisContext(script) {
-    return runInThisContext(script, { importModuleDynamically: constants.USE_MAIN_CONTEXT_DEFAULT_LOADER });
+	return runInThisContext(script, {
+		importModuleDynamically: constants.USE_MAIN_CONTEXT_DEFAULT_LOADER,
+	});
 }
 
 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(defaultLib).functions });
-    }
-
-    return libs;
+	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(defaultLib).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 = runScriptInThisContext(data[0].script);
-    if (!scriptFn().functions) return
-
-    const axiosInstance = axios.create({ timeout: AXIOS_TIMEOUT });
-
-    let lib = {
-        // axios: axios.default,
-        axios: axiosInstance,  //SCY BZ 4316
-        dayjs: dayjs.default,
-        crypto: crypto,
-        log: logger,
-        data: { sendModel, queryData, crudData, genId, getUrlAndParam }
-    }
-
-    if (scriptFn().functions.useLibrary) {
-        Object.assign(lib, await setLibrary(config, scriptFn().functions.useLibrary(), lib));
-    }
-
-    return scriptFn(lib).functions;
+	const config = getConfig(selectedConfig);
+
+	if (data.error) {
+		console.log(data.error, "error");
+		return;
+	}
+	if (data.length == 0) return;
+
+	const scriptFn = runScriptInThisContext(data[0].script);
+	if (!scriptFn().functions) return;
+
+	const axiosInstance = axios.create({ timeout: AXIOS_TIMEOUT });
+
+	let lib = {
+		// axios: axios.default,
+		axios: axiosInstance, //SCY BZ 4316
+		dayjs: dayjs.default,
+		crypto: crypto,
+		log: logger,
+		data: { sendModel, queryData, crudData, genId, getUrlAndParam },
+	};
+
+	if (scriptFn().functions.useLibrary) {
+		Object.assign(
+			lib,
+			await setLibrary(config, scriptFn().functions.useLibrary(), lib),
+		);
+	}
+
+	return scriptFn(lib).functions;
 }
 
 export function getQueryDataPrmsParameters(column, value) {
-    return {
-        length: 1,
-        filter: [{ junction: '', column: column, operator: '=', value1: `'${value}'` }],
-        columns: [{ data: "SYS$CLI_SCRIPT.SCRIPT", key: 'script' }]
-    }
+	return {
+		length: 1,
+		filter: [
+			{
+				junction: "",
+				column: column,
+				operator: "=",
+				value1: `'${value}'`,
+			},
+		],
+		columns: [{ data: "SYS$CLI_SCRIPT.SCRIPT", key: "script" }],
+	};
 }
 
 export async function queryDataPromise(config, column, value) {
-    let param = getQueryDataPrmsParameters(column, value);
+	let param = getQueryDataPrmsParameters(column, value);
 
-    return await queryData(param, config, true);
+	return await queryData(param, config, true);
 }
 
 export function getConfig(config) {
-    return (Array.isArray(config)) ? config[0] : config;
+	return Array.isArray(config) ? config[0] : config;
 }
 
 export const loadCliScript = async (selectedConfig, column, value) => {
-    const config = getConfig(selectedConfig);
+	const config = getConfig(selectedConfig);
 
-    return await queryDataPromise(config, column, value);
-}
+	return await queryDataPromise(config, column, value);
+};
 
 export function getInputData(config, trigger) {
-    const urlAndPort = config.url.split(':');
-    return {
-        arguments: {
-            hostname: urlAndPort[1].split('//')[1],
-            port: +urlAndPort[2],
-            dbindex: config.dbindex,
-            finaDbIndex: config.finaDbIndex,
-            subdomain: config.subdomain,
-            smtp: config.smtp
-        },
-        body: trigger.data
-    }
+	const urlAndPort = config.url.split(":");
+	return {
+		arguments: {
+			hostname: urlAndPort[1].split("//")[1],
+			port: +urlAndPort[2],
+			dbindex: config.dbindex,
+			finaDbIndex: config.finaDbIndex,
+			subdomain: config.subdomain,
+			smtp: config.smtp,
+		},
+		// body: trigger.data,
+		body: trigger.data ?? null,
+	};
 }
 
-export async function scheduleSubscription(config, data, trigger, needSetHistory, isTest = false) {
-    try {
-        let functions = await extractFunctionScript(config, data);
-
-        if (functions) {
-            if (!isTest) {  // next, change isTest to test better
-                functions.onInit(getInputData(config, trigger));
-            }
-
-            if (needSetHistory) {
-                await insertHistory(config, trigger._id, new Date());
-                console.log(`Run Recent Schedule : ${trigger.name}`);
-            } else {
-                console.log(`Run Schedule : ${trigger.name}`);
-            }
-        } else {
-            console.log(`CLI Script does not exist : ${trigger.name}`);
-        }
-    } catch (error) {
-        console.error(error);
-        throw new Error(error);
-    }
+// export async function scheduleSubscription(
+// 	config,
+// 	data,
+// 	trigger,
+// 	needSetHistory,
+// 	isTest = false,
+// ) {
+// 	try {
+// 		let functions = await extractFunctionScript(config, data);
+
+// 		if (functions) {
+// 			if (!isTest) {
+// 				// next, change isTest to test better
+// 				functions.onInit(getInputData(config, trigger));
+// 			}
+
+// 			if (needSetHistory) {
+// 				await insertHistory(config, trigger._id, new Date());
+// 				console.log(`Run Recent Schedule : ${trigger.name}`);
+// 			} else {
+// 				console.log(`Run Schedule : ${trigger.name}`);
+// 			}
+// 		} else {
+// 			console.log(`CLI Script does not exist : ${trigger.name}`);
+// 		}
+// 	} catch (error) {
+// 		console.error(error);
+// 		throw new Error(error);
+// 	}
+// }
+
+// export async function checkSchedule(selectedConfig, trigger, needSetHistory) {
+// 	try {
+// 		const data = await loadCliScript(
+// 			selectedConfig,
+// 			"ID",
+// 			trigger.scriptid,
+// 		);
+// 		await scheduleSubscription(
+// 			selectedConfig,
+// 			data,
+// 			trigger,
+// 			needSetHistory,
+// 		);
+// 	} catch (error) {
+// 		console.error(error);
+// 		throw new Error(error);
+// 	}
+// }
+
+export async function scheduleSubscription(
+	config,
+	trigger,
+	needSetHistory,
+	isTest = false,
+) {
+	try {
+		if (!isTest) {
+			await execCLIScriptWorker(
+				config,
+				{ searchBy: "ID", searchValue: trigger.scriptid },
+				getInputData(config, trigger),
+			);
+		}
+		if (needSetHistory) {
+			await insertHistory(config, trigger._id, new Date());
+			console.info(`Run Recent Schedule : ${trigger.name}`);
+		} else {
+			console.info(`Run Schedule : ${trigger.name}`);
+		}
+	} catch (error) {
+		console.error(error);
+		throw new Error(error);
+	}
 }
 
 export async function checkSchedule(selectedConfig, trigger, needSetHistory) {
-    try {
-        const data = await loadCliScript(selectedConfig, 'ID', trigger.scriptid);
-        await scheduleSubscription(selectedConfig, data, trigger, needSetHistory);
-    } catch (error) {
-        console.error(error);
-        throw new Error(error);
-    }
-}
+	try {
+		await scheduleSubscription(selectedConfig, trigger, needSetHistory);
+	} catch (error) {
+		console.error(error);
+	}
+}

package/worker/cliScriptWorker.js

@@ -1,30 +1,63 @@
-import workerpool from 'workerpool';
+import workerpool from "workerpool";
 import { loadCliScript, extractFunctionScript } from "../scheduler/datalib.js";
 import { createLogger, transports, format } from "winston";
 
-const logger = createLogger({ // logger must used worker thread context
-    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' }),
-    ],
+const logger = createLogger({
+	// logger must used worker thread context
+	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" }),
+	);
+}
+
+export const run = async (apiConfig, scriptIdentifier, scriptData) => {
+	const searchBy =
+		typeof scriptIdentifier === "object"
+			? scriptIdentifier.searchBy
+			: "SCRIPT_NAME";
+	const searchValue =
+		typeof scriptIdentifier === "object"
+			? scriptIdentifier.searchValue
+			: scriptIdentifier;
+	try {
+		const functions = await extractFunctionScript(
+			apiConfig,
+			await loadCliScript(apiConfig, searchBy, searchValue),
+		);
+		const result =
+			functions && functions.onInit
+				? await functions.onInit(scriptData)
+				: "'onInit' not found. Nothing to execute";
 
-export const run = async (apiConfig, scriptName, scriptData)=>{
-    try {
-        const functions = await extractFunctionScript(apiConfig, await loadCliScript(apiConfig, 'SCRIPT_NAME', scriptName));
-        const result = (functions && functions.onInit) ? await functions.onInit(scriptData) : "'onInit' not found. Nothing to execute";
-        logger.info(`CLI script '${scriptName}' success. Result : ${result} ${process.env.NODE_ENV}`);
-        return result;
-    } catch (err) {
-        logger.error(`CLI script '${scriptName}' fail. Error : ${err.message || err}`);
-        throw new Error(err);
-    };
+		logger.info(
+			`CLI script with ${searchBy} = ${searchValue} success. Result : ${result}`,
+		);
+		return result;
+	} catch (err) {
+		logger.error(
+			`CLI script with ${searchBy} = ${searchValue} fail. Error : ${err.message || err}`,
+		);
+		throw new Error(err);
+	}
 };
 
-workerpool.worker({run}, {onTerminate: (code)=>{logger.info(`CLI script worker terminated. Exit code : (${code})`)}});
+workerpool.worker(
+	{ run },
+	{
+		onTerminate: (code) => {
+			logger.info(`CLI script worker terminated. Exit code : (${code})`);
+		},
+	},
+);