web_plsql 0.12.1 → 0.13.2

package/README.md

@@ -39,12 +39,12 @@ Please visit the [node-oracledb](https://node-oracledb.readthedocs.io/en/latest/
 # 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
+- Use the predefined `startServer` 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`
 
-## Use the predefined `startHttpServer`
+## Use the predefined `startServer`
 
-The `startHttpServer` api uses the following configuration object:
+The `startServer` api uses the following configuration object:
 
 ```
 /**
@@ -80,7 +80,6 @@ export const z$errorStyleType = z.enum(['basic', 'debug']);
  * @property {configPlSqlType[]} routePlSql - The PL/SQL routes.
  * @property {errorStyleType} errorStyle - The error style.
  * @property {string} loggerFilename - name of the request logger filename or '' if not required.
- * @property {boolean} monitorConsole - Enable console status monitor.
  */
 ```
 
@@ -138,7 +137,6 @@ The following mod_plsql DAD configuration translates to the configuration option
 		},
 	],
 	loggerFilename: 'access.log', // PlsqlLogEnable and PlsqlLogDirectory
-	monitorConsole: false,
 }
 ```
 

package/examples/config-apex.js

@@ -1,6 +1,6 @@
-import {startHttpServer} from '../src/index.js';
+import {startServer} from '../src/index.js';
 
-void startHttpServer({
+void startServer({
 	port: 80,
 	routeStatic: [
 		{
@@ -22,5 +22,4 @@ void startHttpServer({
 		},
 	],
 	loggerFilename: 'access.log',
-	monitorConsole: false,
 });

package/examples/config-docker.js

@@ -27,5 +27,4 @@ void startHttpServer({
 		},
 	],
 	loggerFilename: 'access.log', // PlsqlLogEnable and PlsqlLogDirectory
-	monitorConsole: false,
 });

package/examples/config-docker.json

@@ -21,6 +21,5 @@
 			"errorStyle": "debug"
 		}
 	],
-	"loggerFilename": "access.log",
-	"monitorConsole": false
+	"loggerFilename": "access.log"
 }

package/examples/config-native.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
-import {startHttpServer} from '../src/index.js';
+import {startServer} from '../src/index.js';
 
