web_plsql 0.12.1 → 0.13.1

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

@@ -5,12 +5,14 @@
 import debugModule from 'debug';
 const debug = debugModule('webplsql:sendResponse');
 
-import {getBlock} from './trace.js';
+import {getBlock} from '../../util/trace.js';
 
 /**
  * @typedef {import('express').Request} Request
  * @typedef {import('express').Response} Response
- * @typedef {import('./types.js').pageType} pageType
+ * @typedef {import('express').CookieOptions} CookieOptions
+ * @typedef {import('../../types.js').pageType} pageType
+ * @typedef {import('../../types.js').cookieType} cookieType
  */
 
 /**
@@ -26,13 +28,11 @@ export const sendResponse = (req, res, page) => {
 
 	// Send the "cookies"
 	page.head.cookies.forEach((cookie) => {
-		const {name, value} = cookie;
-
 		if (debug.enabled) {
-			debugText.push(`res.cookie("${name}", "${value}")`);
+			debugText.push(`res.cookie: name="${cookie.name}" value="${cookie.value}" options=${JSON.stringify(cookie.options)}`);
 		}
 
-		res.cookie(name, value);
+		res.cookie(cookie.name, cookie.value, cookie.options);
 	});
 
 	// If there is a "redirectLocation" header, we immediately redirect and return

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

@@ -7,7 +7,7 @@
 import debugModule from 'debug';
 const debug = debugModule('webplsql:fileUpload');
 
-import {readFile, removeFile} from './file.js';
+import {readFile, removeFile} from '../../util/file.js';
 import oracledb from 'oracledb';
 import z from 'zod';
 
@@ -27,7 +27,7 @@ const z$reqFiles = z.array(
 /**
  * @typedef {import('express').Request} Request
  * @typedef {import('oracledb').Connection} Connection
- * @typedef {import('./types.js').fileUploadType} fileUploadType
+ * @typedef {import('../../types.js').fileUploadType} fileUploadType
  */
 
 /**

package/src/index.js

@@ -1,16 +1,15 @@
 // server
-export {createHttpServer, createHttpsServer, startHttpServer, loadConfig} from './server.js';
-export * from './shutdown.js';
+export {createServer, startServer, loadConfig, startServerConfig} from './server/server.js';
+export * from './util/shutdown.js';
 
 // handler
-export {handlerWebPlSql} from './handlerPlSql.js';
-export {handlerLogger} from './handlerLogger.js';
-export {initMetrics, handlerMetrics} from './handlerMetrics.js';
-export {handlerUpload} from './handlerUpload.js';
+export {handlerWebPlSql} from './handler/plsql/handlerPlSql.js';
+export {handlerLogger} from './handler/handlerLogger.js';
+export {handlerUpload} from './handler/handlerUpload.js';
+export {handlerMetrics} from './handler/handlerMetrics.js';
 
 // oracle
-export * from './oracle.js';
+export * from './util/oracle.js';
 
 // util
-export * from './file.js';
-export * from './tty.js';
+export * from './util/file.js';

package/src/server/config.js

@@ -0,0 +1,45 @@
+/**
+ * @typedef {import('../types.js').configType} configType
+ */
+
+/**
+ * Show configuration.
+ * @param {configType} config - The config.
+ * @returns {void}
+ */
+export const showConfig = (config) => {
+	const LINE = '-'.repeat(80);
+
+	console.log(LINE);
+	console.log('NODE PL/SQL SERVER');
+	console.log(LINE);
+
+	console.log(`Server port:           ${config.port}`);
+	console.log(`Access log:            ${config.loggerFilename.length > 0 ? config.loggerFilename : ''}`);
+
+	if (config.routeStatic.length > 0) {
+		console.log(LINE);
+		config.routeStatic.forEach((e) => {
+			console.log(`Static route:          ${e.route}`);
+			console.log(`Directory path:        ${e.directoryPath}`);
+		});
+	}
+
+	if (config.routePlSql.length > 0) {
+		console.log(LINE);
+		config.routePlSql.forEach((e) => {
+			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(`Validation function:   ${e.requestValidationFunction}`);
+			console.log(`Error style:           ${e.errorStyle}`);
+		});
+	}
+
+	console.log(LINE);
+};

