biz-a-cli 2.3.72 → 2.3.74

package/callbackController.js

@@ -1,42 +1,64 @@
-import { loadCliScript, extractFunctionScript } from "./scheduler/datalib.js";
-
+// import { loadCliScript, extractFunctionScript } from "./scheduler/datalib.js";
+import { execCLIScriptWorker } from "./worker/cliWorkerPool.js";
 
 export function getInputScript(req) {
-    const args = req.app.settings.args;
-    return {
-        data: {
-            arguments: args,
-            body: req.body.body,
-            path: req.path,
-            query: req.body.query,
-            headers: req.body.headers,
-            socket: req.app.settings.socket,
-        },
-        selectedConfig: {
-            url: `http://${args.hostname}:${args.port}`,
-            dbindex: args.dbindex,
-            subdomain: args.subdomain
-        }
-    }
+	const args = req.app.settings.args;
+	return {
+		data: {
+			arguments: args,
+			body: req.body.body,
+			path: req.path,
+			query: req.body.query,
+			headers: req.body.headers,
+			// socket: req.app.settings.socket, // seem never used, and it can not be serialized to worker thread
+		},
+		selectedConfig: {
+			url: `http://${args.hostname}:${args.port}`,
+			dbindex: args.dbindex,
+			subdomain: args.subdomain,
+		},
+	};
 }
 
+// export async function runCliScript(req, res) {
+//     try {
+//         const { data, selectedConfig } = getInputScript(req);
+//         let script = await loadCliScript(selectedConfig, 'ID', req.body.query.scriptid);
+//         let functions = await extractFunctionScript(selectedConfig, script);
+//         if (functions) {
+//             console.info(`## Callback ID ${req.body.query.scriptid} Starts. ##`);
+
+//             let respon = await functions.onInit(data);
+//             res.send(respon);
+
+//             console.info(`## Callback ID ${req.body.query.scriptid} Finish. ##`);
+//         } else {
+//             res.send('CLI Script does not exist.');
+//         }
+//     } catch (error) {
+//         console.error(error);
+//         throw new Error(error);
+//     }
+// }
+
 export async function runCliScript(req, res) {
-    try {
-        const { data, selectedConfig } = getInputScript(req);
-        let script = await loadCliScript(selectedConfig, 'ID', req.body.query.scriptid);
-        let functions = await extractFunctionScript(selectedConfig, script);
-        if (functions) {
-            console.info(`## Callback ID ${req.body.query.scriptid} Starts. ##`);
-            
-            let respon = await functions.onInit(data);
-            res.send(respon);
-
-            console.info(`## Callback ID ${req.body.query.scriptid} Finish. ##`);
-        } else {
-            res.send('CLI Script does not exist.');
-        }
-    } catch (error) {
-        console.error(error);
-        throw new Error(error);
-    }
+	try {
+		const { data, selectedConfig } = getInputScript(req);
+
+		console.info(
+			`## Callback ID ${req.body.query.scriptid} Starts. ##`,
+		);
+
+		let respon = await execCLIScriptWorker(
+			selectedConfig,
+			{ searchBy: "ID", searchValue: req.body.query.scriptid },
+			data,
+		);
+
+		res.send(respon);
+		console.info(`## Callback ID ${req.body.query.scriptid} Finish. ##`);
+	} catch (error) {
+		console.error(error);
+		res.status(500).send(error.message || error);
+	}
 }

package/db/db.js

@@ -0,0 +1,37 @@
+import * as adapter from "./ds.js";
+
+export const queryData = async (param, config = {}) => {
+	return await adapter.queryData(param, config);
+};
+
+/**
+ *
+ * @param {Object} payload - The data to save.
+ * @param {Object} [config] - Optional configuration overrides.
+ * @param {string} [tableName] - Optional. If provided, wraps the payload for standard ORM (sendModel).
+ *                               If omitted, sends the raw payload (for Sibling/ACID orchestration) (sendORMPayload).
+ */
+export const save = async (payload, config = {}) => {
+	return await adapter.save(payload, config);
+};
+
+export const deleteMD = async (id, masterTable, detailTables, config = {}) => {
+	const payload = {
+		id: id,
+		master: masterTable,
+		detail: detailTables,
+	};
+	return await adapter.removeMD(payload, config);
+};
+
+export const remove = async (payload, config = {}) => {
+	return await adapter.remove(payload, config);
+};
+
+export const list = async (payload, config = {}) => {
+	return await adapter.list(payload, config);
+};
+
+export const executeBlock = async (sqlString, config = {}) => {
+	return await adapter.executeBlock(sqlString, config);
+};

package/db/ds.js

