biz-a-cli 2.3.80-15375 → 2.3.80-15381

package/bin/app.js

@@ -55,6 +55,7 @@ import {
 import { validateTenancyDeclaration } from "../engine/orm/tenancyDeclaration.js";
 import { logger } from "../logger.js";
 import { findRawColorsInSource } from "../engine/domain/styleColors.js";
+import { resolveMenuLayout } from "../engine/domain/domainNavigation.js";
 
 const getKeyFolderPath = () => {
 	const scriptPath =
@@ -922,13 +923,39 @@ const parseApplicationConfigData = (rawConfig) => {
 	}
 };
 
-const resolveAppDisplayNameFromApplicationConfig = async ({
+/*
+ * What the stored APPLICATION_CONFIG contributes to the SYS$APPS metadata: the display name (which
+ * also keys the row) and the menu layout the client shell draws.
+ */
+const resolveAppMetadataFromApplicationConfig = async ({
 	server,
 	apiPort,
 	dbIndex,
 	sub,
 }) => {
-	/* A PostgreSQL tenant reads SYS$CONFIG directly. This must not silently return "": the
+	const applicationConfig = await readStoredApplicationConfig({
+		server,
+		apiPort,
+		dbIndex,
+		sub,
+	});
+	const displayName = applicationConfig?.metadata?.name;
+	const declaredLayout = applicationConfig?.navigation?.layout;
+	const menuLayout = resolveMenuLayout(applicationConfig);
+	if (declaredLayout != null && menuLayout == null) {
+		logger.warn(
+			`[Add] navigation.layout ${JSON.stringify(declaredLayout)} is not one of ` +
+				`"horizontal" or "vertical"; the client keeps its default menu.`,
+		);
+	}
+	return {
+		displayName: typeof displayName === "string" ? displayName.trim() : "",
+		menuLayout,
+	};
+};
+
+const readStoredApplicationConfig = async ({ server, apiPort, dbIndex, sub }) => {
+	/* A PostgreSQL tenant reads SYS$CONFIG directly. This must not silently come back empty: 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)) {
@@ -937,15 +964,14 @@ const resolveAppDisplayNameFromApplicationConfig = async ({
 				buildPostgresApplicationConfigLookupSql(),
 				dbIndex,
 			);
-			const displayName = parseApplicationConfigData(rows?.[0]?.data)?.metadata?.name;
-			return typeof displayName === "string" ? displayName.trim() : "";
+			return parseApplicationConfigData(rows?.[0]?.data);
 		} catch {
-			return "";
+			return null;
 		}
 	}
 
 	if (typeof axios.request !== "function") {
-		return "";
+		return null;
 	}
 
 	const baseUrl = "fina/rest/TOrmMethod/%22list%22";
@@ -989,18 +1015,16 @@ const resolveAppDisplayNameFromApplicationConfig = async ({
 			return name === "APPLICATION_CONFIG";
 		});
 		if (!applicationConfigRow) {
-			return "";
+			return null;
 		}
 
-		const applicationConfig = parseApplicationConfigData(
+		return parseApplicationConfigData(
 			applicationConfigRow?.["SYS$CONFIG.DATA"] ??
 				applicationConfigRow?.DATA ??
 				applicationConfigRow?.data,
 		);
-		const displayName = applicationConfig?.metadata?.name;
-		return typeof displayName === "string" ? displayName.trim() : "";
 	} catch {
-		return "";
+		return null;
 	}
 };
 
@@ -1161,8 +1185,8 @@ async function addApp({
 				: `${server}:${apiPort}/${baseUrl}`;
 
 			const headers = { "Content-Type": "text/plain" };
-			const appDisplayName =
-				await resolveAppDisplayNameFromApplicationConfig({
+			const { displayName: appDisplayName, menuLayout } =
+				await resolveAppMetadataFromApplicationConfig({
 					server,
 					apiPort,
 					dbIndex,
@@ -1172,6 +1196,11 @@ async function addApp({
 			if (useApplicationConfigName && appDisplayName.length > 0) {
 				keys.metadata["name"] = appDisplayName;
 			}
+			/* navigation.layout -> how the client shell draws this app's menu. Only a value it
+			   understands is copied; without one the metadata stays exactly as before. */
+			if (useApplicationConfigName && menuLayout) {
+				keys.metadata["menuLayout"] = menuLayout;
+			}
 			const uploadAppName = normalizeAppName(
 				(useApplicationConfigName ? appDisplayName : "") || bundleName,
 			);

package/bin/directHubEvent.js

@@ -6,6 +6,8 @@ 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 { io as ioClient } from "socket.io-client";
+
 import { prefixedLogger } from "../logger.js";
 import { APP_URL, TEST_URL, ADMIN_URL, TEST_ADMIN_URL } from "../envs/hosts.js";
 
@@ -14,28 +16,99 @@ const logger = prefixedLogger("[DirectHub]");
 export async function localhostTunnel(port, notifier) {
 	let tunnelUrl = "";
 	let qt = QuickTunnel.quick("127.0.0.1:" + port);
+	let isReconnecting = false;
+	let loopbackSocket = null;
+
+	function destroyLoopback() {
+		if (loopbackSocket) {
+			loopbackSocket.disconnect();
+			loopbackSocket.close();
+			loopbackSocket = null;
+		}
+	}
+
+	const gracefulProcessShutdown = () => {
+		destroyLoopback();
+		if (qt && typeof qt.stop === "function") {
+			try {
+				qt.stop();
+			} catch (e) {}
+		}
+	};
+	process.once("SIGINT", gracefulProcessShutdown);
+	process.once("SIGTERM", gracefulProcessShutdown);
+
 	function reconnectTunnel() {
+		process.off("SIGINT", gracefulProcessShutdown);
+		process.off("SIGTERM", gracefulProcessShutdown);
+		destroyLoopback();
+
+		if (isReconnecting) return;
+		isReconnecting = true;
+
+		if (qt && typeof qt.stop === "function") {
+			try {
+				qt.stop();
+			} catch (e) {}
+		}
+
 		setTimeout(() => {
 			qt = localhostTunnel(port, notifier);
 		}, RECONNECT_SOCKET_DELAY);
 	}
+
+	function startDirectHubHeartbeat() {
+		if (loopbackSocket && loopbackSocket.connected) return;
+
+		if (!tunnelUrl || !tunnelUrl.includes("trycloudflare.com")) {
+			logger.warn(`Invalid remote URL detected. Heartbeat aborted.`);
+			return;
+		}
+
+		destroyLoopback();
+
+		loopbackSocket = ioClient(tunnelUrl, {
+			query: { isLoopback: true },
+			transports: ["websocket"],
+			reconnectionDelay: 5000,
+			reconnectionAttempts: 3,
+		});
+
+		loopbackSocket.on("connect", () => {
+			logger.debug(
+				`Heartbeat established via public internet. Cloudflare idle-drop prevented.`,
+			);
+		});
+
+		loopbackSocket.io.on("reconnect_failed", () => {
+			logger.warn(
+				`Heartbeat failed to reach Edge. Ghost tunnel confirmed. Terminating...`,
+			);
+			notifier("");
+			destroyLoopback();
+			if (qt && typeof qt.stop === "function")
+				try {
+					qt.stop();
+				} catch (e) {}
+		});
+	}
+
 	qt.on("url", (qtUrl) => {
 		tunnelUrl = qtUrl;
 	})
 		.on("connected", (conn) => {
 			notifier(tunnelUrl);
 			logger.info(`Connected to Direct Hub at public URL ${tunnelUrl}`);
+			startDirectHubHeartbeat();
 		})
 		.on("disconnected", (conn) => {
 			notifier("");
-			qt.stop();
 			logger.info(
 				`Disconnected from edge node. Awaiting native reconnect...`,
 			);
 		})
 		.on("error", (err) => {
 			notifier("");
-			qt.stop();
 			logger.error(
 				`Tunnel error: ${err.message || err}. Awaiting native reconnect...`,
 			);
@@ -91,7 +164,10 @@ export function directHubEvent(serverSocket, argv) {
 				if (clientInstanceId) {
 					clientSocket.join(clientInstanceId);
 					clientSocket.on("ESB_ACK", (msgId) => {
-						ClientEmitter.acknowledgeMessage(msgId, clientInstanceId);
+						ClientEmitter.acknowledgeMessage(
+							msgId,
+							clientInstanceId,
+						);
 					});
 				}
 
@@ -108,6 +184,8 @@ export function directHubEvent(serverSocket, argv) {
 		} else if (clientSocket.handshake.query.isDeploy) {
 			setConnectListeners(clientSocket);
 			deploymentListenerForVSCode(clientSocket, argv);
+		} else if (clientSocket.handshake.query.isLoopback) {
+			setConnectListeners(clientSocket);
 		} else {
 			clientSocket.disconnect();
 		}

package/engine/domain/domainNavigation.js

@@ -18,6 +18,23 @@
 /* The route shape the client's menu component renders, identical to a hand-declared leaf. */
 const linkFor = (entry) => ["./form", String(entry?.entryPoint ?? "").trim(), null];
 
+/* The menu layouts the client shell can draw. */
+const MENU_LAYOUTS = ["horizontal", "vertical"];
+
+/*
+ * How the client shell draws this app's menu: `navigation.layout` in application.js.
+ *
+ * It reaches the browser as SYS$APPS.METADATA.menuLayout, beside the display name. Answers null when
+ * nothing usable is declared, so an app that never mentions it keeps its metadata exactly as it was
+ * and the client keeps the horizontal bar.
+ */
+export const resolveMenuLayout = (applicationConfig) => {
+	const raw = applicationConfig?.navigation?.layout;
+	if (typeof raw !== "string") return null;
+	const layout = raw.trim().toLowerCase();
+	return MENU_LAYOUTS.includes(layout) ? layout : null;
+};
+
 /*
  * Which of a domain's declared entries are live right now.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "biz-a-cli",
-	"version": "2.3.80-15375",
+	"version": "2.3.80-15381",
 	"description": "",
 	"main": "bin/index.js",
 	"type": "module",
@@ -45,7 +45,7 @@
 	},
 	"dependencies": {
 		"axios": "^1.7.8",
-		"cloudflared": "^0.6.0",
+		"cloudflared": "^0.7.2",
 		"compression": "^1.7.5",
 		"cors": "^2.8.5",
 		"dayjs": "^1.11.10",