package/src/server/connections.js

@@ -0,0 +1,40 @@
+/**
+ * @typedef {import('node:net').Socket} Socket
+ */
+
+/**
+ * @param {string} id - id
+ * @param {string} ip - address
+ * @param {string} port - port
+ * @param {string} read - bytes read
+ * @param {string} written - bytes written
+ */
+const line = (id, ip, port, read, written) => {
+	console.log(`${id.padStart(3)}  ${ip.padEnd(15)}  ${port.padStart(5)}  ${read.padStart(10)}  ${written.padStart(10)}`);
+};
+
+/**
+ * Show connections.
+ * @param {Set<Socket>} connections - The connections.
+ * @returns {void}
+ */
+export const showConnections = (connections) => {
+	if (connections.size === 0) {
+		console.log('No open connections.');
+		return;
+	}
+
+	// Print header
+	line('ID', 'IP', 'Port', 'Read', 'Written');
+
+	let i = 0;
+	for (const socket of connections) {
+		line(
+			(i++).toString(),
+			socket.remoteAddress ?? '',
+			typeof socket.remotePort === 'number' ? socket.remotePort.toFixed() : '',
+			socket.bytesRead.toFixed(),
+			socket.bytesWritten.toFixed(),
+		);
+	}
+};

package/src/server/server.js

@@ -0,0 +1,185 @@
+import debugModule from 'debug';
+const debug = debugModule('webplsql:server');
+
+import http from 'node:http';
+import https from 'node:https';
+import express from 'express';
+import bodyParser from 'body-parser';
+import cookieParser from 'cookie-parser';
+import compression from 'compression';
+import {z$configType} from '../types.js';
+import {installShutdown} from '../util/shutdown.js';
+import {poolCreate, poolsClose} from '../util/oracle.js';
+import {handlerUpload} from '../handler/handlerUpload.js';
+import {handlerLogger} from '../handler/handlerLogger.js';
+import {handlerWebPlSql} from '../handler/plsql/handlerPlSql.js';
+import {readFileSyncUtf8, getJsonFile} from '../util/file.js';
+import {showConfig} from './config.js';
+
+/**
+ * @typedef {import('node:net').Socket} Socket
+ * @typedef {import('express').Express} Express
+ * @typedef {import('express').Request} Request
+ * @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 {object} webServer - Web server interface.
+ * @property {configType} config - Configuration object.
+ * @property {Pool[]} connectionPools - Oracle connection pools.
+ * @property {Express} app - Express app.
+ * @property {http.Server | https.Server} server - Native Node http(s) server instance.
+ * @property {() => Promise<void>} shutdown - Shutdown function.
+ */
+
+/**
+ * @typedef {object} sslConfig - SSL configuration.
+ * @property {string} keyFilename - key filename.
+ * @property {string} certFilename - cert filename.
+ */
+
+/**
+ * Create HTTPS server.
+ * @param {Express} app - express application
+ * @param {sslConfig} [ssl] - ssl configuration.
+ * @returns {http.Server | https.Server} - server
+ */
+export const createServer = (app, ssl) => {
+	if (ssl) {
+		const key = readFileSyncUtf8(ssl.keyFilename);
+		const cert = readFileSyncUtf8(ssl.certFilename);
+
+		return https.createServer({key, cert}, app);
+	} else {
+		return http.createServer(app);
+	}
+};
+
+/**
+ * Start server.
+ * @param {configType} config - The config.
+ * @param {sslConfig} [ssl] - ssl configuration.
+ * @returns {Promise<webServer>} - Promise resolving to the web server object.
+ */
+export const startServer = async (config, ssl) => {
+	debug('startServer: BEGIN', config, ssl);
+
+	config = z$configType.parse(config);
+
+	showConfig(config);
+
+	// Create express app
+	const app = express();
+
+	// 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));
+	}
+
+	// Default middleware
+	app.use(handlerUpload());
+	app.use(bodyParser.json());
+	app.use(bodyParser.urlencoded({extended: true}));
+	app.use(cookieParser());
+	app.use(compression());
+
+	/** @type {Pool[]} */
+	const connectionPools = [];
+
+	// Oracle pl/sql express middleware
+	for (const i of config.routePlSql) {
+		// Allocate the Oracle database pool
+		const pool = await poolCreate(i.user, i.password, i.connectString);
+		connectionPools.push(pool);
+
+		app.use([`${i.route}/:name`, i.route], handlerWebPlSql(pool, i));
+	}
+
+	// create server
+	debug('startServer: createServer');
+	const server = createServer(app, ssl);
+
+	// Track open connections
+	/** @type {Set<Socket>} */
+	const connections = new Set();
+	server.on('connection', (/** @type {Socket} */ socket) => {
+		connections.add(socket);
+		socket.on('close', () => {
+			connections.delete(socket);
+		});
+	});
+
+	const closeAllConnections = () => {
+		for (const socket of connections) {
+			socket.destroy(); // forcibly closes the connection
+			connections.delete(socket);
+		}
+	};
+
+	const shutdown = async () => {
+		debug('startServer: onShutdown');
+
+		await poolsClose(connectionPools);
+
+		server.close(() => {
+			console.log('Server has closed');
+			process.exit(0);
+		});
+
+		closeAllConnections();
+	};
+
+	// Install shutdown handler
+	installShutdown(shutdown);
+
+	// Listen
+	debug('startServer: start listener');
+	await /** @type {Promise<void>} */ (
+		new Promise((resolve, reject) => {
+			server
+				.listen(config.port)
+				.on('listening', () => {
+					debug('startServer: listener running');
+					resolve();
+				})
+				.on('error', (err) => {
+					console.error(err);
+					reject(err);
+				});
+		})
+	);
+
+	debug('startServer: END');
+
+	return {
+		config,
+		connectionPools,
+		app,
+		server,
+		shutdown,
+	};
+};
+
+/**
+ * Load configuration.
+ * @param {string} [filename] - The configuration filename.
+ * @returns {configType} - Promise.
+ */
+export const loadConfig = (filename = 'config.json') => z$configType.parse(getJsonFile(filename));
+
+/**
+ * Start server from config file.
+ * @param {string} [filename] - The configuration filename.
+ * @param {sslConfig} [ssl] - ssl configuration.
+ * @returns {Promise<webServer>} - Promise resolving to the web server object.
+ */
+export const startServerConfig = async (filename = 'config.json', ssl) => startServer(loadConfig(filename), ssl);