@@ -0,0 +1,189 @@
+import axios from "axios";
+import { IDLE_SOCKET_TIMEOUT_MILLISECONDS } from "../bin/hubEvent.js";
+
+let injectedConfig = {};
+
+export const setGlobalConfig = (cfg) => {
+	injectedConfig = cfg;
+};
+
+// ===============
+// PRIVATE HELPERS
+// ===============
+
+/**
+ * Configuration object for DataSnap requests.
+ * All properties are OPTIONAL.
+ * Fallback Priority: 1. Caller Config -> 2. CLI ARGV -> 3. Hardcoded Defaults
+ *
+ * @typedef {Object} DsConfig
+ * @property {string}  [url]         - Override full base URL (e.g., "http://localhost:212").
+ * @property {boolean} [secure]      - Use HTTPS? Fallback: argv.secure or false.
+ * @property {string}  [hostname]    - FINA API Hostname. Fallback: argv.hostname or "127.0.0.1".
+ * @property {number}  [port]        - FINA API Port. Fallback: argv.port or 212.
+ * @property {number}  [dbindex]     - Firebird Database Index. Fallback: argv.dbindex or 2.
+ * @property {string}  [methodClass] - DataSnap Method Class. Default: "TOrmMethod".
+ * @property {number}  [timeout]     - Axios timeout in ms. Default: IDLE_SOCKET_TIMEOUT_MILLISECONDS.
+ */
+
+function resolveConfig(config = {}) {
+	// 3-Tier Fallback: 1. Caller Config -> 2. Global Defaults (hub.js argv) -> 3. Hardcoded Default
+	const isSecure = config.secure ?? injectedConfig.secure ?? false;
+	const protocol = isSecure ? "https://" : "http://";
+	const hostname = config.hostname ?? injectedConfig.hostname ?? "127.0.0.1";
+	const port = config.port ?? injectedConfig.port ?? 212;
+
+	return {
+		url: config.url || `${protocol}${hostname}:${port}`,
+		dbindex: config.dbindex ?? injectedConfig.dbindex ?? 2,
+		methodClass: config.methodClass ?? "TOrmMethod",
+		timeout: config.timeout ?? IDLE_SOCKET_TIMEOUT_MILLISECONDS,
+	};
+}
+
+function buildDataSnapUrl(resolvedConfig, dsPath, isPost = true) {
+	const encodedPath = isPost ? `%22${dsPath}%22` : dsPath;
+	return `${resolvedConfig.url}/fina/rest/${resolvedConfig.methodClass}/${encodedPath}`;
+}
+
+function buildDataSnapPayload(resolvedConfig, ormMethod, payloadObject) {
+	const paramObj = {
+		dbIndex: resolvedConfig.dbindex, // Critical for MultiDBServerMethod.pas, if payloadObject not have dbIndex
+		method: ormMethod,
+		object: payloadObject,
+	};
+
+	return JSON.stringify({
+		_parameters: [JSON.stringify(paramObj)],
+	});
+}
+
+const dsReq = async (url, data, timeoutMs, httpMethod = "POST") => {
+	// Universal DataSnap Requester using axios.request
+	const res = await axios.request({
+		method: httpMethod,
+		url: url,
+		data: data,
+		timeout: timeoutMs,
+		// MANDATORY: Prevents DataSnap from parsing JSON into multiple parameters
+		headers: { "content-type": "text/plain" },
+	});
+
+	// Normalize response (Bypass the JSON stringify tax if DataSnap double-stringified)
+	const parsedRes =
+		typeof res.data === "string" ? JSON.parse(res.data) : res.data;
+
+	// GATEKEEPER: Catch Delphi's `Result.AddPair(KEY_ERROR, E.Message);`
+	if (parsedRes && parsedRes.error) {
+		throw new Error(parsedRes.error);
+	}
+
+	return parsedRes;
+};
+
+// ============================================================================
+// PUBLIC API (Zero-Config Needed by Caller, but worker-safe via config param)
+// ============================================================================
+
+export const queryData = async (payload, config = {}) => {
+	const cfg = resolveConfig(config);
+	const url = buildDataSnapUrl(cfg, "list");
+	const data = buildDataSnapPayload(cfg, "list", payload);
+
+	const res = await dsReq(url, data, cfg.timeout);
+	let rawData = res;
+	if (res && res.data) {
+		rawData =
+			typeof res.data === "string" ? JSON.parse(res.data) : res.data;
+	}
+	if (payload && Array.isArray(payload.columns) && Array.isArray(rawData)) {
+		return rawData.map((row) => {
+			const mappedObj = {};
+
+			payload.columns.forEach((col, index) => {
+				if (!col.key) return;
+
+				if (Array.isArray(row)) {
+					mappedObj[col.key] = row[index];
+				} else {
+					const exactDataMatch = row[col.data];
+					const upperDataMatch = row[String(col.data).toUpperCase()];
+					const aliasMatch = col.alias ? row[col.alias] : undefined;
+					const upperAliasMatch = col.alias
+						? row[String(col.alias).toUpperCase()]
+						: undefined;
+
+					if (exactDataMatch !== undefined)
+						mappedObj[col.key] = exactDataMatch;
+					else if (upperDataMatch !== undefined)
+						mappedObj[col.key] = upperDataMatch;
+					else if (aliasMatch !== undefined)
+						mappedObj[col.key] = aliasMatch;
+					else if (upperAliasMatch !== undefined)
+						mappedObj[col.key] = upperAliasMatch;
+				}
+			});
+			return mappedObj;
+		});
+	}
+	return rawData;
+};
+
+export const save = async (payload, config = {}) => {
+	const cfg = resolveConfig(config);
+	const url = buildDataSnapUrl(cfg, "orm");
+	const data = buildDataSnapPayload(cfg, "put", payload);
+	return await dsReq(url, data, cfg.timeout);
+};
+
+export const remove = async (payload, config = {}) => {
+	const cfg = resolveConfig(config);
+	const url = buildDataSnapUrl(cfg, "orm");
+	const data = buildDataSnapPayload(cfg, "delete", payload);
+	return await dsReq(url, data, cfg.timeout);
+};
+
+export const removeMD = async (payload, config = {}) => {
+	const cfg = resolveConfig(config);
+	const url = buildDataSnapUrl(cfg, "orm");
+
+	const { id, master, detail } = payload;
+	let delphiObj = { [master]: { id: Number(id) } };
+
+	const buildNestedDetail = (details) => {
+		let result = {};
+		for (const item of details) {
+			if (typeof item === "string") {
+				result[item] = [];
+			} else if (typeof item === "object" && item !== null) {
+				for (const key of Object.keys(item)) {
+					if (Array.isArray(item[key]) && item[key].length > 0) {
+						result[key] = [buildNestedDetail(item[key])];
+					}
+				}
+			}
+		}
+		return result;
+	};
+
+	if (detail && detail.length > 0) {
+		Object.assign(delphiObj[master], buildNestedDetail(detail));
+	}
+
+	const data = buildDataSnapPayload(cfg, "deletemd", delphiObj);
+	return await dsReq(url, data, cfg.timeout);
+};
+
+export const list = async (payload, config = {}) => {
+	const cfg = resolveConfig(config);
+	const url = buildDataSnapUrl(cfg, "list");
+	const data = buildDataSnapPayload(cfg, "list", payload);
+	return await dsReq(url, data, cfg.timeout);
+};
+
+export const executeBlock = async (sqlString, config = {}) => {
+	const cfg = resolveConfig(config);
+	const url = buildDataSnapUrl(cfg, "block");
+	const data = buildDataSnapPayload(cfg, "block", sqlString);
+	return await dsReq(url, data, cfg.timeout);
+};

