biz-a-cli 2.3.80-15296 → 2.3.80-15317

package/bin/app.js

@@ -18,12 +18,23 @@ import { spawn } from "node:child_process";
 import { newMigration, runMigrations } from "./migrate.js";
 import {
 	APP_CONFIG_NAME,
+	buildEnsureConfigTableSql,
+	buildPostgresConfigUpsertSql,
+	buildPostgresApplicationConfigLookupSql,
+	buildPostgresSetAppSql,
 	extractConfigVersion,
 	getChunkedUpsertBlocks,
 	getUpsertBlock,
 	isSemanticVersion,
 	parseConfigForVersion,
 } from "../engine/domain/appConfig.js";
+import {
+	isPostgresIndex,
+	execPostgres,
+	primeRegistry,
+} from "../engine/domain/dialect.js";
+import { addUser } from "../engine/orm/userAdmin.js";
+import { logger } from "../logger.js";
 
 const getKeyFolderPath = () => {
 	const scriptPath =
@@ -511,6 +522,11 @@ async function uploadConfigs({
 	publish = false,
 	forceFull = false,
 }) {
+	/* Phase B2: ask biz-a for this tenant's database coordinates before anything reads the
+	   dialect. A deployed CLI has no config/databases.json, so without this the registry
+	   indexes would look like Firebird. No-op when --sub is absent or biz-a is unreachable. */
+	await primeRegistry({ subdomain: sub, serverLink: env.BIZA_SERVER_LINK });
+
 	const { application, domains } = collectConfigUploads({
 		workingDir,
 		fileNames,
@@ -523,11 +539,24 @@ async function uploadConfigs({
 	};
 
 	const saveOne = async ({ name, version, content }) => {
+		/* A PostgreSQL index writes straight to its pool. No chunking: the block splitting below
+		   exists only because the FINA HTTP body has a size limit, which a direct connection does
+		   not. */
+		if (isPostgresIndex(dbIndex)) {
+			await execPostgres(buildEnsureConfigTableSql(), dbIndex);
+			await execPostgres(
+				buildPostgresConfigUpsertSql(name, version, content, false),
+				dbIndex,
+			);
+			logger.info(`saved ${name}@${version} (postgres db${dbIndex})`);
+			return;
+		}
+
 		const blocks = resolveUpsertBlocks(name, version, content, dbIndex);
 		for (const block of blocks) {
 			await executeConfigBlock(block, { server, apiPort, dbIndex });
 		}
-		console.log(
+		logger.info(
 			`saved ${name}@${version}${blocks.length > 1 ? ` (${blocks.length} chunks)` : ""}`,
 		);
 	};
@@ -579,7 +608,7 @@ async function uploadConfigs({
 				`Publish ${domain.name}@${domain.version} failed: ${result?.error ?? "no error message from server"}`,
 			);
 		}
-		console.log(`published ${domain.name}@${domain.version}`);
+		logger.info(`published ${domain.name}@${domain.version}`);
 	}
 
 	if (application) {
@@ -608,7 +637,7 @@ async function uploadConfigs({
 					`Publish ${application.name}@${application.version} failed: ${result?.error ?? "no error message from server"}`,
 				);
 			}
-			console.log(`published ${application.name}@${application.version}`);
+			logger.info(`published ${application.name}@${application.version}`);
 		} finally {
 			process.chdir(previousCwd);
 			fs.rmSync(scratchDir, { force: true, recursive: true });
@@ -657,6 +686,22 @@ const resolveAppDisplayNameFromApplicationConfig = async ({
 	dbIndex,
 	sub,
 }) => {
+	/* A PostgreSQL tenant reads SYS$CONFIG directly. This must not silently return "": the
+	   display name keys the SYS$APPS row, so falling back to the random bundle name would insert
+	   a fresh app row on every publish instead of updating the existing one. */
+	if (isPostgresIndex(dbIndex)) {
+		try {
+			const rows = await execPostgres(
+				buildPostgresApplicationConfigLookupSql(),
+				dbIndex,
+			);
+			const displayName = parseApplicationConfigData(rows?.[0]?.data)?.metadata?.name;
+			return typeof displayName === "string" ? displayName.trim() : "";
+		} catch {
+			return "";
+		}
+	}
+
 	if (typeof axios.request !== "function") {
 		return "";
 	}
@@ -787,7 +832,7 @@ async function addApp({
 			const keys = await prepareKeys();
 			if (!keys) {
 				const msg = "Can not prepare encryption keys";
-				console.error(msg);
+				logger.error(msg);
 				return { success: false, error: msg };
 			}
 
@@ -825,7 +870,7 @@ async function addApp({
 			}
 			const bundleFile = `${rootFolder}${bundleName}.tgz`;
 			compressIt(bundleFile, bundleFolder);
-			console.log(
+			logger.info(
 				`Finished packing ${processedFile} files into "${bundleFile}" (${((performance.now() - bundlingStart) / 1000).toFixed(2)}s)`,
 			);
 
@@ -853,29 +898,44 @@ async function addApp({
 			const uploadAppName = normalizeAppName(
 				(useApplicationConfigName ? appDisplayName : "") || bundleName,
 			);
+			/* SYS$APPS is a Biz-A table, not a FINA one, so a PostgreSQL tenant is written
+			   directly — no FINA server in the path at all. On Firebird the FINA stored
+			   procedure TOrmMethod/"setApp" still owns the write. */
+			if (isPostgresIndex(dbIndex)) {
+				await execPostgres(
+					buildPostgresSetAppSql(uploadAppName, data, keys.metadata),
+					dbIndex,
+				);
+				logger.info(
+					`Finished uploading "${bundleFile}" to postgres db${dbIndex} (${((performance.now() - uploadingStart) / 1000).toFixed(2)}s)`,
+				);
+				fs.rmSync(rootFolder, { force: true, recursive: true });
+				return { success: true, data: { appName: uploadAppName } };
+			}
+
 			const param = {
 				_parameters: [dbIndex, uploadAppName, data, keys.metadata],
 			};
 
 			const res = await axios.post(url, param, { headers: headers });
 			if (res.data.success) {
-				console.log(
+				logger.info(
 					`Finished uploading "${bundleFile}" (${((performance.now() - uploadingStart) / 1000).toFixed(2)}s)`,
 				);
 				fs.rmSync(rootFolder, { force: true, recursive: true });
 				return { success: true, data: res.data };
 			}
 
-			console.error(res.data.error);
+			logger.error(res.data.error);
 			return { success: false, error: res.data.error, data: res.data };
 		}
 
 		const msg = "Nothing to upload. Please recheck your app folder.";
-		console.error(msg);
+		logger.error(msg);
 		return { success: false, error: msg };
 	} catch (e) {
 		const errMsg = e.response?.data ? e.response.data : e;
-		console.error(errMsg);
+		logger.error(errMsg);
 		return { success: false, error: errMsg };
 	} finally {
 		process.chdir(oldCwd);
@@ -914,9 +974,9 @@ async function runUnitTests(options) {
 		});
 
 		child.on("close", async (code) => {
-			console.log("====================");
-			console.log(output);
-			console.log("====================");
+			logger.info("====================");
+			logger.info(output);
+			logger.info("====================");
 			const noTestsFound = output.includes("No tests found");
 			const missingJest =
 				output.includes("missing packages") && output.includes("jest");
@@ -939,7 +999,7 @@ async function runUnitTests(options) {
 					forceFull: options.forceFull,
 				});
 			} else {
-				console.error("Biz-A Add aborted");
+				logger.error("Biz-A Add aborted");
 			}
 			resolve();
 		});
@@ -999,7 +1059,7 @@ const buildCli = () =>
 						});
 						if (res.data?.success) {
 							if (deleteApps == "") {
-								console.log("All apps removed");
+								logger.info("All apps removed");
 							} else {
 								const failedList =
 									res.data._f &&
@@ -1012,18 +1072,18 @@ const buildCli = () =>
 										: [];
 								const removeList = deleteApps.split(",");
 								removeList.forEach((app) => {
-									console.log(
+									logger.info(
 										`${app} ${failedList.indexOf(app) == -1 ? "removed" : "not found"}`,
 									);
 								});
 							}
 						} else {
-							console.error(res.data.error);
+							logger.error(res.data.error);
 						}
 						return res;
 					} catch (e) {
 						const errMsg = e.response?.data ? e.response.data : e;
-						console.error(errMsg);
+						logger.error(errMsg);
 						return errMsg;
 					}
 				})();
@@ -1043,6 +1103,83 @@ const buildCli = () =>
 			},
 			(commandOptions) => newMigration(commandOptions),
 		)
+		.command(
+			"user:add",
+			"Create a platform user in SYS$USERS on a PostgreSQL tenant (defaults: supervisor/supervisor)",
+			(yargs) =>
+				yargs
+					.option("u", {
+						alias: "username",
+						describe: "User name (stored upper-cased, as the login expects)",
+						type: "string",
+						default: "supervisor",
+					})
+					.option("w", {
+						alias: "password",
+						describe: "Password. Hashed with scrypt before it is stored",
+						type: "string",
+						default: "supervisor",
+					})
+					.option("fullname", {
+						describe: "Display name (defaults to the user name)",
+						type: "string",
+					})
+					.option("userlevel", {
+						describe: "User level. Anything below 0 cannot log in",
+						type: "number",
+						default: 9,
+					})
+					.option("replace", {
+						describe:
+							"Reset the password if the user already exists. Without it an existing user is left untouched",
+						type: "boolean",
+						default: false,
+					})
+					.option("admin", {
+						describe:
+							"Grant admin (SYS$ADMINISTRATOR). The FIRST user is granted automatically - without one, nobody can reach the admin screens or publish",
+						type: "boolean",
+						default: false,
+					}),
+			async (commandOptions) => {
+				const dbIndex = Number(commandOptions.dbIndex);
+				try {
+					await primeRegistry({
+						subdomain: commandOptions.sub,
+						serverLink: env.BIZA_SERVER_LINK,
+					});
+					const result = await addUser(
+						{
+							username: commandOptions.username,
+							password: commandOptions.password,
+							fullname: commandOptions.fullname,
+							userlevel: commandOptions.userlevel,
+							replace: commandOptions.replace,
+							admin: commandOptions.admin,
+						},
+						{
+							exec: execPostgres,
+							dbIndex,
+							isPostgres: isPostgresIndex(dbIndex),
+						},
+					);
+					if (result.status === "exists") {
+						logger.info(
+							`user ${result.username} already exists in db${dbIndex} - password left untouched. Use --replace to reset it.` +
+								(result.admin ? " Granted admin." : ""),
+						);
+						return;
+					}
+					logger.info(
+						`user ${result.username} ${result.status} in db${dbIndex}` +
+							(result.admin ? " and granted admin" : ""),
+					);
+				} catch (error) {
+					logger.error(`user:add failed: ${error?.message ?? error}`);
+					process.exitCode = 1;
+				}
+			},
+		)
 		.command(
 			"migrate:run",
 			"Run pending DDL migrations from the /migrations folder",

package/bin/deleteApp.js

@@ -2,6 +2,7 @@
 
 import yargs from "yargs";
 import axios from "axios";
+import { logger } from "../logger.js";
 import { env } from "../envs/env.js"
 
 const options = yargs(process.argv.slice(2))
@@ -52,12 +53,12 @@ const deleteApp = async () => {
         const param = { _parameters: [options.dbindex, deleteApps] }
         const res = await axios.post(url, param, { headers: headers });
         if (res.data.success) {
-            console.log(`${deleteApps=='' ? 'All' : deleteApps} apps removed`)
+            logger.info(`${deleteApps=='' ? 'All' : deleteApps} apps removed`)
         } else {
-            console.error(res.data.error)
+            logger.error(res.data.error)
         }
     } catch (e) {
-        console.error(e.response?.data ? e.response.data : e)
+        logger.error(e.response?.data ? e.response.data : e)
     }
 }
 

package/bin/directHubEvent.js

@@ -6,6 +6,9 @@ import { CLIENT_ROOM } from "../message-broker/clientEmitter.js";
 import { ClientEmitter } from "../message-broker/clientEmitter.js";
 import { joinExtRooms } from "../engine/ext/esb.js";
 import { extClientListener } from "../engine/ext/socketListener.js";
+import { prefixedLogger } from "../logger.js";
+
+const logger = prefixedLogger("[DirectHub]");
 
 export async function localhostTunnel(port, notifier) {
 	let tunnelUrl = "";
@@ -16,55 +19,52 @@ export async function localhostTunnel(port, notifier) {
 		}, RECONNECT_SOCKET_DELAY);
 	}
 	qt.on("url", (qtUrl) => {
-		// console.log('qt url', qtUrl)
 		tunnelUrl = qtUrl;
 	})
 		.on("connected", (conn) => {
-			// console.log('qt connect', conn)
 			notifier(tunnelUrl);
-			console.log(
-				`${new Date()}: Connected to Direct Hub at public URL ${tunnelUrl}`,
-			);
+			logger.info(`Connected to Direct Hub at public URL ${tunnelUrl}`);
 		})
 		.on("disconnected", (conn) => {
-			// console.log('qt disconnect', conn)
 			notifier("");
 			qt.stop();
+			logger.info(
+				`Disconnected from edge node. Awaiting native reconnect...`,
+			);
 		})
 		.on("error", (err) => {
-			// console.log('qt err', err)
 			notifier("");
 			qt.stop();
+			logger.error(
+				`Tunnel error: ${err.message || err}. Awaiting native reconnect...`,
+			);
 		})
 		.on("exit", (code) => {
-			// console.log('qt exit', code)
 			notifier("");
-			console.log(
-				`${new Date()}: Direct Hub is not available, will try to reinitiate it in ${RECONNECT_SOCKET_DELAY / 1000} seconds. Error code : `,
+			logger.error(
+				`Direct Hub is not available, will try to reinitiate it in ${RECONNECT_SOCKET_DELAY / 1000} seconds. Error code : `,
 				code,
 			);
 			reconnectTunnel();
-			// })
-			// on('stdout', (data)=>{
-			//     console.log('qt stdout', data)
-			// })
-			// on('stderr', (data)=>{
-			//     console.log('qt stderr', data)
+		})
+		.on("stdout", (data) => {
+			logger.debug(`stdout`, data);
+		})
+		.on("stderr", (data) => {
+			logger.debug(`stderr`, data);
 		});
+
 	return qt;
 }
 
 export function directHubEvent(serverSocket, argv) {
 	serverSocket.on("connection", (clientSocket) => {
 		const setConnectListeners = (sock) => {
-			// shall not log in production mode
-			if (process.env.NODE_ENV !== "production") {
-				const id = `<${sock.handshake?.query?.isClient ? `Client` : sock.handshake?.query?.isDeploy ? "Deployer" : "Anonymous"}> ${sock.id}`;
-				console.log(id, `connected`);
-				sock.on("disconnect", (reason) => {
-					console.log(id, `disconnected. Reason : ${reason}`);
-				});
-			}
+			const id = `<${sock.handshake?.query?.isClient ? `Client` : sock.handshake?.query?.isDeploy ? "Deployer" : sock.handshake?.query?.isLoopback ? "DirectHub Heartbeat" : "Anonymous"}> ${sock.id}`;
+			logger.debug(id, `connected`);
+			sock.on("disconnect", (reason) => {
+				logger.debug(id, `disconnected. Reason : ${reason}`);
+			});
 		};
 
 		if (clientSocket.handshake.query.isClient) {
@@ -81,7 +81,7 @@ export function directHubEvent(serverSocket, argv) {
 				joinExtRooms(clientSocket, extToken, { slug: extSlug });
 			} else {
 				// INTERNAL client — full listener + existing rooms, unchanged.
-				clientListener(clientSocket, argv);
+				clientListener(clientSocket, argv, "direct");
 				clientSocket.join(CLIENT_ROOM);
 
 				// isolated Client in a room using clientInstanceId