web_plsql 1.3.1 → 1.4.0

package/dist/index.mjs

@@ -111,11 +111,14 @@ const transactionModeSchema = z$1.union([
 /**
 * Authentication configuration for a PL/SQL route
 */
-const z$authSchema = z$1.strictObject({
+const z$authSchema = z$1.union([z$1.strictObject({
 	type: z$1.literal("basic"),
 	callback: z$1.custom((val) => typeof val === "function", { message: "Invalid auth callback" }),
 	realm: z$1.string().optional()
-});
+}), z$1.strictObject({
+	type: z$1.literal("custom"),
+	callback: z$1.custom((val) => typeof val === "function", { message: "Invalid auth callback" })
+})]);
 /**
 * PL/SQL handler behavior configuration
 */
@@ -211,7 +214,7 @@ globalThis.__VERSION__ ??= "**development**";
 * Returns the current library version
 * @returns {string} - Version.
 */
-const getVersion = () => "1.3.1";
+const getVersion = () => "1.4.0";
 
 //#endregion
 //#region src/backend/server/config.ts
@@ -2969,33 +2972,36 @@ const processRequest = async (req, res, options, connectionPool, procedureNameCa
 	debug$2("processRequest: ENTER");
 	if (typeof req.params.name !== "string") console.warn(`processRequest: WARNING: the req.params.name is not a string but an array of string: ${req.params.name}`);
 	const connection = await connectionPool.getConnection();
-	const cgiObj = getCGI(req, options.documentTable, options.cgi ?? {}, authenticatedUser);
-	debug$2("processRequest: cgiObj=", cgiObj);
-	const filesToUpload = getFiles(req);
-	debug$2("processRequest: filesToUpload=", filesToUpload);
-	const argObj = {};
-	Object.assign(argObj, req.query);
-	filesToUpload.reduce((aggregator, file) => {
-		aggregator[file.fieldname] = file.filename;
-		return aggregator;
-	}, argObj);
-	Object.assign(argObj, normalizeBody(req));
-	debug$2("processRequest: argObj=", argObj);
-	await invokeProcedure(req, res, argObj, cgiObj, filesToUpload, options, connection, procedureNameCache, argumentCache);
-	if (options.transactionMode === "rollback") {
-		debug$2("transactionMode: rollback");
-		await connection.rollback();
-	} else if (typeof options.transactionMode === "function") {
-		debug$2("transactionMode: callback");
-		const procName = Array.isArray(req.params.name) ? req.params.name[0] : req.params.name;
-		const result = options.transactionMode(connection, procName ?? "");
-		debug$2("transactionMode: callback restult", result);
-		if (result && typeof result.then === "function") await result;
-	} else {
-		debug$2("transactionMode: commit");
-		await connection.commit();
-	}
-	await connection.release();
+	try {
+		const cgiObj = getCGI(req, options.documentTable, options.cgi ?? {}, authenticatedUser);
+		debug$2("processRequest: cgiObj=", cgiObj);
+		const filesToUpload = getFiles(req);
+		debug$2("processRequest: filesToUpload=", filesToUpload);
+		const argObj = {};
+		Object.assign(argObj, req.query);
+		filesToUpload.reduce((aggregator, file) => {
+			aggregator[file.fieldname] = file.filename;
+			return aggregator;
+		}, argObj);
+		Object.assign(argObj, normalizeBody(req));
+		debug$2("processRequest: argObj=", argObj);
+		await invokeProcedure(req, res, argObj, cgiObj, filesToUpload, options, connection, procedureNameCache, argumentCache);
+		if (options.transactionMode === "rollback") {
+			debug$2("transactionMode: rollback");
+			await connection.rollback();
+		} else if (typeof options.transactionMode === "function") {
+			debug$2("transactionMode: callback");
+			const procName = Array.isArray(req.params.name) ? req.params.name[0] : req.params.name;
+			const result = options.transactionMode(connection, procName ?? "");
+			debug$2("transactionMode: callback restult", result);
+			if (result && typeof result.then === "function") await result;
+		} else {
+			debug$2("transactionMode: commit");
+			await connection.commit();
+		}
+	} finally {
+		await connection.release();
+	}
 	debug$2("processRequest: EXIT");
 };
 
@@ -3099,6 +3105,10 @@ const errorPage = (req, res, options, error) => {
 		}
 	});
 	console.error(text);
+	if (res.headersSent) {
+		console.warn("errorPage: Response headers already sent. Cannot show error page.");
+		return;
+	}
 	if (options.errorStyle === "basic") res.status(404).send("Page not found");
 	else res.status(404).send(getHtmlPage(html));
 };