package/src/types.js

@@ -2,6 +2,7 @@ import z from 'zod';
 
 /**
  * @typedef {import('oracledb').BindParameter} BindParameter
+ * @typedef {import('express').CookieOptions} CookieOptions
  */
 
 /**
@@ -68,14 +69,12 @@ export const z$configPlSqlType = z.strictObject({
  * @property {configStaticType[]} routeStatic - The static routes.
  * @property {configPlSqlType[]} routePlSql - The PL/SQL routes.
  * @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.strictObject({
 	port: z.number(),
 	routeStatic: z.array(z$configStaticType),
 	routePlSql: z.array(z$configPlSqlType),
 	loggerFilename: z.string(),
-	monitorConsole: z.boolean(),
 });
 
 /**
@@ -109,11 +108,7 @@ export const z$configType = z.strictObject({
  * @typedef {object} cookieType
  * @property {string} name - The name of the cookie.
  * @property {string} value - The value of the cookie.
- * @property {string} [path] - The path of the cookie.
- * @property {string} [domain] - The domain of the cookie.
- * @property {string} [secure] - The secure flag.
- * @property {Date} [expires] - The expiration date.
- * @property {boolean} [httpOnly] - The httpOnly flag.
+ * @property {CookieOptions} options - The cookie options.
  */
 
 /**
@@ -133,9 +128,3 @@ export const z$configType = z.strictObject({
  * @property {number | null} file.fileSize - The file size.
  * @property {Buffer | null} file.fileBlob - The file blob.
  */
-
-/**
- * @typedef {object} metricsType - The metrics.
- * @property {number} totalRequests - The total number of requests.
- * @property {number} requestsInLastInterval - The number of requests in the last second.
- */

package/src/util/date.js