-void startHttpServer({
+void startServer({
 	port: 8888,
 	routeStatic: [
 		{
@@ -26,5 +26,4 @@ void startHttpServer({
 		},
 	],
 	loggerFilename: 'access.log', // PlsqlLogEnable and PlsqlLogDirectory
-	monitorConsole: false,
 });

package/examples/sql/install.sql

@@ -26,3 +26,5 @@ ALTER SESSION SET CURRENT_SCHEMA=&&SAMPLE_USER;
 show errors
 @@sample_package_body.sql
 show errors
+
+exit

package/examples/sql/sample_package.sql

@@ -9,8 +9,9 @@ PROCEDURE page_index(p IN VARCHAR2 DEFAULT NULL);
 PROCEDURE pag_simple(text IN VARCHAR2 DEFAULT NULL);
 PROCEDURE page_flexible(name_array IN owa.vc_arr, value_array IN owa.vc_arr);
 PROCEDURE page_array(text IN vc_arr);
+PROCEDURE page_slow;
 PROCEDURE page_cgi;
-PROCEDURE page_cookie;
+PROCEDURE page_cookie(p_action IN VARCHAR2 DEFAULT NULL);
 PROCEDURE page_form;
 PROCEDURE page_form_process(firstname IN VARCHAR2 DEFAULT NULL, lastname IN VARCHAR2 DEFAULT NULL, age IN VARCHAR2 DEFAULT NULL, sex IN VARCHAR2 DEFAULT NULL, vehicle IN vc_arr  DEFAULT emptyArray);
 PROCEDURE page_file_upload;

package/examples/sql/sample_package_body.sql

@@ -1,6 +1,12 @@
 CREATE OR REPLACE
 PACKAGE BODY sample_pkg IS
 
+COOKIE_ACTION_REMOVE	CONSTANT	VARCHAR2(30)	:=	'REMOVE';
+COOKIE_ACTION_SEND		CONSTANT	VARCHAR2(30)	:=	'SEND';
+
+COOKIE_NAME_NO_EXPIRES	CONSTANT	VARCHAR2(30)	:=	'COOKIE_NO_EXPIRES';
+COOKIE_NAME_ONE_DAY		CONSTANT	VARCHAR2(30)	:=	'COOKIE_ONE_DAY';
+
 PROCEDURE open_page(title IN VARCHAR2);
 PROCEDURE close_page;
 
@@ -19,6 +25,7 @@ BEGIN
 	htp.p('<li><a href="sample_pkg.pag_simple?text=some-text">Simple page</a></li>');
 	htp.p('<li><a href="sample_pkg.page_array?text=some-text'||CHR(38)||'text=more-text'||CHR(38)||'text=last-text">Array passing</a></li>');
 	htp.p('<li><a href="!sample_pkg.page_flexible?p1=v1'||CHR(38)||'p2=v2'||CHR(38)||'p3=v3.1'||CHR(38)||'p3=v3.2"">Flexible parameter passing</a></li>');
+	htp.p('<li><a href="sample_pkg.page_slow">Slow page (5 seconds)</a></li>');
 	htp.p('<li><a href="sample_pkg.page_cgi">CGI</a></li>');
 	htp.p('<li><a href="sample_pkg.page_cookie">Cookies</a></li>');
 	htp.p('<li><a href="sample_pkg.page_form">Form</a></li>');
@@ -40,6 +47,21 @@ BEGIN
 	close_page();
 END pag_simple;
 
+PROCEDURE page_slow
+IS
+	l_start  TIMESTAMP := SYSTIMESTAMP;
+	l_now    TIMESTAMP;
+BEGIN
+	LOOP
+		l_now := SYSTIMESTAMP;
+		EXIT WHEN l_now >= l_start + INTERVAL '5' SECOND;
+	END LOOP;
+
+	open_page('web_plsql - Slow page');
+	htp.p('<p>I am slow</p>');
+	close_page();
+END page_slow;
+
 PROCEDURE page_array(text IN vc_arr)
 IS
 BEGIN
@@ -79,26 +101,56 @@ BEGIN
 	close_page();
 END page_cgi;
 
-PROCEDURE page_cookie
+PROCEDURE page_cookie(p_action IN VARCHAR2 DEFAULT NULL)
 IS
-	names		owa_cookie.vc_arr;
-	vals		owa_cookie.vc_arr;
-	num_vals	INTEGER;
+	l_names		owa_cookie.vc_arr;
+	l_vals		owa_cookie.vc_arr;
+	l_num_vals	INTEGER;
 BEGIN
-	owa_cookie.get_all(names=>names, vals=>vals, num_vals=>num_vals);
+	CASE UPPER(p_action)
 
-	owa_util.mime_header('text/html', FALSE);
-	owa_cookie.send('demoCookie', TO_CHAR(SYSDATE, 'YYYY.MM.DD HH24:MI:SS'));
-	owa_util.http_header_close;
+	WHEN COOKIE_ACTION_REMOVE THEN
+		owa_util.mime_header('text/html', FALSE);
 
-	open_page('web_plsql - Cookies');
-	htp.p('<table>');
-	htp.p('<tr><th>name</th><th>value</th></tr>');
-	FOR i IN 1 .. num_vals LOOP
-		htp.p('<tr><td>'||names(i)||'</td><td>'||vals(i)||'</td></tr>');
-	END LOOP;
-	htp.p('</table>');
-	close_page();
+		owa_cookie.remove(name=>COOKIE_NAME_NO_EXPIRES, val=>'');
+		owa_cookie.remove(name=>COOKIE_NAME_ONE_DAY, val=>'');
+
+		owa_util.redirect_url('sample_pkg.page_cookie');
+		owa_util.http_header_close;
+
+	WHEN COOKIE_ACTION_SEND THEN
+		owa_util.mime_header('text/html', FALSE);
+
+		owa_cookie.send(name=>COOKIE_NAME_NO_EXPIRES, value=>'VALUE-' || TO_CHAR(TRUNC(dbms_random.value(1, 101))));
+		owa_cookie.send(name=>COOKIE_NAME_ONE_DAY, value=>'VALUE-' || TO_CHAR(TRUNC(dbms_random.value(1, 101))), expires=>SYSDATE + 1);
+
+		owa_util.redirect_url('sample_pkg.page_cookie');
+		owa_util.http_header_close;
+
+	ELSE
+		owa_cookie.get_all(names=>l_names, vals=>l_vals, num_vals=>l_num_vals);
+
+		open_page('web_plsql - Cookies');
+
+		-- actions
+		htp.p('<p>');
+		htp.p('<form method="POST" action="sample_pkg.page_cookie">');
+		htp.p('<input type="submit" name="p_action" value="' || COOKIE_ACTION_REMOVE || '">');
+		htp.p('<input type="submit" name="p_action" value="' || COOKIE_ACTION_SEND || '">');
+		htp.p('</form>');
+		htp.p('</p>');
+
+		-- show cookies
+		htp.p('<table>');
+		htp.p('<tr><th>name</th><th>value</th></tr>');
+		FOR i IN 1 .. l_num_vals LOOP
+			htp.p('<tr><td>'||l_names(i)||'</td><td>'||l_vals(i)||'</td></tr>');
+		END LOOP;
+		htp.p('</table>');
+
+		close_page();
+
+	END CASE;
 END page_cookie;
 
 PROCEDURE page_form
@@ -241,5 +293,8 @@ BEGIN
 	htp.p('</html>');
 END close_page;
 
+BEGIN
+	dbms_random.seed(TO_CHAR(SYSDATE,'MM-DD-YYYY HH24:MI:SS'));
+
 END sample_pkg;
 /

package/examples/sql/uninstall.sql

@@ -3,3 +3,5 @@ define SAMPLE_USER=sample
 
 -- drop user
 DROP USER &&SAMPLE_USER CASCADE;
+
+exit

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "web_plsql",
-	"version": "0.12.1",
+	"version": "0.13.2",
 	"author": "Dieter Oberkofler <dieter.oberkofler@gmail.com>",
 	"license": "MIT",
 	"description": "The Express Middleware for Oracle PL/SQL",
@@ -47,7 +47,7 @@
 		"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 --allowSyntheticDefaultImports true src/*.js",
 		"clean": "shx rm -f *.tgz && shx rm -f *.log",
-		"ci": "npm run clean && npm run lint && npm run test",
+		"ci": "npm run clean && npm run lint && npm run test && npm run types",
 		"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"
@@ -57,22 +57,20 @@
 	},
 	"dependencies": {
 		"basic-auth": "2.0.1",
-		"body-parser": "2.2.0",
 		"compression": "1.8.1",
 		"cookie-parser": "1.4.7",
-		"debug": "4.4.1",
+		"debug": "4.4.3",
 		"escape-html": "1.0.3",
 		"express": "5.1.0",
-		"fs-extra": "11.3.1",
+		"fs-extra": "11.3.2",
 		"http-parser-js": "0.5.10",
 		"morgan": "1.10.1",
 		"multer": "2.0.2",
 		"rotating-file-stream": "3.2.7",
-		"zod": "4.1.5"
+		"zod": "4.1.11"
 	},
 	"devDependencies": {
 		"@types/basic-auth": "1.1.8",
-		"@types/body-parser": "1.19.6",
 		"@types/compression": "1.8.1",
 		"@types/cookie-parser": "1.4.9",
 		"@types/debug": "4.1.12",
@@ -80,16 +78,16 @@
 		"@types/fs-extra": "11.0.4",
 		"@types/morgan": "1.9.10",
 		"@types/multer": "2.0.0",
-		"@types/node": "24.3.1",
+		"@types/node": "24.5.2",
 		"@types/oracledb": "6.9.1",
 		"@types/supertest": "6.0.3",
-		"eslint": "9.34.0",
-		"eslint-plugin-jsdoc": "54.3.1",
+		"eslint": "9.36.0",
+		"eslint-plugin-jsdoc": "60.1.1",
 		"prettier": "3.6.2",
 		"rimraf": "6.0.1",
 		"shx": "0.4.0",
 		"supertest": "7.1.4",
 		"typescript": "5.9.2",
-		"typescript-eslint": "8.42.0"
+		"typescript-eslint": "8.44.0"
 	}
 }

package/src/handler/handlerMetrics.js

@@ -0,0 +1,68 @@
+import debugModule from 'debug';
+const debug = debugModule('webplsql:handlerMetrics');
+
+/**
+ * @typedef {import('express').RequestHandler} RequestHandler
+ */
+
+/**
+ * @typedef {object} metricsType
+ * @property {Date} started - When was the server started.
+ * @property {number} totalRequests - Total number of requests.
+ * @property {number} totalRequestDuration - Total amount of time in ms in request.
+ * @property {number} minRequestDuration - Min amount of time in ms in request.
+ * @property {number} maxRequestDuration - Max amount of time in ms in request.
+ */
+
+/**
+ * Convert hrtime to ms.
+ * @param {[number, number]} hrtime - Time
+ * @returns {number} Millisecoinds.
+ */
+const hrtime2ms = (hrtime) => hrtime[0] * 1000 + hrtime[1] / 1_000_000;
+
+/**
+ * metrics initializer.
+ * @returns {metricsType} The metrics.
+ */
+export const initMetrics = () => {
+	return {
+		started: new Date(),
+		totalRequests: 0,
+		totalRequestDuration: 0,
+		minRequestDuration: -1,
+		maxRequestDuration: -1,
+	};
+};
+
+/**
+ * The metrics handler.
+ * @param {metricsType} metrics - the nmetrics.
+ * @returns {RequestHandler} - Request handler.
+ */
+export const handlerMetrics = (metrics) => {
+	debug('register');
+
+	return (req, res, next) => {
+		metrics.totalRequests++;
+
+		const start = hrtime2ms(process.hrtime());
+		res.on('finish', () => {
+			const duration = hrtime2ms(process.hrtime()) - start;
+
+			metrics.totalRequestDuration += duration;
+			if (metrics.minRequestDuration < 0 || duration < metrics.minRequestDuration) {
+				metrics.minRequestDuration = duration;
+			}
+			if (metrics.maxRequestDuration < 0 || duration > metrics.maxRequestDuration) {
+				metrics.maxRequestDuration = duration;
+			}
+
+			if (debug.enabled) {
+				debug(`Request to ${req.params?.name} ${req.url} took ${duration.toFixed(3)}ms`);
+			}
+		});
+
+		next();
+	};
+};

package/src/{handlerUpload.js → handler/handlerUpload.js}

@@ -6,8 +6,8 @@ import multer from 'multer';
  * @typedef {import('express').Response} Response
  * @typedef {import('express').NextFunction} NextFunction
  * @typedef {import('oracledb').Pool} Pool
- * @typedef {import('./types.js').environmentType} environmentType
- * @typedef {import('./types.js').configType} configType
+ * @typedef {import('../types.js').environmentType} environmentType
+ * @typedef {import('../types.js').configType} configType
  */
 
 /**

package/src/{cgi.js → handler/plsql/cgi.js}

@@ -4,11 +4,13 @@
 
 import os from 'node:os';
 import {URL} from 'node:url';
+import debugModule from 'debug';
+const debug = debugModule('webplsql:cgi');
 
 /**
  * @typedef {import('express').Request} Request
- * @typedef {import('./types.js').environmentType} environmentType
- * @typedef {import('./types.js').configPlSqlType} configPlSqlType
+ * @typedef {import('../../types.js').environmentType} environmentType
+ * @typedef {import('../../types.js').configPlSqlType} configPlSqlType
  */
 
 /** @type {environmentType} */
@@ -57,6 +59,8 @@ const getCookieString = (req) => {
 		cookieString += `${propName}=${req.cookies[propName]};`;
 	}
 
+	debug('getCookieString', req.cookies, cookieString);
+
 	return cookieString;
 };
 

package/src/{errorPage.js → handler/plsql/errorPage.js}

@@ -6,15 +6,15 @@ import util from 'node:util';
 import escape from 'escape-html';
 import {ProcedureError} from './procedureError.js';
 import {RequestError} from './requestError.js';
-import {inspectRequest, logToFile} from './trace.js';
-import {errorToString} from './error.js';
+import {inspectRequest, logToFile} from '../../util/trace.js';
+import {errorToString} from '../../util/errorToString.js';
 
 /**
  * @typedef {import('express').Request} Request
  * @typedef {import('express').Response} Response
- * @typedef {import('./types.js').BindParameterConfig} BindParameterConfig
- * @typedef {import('./types.js').environmentType} environmentType
- * @typedef {import('./types.js').configPlSqlHandlerType} configPlSqlHandlerType
+ * @typedef {import('../../types.js').BindParameterConfig} BindParameterConfig
+ * @typedef {import('../../types.js').environmentType} environmentType
+ * @typedef {import('../../types.js').configPlSqlHandlerType} configPlSqlHandlerType
  * @typedef {{html: string; text: string}} outputType
  */
 

package/src/{handlerPlSql.js → handler/plsql/handlerPlSql.js}

@@ -16,8 +16,8 @@ import {errorPage} from './errorPage.js';
  * @typedef {import('express').Response} Response
  * @typedef {import('express').NextFunction} NextFunction
  * @typedef {import('oracledb').Pool} Pool
- * @typedef {import('./types.js').environmentType} environmentType
- * @typedef {import('./types.js').configPlSqlHandlerType} configPlSqlHandlerType
+ * @typedef {import('../../types.js').environmentType} environmentType
+ * @typedef {import('../../types.js').configPlSqlHandlerType} configPlSqlHandlerType
  */
 
 /**

package/src/{parsePage.js → handler/plsql/parsePage.js}

@@ -1,6 +1,9 @@
+import debugModule from 'debug';
+const debug = debugModule('webplsql:parsePage');
+
 /**
- * @typedef {import('./types.js').pageType} pageType
- * @typedef {import('./types.js').cookieType} cookieType
+ * @typedef {import('../../types.js').pageType} pageType
+ * @typedef {import('../../types.js').cookieType} cookieType
  */
 
 /**
@@ -42,6 +45,7 @@ export const parsePage = (text) => {
 	//	2)	parse the headers
 	//
 
+	debug('parsing the headers received from PL/SQL');
 	head.split('\n').forEach((line) => {
 		const header = getHeader(line);
 
@@ -50,15 +54,19 @@ export const parsePage = (text) => {
 				case 'set-cookie':
 					{
 						const cookie = parseCookie(header.value);
+						debug(`oracle header "set-cookie" with value "${header.value}" was received has been parsed to ${JSON.stringify(cookie)}`);
 						/* istanbul ignore else */
 						if (cookie !== null) {
 							page.head.cookies.push(cookie);
+						} else {
+							throw new Error(`Unable to parse header "set-cookie" with value "${header.value}" received from PL/SQL`);
 						}
 					}
 					break;
 
 				case 'content-type':
 					page.head.contentType = header.value;