package/engine/bpm/routes.js

@@ -0,0 +1,61 @@
+import express from "express";
+import * as workflow from "./workflow.js";
+import * as workflowRT from "./workflow-runtime.js";
+
+const router = express.Router();
+
+// The Wrapper: Translates HTTP requests into pure Engine payloads
+const expressWrapper = (engineFunction) => async (req, res) => {
+	try {
+		const result = await engineFunction(req.body);
+		res.json({ success: true, data: result });
+	} catch (error) {
+		res.status(400).json({ success: false, error: error.message });
+	}
+};
+
+// ==========================================
+// DESIGN TIME: /workflow/ Prefix
+// ==========================================
+router.post("/workflow/save", expressWrapper(workflow.save));
+router.post("/workflow/publish", expressWrapper(workflow.publish));
+router.post("/workflow/remove", expressWrapper(workflow.remove));
+
+// ==========================================
+// RUNTIME EXECUTION: /workflowRT/ Prefix
+// ==========================================
+router.post("/workflowRT/initiate", expressWrapper(workflowRT.initiate));
+router.post(
+	"/workflowRT/availableTransitions",
+	expressWrapper(workflowRT.availableTransitions),
+);
+router.post(
+	"/workflowRT/executeTransition",
+	expressWrapper(workflowRT.executeTransition),
+);
+router.post("/workflowRT/terminate", expressWrapper(workflowRT.terminate));
+router.post("/workflowRT/remove", expressWrapper(workflowRT.remove));
+router.post("/workflowRT/myTasks", expressWrapper(workflowRT.myTasks));
+router.post(
+	"/workflowRT/instanceState",
+	expressWrapper(workflowRT.instanceState),
+);
+router.post(
+	"/workflowRT/instanceLogs",
+	expressWrapper(workflowRT.instanceLogs),
+);
+router.post(
+	"/workflowRT/instanceTasks",
+	expressWrapper(workflowRT.instanceTasks),
+);
+router.post(
+	"/workflowRT/instanceTimers",
+	expressWrapper(workflowRT.instanceTimers),
+);
+router.post(
+	"/workflowRT/instanceEffectLogs",
+	expressWrapper(workflowRT.instanceEffectLogs),
+);
+router.post("/workflowRT/retryEffect", expressWrapper(workflowRT.retryEffect));
+
+export default router;