@@ -0,0 +1,23 @@
+/**
+ * Get duration as human readable string.
+ * @param {number} duration - Milliseconds.
+ * @returns {string} String.
+ */
+export const humanDuration = (duration) => {
+	if (!Number.isFinite(duration)) return 'invalid';
+
+	const ms = Math.floor(duration % 1000);
+	const s = Math.floor((duration / 1000) % 60);
+	const m = Math.floor((duration / (1000 * 60)) % 60);
+	const h = Math.floor((duration / (1000 * 60 * 60)) % 24);
+	const d = Math.floor(duration / (1000 * 60 * 60 * 24));
+
+	const parts = [];
+	if (d) parts.push(`${d}d`);
+	if (h) parts.push(`${h}h`);
+	if (m) parts.push(`${m}m`);
+	if (s) parts.push(`${s}s`);
+	if (ms || !parts.length) parts.push(`${ms}ms`);
+
+	return parts.join(' ');
+};

package/src/{shutdown.js → util/shutdown.js}

@@ -1,19 +1,6 @@
 import debugModule from 'debug';
 const debug = debugModule('webplsql:shutdown');
 
-/**
- * @param {() => Promise<void>} handler - Shutdown handler
- * @returns {void}
- */
-const shutdown = (handler) => {
-	handler().then(
-		() => process.exit(0),
-		() => process.exit(1),
-	);
-
-	process.exit(0);
-};
-
 /**
  * Install a shutdown handler.
  * @param {() => Promise<void>} handler - Shutdown handler
@@ -27,18 +14,18 @@ export const installShutdown = (handler) => {
 	 */
 	process.on('unhandledRejection', (reason, p) => {
 		console.log('\nUnhandled promise rejection. Graceful shutdown...', reason, p);
-		shutdown(handler);
+		void handler();
 	});
 
 	// install signal event handler
 	process.on('SIGTERM', function sigterm() {
 		console.log('\nGot SIGINT (aka ctrl-c in docker). Graceful shutdown...');
-		shutdown(handler);
+		void handler();
 	});
 
 	process.on('SIGINT', function sigint() {
 		console.log('\nGot SIGTERM (aka docker container stop). Graceful shutdown...');
-		shutdown(handler);
+		void handler();
 	});
 };
 

package/src/util/type.js

@@ -0,0 +1,6 @@
+/**
+ *	Is the given value a string or an array of strings
+ *	@param {unknown} value - The value to check.
+ *	@returns {value is string | string[]} - True if the value is a string or an array of strings
+ */
+export const isStringOrArrayOfString = (value) => typeof value === 'string' || (Array.isArray(value) && value.every((element) => typeof element === 'string'));

package/types/handler/handlerMetrics.d.ts

@@ -0,0 +1,25 @@
+export function initMetrics(): metricsType;
+export function handlerMetrics(metrics: metricsType): RequestHandler;
+export type RequestHandler = import("express").RequestHandler;
+export type metricsType = {
+    /**
+     * - When was the server started.
+     */
+    started: Date;
+    /**
+     * - Total number of requests.
+     */
+    totalRequests: number;
+    /**
+     * - Total amount of time in ms in request.
+     */
+    totalRequestDuration: number;
+    /**
+     * - Min amount of time in ms in request.
+     */
+    minRequestDuration: number;
+    /**
+     * - Max amount of time in ms in request.
+     */
+    maxRequestDuration: number;
+};

package/types/{handlerUpload.d.ts → handler/handlerUpload.d.ts}

@@ -3,5 +3,5 @@ export type RequestHandler = import("express").RequestHandler;
 export type Response = import("express").Response;
 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;
+export type environmentType = import("../types.js").environmentType;
+export type configType = import("../types.js").configType;

package/types/{cgi.d.ts → handler/plsql/cgi.d.ts}

@@ -1,4 +1,4 @@
 export function getCGI(req: Request, doctable: string, cgi: environmentType): environmentType;
 export type Request = import("express").Request;
-export type environmentType = import("./types.js").environmentType;
-export type configPlSqlType = import("./types.js").configPlSqlType;
+export type environmentType = import("../../types.js").environmentType;
+export type configPlSqlType = import("../../types.js").configPlSqlType;

