web_plsql 0.8.0 → 0.11.0

package/README.md

@@ -24,21 +24,28 @@ Please visit the [node-oracledb](https://node-oracledb.readthedocs.io/en/latest/
 * Create a new npm project (`npm i`)
 * Install package (`npm i --omit=dev web_plsql`)
 
-# Example (native)
+# Example
+
+## Native
 * Change to the `examples/sql` directory, start SQLPLus, connect to the database as SYS specifying the SYSDBA roleInstall and install the sample schema `@examples/sql/install.sql`.
-* Start server using `node examples/server_sample.js` after having set the WEB_PLSQL_ORACLE_SERVER environment variable to the database where you just installed the sample schema.
+* Start server using `node examples/config-native.js` after having set the WEB_PLSQL_ORACLE_SERVER environment variable to the database where you just installed the sample schema.
 * Invoke a browser and open the page `http://localhost/sample`.
 
-# Example (container)
-* Build the image using `npm run image-build`
-* Start the container using `./run_container.sh` after eventually modifying the `run_container.sh` script.
+## Container
+* Build the image using `npm run image-build`.
+* Adapt the `examples/config-docker.json` configuration file. Typically only the `connectString` property must be changed.
+* Start the container using `docker compose up -d`.
+
+# Configuration
+
+There are 2 options on how to use the web_plsql express middleware:
+- Use the predefined `startHttpServer` api in `src/server.js` like in the `examples/config-native.js` example
+- Hand craft a new Express server using the `handlerWebPlSql` middleware in `src/handlerPlSql.js`
 
-# Running
-There are 2 main options on how to use the mod_plsql Express middleware:
+## Use the predefined `startHttpServer`
 
-## Make a copy of the `server_sample.js` sample script and configure it accordingly to your needs.
+The `startHttpServer` api uses the following configuration object:
 
-The the default server implemented in `src/server.js` and has the following configuration options:
 ```
 /**
  * @typedef {'basic' | 'debug'} errorStyleType
@@ -77,6 +84,12 @@ export const z$errorStyleType = z.enum(['basic', 'debug']);
  */
 ```
 
+## Hand craft a new Express server using the `handlerWebPlSql` middleware
+
+WIP
+
+# Compare with mod_plsql
+
 The following mod_plsql DAD configuration translates to the configuration options as follows:
 
 **DAD**

package/examples/{server_apex.js → config-apex.js}

@@ -13,7 +13,7 @@ void startHttpServer({
 			route: '/apex',
 			user: 'APEX_PUBLIC_USER',
 			password: 'secret',
-			connectString: process.env.ORACLE_SERVER ?? '',
+			connectString: 'localhost:1521/orcl',
 			defaultPage: 'apex',
 			pathAlias: 'r',
 			pathAliasProcedure: 'wwv_flow.resolve_friendly_url',

package/examples/config-docker.js

@@ -0,0 +1,31 @@
+#!/usr/bin/env node
+
+// @ts-expect-error NOTE: the following import would show an error because the path does not exist
+import {startHttpServer} from './src/index.js';
+
+void startHttpServer({
+	port: 8888,
+	routeStatic: [
+		{
+			route: '/static',
+			directoryPath: 'examples/static',
+		},
+	],
+	routePlSql: [
+		{
+			route: '/sample',
+			user: 'sample', // PlsqlDatabaseUserName
+			password: 'sample', // PlsqlDatabasePassword
+			connectString: 'host.docker.internal:1521/TEST', // PlsqlDatabaseConnectString
+			defaultPage: 'sample_pkg.page_index', // PlsqlDefaultPage
+			documentTable: 'doctable', // PlsqlDocumentTablename
+			exclusionList: ['sample_pkg.page_exclusion_list'], // PlsqlExclusionList
+			requestValidationFunction: 'sample_pkg.request_validation_function', // PlsqlRequestValidationFunction
+			pathAlias: 'myalias', // PlsqlPathAlias
+			pathAliasProcedure: 'sample_pkg.page_path_alias', // PlsqlPathAliasProcedure
+			errorStyle: 'debug', // PlsqlErrorStyle
+		},
+	],
+	loggerFilename: 'access.log', // PlsqlLogEnable and PlsqlLogDirectory
+	monitorConsole: false,
+});

package/examples/config-docker.json

@@ -0,0 +1,26 @@
+{
+	"port": 8888,
+	"routeStatic": [
+		{
+			"route": "/static",
+			"directoryPath": "examples/static"
+		}
+	],
+	"routePlSql": [
+		{
+			"route": "/sample",
+			"user": "sample",
+			"password": "sample",
+			"connectString": "host.docker.internal:1521/TEST",
+			"defaultPage": "sample_pkg.page_index",
+			"documentTable": "doctable",
+			"exclusionList": ["sample_pkg.page_exclusion_list"],
+			"requestValidationFunction": "sample_pkg.request_validation_function",
+			"pathAlias": "myalias",
+			"pathAliasProcedure": "sample_pkg.page_path_alias",
+			"errorStyle": "debug"
+		}
+	],
+	"loggerFilename": "access.log",
+	"monitorConsole": false
+}

package/examples/{server_sample.js → config-native.js}

@@ -13,9 +13,9 @@ void startHttpServer({
 	routePlSql: [
 		{
 			route: '/sample',
-			user: process.env.WEB_PLSQL_ORACLE_USER ?? 'sample', // PlsqlDatabaseUserName
-			password: process.env.WEB_PLSQL_ORACLE_PASSWORD ?? 'sample', // PlsqlDatabasePassword
-			connectString: process.env.WEB_PLSQL_ORACLE_SERVER ?? 'localhost:1521/orcl', // PlsqlDatabaseConnectString
+			user: 'sample', // PlsqlDatabaseUserName
+			password: 'sample', // PlsqlDatabasePassword
+			connectString: process.env.WEB_PLSQL_ORACLE_SERVER ?? 'localhost:1521/TEST', // PlsqlDatabaseConnectString
 			defaultPage: 'sample_pkg.page_index', // PlsqlDefaultPage
 			documentTable: 'doctable', // PlsqlDocumentTablename
 			exclusionList: ['sample_pkg.page_exclusion_list'], // PlsqlExclusionList

package/examples/sql/install.sql

@@ -19,10 +19,10 @@ GRANT execute on dbms_lob TO &&SAMPLE_USER;
 ALTER SESSION SET CURRENT_SCHEMA=&&SAMPLE_USER;
 
 -- install document table
-@doctable.sql
+@@doctable.sql
 
 -- install package
-@sample_package.sql
+@@sample_package.sql
 show errors
-@sample_package_body.sql
+@@sample_package_body.sql
 show errors

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "web_plsql",
-	"version": "0.8.0",
+	"version": "0.11.0",
 	"author": "Dieter Oberkofler <dieter.oberkofler@gmail.com>",
 	"license": "MIT",
 	"description": "The Express Middleware for Oracle PL/SQL",
@@ -43,52 +43,53 @@
 	"types": "./types/index.d.ts",
 	"type": "module",
 	"scripts": {
-		"lint": "prettier --check . && eslint . && tsc --noEmit",
+		"lint": "prettier --check --experimental-cli . && eslint . && tsc --noEmit",
 		"test": "node --test --test-concurrency=1 \"./tests/**/*.test.js\"",
-		"types": "rm -rf types && tsc  --noEmit false --declaration true --declarationDir types --emitDeclarationOnly true --allowJs true --target es2020 --module es2020 --moduleResolution node src/*.js",
+		"types": "rm -rf types && tsc  --noEmit false --declaration true --declarationDir types --emitDeclarationOnly true --allowJs true --target es2020 --module es2020 --moduleResolution node --allowSyntheticDefaultImports true src/*.js",
 		"clean": "shx rm -f *.tgz && shx rm -f *.log",
 		"ci": "npm run clean && npm run lint && npm run test",
 		"create-package": "shx rm -f *.tgz && npm pack",
 		"image-build": "docker build --no-cache --progress=plain --tag=web_plsql .",
 		"image-save": "docker save web_plsql | gzip > web_plsql.tar.gz"
 	},
+	"peerDependencies": {
+		"oracledb": "6.9.0"
+	},
 	"dependencies": {
 		"basic-auth": "2.0.1",
 		"body-parser": "2.2.0",
-		"compression": "1.8.0",
-		"connect-multiparty": "2.2.0",
+		"compression": "1.8.1",
 		"cookie-parser": "1.4.7",
-		"debug": "4.4.0",
+		"debug": "4.4.1",
 		"escape-html": "1.0.3",
 		"express": "5.1.0",
-		"fs-extra": "11.3.0",
+		"fs-extra": "11.3.1",
 		"http-parser-js": "0.5.10",
-		"morgan": "1.10.0",
-		"multer": "1.4.5-lts.2",
-		"oracledb": "6.8.0",
+		"morgan": "1.10.1",
+		"multer": "2.0.2",
 		"rotating-file-stream": "3.2.6",
-		"zod": "3.24.2"
+		"zod": "4.0.17"
 	},
 	"devDependencies": {
 		"@types/basic-auth": "1.1.8",
-		"@types/body-parser": "1.19.5",
-		"@types/compression": "1.7.5",
-		"@types/cookie-parser": "1.4.8",
+		"@types/body-parser": "1.19.6",
+		"@types/compression": "1.8.1",
+		"@types/cookie-parser": "1.4.9",
 		"@types/debug": "4.1.12",
 		"@types/escape-html": "1.0.4",
 		"@types/fs-extra": "11.0.4",
-		"@types/morgan": "1.9.9",
-		"@types/multer": "1.4.12",
-		"@types/node": "22.14.1",
-		"@types/oracledb": "6.6.0",
+		"@types/morgan": "1.9.10",
+		"@types/multer": "2.0.0",
+		"@types/node": "24.3.0",
+		"@types/oracledb": "6.9.1",
 		"@types/supertest": "6.0.3",
-		"eslint": "9.24.0",
-		"eslint-plugin-jsdoc": "50.6.9",
-		"prettier": "3.5.3",
+		"eslint": "9.33.0",
+		"eslint-plugin-jsdoc": "54.1.1",
+		"prettier": "3.6.2",
 		"rimraf": "6.0.1",
 		"shx": "0.4.0",
-		"supertest": "7.1.0",
-		"typescript": "5.8.3",
-		"typescript-eslint": "8.30.1"
+		"supertest": "7.1.4",
+		"typescript": "5.9.2",
+		"typescript-eslint": "8.40.0"
 	}
 }

package/src/procedure.js

@@ -33,51 +33,69 @@ import {errorToString} from './error.js';
 
 /**
  * Get the SQL statement to execute when a new procedure is invoked
+ *
+ * NOTE:
+ * 	1) dbms_session.modify_package_state(dbms_session.reinitialize) is used to ensure a stateless environment by resetting package state (dbms_session.reset_package)
+ *
  * @param {string} procedure - The procedure
  * @returns {string} - The SQL statement to execute
  */
-const getProcedureSQL = (procedure) => `DECLARE
-	fileType VARCHAR2(32767);
-	fileSize INTEGER;
-	fileBlob BLOB;
-	fileExist INTEGER := 0;
+const getProcedureSQL = (procedure) => `
+DECLARE
+	l_file_type		VARCHAR2(32767);
+	l_file_size		INTEGER;
+	l_file_exists	INTEGER := 0;
 BEGIN
-	-- Ensure a stateless environment by resetting package state (dbms_session.reset_package)
 	dbms_session.modify_package_state(dbms_session.reinitialize);
-
-	-- initialize the cgi
 	owa.init_cgi_env(:cgicount, :cginames, :cgivalues);
-
-	-- initialize the htp package
 	htp.init;
-
-	-- set the HTBUF_LEN
 	htp.HTBUF_LEN := :htbuflen;
 
-	-- execute the procedure
 	BEGIN
 		${procedure}
 	EXCEPTION WHEN OTHERS THEN
-		raise_application_error(-20000, 'Error executing ${procedure}'||CHR(10)||SUBSTR(dbms_utility.format_error_stack()||CHR(10)||dbms_utility.format_error_backtrace(), 1, 2000));
+		raise_application_error(-20000, 'Error executing "${procedure}"', TRUE);
 	END;
 
-	-- Check for file download
 	IF (wpg_docload.is_file_download()) THEN
-		wpg_docload.get_download_file(fileType);
-		IF (filetype = 'B') THEN
-			fileExist := 1;
+		wpg_docload.get_download_file(l_file_type);
+		IF (l_file_type = 'B') THEN
+			l_file_exists := 1;
 			wpg_docload.get_download_blob(:fileBlob);
-			fileSize := dbms_lob.getlength(:fileBlob);
-			--dbms_lob.copy(dest_lob=>:fileBlob, src_lob=>fileBlob, amount=>fileSize);
+			l_file_size := dbms_lob.getlength(:fileBlob);
 		END IF;
 	END IF;
-	:fileExist := fileExist;
-	:fileType := fileType;
-	:fileSize := fileSize;
+	:fileExist := l_file_exists;
+	:fileType := l_file_type;
+	:fileSize := l_file_size;
 
-	-- retrieve the page
 	owa.get_page(thepage=>:lines, irows=>:irows);
-END;`;
+END;
+`;
+
+/**
+ *	Get the procedure and arguments to execute
+ *	@param {string} procName - The procedure to execute
+ *	@param {argObjType} argObj - The arguments to pass to the procedure
+ *	@param {configPlSqlHandlerType} options - The options for the middleware
+ *	@param {Connection} databaseConnection - The database connection
+ *	@returns {Promise<{sql: string; bind: BindParameterConfig}>} - The SQL statement and bindings for the procedure to execute
+ */
+const getProcedure = async (procName, argObj, options, databaseConnection) => {
+	if (options.pathAlias && options.pathAlias.toLowerCase() === procName.toLowerCase()) {
+		debug(`getProcedure: path alias "${options.pathAlias}" redirects to "${options.pathAliasProcedure}"`);
+		return {
+			sql: `${options.pathAliasProcedure}(p_path=>:p_path);`,
+			bind: {
+				p_path: {dir: oracledb.BIND_IN, type: oracledb.STRING, val: procName},
+			},
+		};
+	} else if (procName.startsWith('!')) {
+		return await getProcedureVariable(procName.substring(1), argObj, databaseConnection, options);
+	}
+
+	return await getProcedureNamed(procName, argObj, databaseConnection, options);
+};
 
 /**
  * Invoke the Oracle procedure and return the page content
@@ -234,27 +252,3 @@ export const invokeProcedure = async (req, res, argObj, cgiObj, filesToUpload, o
 
 	debug('invokeProcedure: EXIT');
 };
-
-/**
- *	Get the procedure and arguments to execute
- *	@param {string} procName - The procedure to execute
- *	@param {argObjType} argObj - The arguments to pass to the procedure
- *	@param {configPlSqlHandlerType} options - The options for the middleware
- *	@param {Connection} databaseConnection - The database connection
- *	@returns {Promise<{sql: string; bind: BindParameterConfig}>} - The SQL statement and bindings for the procedure to execute
- */
-const getProcedure = async (procName, argObj, options, databaseConnection) => {
-	if (options.pathAlias && options.pathAlias.toLowerCase() === procName.toLowerCase()) {
-		debug(`getProcedure: path alias "${options.pathAlias}" redirects to "${options.pathAliasProcedure}"`);
-		return {
-			sql: `${options.pathAliasProcedure}(p_path=>:p_path);`,
-			bind: {
-				p_path: {dir: oracledb.BIND_IN, type: oracledb.STRING, val: procName},
-			},
-		};
-	} else if (procName.startsWith('!')) {
-		return await getProcedureVariable(procName.substring(1), argObj, databaseConnection, options);
-	}
-
-	return await getProcedureNamed(procName, argObj, databaseConnection, options);
-};

package/src/procedureSanitize.js

@@ -135,7 +135,7 @@ const loadRequestValid = async (procName, requestValidationFunction, databaseCon
 	}
 
 	try {
-		const data = z.object({valid: z.number()}).strict().parse(result.outBinds);
+		const data = z.strictObject({valid: z.number()}).parse(result.outBinds);
 		return data.valid === 1;
 	} catch (err) {
 		debug('result', result.outBinds);

package/src/request.js

@@ -48,9 +48,9 @@ export const processRequest = async (req, res, options, connectionPool) => {
 	const argObj = {};
 	Object.assign(argObj, req.query);
 
-	// Add the files to the arguments
+	// For add the files that must be uploaded, we now copy the actual filename to the appropriate prameter to the invoked procedure.
 	filesToUpload.reduce((aggregator, file) => {
-		aggregator[file.fieldname] = file.originalname;
+		aggregator[file.fieldname] = file.filename;
 		return aggregator;
 	}, argObj);
 

package/src/server.js

@@ -28,6 +28,54 @@ import {readFileSyncUtf8, getJsonFile} from './file.js';
  * @typedef {import('./types.js').configType} configType
  */
 
+/**
+ * Show configuration.
+ * @param {configType} config - The config.
+ * @returns {void}
+ */
+export const showConfig = (config) => {
+	const expressVersion = getExpressVersion();
+	const packageVersion = getPackageVersion();
+
+	console.log('-'.repeat(80));
+	console.log('NODE PL/SQL SERVER');
+	console.log('-'.repeat(80));
+
+	console.log(`Application version: ${packageVersion}`);
+	console.log(`Express version:     ${expressVersion}`);
+	console.log(`Server port:         ${config.port}`);
+	console.log(`Access log:          ${config.loggerFilename.length > 0 ? config.loggerFilename : ''}`);
+	console.log(`Monitor console:     ${config.monitorConsole ? 'on' : 'off'}`);
+
+	if (config.routeStatic.length > 0) {
+		console.log('');
+		config.routeStatic.forEach((e, i) => {
+			console.log(`Static route #${i + 1}`);
+			console.log(` Route:            "${e.route}"`);
+			console.log(` Directory path:   "${e.directoryPath}"`);
+		});
+	}
+
+	if (config.routePlSql.length > 0) {
+		console.log('');
+		config.routePlSql.forEach((e, i) => {
+			console.log(`Application route #${i + 1}`);
+			console.log(` Route:                       "http://localhost:${config.port}${e.route}"`);
+			console.log(` Oracle user:                 "${e.user}"`);
+			console.log(` Oracle server:               "${e.connectString}"`);
+			console.log(` Oracle document table:       "${e.documentTable}"`);
+			console.log(` Default page:                "${e.defaultPage}"`);
+			console.log(` Path alias:                  "${e.pathAlias}"`);
+			console.log(` Path alias procedure:        "${e.pathAliasProcedure}"`);
+			console.log(` Exclution list:              "${e.exclusionList?.join(', ')}"`);
+			console.log(` Request validation function: "${e.requestValidationFunction}"`);
+			console.log(` Error style:                 "${e.errorStyle}"`);
+		});
+	}
+
+	console.log('-'.repeat(80));
+};
+
 /**
  * Create HTTP server.
  * @param {Express} app - express application
@@ -38,7 +86,6 @@ import {readFileSyncUtf8, getJsonFile} from './file.js';
 export const createHttpServer = (app, port, connectionPools) => {
 	return new Promise((resolve) => {
 		// Create server
-		// eslint-disable-next-line @typescript-eslint/no-misused-promises
 		const server = http.createServer({}, app);
 
 		// Install shutdown handler
@@ -73,7 +120,6 @@ export const createHttpsServer = (app, sslKeyFilename, sslCertFilename, port, co
 		const cert = readFileSyncUtf8(sslCertFilename);
 
 		// Create server
-		// eslint-disable-next-line @typescript-eslint/no-misused-promises
 		const server = https.createServer({key, cert}, app);
 
 		// Install shutdown handler
@@ -100,24 +146,33 @@ export const createHttpsServer = (app, sslKeyFilename, sslCertFilename, port, co
 export const startHttpServer = async (config) => {
 	debug('startHttpServer', config);
 
-	const expressVersion = getExpressVersion();
-	const packageVersion = getPackageVersion();
-
 	config = z$configType.parse(config);
 
-	console.log(`WEB_PL/SQL ${packageVersion} using express ${expressVersion}`);
+	showConfig(config);
 
 	// Create express app
 	const app = express();
 
+	// Debug requests
+	if (debug.enabled) {
+		app.use((req, res, next) => {
+			console.log(`Request: "${req.method}" "${req.url}"`);
+			next();
+		});
+	}
+
 	// Metrics
 	const metrics = initMetrics();
 	app.use(handlerMetrics(metrics));
 
+	// Access log
+	if (config.loggerFilename.length > 0) {
+		app.use(handlerLogger(config.loggerFilename));
+	}
+
 	// Serving static files
 	for (const i of config.routeStatic) {
 		app.use(i.route, express.static(i.directoryPath));
-		console.log(`Static resources on "${i.route}" from directory ${i.directoryPath}`);
 	}
 
 	// Default middleware
@@ -127,12 +182,6 @@ export const startHttpServer = async (config) => {
 	app.use(cookieParser());
 	app.use(compression());
 
-	// Access log
-	if (config.loggerFilename.length > 0) {
-		console.log(`Access log in "${config.loggerFilename}"`);
-		app.use(handlerLogger(config.loggerFilename));
-	}
-
 	/** @type {Pool[]} */
 	const connectionPools = [];
 
@@ -143,11 +192,6 @@ export const startHttpServer = async (config) => {
 		connectionPools.push(pool);
 
 		app.use([`${i.route}/:name`, i.route], handlerWebPlSql(pool, i));
-
-		console.log(`Application route "http://localhost:${config.port}${i.route}"`);
-		console.log(`   Oracle user:           ${i.user}`);
-		console.log(`   Oracle server:         ${i.connectString}`);
-		console.log(`   Oracle document table: ${i.documentTable}`);
 	}
 
 	// Update metrics every second

package/src/trace.js

@@ -10,7 +10,7 @@ import util from 'node:util';
  * Return a string representation of the value.
  *
  * @param {unknown} value - Any value.
- * @param {number | null} depth - Specifies the number of times to recurse while formatting object..
+ * @param {number | null} depth - Specifies the number of times to recurse while formatting object.
  * @returns {string} - The string representation.
  */
 export const inspect = (value, depth = null) => util.inspect(value, {showHidden: false, depth, colors: false});

package/src/types.js

@@ -14,12 +14,10 @@ export const z$errorStyleType = z.enum(['basic', 'debug']);
  * @property {string} route - The Static route path.
  * @property {string} directoryPath - The Static directory.
  */
-export const z$configStaticType = z
-	.object({
-		route: z.string(),
-		directoryPath: z.string(),
-	})
-	.strict();
+export const z$configStaticType = z.strictObject({
+	route: z.string(),
+	directoryPath: z.string(),
+});
 
 /**
  * @typedef {object} configPlSqlHandlerType
@@ -32,17 +30,15 @@ export const z$configStaticType = z
  * @property {Record<string, string>} [cgi] - The additional CGI.
  * @property {errorStyleType} errorStyle - The error style.
  */
-export const z$configPlSqlHandlerType = z
-	.object({
-		defaultPage: z.string(),
-		pathAlias: z.string().optional(),
-		pathAliasProcedure: z.string().optional(),
-		documentTable: z.string(),
-		exclusionList: z.array(z.string()).optional(),
-		requestValidationFunction: z.string().optional(),
-		errorStyle: z$errorStyleType,
-	})
-	.strict();
+export const z$configPlSqlHandlerType = z.strictObject({
+	defaultPage: z.string(),
+	pathAlias: z.string().optional(),
+	pathAliasProcedure: z.string().optional(),
+	documentTable: z.string(),
+	exclusionList: z.array(z.string()).optional(),
+	requestValidationFunction: z.string().optional(),
+	errorStyle: z$errorStyleType,
+});
 
 /**
  * @typedef {object} configPlSqlConfigType
@@ -51,19 +47,20 @@ export const z$configPlSqlHandlerType = z
  * @property {string} password - The Oracle password.
  * @property {string} connectString - The Oracle connect string.
  */
-export const z$configPlSqlConfigType = z
-	.object({
-		route: z.string(),
-		user: z.string(),
-		password: z.string(),
-		connectString: z.string(),
-	})
-	.strict();
+export const z$configPlSqlConfigType = z.strictObject({
+	route: z.string(),
+	user: z.string(),
+	password: z.string(),
+	connectString: z.string(),
+});
 
 /**
  * @typedef {configPlSqlHandlerType & configPlSqlConfigType} configPlSqlType
  */
-export const z$configPlSqlType = z$configPlSqlHandlerType.merge(z$configPlSqlConfigType);
+export const z$configPlSqlType = z.strictObject({
+	...z$configPlSqlHandlerType.shape,
+	...z$configPlSqlConfigType.shape,
+});
 
 /**
  * @typedef {object} configType
@@ -73,15 +70,13 @@ export const z$configPlSqlType = z$configPlSqlHandlerType.merge(z$configPlSqlCon
  * @property {string} loggerFilename - name of the request logger filename or '' if not required.
  * @property {boolean} monitorConsole - Enable console status monitor.
  */
-export const z$configType = z
-	.object({
-		port: z.number(),
-		routeStatic: z.array(z$configStaticType),
-		routePlSql: z.array(z$configPlSqlType),
-		loggerFilename: z.string(),
-		monitorConsole: z.boolean(),
-	})
-	.strict();
+export const z$configType = z.strictObject({
+	port: z.number(),
+	routeStatic: z.array(z$configStaticType),
+	routePlSql: z.array(z$configPlSqlType),
+	loggerFilename: z.string(),
+	monitorConsole: z.boolean(),
+});
 
 /**
  * Environment variables as string key-value pairs

package/src/upload.js

@@ -11,6 +11,19 @@ import {readFile, removeFile} from './file.js';
 import oracledb from 'oracledb';
 import z from 'zod';
 
+const z$reqFiles = z.array(
+	z.looseObject({
+		fieldname: z.string(),
+		originalname: z.string(),
+		encoding: z.string(),
+		mimetype: z.string(),
+		destination: z.string(),
+		filename: z.string(),
+		path: z.string(),
+		size: z.number(),
+	}),
+);
+
 /**
  * @typedef {import('express').Request} Request
  * @typedef {import('oracledb').Connection} Connection
@@ -37,22 +50,7 @@ export const getFiles = (req) => {
 
 	debug('req.files=', req.files);
 
-	// validate
-	const reqFiles = z
-		.object({
-			fieldname: z.string(),
-			originalname: z.string(),
-			encoding: z.string(),
-			mimetype: z.string(),
-			destination: z.string(),
-			filename: z.string(),
-			path: z.string(),
-			size: z.number(),
-		})
-		.array()
-		.parse(req.files);
-
-	return reqFiles;
+	return z$reqFiles.parse(req.files);
 };
 
 /**

package/types/server.d.ts

@@ -1,3 +1,4 @@
+export function showConfig(config: configType): void;
 export function createHttpServer(app: Express, port: number, connectionPools: Pool[]): Promise<http.Server>;
 export function createHttpsServer(app: Express, sslKeyFilename: string, sslCertFilename: string, port: number, connectionPools: Pool[]): Promise<https.Server>;
 export function startHttpServer(config: configType): Promise<void>;
@@ -9,3 +10,5 @@ export type NextFunction = import("express").NextFunction;
 export type Pool = import("oracledb").Pool;
 export type environmentType = import("./types.js").environmentType;
 export type configType = import("./types.js").configType;
+import http from 'node:http';
+import https from 'node:https';

package/types/stream.d.ts

@@ -1 +1,2 @@
 export function streamToBuffer(readable: stream.Readable): Promise<Buffer>;
+import stream from 'node:stream';

package/types/trace.d.ts

@@ -3,3 +3,4 @@ export function logToFile(text: string): void;
 export function inspectRequest(req: express.Request, simple?: boolean): string;
 export function getBlock(title: string, body: string): string;
 export function getTimestamp(): string;
+import express from 'express';

package/types/types.d.ts

@@ -4,13 +4,19 @@
 /**
  * @typedef {'basic' | 'debug'} errorStyleType
  */
-export const z$errorStyleType: any;
+export const z$errorStyleType: z.ZodEnum<{
+    basic: "basic";
+    debug: "debug";
+}>;
 /**
  * @typedef {object} configStaticType
  * @property {string} route - The Static route path.
  * @property {string} directoryPath - The Static directory.
  */
-export const z$configStaticType: any;
+export const z$configStaticType: z.ZodObject<{
+    route: z.ZodString;
+    directoryPath: z.ZodString;
+}, z.core.$strict>;
 /**
  * @typedef {object} configPlSqlHandlerType
  * @property {string} defaultPage - The default page.
@@ -22,7 +28,18 @@ export const z$configStaticType: any;
  * @property {Record<string, string>} [cgi] - The additional CGI.
  * @property {errorStyleType} errorStyle - The error style.
  */
-export const z$configPlSqlHandlerType: any;
+export const z$configPlSqlHandlerType: z.ZodObject<{
+    defaultPage: z.ZodString;
+    pathAlias: z.ZodOptional<z.ZodString>;
+    pathAliasProcedure: z.ZodOptional<z.ZodString>;
+    documentTable: z.ZodString;
+    exclusionList: z.ZodOptional<z.ZodArray<z.ZodString>>;
+    requestValidationFunction: z.ZodOptional<z.ZodString>;
+    errorStyle: z.ZodEnum<{
+        basic: "basic";
+        debug: "debug";
+    }>;
+}, z.core.$strict>;
 /**
  * @typedef {object} configPlSqlConfigType
  * @property {string} route - The PL/SQL route path.
@@ -30,11 +47,31 @@ export const z$configPlSqlHandlerType: any;
  * @property {string} password - The Oracle password.
  * @property {string} connectString - The Oracle connect string.
  */
-export const z$configPlSqlConfigType: any;
+export const z$configPlSqlConfigType: z.ZodObject<{
+    route: z.ZodString;
+    user: z.ZodString;
+    password: z.ZodString;
+    connectString: z.ZodString;
+}, z.core.$strict>;
 /**
  * @typedef {configPlSqlHandlerType & configPlSqlConfigType} configPlSqlType
  */
-export const z$configPlSqlType: any;
+export const z$configPlSqlType: z.ZodObject<{
+    route: z.ZodString;
+    user: z.ZodString;
+    password: z.ZodString;
+    connectString: z.ZodString;
+    defaultPage: z.ZodString;
+    pathAlias: z.ZodOptional<z.ZodString>;
+    pathAliasProcedure: z.ZodOptional<z.ZodString>;
+    documentTable: z.ZodString;
+    exclusionList: z.ZodOptional<z.ZodArray<z.ZodString>>;
+    requestValidationFunction: z.ZodOptional<z.ZodString>;
+    errorStyle: z.ZodEnum<{
+        basic: "basic";
+        debug: "debug";
+    }>;
+}, z.core.$strict>;
 /**
  * @typedef {object} configType
  * @property {number} port - The server port number.
@@ -43,7 +80,31 @@ export const z$configPlSqlType: any;
  * @property {string} loggerFilename - name of the request logger filename or '' if not required.
  * @property {boolean} monitorConsole - Enable console status monitor.
  */
-export const z$configType: any;
+export const z$configType: z.ZodObject<{
+    port: z.ZodNumber;
+    routeStatic: z.ZodArray<z.ZodObject<{
+        route: z.ZodString;
+        directoryPath: z.ZodString;
+    }, z.core.$strict>>;
+    routePlSql: z.ZodArray<z.ZodObject<{
+        route: z.ZodString;
+        user: z.ZodString;
+        password: z.ZodString;
+        connectString: z.ZodString;
+        defaultPage: z.ZodString;
+        pathAlias: z.ZodOptional<z.ZodString>;
+        pathAliasProcedure: z.ZodOptional<z.ZodString>;
+        documentTable: z.ZodString;
+        exclusionList: z.ZodOptional<z.ZodArray<z.ZodString>>;
+        requestValidationFunction: z.ZodOptional<z.ZodString>;
+        errorStyle: z.ZodEnum<{
+            basic: "basic";
+            debug: "debug";
+        }>;
+    }, z.core.$strict>>;
+    loggerFilename: z.ZodString;
+    monitorConsole: z.ZodBoolean;
+}, z.core.$strict>;
 export type BindParameter = import("oracledb").BindParameter;
 export type errorStyleType = "basic" | "debug";
 export type configStaticType = {
@@ -249,3 +310,4 @@ export type metricsType = {
      */
     requestsInLastInterval: number;
 };
+import z from 'zod';