+					debug(`oracle header "content-type" with value "${page.head.contentType}" was parsed`);
 					break;
 
 				case 'x-db-content-length':
@@ -67,6 +75,9 @@ export const parsePage = (text) => {
 						/* istanbul ignore else */
 						if (!Number.isNaN(contentLength)) {
 							page.head.contentLength = contentLength;
+							debug(`oracle header "x-db-content-length" with value "${page.head.contentLength}" was parsed`);
+						} else {
+							throw new Error(`Unable to parse header "x-db-content-length" with value "${header.value}" received from PL/SQL`);
 						}
 					}
 					break;
@@ -77,17 +88,21 @@ export const parsePage = (text) => {
 						/* istanbul ignore else */
 						if (!Number.isNaN(statusCode)) {
 							page.head.statusCode = statusCode;
+							debug(`oracle header "status" with value "${page.head.statusCode}" was parsed`);
 							const index = header.value.indexOf(' ');
 							/* istanbul ignore else */
 							if (index !== -1) {
 								page.head.statusDescription = header.value.substring(index + 1);
 							}
+						} else {
+							throw new Error(`Unable to parse header "status" with value "${header.value}" received from PL/SQL`);
 						}
 					}
 					break;
 
 				case 'location':
 					page.head.redirectLocation = header.value;