package/types/{errorPage.d.ts → handler/plsql/errorPage.d.ts}

@@ -1,9 +1,9 @@
 export function errorPage(req: Request, res: Response, options: configPlSqlHandlerType, error: unknown): void;
 export type Request = import("express").Request;
 export type Response = import("express").Response;
-export type BindParameterConfig = import("./types.js").BindParameterConfig;
-export type environmentType = import("./types.js").environmentType;
-export type configPlSqlHandlerType = import("./types.js").configPlSqlHandlerType;
+export type BindParameterConfig = import("../../types.js").BindParameterConfig;
+export type environmentType = import("../../types.js").environmentType;
+export type configPlSqlHandlerType = import("../../types.js").configPlSqlHandlerType;
 export type outputType = {
     html: string;
     text: string;

package/types/{handlerPlSql.d.ts → handler/plsql/handlerPlSql.d.ts}

@@ -4,5 +4,5 @@ export type Request = import("express").Request;
 export type Response = import("express").Response;
 export type NextFunction = import("express").NextFunction;
 export type Pool = import("oracledb").Pool;
-export type environmentType = import("./types.js").environmentType;
-export type configPlSqlHandlerType = import("./types.js").configPlSqlHandlerType;
+export type environmentType = import("../../types.js").environmentType;
+export type configPlSqlHandlerType = import("../../types.js").configPlSqlHandlerType;

package/types/handler/plsql/parsePage.d.ts

@@ -0,0 +1,3 @@
+export function parsePage(text: string): pageType;
+export type pageType = import("../../types.js").pageType;
+export type cookieType = import("../../types.js").cookieType;

package/types/{procedure.d.ts → handler/plsql/procedure.d.ts}

@@ -3,8 +3,8 @@ export type Request = import("express").Request;
 export type Response = import("express").Response;
 export type Connection = import("oracledb").Connection;
 export type Result = import("oracledb").Result<unknown>;
-export type argObjType = import("./types.js").argObjType;
-export type fileUploadType = import("./types.js").fileUploadType;
-export type environmentType = import("./types.js").environmentType;
-export type configPlSqlHandlerType = import("./types.js").configPlSqlHandlerType;
-export type BindParameterConfig = import("./types.js").BindParameterConfig;
+export type argObjType = import("../../types.js").argObjType;
+export type fileUploadType = import("../../types.js").fileUploadType;
+export type environmentType = import("../../types.js").environmentType;
+export type configPlSqlHandlerType = import("../../types.js").configPlSqlHandlerType;
+export type BindParameterConfig = import("../../types.js").BindParameterConfig;

package/types/{procedureError.d.ts → handler/plsql/procedureError.d.ts}

@@ -1,6 +1,6 @@
 /**
- * @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 {
     /**
@@ -19,5 +19,5 @@ export class ProcedureError extends Error {
     /** @type {BindParameterConfig} */
     bind: BindParameterConfig;
 }
-export type environmentType = import("./types.js").environmentType;
-export type BindParameterConfig = import("./types.js").BindParameterConfig;
+export type environmentType = import("../../types.js").environmentType;
+export type BindParameterConfig = import("../../types.js").BindParameterConfig;

package/types/{procedureNamed.d.ts → handler/plsql/procedureNamed.d.ts}

@@ -9,6 +9,6 @@ export type cacheEntryType = {
 };
 export type Connection = import("oracledb").Connection;
 export type Result = import("oracledb").Result<unknown>;
-export type configPlSqlHandlerType = import("./types.js").configPlSqlHandlerType;
-export type argObjType = import("./types.js").argObjType;
-export type BindParameterConfig = import("./types.js").BindParameterConfig;
+export type configPlSqlHandlerType = import("../../types.js").configPlSqlHandlerType;
+export type argObjType = import("../../types.js").argObjType;
+export type BindParameterConfig = import("../../types.js").BindParameterConfig;

package/types/{procedureSanitize.d.ts → handler/plsql/procedureSanitize.d.ts}

@@ -3,11 +3,11 @@ export type Request = import("express").Request;
 export type Response = import("express").Response;
 export type Connection = import("oracledb").Connection;
 export type Result = import("oracledb").Result<unknown>;
