biz-a-cli 2.3.78 → 2.3.79-15208

package/bin/hub.js

@@ -21,6 +21,9 @@ import {
 } from "./directHubEvent.js";
 import { env } from "../envs/env.js";
 import { setGlobalConfig } from "../db/ds.js";
+import { CLI_Agent } from "../message-broker/agent.js";
+import { initBpmAgent } from "../engine/bpm/bpm-agent.js";
+import { bootMicroservices } from "../message-broker/orchestrator.js";
 
 const logger = createLogger({
 	level: "info",
@@ -54,15 +57,14 @@ const argv = yargs(process.argv.slice(2))
 	.options("s", {
 		alias: "server",
 		// default: env.BIZA_SERVER_LINK, // handle by serverMode
-		describe: "(Required) Tunnel server endpoint",
+		describe: "Tunnel server endpoint",
 		type: "string",
-		demandOption: false,
 	})
 	.options("sub", {
 		alias: "subdomain",
 		describe: "Public URL the tunnel server is forwarding to us",
 		type: "string",
-		demandOption: true,
+		// demandOption: true, // handle required argument manually
 	})
 	.options("h", {
 		alias: "hostname",
@@ -70,55 +72,66 @@ const argv = yargs(process.argv.slice(2))
 		describe:
 			'Address of API server for forwarding over socket-tunnel. Please emit "HTTP" or "HTTPS" from address',
 		type: "string",
-		demandOption: false,
 	})
 	.options("p", {
 		alias: "port",
 		default: 212,
 		describe: "Port of API server for forwarding over socket-tunnel",
 		type: "number",
-		demandOption: false,
 	})
 	.options("secure", {
 		default: false,
 		describe: "Is API server using ssl (HTTPS) ?",
 		type: "boolean",
-		demandOption: false,
 	})
 	.options("publish", {
 		default: true,
 		describe: "Will the CLI be published to the internet??",
 		type: "boolean",
-		demandOption: false,
 	})
 	.options("d", {
 		alias: "dbindex",
 		default: 2,
 		describe: "Biz-A Database Index (Callback Feature)",
 		type: "number",
-		demandOption: false,
 	})
 	.options("sp", {
 		alias: "serverport",
 		default: defaultPort,
 		describe: "Express Port (Callback Feature)",
 		type: "number",
-		demandOption: false,
 	})
 	.options("hs", {
 		alias: "hubServer",
 		// default: `${env.BIZA_HUB_SERVER_LINK}`, // handle by serverMode
 		describe: "BizA hub",
 		type: "string",
-		demandOption: false,
 	})
 	.options("serverMode", {
 		alias: "sMode",
 		describe: "Backend server mode: prod, dev, or backup",
 		type: "string",
 		// choices: ["prod", "dev", "backup"],
-		choices: ["prod", "dev"],
+		choices: ["prod", "dev", "local"],
 		default: "prod",
+	})
+	.options("mode", {
+		describe:
+			"Message Broker mode: 'monolithic' [default], 'dispatcher', or 'agent'",
+		type: "string",
+		choices: ["monolithic", "dispatcher", "agent"],
+		default: "monolithic",
+	})
+	.options("dispatcherUrl", {
+		describe: "Required if mode is 'agent'. URL of the Dispatcher.",
+		type: "string",
+		default: "http://127.0.0.1:3002",
+	})
+	.options("services", {
+		describe:
+			"Comma-separated list of engine jobs this agent handles (e.g., 'BPM,EMAIL')",
+		type: "string",
+		default: "ALL",
 	}).argv;
 
 // Server endpoint mapping by mode
@@ -135,6 +148,10 @@ const SERVER_ENDPOINTS = {
 	// 	server: "https://backupServer.biz-a.id",
 	// 	hub: "https://backupHub.biz-a.id",
 	// },
+	local: {
+		server: "http://localhost:3000",
+		hub: "http://localhost:3001",
+	},
 };
 
 if (!argv.server) {
@@ -147,6 +164,23 @@ if (!argv.hubServer) {
 		SERVER_ENDPOINTS[argv.serverMode]?.hub || SERVER_ENDPOINTS.prod.hub;
 }
 
+// handle required options manually, not using yargs demandOption
+if (argv.mode !== "agent") {
+	const requiredArgs = ["subdomain"];
+	if (!argv["server"] || !argv["subdomain"] || !argv["port"]) {
+		for (let key of requiredArgs) {
+			if (argv[key]) continue;
+			console.log(
+				"Error: missing required option : " + requiredArgs.join(","),
+			);
+			yargs().showHelp();
+			process.exit();
+		}
+	}
+} else {
+	argv.serverport += 1; // make sure agent used different default port
+}
+
 setGlobalConfig(argv);
 
 if (argv.help) {
@@ -154,17 +188,6 @@ if (argv.help) {
 	process.exit();
 }
 
-if (!argv["server"] || !argv["subdomain"] || !argv["port"]) {
-	for (let key in ["server", "subdomain", "port"]) {
-		if (argv[key]) continue;
-
-		console.log("Error: Required option, but nothing found");
-
-		yargs().showHelp();
-		process.exit();
-	}
-}
-
 import express from "express";
 import compression from "compression";
 import cors from "cors";
@@ -236,38 +259,51 @@ server.listen(argv.serverport, () => {
 	);
 });
 
-await streamEvent(
-	ioClient(argv["server"], { query: { isSockStream: true } }),
-	argv,
-); // as socket client to BizA SERVER
-
-// as socket client to BizA HUB
-if (argv.hubServer) {
-	socket = hubEvent(
-		ioClient(argv["hubServer"], {
-			reconnectionDelay: RECONNECT_SOCKET_DELAY,
-			reconnectionDelayMax: RECONNECT_SOCKET_DELAY,
-			query: { isCLI: true, room: argv["subdomain"] },
-		}),
+if (argv.mode.trim().toLowerCase() === "agent") {
+	// Message broker agent not need connection to server, hubServer, directHub
+	console.log(`[Message Broker] Starting as isolated CLI Agent...`);
+	const genericAgent = new CLI_Agent(argv.dispatcherUrl, argv.services);
+	initBpmAgent(genericAgent, argv.services);
+} else {
+	// as socket client to BizA SERVER
+	await streamEvent(
+		ioClient(argv["server"], { query: { isSockStream: true } }),
 		argv,
-		(url) => {
-			if (url !== argv.connectedHubUrl) {
-				argv.connectedHubUrl = url;
-			}
-		},
 	);
-}
 
-// as socket server for BizA Client and BizA devTools
-directHubEvent(createSocketServer(server, argv.cliAddress().ip), argv);
+	// as socket client to BizA HUB
+	if (argv.hubServer) {
+		socket = hubEvent(
+			ioClient(argv["hubServer"], {
+				reconnectionDelay: RECONNECT_SOCKET_DELAY,
+				reconnectionDelayMax: RECONNECT_SOCKET_DELAY,
+				query: { isCLI: true, room: argv["subdomain"] },
+			}),
+			argv,
+			(url) => {
+				if (url !== argv.connectedHubUrl) {
+					argv.connectedHubUrl = url;
+				}
+			},
+		);
+	}
 
-if (argv.publish == true) {
-	localhostTunnel(argv.serverport, (url) => {
-		// publish CLI
-		if (url !== argv.connectedPublicUrl) {
-			argv.connectedPublicUrl = url;
-		}
-	});
+	const ioServerInstance = createSocketServer(server, argv.cliAddress().ip); // used by directHub at "/" namespace and "/message-broker" namespace
+
+	// as socket server for BizA Client and BizA devTools
+	// directHubEvent(createSocketServer(server, argv.cliAddress().ip), argv);
+	directHubEvent(ioServerInstance, argv);
+
+	bootMicroservices(argv, ioServerInstance);
+
+	if (argv.publish == true) {
+		localhostTunnel(argv.serverport, (url) => {
+			// publish CLI
+			if (url !== argv.connectedPublicUrl) {
+				argv.connectedPublicUrl = url;
+			}
+		});
+	}
 }
 
 export { app };

package/bin/hubEvent.js

@@ -17,7 +17,7 @@ const DISCONNECT_REASON_BY_SOCKET_SERVER = "io server disconnect";
 
 export const socketAgent = (isUsingHttps) => (isUsingHttps == true ? tls : net);
 
-const getIdText = (id) => (id ? id + " " : "");
+const getIdText = (id) => (id ? id + " " : "");
 
 export const streamEvent = async (socket, argv) =>
 	new Promise((resolve, reject) => {
@@ -164,76 +164,9 @@ export const streamEvent = async (socket, argv) =>
 			}
 		};
 
-		const publishReqCb = async (data, callback) => {
-			try {
-				process.env.BIZA_APP_SKIP_PARSE = "1";
-				const { addApp } = await import("./app.js");
-
-				const requestBody =
-					typeof data?.body === "string"
-						? JSON.parse(data.body || "{}")
-						: data?.body || {};
-				const hasTransportEnvelope =
-					requestBody &&
-					typeof requestBody === "object" &&
-					typeof requestBody.body === "object" &&
-					(Object.prototype.hasOwnProperty.call(
-						requestBody,
-						"method",
-					) ||
-						Object.prototype.hasOwnProperty.call(
-							requestBody,
-							"query",
-						) ||
-						Object.prototype.hasOwnProperty.call(
-							requestBody,
-							"headers",
-						));
-				const unwrappedPayload = hasTransportEnvelope
-					? requestBody.body
-					: requestBody;
-				const publishPayload =
-					unwrappedPayload &&
-					typeof unwrappedPayload === "object" &&
-					unwrappedPayload.addApp &&
-					typeof unwrappedPayload.addApp === "object"
-						? unwrappedPayload.addApp
-						: unwrappedPayload;
-				const params =
-					publishPayload && typeof publishPayload.options === "object"
-						? publishPayload.options
-						: publishPayload;
-				const toNumber = (value, fallback) => {
-					const parsed = Number(value);
-					return Number.isFinite(parsed) ? parsed : fallback;
-				};
-
-				const response = await addApp({
-					workingDir: params.workingDir || process.cwd(),
-					verbose: !!params.verbose,
-					server: params.server || argv.server || "http://localhost",
-					apiPort: toNumber(params.apiPort, argv.port || 212),
-					dbIndex: toNumber(params.dbIndex, argv.dbindex || 2),
-					sub: params.sub || params.subdomain || argv.subdomain,
-					files: params.files || params.fileList,
-					body: publishPayload,
-				});
-
-				callback(response);
-			} catch (error) {
-				callback({
-					success: false,
-					error: error?.message || error,
-				});
-			} finally {
-				delete process.env.BIZA_APP_SKIP_PARSE;
-			}
-		};
-
 		socket.on("connect", connectCb);
 		socket.on("incomingClient", incomingHubCb);
 		socket.on("cli-req", cliReqCb);
-		socket.on("publish-req", publishReqCb);
 		socket.on("cliCommand", (data, cb) => handleCliCommand(data, cb, argv));
 
 		socket.on("disconnect", (reason) => {
@@ -363,7 +296,7 @@ const EngineRegistry = {
 	// ZERO-MEMORY LAZY REGISTRY. Lazy load the module into memory (Only impacts performance on the very first call)
 	"bpm/workflow": () => import("../engine/bpm/workflow.js"),
 	"bpm/workflowRT": () => import("../engine/bpm/workflow-runtime.js"),
-	// 'domain/system': () => import('../engine/domain/system.js') // example for Domain Engine
+	"domain/system": () => import("../engine/domain/system.js"),
 };
 
 const handleCliCommand = async (data, cb, argv) => {
@@ -414,7 +347,10 @@ const handleCliCommand = async (data, cb, argv) => {
 					);
 				}
 
-				const result = await engineModule[methodName](data.payload);
+				const result = await engineModule[methodName](
+					data.payload,
+					argv,
+				);
 
 				cb(null, { success: true, data: result });
 				break;

package/bin/migrate.js

@@ -7,14 +7,14 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const migrationDir = path.resolve(__dirname, "..", "migrations");
 
-const flattenSql = (sqlString) => {
-	return sqlString
-		.replace(/--.*$/gm, "") // 1. Strip all SQL comments
-		.split(/\r?\n/) // 2. Split into array of individual lines
-		.map((line) => line.trim()) // 3. Trim leading/trailing indentation
-		.filter((line) => line.length > 0) // 4. Remove empty lines entirely
-		.join(" "); // 5. Join safely with exactly one space
-};
+// const flattenSql = (sqlString) => {
+// 	return sqlString
+// 		.replace(/--.*$/gm, "") // 1. Strip all SQL comments
+// 		.split(/\r?\n/) // 2. Split into array of individual lines
+// 		.map((line) => line.trim()) // 3. Trim leading/trailing indentation
+// 		.filter((line) => line.length > 0) // 4. Remove empty lines entirely
+// 		.join(" "); // 5. Join safely with exactly one space
+// };
 
 export const newMigration = (argv) => {
 	if (!fs.existsSync(migrationDir)) {
@@ -72,7 +72,8 @@ export const runMigrations = async (argv) => {
 				END
 			END
 		`;
-		await executeBlock(flattenSql(bootstrapSql), apiConfig);
+		// await executeBlock(flattenSql(bootstrapSql), apiConfig);
+		await executeBlock(bootstrapSql, apiConfig);
 	};
 
 	try {
@@ -154,7 +155,8 @@ export const runMigrations = async (argv) => {
 			const trackerSql = `\n  INSERT INTO SYS$MIGRATIONS (FILE_NAME) VALUES ('${file}');\n`;
 			let rawSql = sqlContent.replace(/END\s*$/i, trackerSql + "END");
 
-			await executeBlock(flattenSql(rawSql), apiConfig);
+			// await executeBlock(flattenSql(rawSql), apiConfig);
+			await executeBlock(rawSql, apiConfig);
 
 			console.log(`[Migrate] Success: ${file}`);
 		}

package/db/db.js

@@ -1,5 +1,7 @@
 import * as adapter from "./ds.js";
 
+export const getGlobalConfig = () => adapter.getGlobalConfig();
+
 export const queryData = async (param, config = {}) => {
 	return await adapter.queryData(param, config);
 };

package/db/ds.js

@@ -7,6 +7,8 @@ export const setGlobalConfig = (cfg) => {
 	injectedConfig = cfg;
 };
 
+export const getGlobalConfig = () => injectedConfig;
+
 // ===============
 // PRIVATE HELPERS
 // ===============
@@ -53,8 +55,47 @@ function buildDataSnapPayload(resolvedConfig, ormMethod, payloadObject) {
 		object: payloadObject,
 	};
 
+	// return JSON.stringify({
+	// 	_parameters: [JSON.stringify(paramObj)],
+	// });
+
+	// convert to FB Valid sql string before stringification
+	const fbSafeStr = JSON.stringify(paramObj, (key, value) => {
+		// convert js datetime to expected format by firebird
+		// if (Object.prototype.toString.call(value) === "[object Date]") {
+		// 	return value.toISOString().replace("T", " ").replace("Z", "");
+		// }
+		// if (typeof value === "string" && /^\d{4}-\d{2}-\d{2}T/.test(value)) {
+		// 	return value.replace("T", " ").replace(/Z$/, "");
+		// }
+
+		const isDateObject =
+			Object.prototype.toString.call(value) === "[object Date]";
+		const isIsoString =
+			typeof value === "string" && /^\d{4}-\d{2}-\d{2}T/.test(value);
+
+		if (isDateObject || isIsoString) {
+			// Convert strings to real Date objects so JavaScript handles the timezone math
+			const dateObj = isDateObject ? value : new Date(value);
+
+			// Build local time string manually to avoid toISOString() UTC conversion
+			const pad = (num) => String(num).padStart(2, "0");
+			const YYYY = dateObj.getFullYear();
+			const MM = pad(dateObj.getMonth() + 1);
+			const DD = pad(dateObj.getDate());
+			const HH = pad(dateObj.getHours());
+			const mm = pad(dateObj.getMinutes());
+			const ss = pad(dateObj.getSeconds());
+			const ms = String(dateObj.getMilliseconds()).padStart(3, "0");
+
+			return `${YYYY}-${MM}-${DD} ${HH}:${mm}:${ss}.${ms}`;
+		}
+
+		return value;
+	});
+
 	return JSON.stringify({
-		_parameters: [JSON.stringify(paramObj)],
+		_parameters: [fbSafeStr],
 	});
 }
 
@@ -97,7 +138,7 @@ export const queryData = async (payload, config = {}) => {
 			typeof res.data === "string" ? JSON.parse(res.data) : res.data;
 	}
 	if (payload && Array.isArray(payload.columns) && Array.isArray(rawData)) {
-		return rawData.map((row) => {
+		const result = rawData.map((row) => {
 			const mappedObj = {};
 
 			payload.columns.forEach((col, index) => {
@@ -125,6 +166,36 @@ export const queryData = async (payload, config = {}) => {
 			});
 			return mappedObj;
 		});
+		return result;
+
+		// 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;
 };
@@ -181,9 +252,20 @@ export const list = async (payload, config = {}) => {
 	return await dsReq(url, data, cfg.timeout);
 };
 
+function flattenSql(sqlString) {
+	return sqlString
+		.replace(/--.*$/gm, "") // 1. Strip all SQL comments
+		.split(/\r?\n/) // 2. Split into array of individual lines
+		.map((line) => line.trim()) // 3. Trim leading/trailing indentation
+		.filter((line) => line.length > 0) // 4. Remove empty lines entirely
+		.join(" "); // 5. Join safely with exactly one space
+}
+
 export const executeBlock = async (sqlString, config = {}) => {
 	const cfg = resolveConfig(config);
 	const url = buildDataSnapUrl(cfg, "block");
-	const data = buildDataSnapPayload(cfg, "block", sqlString);
+	const flatSql = flattenSql(sqlString);
+	// const data = buildDataSnapPayload(cfg, "block", sqlString);
+	const data = buildDataSnapPayload(cfg, "block", flatSql);
 	return await dsReq(url, data, cfg.timeout);
 };