+					debug(`oracle header "location" with value "${page.head.statusCode}" was parsed`);
 					break;
 
 				case 'x-oracle-ignore':
@@ -151,27 +166,28 @@ const parseCookie = (text) => {
 	const cookie = {
 		name: cookieElements[0].substring(0, index).trim(),
 		value: cookieElements[0].substring(index + 1).trim(),
+		options: {},
 	};
 
-	// remove the fisrt element
+	// remove the first element
 	cookieElements.shift();
 
 	// get the other options
 	cookieElements.forEach((element) => {
 		if (element.startsWith('path=')) {
-			cookie.path = element.substring(5);
+			cookie.options.path = element.substring(5);
 		} else if (element.toLowerCase().startsWith('domain=')) {
-			cookie.domain = element.substring(7);
+			cookie.options.domain = element.substring(7);
 		} else if (element.toLowerCase().startsWith('secure=')) {
 			/* istanbul ignore next */
-			cookie.secure = element.substring(7);
+			cookie.options.secure = true;
 		} else if (element.toLowerCase().startsWith('expires=')) {
 			const date = tryDecodeDate(element.substring(8));
 			if (date) {
-				cookie.expires = date;
+				cookie.options.expires = date;
 			}
 		} else if (element.toLowerCase().startsWith('httponly')) {
-			cookie.httpOnly = true;
+			cookie.options.httpOnly = true;
 		}
 	});
 

package/src/{procedure.js → handler/plsql/procedure.js}

@@ -16,19 +16,19 @@ import {getProcedureNamed} from './procedureNamed.js';
 import {parsePage} from './parsePage.js';
 import {sendResponse} from './sendResponse.js';
 import {ProcedureError} from './procedureError.js';
-import {inspect, getBlock} from './trace.js';
-import {errorToString} from './error.js';
+import {inspect, getBlock} from '../../util/trace.js';
+import {errorToString} from '../../util/errorToString.js';
 
 /**
  * @typedef {import('express').Request} Request
  * @typedef {import('express').Response} Response
  * @typedef {import('oracledb').Connection} Connection
  * @typedef {import('oracledb').Result<unknown>} Result
- * @typedef {import('./types.js').argObjType} argObjType
- * @typedef {import('./types.js').fileUploadType} fileUploadType
- * @typedef {import('./types.js').environmentType} environmentType
- * @typedef {import('./types.js').configPlSqlHandlerType} configPlSqlHandlerType
- * @typedef {import('./types.js').BindParameterConfig} BindParameterConfig
+ * @typedef {import('../../types.js').argObjType} argObjType
+ * @typedef {import('../../types.js').fileUploadType} fileUploadType
+ * @typedef {import('../../types.js').environmentType} environmentType
+ * @typedef {import('../../types.js').configPlSqlHandlerType} configPlSqlHandlerType
+ * @typedef {import('../../types.js').BindParameterConfig} BindParameterConfig
  */
 
 /**
@@ -215,9 +215,6 @@ export const invokeProcedure = async (req, res, argObj, cgiObj, filesToUpload, o
 
 	// combine page
 	const pageContent = data.lines.join('');
-	if (debug.enabled && pageContent.length > 0) {
-		debug(getBlock('PLAIN CONTENT', pageContent));
-	}
 
 	//
 	//	6) PARSE PAGE

package/src/{procedureError.js → handler/plsql/procedureError.js}

@@ -3,8 +3,8 @@
  */
 
 /**
- * @typedef {import('./types.js').environmentType} environmentType
- * @typedef {import('./types.js').BindParameterConfig} BindParameterConfig
+ * @typedef {import('../../types.js').environmentType} environmentType
+ * @typedef {import('../../types.js').BindParameterConfig} BindParameterConfig
  */
 
 export class ProcedureError extends Error {

package/src/{procedureNamed.js → handler/plsql/procedureNamed.js}

@@ -9,7 +9,7 @@ import oracledb from 'oracledb';
 import z from 'zod';
 import {sanitizeProcName} from './procedureSanitize.js';
 import {RequestError} from './requestError.js';
-import {errorToString} from './error.js';
+import {errorToString} from '../../util/errorToString.js';
 
 /**
  * @typedef {Record<string, string>} argsType
@@ -19,9 +19,9 @@ import {errorToString} from './error.js';
 /**
  * @typedef {import('oracledb').Connection} Connection
  * @typedef {import('oracledb').Result<unknown>} Result
- * @typedef {import('./types.js').configPlSqlHandlerType} configPlSqlHandlerType
- * @typedef {import('./types.js').argObjType} argObjType
- * @typedef {import('./types.js').BindParameterConfig} BindParameterConfig
+ * @typedef {import('../../types.js').configPlSqlHandlerType} configPlSqlHandlerType
+ * @typedef {import('../../types.js').argObjType} argObjType
+ * @typedef {import('../../types.js').BindParameterConfig} BindParameterConfig
  */
 
 const SQL_GET_ARGUMENT = [

package/src/{procedureSanitize.js → handler/plsql/procedureSanitize.js}

@@ -4,18 +4,18 @@ const debug = debugModule('webplsql:procedureSanitize');
 import oracledb from 'oracledb';
 import z from 'zod';
 import {RequestError} from './requestError.js';
-import {errorToString} from './error.js';
+import {errorToString} from '../../util/errorToString.js';
 
 /**
  * @typedef {import('express').Request} Request
  * @typedef {import('express').Response} Response
  * @typedef {import('oracledb').Connection} Connection
  * @typedef {import('oracledb').Result<unknown>} Result
- * @typedef {import('./types.js').argObjType} argObjType
- * @typedef {import('./types.js').fileUploadType} fileUploadType
- * @typedef {import('./types.js').environmentType} environmentType
- * @typedef {import('./types.js').configPlSqlHandlerType} configPlSqlHandlerType
- * @typedef {import('./types.js').BindParameterConfig} BindParameterConfig
+ * @typedef {import('../../types.js').argObjType} argObjType
+ * @typedef {import('../../types.js').fileUploadType} fileUploadType
+ * @typedef {import('../../types.js').environmentType} environmentType
+ * @typedef {import('../../types.js').configPlSqlHandlerType} configPlSqlHandlerType
+ * @typedef {import('../../types.js').BindParameterConfig} BindParameterConfig
  */
 
 const DEFAULT_EXCLUSION_LIST = ['sys.', 'dbms_', 'utl_', 'owa_', 'htp.', 'htf.', 'wpg_docload.', 'ctxsys.', 'mdsys.'];

package/src/{procedureVariable.js → handler/plsql/procedureVariable.js}

@@ -11,9 +11,9 @@ import {sanitizeProcName} from './procedureSanitize.js';
 /**
  * @typedef {import('oracledb').Connection} Connection
  * @typedef {import('oracledb').Result<unknown>} Result
- * @typedef {import('./types.js').configPlSqlHandlerType} configPlSqlHandlerType
- * @typedef {import('./types.js').argObjType} argObjType
- * @typedef {import('./types.js').BindParameterConfig} BindParameterConfig
+ * @typedef {import('../../types.js').configPlSqlHandlerType} configPlSqlHandlerType
+ * @typedef {import('../../types.js').argObjType} argObjType
+ * @typedef {import('../../types.js').BindParameterConfig} BindParameterConfig
  */
 
 /**