-export type argObjType = import("./types.js").argObjType;
-export type fileUploadType = import("./types.js").fileUploadType;
-export type environmentType = import("./types.js").environmentType;
-export type configPlSqlHandlerType = import("./types.js").configPlSqlHandlerType;
-export type BindParameterConfig = import("./types.js").BindParameterConfig;
+export type argObjType = import("../../types.js").argObjType;
+export type fileUploadType = import("../../types.js").fileUploadType;
+export type environmentType = import("../../types.js").environmentType;
+export type configPlSqlHandlerType = import("../../types.js").configPlSqlHandlerType;
+export type BindParameterConfig = import("../../types.js").BindParameterConfig;
 export type cacheEntryType = {
     hitCount: number;
     valid: boolean;

package/types/{procedureVariable.d.ts → handler/plsql/procedureVariable.d.ts}

@@ -4,6 +4,6 @@ export function getProcedureVariable(procName: string, argObj: argObjType, datab
 }>;
 export type Connection = import("oracledb").Connection;
 export type Result = import("oracledb").Result<unknown>;
-export type configPlSqlHandlerType = import("./types.js").configPlSqlHandlerType;
-export type argObjType = import("./types.js").argObjType;
-export type BindParameterConfig = import("./types.js").BindParameterConfig;
+export type configPlSqlHandlerType = import("../../types.js").configPlSqlHandlerType;
+export type argObjType = import("../../types.js").argObjType;
+export type BindParameterConfig = import("../../types.js").BindParameterConfig;

package/types/{request.d.ts → handler/plsql/request.d.ts}

@@ -3,5 +3,5 @@ export type Request = import("express").Request;
 export type Response = import("express").Response;
 export type Pool = import("oracledb").Pool;
 export type Connection = import("oracledb").Connection;
-export type argObjType = import("./types.js").argObjType;
-export type configPlSqlHandlerType = import("./types.js").configPlSqlHandlerType;
+export type argObjType = import("../../types.js").argObjType;
+export type configPlSqlHandlerType = import("../../types.js").configPlSqlHandlerType;

package/types/{sendResponse.d.ts → handler/plsql/sendResponse.d.ts}

@@ -1,4 +1,6 @@
 export function sendResponse(req: Request, res: Response, page: pageType): void;
 export type Request = import("express").Request;
 export type Response = import("express").Response;
-export type pageType = import("./types.js").pageType;
+export type CookieOptions = import("express").CookieOptions;
+export type pageType = import("../../types.js").pageType;
+export type cookieType = import("../../types.js").cookieType;

package/types/{upload.d.ts → handler/plsql/upload.d.ts}

@@ -2,4 +2,4 @@ export function getFiles(req: Request): fileUploadType[];
 export function uploadFile(file: fileUploadType, doctable: string, databaseConnection: Connection): Promise<void>;
 export type Request = import("express").Request;
 export type Connection = import("oracledb").Connection;
-export type fileUploadType = import("./types.js").fileUploadType;
+export type fileUploadType = import("../../types.js").fileUploadType;

package/types/index.d.ts

@@ -1,9 +1,8 @@
-export * from "./shutdown.js";
-export * from "./oracle.js";
-export * from "./file.js";
-export * from "./tty.js";
-export { handlerWebPlSql } from "./handlerPlSql.js";
-export { handlerLogger } from "./handlerLogger.js";
-export { handlerUpload } from "./handlerUpload.js";
-export { createHttpServer, createHttpsServer, startHttpServer, loadConfig } from "./server.js";
-export { initMetrics, handlerMetrics } from "./handlerMetrics.js";
+export * from "./util/shutdown.js";
+export * from "./util/oracle.js";
+export * from "./util/file.js";
+export { handlerWebPlSql } from "./handler/plsql/handlerPlSql.js";
+export { handlerLogger } from "./handler/handlerLogger.js";
+export { handlerUpload } from "./handler/handlerUpload.js";
+export { handlerMetrics } from "./handler/handlerMetrics.js";
+export { createServer, startServer, loadConfig, startServerConfig } from "./server/server.js";