@@ -3122,16 +3132,22 @@ const requestHandler = async (req, res, _next, connectionPool, options, procedur
 		if (options.auth?.type === "basic") {
 			const b64auth = (req.headers.authorization ?? "").split(" ")[1] ?? "";
 			const [login, password] = Buffer.from(b64auth, "base64").toString().split(":");
-			if (login) authenticatedUser = await options.auth.callback(connectionPool, {
+			if (login) authenticatedUser = await options.auth.callback({
 				username: login,
 				password
-			});
+			}, connectionPool);
 			if (authenticatedUser === null) {
 				const realm = options.auth.realm ?? "PL/SQL Gateway";
 				res.set("WWW-Authenticate", `Basic realm="${realm}"`);
 				res.status(401).send("Authentication required.");
 				return;
 			}
+		} else if (options.auth?.type === "custom") {
+			authenticatedUser = await options.auth.callback(req, connectionPool);
+			if (authenticatedUser === null) {
+				res.status(401).send("Authentication required.");
+				return;
+			}
 		}
 		if (typeof req.params.name !== "string" || req.params.name.length === 0) if (typeof options.defaultPage === "string" && options.defaultPage.length > 0) {
 			const newUrl = url.resolve(`${req.originalUrl}/${options.defaultPage}`, "");
@@ -3237,8 +3253,8 @@ const createAdminRouter = (adminContext) => {
 			const name = cache?.poolName ?? `pool-${index}`;
 			const p = pool;
 			const stats = typeof p.getStatistics === "function" ? p.getStatistics() : null;
-			const procStats = cache?.procedureNameCache.getStats();
-			const argStats = cache?.argumentCache.getStats();
+			const procStats = cache?.procedureNameCache?.getStats();
+			const argStats = cache?.argumentCache?.getStats();
 			return {
 				name,
 				stats,
@@ -3246,12 +3262,12 @@ const createAdminRouter = (adminContext) => {
 				connectionsInUse: pool.connectionsInUse,
 				cache: {
 					procedureName: {
-						size: cache?.procedureNameCache.keys().length ?? 0,
+						size: cache?.procedureNameCache?.keys().length ?? 0,
 						hits: procStats?.hits ?? 0,
 						misses: procStats?.misses ?? 0
 					},
 					argument: {
-						size: cache?.argumentCache.keys().length ?? 0,
+						size: cache?.argumentCache?.keys().length ?? 0,
 						hits: argStats?.hits ?? 0,
 						misses: argStats?.misses ?? 0
 					}
@@ -3458,32 +3474,45 @@ const handlerAdminConsole = (config, adminContext) => {
 	const resolvedStaticDir = config.staticDir ?? resolveAdminStaticDir();
 	if (adminRoute && !adminRoute.startsWith("/")) throw new Error("adminRoute must start with /");
 	if (!config.devMode && !existsSync(resolvedStaticDir)) throw new Error(`Admin console not built. Run 'npm run build:frontend' first.\nExpected: ${resolvedStaticDir}`);
-	const originalRotate = adminContext.statsManager.rotateBucket.bind(adminContext.statsManager);
-	adminContext.statsManager.rotateBucket = () => {
-		originalRotate(adminContext.pools.map((pool, index) => {
-			const cache = adminContext.caches[index];
-			const name = cache?.poolName ?? `pool-${index}`;
-			const procStats = cache?.procedureNameCache.getStats();
-			const argStats = cache?.argumentCache.getStats();
-			return {
-				name,
-				connectionsOpen: pool.connectionsOpen,
-				connectionsInUse: pool.connectionsInUse,
-				cache: {
-					procedureName: {
-						size: cache?.procedureNameCache.keys().length ?? 0,
-						hits: procStats?.hits ?? 0,
-						misses: procStats?.misses ?? 0
-					},
-					argument: {
-						size: cache?.argumentCache.keys().length ?? 0,
-						hits: argStats?.hits ?? 0,
-						misses: argStats?.misses ?? 0
+	const statsManager = adminContext.statsManager;
+	const currentRotate = statsManager.rotateBucket;
+	if (!Object.prototype.hasOwnProperty.call(currentRotate, "_isWrapped")) {
+		const originalRotate = statsManager.rotateBucket;
+		const wrappedRotate = (poolSnapshots = []) => {
+			const mergedSnapshots = [...adminContext.pools.map((pool, index) => {
+				const cache = adminContext.caches[index];
+				const name = cache?.poolName ?? `pool-${index}`;
+				const procStats = cache?.procedureNameCache?.getStats();
+				const argStats = cache?.argumentCache?.getStats();
+				return {
+					name,
+					connectionsOpen: pool.connectionsOpen,
+					connectionsInUse: pool.connectionsInUse,
+					cache: {
+						procedureName: {
+							size: cache?.procedureNameCache?.keys().length ?? 0,
+							hits: procStats?.hits ?? 0,
+							misses: procStats?.misses ?? 0
+						},
+						argument: {
+							size: cache?.argumentCache?.keys().length ?? 0,
+							hits: argStats?.hits ?? 0,
+							misses: argStats?.misses ?? 0
+						}
 					}
-				}
-			};
-		}));
-	};
+				};
+			})];
+			if (Array.isArray(poolSnapshots)) {
+				for (const ps of poolSnapshots) if (!mergedSnapshots.some((s) => s.name === ps.name)) mergedSnapshots.push(ps);
+			}
+			originalRotate.call(statsManager, mergedSnapshots);
+		};
+		Object.defineProperty(wrappedRotate, "_isWrapped", {
+			value: true,
+			writable: false
+		});
+		statsManager.rotateBucket = wrappedRotate;
+	}
 	const router = Router();
 	router.use((req, res, next) => {
 		if (adminContext.paused && !req.path.startsWith(adminRoute)) {