web_plsql 0.4.0 → 0.5.1

package/CHANGELOG.md

@@ -5,13 +5,44 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [?.?.?] - 2021-??-??
+## [?.?.?] - ????-??-??
 
 ### Added
 ### Changed
 ### Fixed
 
 
+## [0.5.1] - 2022-09-11
+
+### Fixed
+- Updated all dependencies.
+
+
+## [0.5.0] - 2022-05-09
+
+### Changed
+- Replaced mocha with jest.
+- Added support for node 18.
+
+### Fixed
+- Updated all dependencies.
+
+
+## [0.4.2] - 2022-01-17
+
+### Changed
+- node.js support starting with v16.
+
+### Fixed
+- Updated all dependencies.
+
+
+## [0.4.1] - 2021-08-30
+
+### Fixed
+- Updated all dependencies.
+
+
 ## [0.4.0] - 2021-04-09
 
 ### Added
@@ -39,8 +70,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [0.2.0] - 2019-06-02
 
-### Added
-
 ## [0.2.0] - 2019-06-02
 
 ### Fixed

package/README.md

@@ -119,11 +119,6 @@ app.listen(PORT);
 
 # Missing features
 
-## Features in mod_plsql that are not (yet) available in web_plsql:
-- Support for APEX 5.
-- Default exclusion list.
-- Basic and custom authentication methods, based on the OWA_SEC package and custom packages.
-
 ## Supported mod_plsql configuration options:
 - PlsqlDatabaseConnectString -> specified when creating the oracledb connection pool
 - PlsqlDatabaseUserName -> specified when creating the oracledb connection pool
@@ -136,16 +131,21 @@ app.listen(PORT);
 - PlsqlPathAlias -> use the "pathAlias.alias" configuration option
 - PlsqlPathAliasProcedure -> use the "pathAlias.procedure" configuration option
 
-## Configuration options that are not (yet) supported:
+## Features in mod_plsql that are planned t be available in web_plsql:
+- PlsqlDocumentPath
+- PlsqlDocumentProcedure
+- PlsqlExclusionList
+- PlsqlRequestValidationFunction
+- Support for APEX 5.
+- Default exclusion list.
+- Basic and custom authentication methods, based on the OWA_SEC package and custom packages.
+
+## Configuration options that will not be supported:
 - PlsqlIdleSessionCleanupInterval
 - PlsqlAfterProcedure
 - PlsqlAlwaysDescribeProcedure
 - PlsqlBeforeProcedure
 - PlsqlCGIEnvironmentList
-- PlsqlDocumentPath
-- PlsqlDocumentProcedure
-- PlsqlExclusionList
-- PlsqlRequestValidationFunction
 - PlsqlSessionCookieName
 - PlsqlSessionStateManagement
 - PlsqlTransferMode

package/examples/sample.js

@@ -79,6 +79,23 @@ app.use(PATH + '/:name?', webplsql(connectionPool, OPTIONS));
 // serving static files
 app.use('/static', express.static(path.join(process.cwd(), 'examples/static')));
 
+// shutdown
+process.on('SIGTERM', shutDown);
+process.on('SIGINT', shutDown);
+
 // listen on port
 console.log(`Sample app is listening on http://localhost:${PORT}${PATH}`);
-app.listen(PORT);
+const server = app.listen(PORT);
+
+function shutDown() {
+	console.log('Received kill signal, shutting down gracefully');
+	server.close(() => {
+		console.log('Closed out remaining connections');
+		process.exit(0);
+	});
+
+	setTimeout(() => {
+		console.error('Could not close connections in time, forcefully shutting down');
+		process.exit(1);
+	}, 10000);
+}

package/jest.config.js

@@ -0,0 +1,207 @@
+/*
+ * For a detailed explanation regarding each configuration property, visit:
+ * https://jestjs.io/docs/configuration
+ */
+
+module.exports = {
+  // All imported modules in your tests should be mocked automatically
+  // automock: false,
+
+  // Stop running tests after `n` failures
+  // bail: 0,
+
+  // The directory where Jest should store its cached dependency information
+  // cacheDirectory: "/private/var/folders/2y/kvrr5nws6xz4nx9vnwjxj17w0000gn/T/jest_dx",
+
+  // Automatically clear mock calls, instances, contexts and results before every test
+  // clearMocks: false,
+
+  // Indicates whether the coverage information should be collected while executing the test
+  collectCoverage: true,
+
+  // An array of glob patterns indicating a set of files for which coverage information should be collected
+  // collectCoverageFrom: undefined,
+  collectCoverageFrom: ['./src/**/*.{ts,js}'],
+
+  // The directory where Jest should output its coverage files
+  coverageDirectory: "coverage",
+
+  // An array of regexp pattern strings used to skip coverage collection
+  // coveragePathIgnorePatterns: [
+  //   "/node_modules/"
+  // ],
+
+  // Indicates which provider should be used to instrument code for coverage
+  coverageProvider: "v8",
+
+  // A list of reporter names that Jest uses when writing coverage reports
+  // coverageReporters: [
+  //   "json",
+  //   "text",
+  //   "lcov",
+  //   "clover"
+  // ],
+
+  // An object that configures minimum threshold enforcement for coverage results
+  // coverageThreshold: undefined,
+
+  // A path to a custom dependency extractor
+  // dependencyExtractor: undefined,
+
+  // Make calling deprecated APIs throw helpful error messages
+  // errorOnDeprecated: false,
+
+  // The default configuration for fake timers
+  // fakeTimers: {
+  //   "enableGlobally": false
+  // },
+
+  // Force coverage collection from ignored files using an array of glob patterns
+  // forceCoverageMatch: [],
+
+  // A path to a module which exports an async function that is triggered once before all test suites
+  // globalSetup: undefined,
+
+  // A path to a module which exports an async function that is triggered once after all test suites
+  // globalTeardown: undefined,
+
+  // A set of global variables that need to be available in all test environments
+  // globals: {},
+
+  // The maximum amount of workers used to run your tests. Can be specified as % or a number. E.g. maxWorkers: 10% will use 10% of your CPU amount + 1 as the maximum worker number. maxWorkers: 2 will use a maximum of 2 workers.
+  // maxWorkers: "50%",
+
+  // An array of directory names to be searched recursively up from the requiring module's location
+  // moduleDirectories: [
+  //   "node_modules"
+  // ],
+
+  // An array of file extensions your modules use
+  // moduleFileExtensions: [
+  //   "js",
+  //   "mjs",
+  //   "cjs",
+  //   "jsx",
+  //   "ts",
+  //   "tsx",
+  //   "json",
+  //   "node"
+  // ],
+
+  // A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module
+  // moduleNameMapper: {},
+
+  // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
+  // modulePathIgnorePatterns: [],
+
+  // Activates notifications for test results
+  // notify: false,
+
+  // An enum that specifies notification mode. Requires { notify: true }
+  // notifyMode: "failure-change",
+
+  // A preset that is used as a base for Jest's configuration
+  // preset: undefined,
+  preset: 'ts-jest',
+
+  // Run tests from one or more projects
+  // projects: undefined,
+
+  // Use this configuration option to add custom reporters to Jest
+  // reporters: undefined,
+
+  // Automatically reset mock state before every test
+  // resetMocks: false,
+
+  // Reset the module registry before running each individual test
+  // resetModules: false,
+
+  // A path to a custom resolver
+  // resolver: undefined,
+
+  // Automatically restore mock state and implementation before every test
+  // restoreMocks: false,
+
+  // The root directory that Jest should scan for tests and modules within
+  // rootDir: undefined,
+
+  // A list of paths to directories that Jest should use to search for files in
+  // roots: [
+  //   "<rootDir>"
+  // ],
+
+  // Allows you to use a custom runner instead of Jest's default test runner
+  // runner: "jest-runner",
+
+  // The paths to modules that run some code to configure or set up the testing environment before each test
+  // setupFiles: [],
+
+  // A list of paths to modules that run some code to configure or set up the testing framework before each test
+  // setupFilesAfterEnv: [],
+
+  // The number of seconds after which a test is considered as slow and reported as such in the results.
+  // slowTestThreshold: 5,
+
+  // A list of paths to snapshot serializer modules Jest should use for snapshot testing
+  // snapshotSerializers: [],
+
+  // The test environment that will be used for testing
+  // testEnvironment: "jest-environment-node",
+
+  // Options that will be passed to the testEnvironment
+  // testEnvironmentOptions: {},
+
+  // Adds a location field to test results
+  // testLocationInResults: false,
+
+  // The glob patterns Jest uses to detect test files
+  // testMatch: [
+  //   "**/__tests__/**/*.[jt]s?(x)",
+  //   "**/?(*.)+(spec|test).[tj]s?(x)"
+  // ],
+
+  // An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
+  // testPathIgnorePatterns: [
+  //   "/node_modules/"
+  // ],
+
+  // The regexp pattern or array of patterns that Jest uses to detect test files
+  // testRegex: [],
+
+  // This option allows the use of a custom results processor
+  // testResultsProcessor: undefined,
+
+  // This option allows use of a custom test runner
+  // testRunner: "jest-circus/runner",
+
+  // A map from regular expressions to paths to transformers
+  // transform: undefined,
+	transform: {
+		'\\.[jt]sx?$': [
+			'ts-jest',
+			{
+				tsconfig: 'tsconfig.src.json',
+				diagnostics: true,
+				useESM: true,
+			},
+		],
+	},
+
+  // An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
+  // transformIgnorePatterns: [
+  //   "/node_modules/",
+  //   "\\.pnp\\.[^\\/]+$"
+  // ],
+
+  // An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
+  // unmockedModulePathPatterns: undefined,
+
+  // Indicates whether each individual test should be reported during the run
+  // verbose: undefined,
+
+  // An array of regexp patterns that are matched against all source file paths before re-running tests in watch mode
+  // watchPathIgnorePatterns: [],
+
+  // Whether to use watchman for file crawling
+  // watchman: true,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web_plsql",
-  "version": "0.4.0",
+  "version": "0.5.1",
   "author": "Dieter Oberkofler <dieter.oberkofler@gmail.com>",
   "license": "MIT",
   "description": "The Express Middleware for Oracle PL/SQL",
@@ -20,7 +20,7 @@
   ],
   "homepage": "https://github.com/doberkofler/web_plsql",
   "engines": {
-    "node": ">=10"
+    "node": ">=16"
   },
   "maintainers": [
     {
@@ -41,73 +41,45 @@
     "eslint": "eslint --cache --report-unused-disable-directives \"./**/*.ts\"",
     "type-check": "tsc --project ./tsconfig.json --noEmit",
     "lint": "npm run eslint && npm run type-check",
-    "test": "mocha --project ./tsconfig.test.json --require ts-node/register --require source-map-support/register --check-leaks --full-trace --bail ./test/*.ts",
-    "test-cov": "npm run build && nyc mocha --project ./tsconfig.test.json --require ts-node/register --require source-map-support/register --check-leaks --full-trace --bail ./test/*.ts",
-    "coveralls": "npm run test-cov && cat ./coverage/lcov.info | coveralls",
+    "test": "jest --coverage=false",
+    "test:coverage": "jest",
     "sample": "node examples/sample.js",
     "rebuild": "npm run clean && npm run lint && npm run build && npm run test",
     "create-package": "shx rm -f *.tgz && npm pack",
     "install": "npm run build"
   },
-  "nyc": {
-    "include": [
-      "src/*.ts"
-    ],
-    "extension": [
-      ".ts"
-    ],
-    "require": [
-      "ts-node/register"
-    ],
-    "reporter": [
-      "text-summary",
-      "html"
-    ],
-    "sourceMap": true,
-    "instrument": true,
-    "all": true
-  },
   "dependencies": {
-    "body-parser": "1.19.0",
+    "body-parser": "1.20.0",
     "compression": "1.7.4",
     "connect-multiparty": "2.2.0",
-    "cookie-parser": "1.4.5",
+    "cookie-parser": "1.4.6",
     "escape-html": "1.0.3",
-    "express": "4.17.1",
-    "express-status-monitor": "1.3.3",
-    "http-parser-js": "0.5.3",
+    "express": "4.18.1",
+    "express-status-monitor": "1.3.4",
+    "http-parser-js": "0.5.8",
     "mkdirp": "1.0.4",
-    "morgan": "1.10.0"
+    "morgan": "1.10.0",
+    "oracledb": "5.5.0"
   },
   "devDependencies": {
-    "@types/body-parser": "1.19.0",
-    "@types/chai": "4.2.16",
-    "@types/compression": "1.7.0",
-    "@types/cookie-parser": "1.4.2",
-    "@types/escape-html": "1.0.0",
-    "@types/express": "4.17.11",
-    "@types/mkdirp": "1.0.1",
-    "@types/mocha": "8.2.2",
-    "@types/morgan": "1.9.2",
-    "@types/node": "14.14.37",
-    "@types/oracledb": "5.1.0",
-    "@types/supertest": "2.0.11",
-    "@typescript-eslint/eslint-plugin": "4.21.0",
-    "@typescript-eslint/parser": "4.21.0",
-    "chai": "4.3.4",
-    "coveralls": "3.1.0",
-    "eslint": "7.23.0",
-    "istanbul": "1.1.0-alpha.1",
-    "mocha": "8.3.2",
-    "nyc": "15.1.0",
+    "@types/body-parser": "1.19.2",
+    "@types/compression": "1.7.2",
+    "@types/cookie-parser": "1.4.3",
+    "@types/escape-html": "1.0.2",
+    "@types/mkdirp": "1.0.2",
+    "@types/morgan": "1.9.3",
+    "@types/node": "18.7.16",
+    "@types/oracledb": "5.2.3",
+    "@types/supertest": "2.0.12",
+    "@typescript-eslint/eslint-plugin": "5.36.2",
+    "@typescript-eslint/parser": "5.36.2",
+    "eslint": "8.23.0",
+    "jest": "29.0.3",
     "rimraf": "3.0.2",
-    "shx": "0.3.3",
-    "source-map-support": "0.5.19",
-    "supertest": "6.1.3",
-    "ts-node": "9.1.1",
-    "typescript": "4.2.4"
-  },
-  "optionalDependencies": {
-    "oracledb": "5.1.0"
+    "shx": "0.3.4",
+    "supertest": "6.2.4",
+    "ts-jest": "29.0.0",
+    "ts-node": "10.9.1",
+    "typescript": "4.8.3"
   }
 }

package/src/cgi.ts

@@ -26,7 +26,7 @@ export function getCGI(req: express.Request, options: oracleExpressMiddleware$op
 		'GATEWAY_IVERSION': '2',
 		'SERVER_SOFTWARE': 'web_plsql',
 		'GATEWAY_INTERFACE': 'CGI/1.1',
-		'SERVER_PORT': req.socket.localPort.toString(),
+		'SERVER_PORT': typeof req.socket.localPort === 'number' ? req.socket.localPort.toString() : '',
 		'SERVER_NAME': os.hostname(),
 		'REQUEST_METHOD': req.method,
 		'PATH_INFO': req.params.name,

package/src/errorPage.ts

@@ -21,7 +21,7 @@ type outputType = {html: string; text: string};
 * @param {Trace} trace - Tracing object.
 * @param {Error} error - The error.
 */
-export function errorPage(req: express.Request, res: express.Response, options: oracleExpressMiddleware$options, trace: Trace, error: Error): void {
+export function errorPage(req: express.Request, res: express.Response, options: oracleExpressMiddleware$options, trace: Trace, error: unknown): void {
 	let output = {
 		html: '',
 		text: ''
@@ -30,14 +30,16 @@ export function errorPage(req: express.Request, res: express.Response, options:
 	// get the error description
 	try {
 		output = getError(req, error);
-	} catch (e) {
+	} catch (err) {
 		/* istanbul ignore next */
 		const header = 'ERROR';
+
 		/* istanbul ignore next */
-		const message = `${e.message}\n${e.stack}`;
+		const message = err instanceof Error ? `${err.message}\n${err.stack}` : JSON.stringify(err);
 
 		/* istanbul ignore next */
 		output.html += getHeaderHtml(header) + getHtml(message);
+
 		/* istanbul ignore next */
 		output.text += getHeaderHtml(header) + getHtml(message);
 	}
@@ -59,7 +61,7 @@ export function errorPage(req: express.Request, res: express.Response, options:
 /*
 * Show an error page
 */
-function getError(req: express.Request, error: Error): outputType {
+function getError(req: express.Request, error: unknown): outputType {
 	let timestamp: Date = new Date();
 	let message: string = '';
 	let environment: environmentType | null = null;
@@ -89,9 +91,9 @@ function getError(req: express.Request, error: Error): outputType {
 		try {
 			/* istanbul ignore next */
 			new Error(); // eslint-disable-line no-new
-		} catch (e) {
+		} catch (err) {
 			/* istanbul ignore next */
-			message += e.stack;
+			message += err instanceof Error ? err.stack : '';
 		}
 	}
 
@@ -163,11 +165,12 @@ function getProcedure(output: outputType, sql: string, bind: any) {
 				text += name + ': ' + value + '\n';
 			});
 		}
-	} catch (e) {
+	} catch (err) {
 		/* istanbul ignore next */
-		output.html += e.toString();
+		output.html += err instanceof Error ? err.toString() : 'ERROR';
+
 		/* istanbul ignore next */
-		output.text += e.toString();
+		output.text += err instanceof Error ? err.toString() : 'ERROR';
 		/* istanbul ignore next */
 		return;
 	}
@@ -190,11 +193,13 @@ function getEnvironment(output: outputType, environment: environmentType) {
 			html += `<tr><td>${key}:</td><td>${environment[key]}</td></tr>`;
 			text += key + '=' + environment[key] + '\n';
 		}
-	} catch (e) {
+	} catch (err) {
 		/* istanbul ignore next */
-		output.html += e.toString();
+		output.html += err instanceof Error ? err.toString() : 'ERROR';
+
 		/* istanbul ignore next */
-		output.text += e.toString();
+		output.text += err instanceof Error ? err.toString() : 'ERROR';
+
 		/* istanbul ignore next */
 		return;
 	}

package/src/fileUpload.ts

@@ -90,9 +90,9 @@ export function uploadFile(file: fileUploadType, docTableName: string, databaseC
 		let blobContent;
 		try {
 			blobContent = fs.readFileSync(file.physicalFilename);
-		} catch (e) {
+		} catch (err) {
 			/* istanbul ignore next */
-			reject(new Error(`Unable to read file "${file.physicalFilename}"\n` + e.toString()));
+			reject(new Error(`Unable to read file "${file.physicalFilename}"\n${err instanceof Error ? err.toString() : ''}`));
 			/* istanbul ignore next */
 			return;
 		}

package/src/index.ts

@@ -58,8 +58,8 @@ function requestHandler(req: express.Request, res: express.Response, databasePoo
 					errorPage(req, res, options, trace, e);
 				});
 		}
-	} catch (e) {
+	} catch (err) {
 		/* istanbul ignore next */
-		errorPage(req, res, options, trace, e);
+		errorPage(req, res, options, trace, err);
 	}
 }

package/src/procedure.ts

@@ -81,9 +81,9 @@ export async function invokeProcedure(req: express.Request, res: express.Respons
 		trace.write(`execute:\n${'-'.repeat(30)}\n${sqlStatement}\n${'-'.repeat(30)}\nwith bindings:\n${Trace.inspect(bind)}`);
 		result = await databaseConnection.execute(sqlStatement, Object.assign(bind, para.bind));
 		trace.write(`results:\n${Trace.inspect(result)}`);
-	} catch (e) {
+	} catch (err) {
 		/* istanbul ignore next */
-		throwError(`Error when executing procedure\n${sqlStatement}\n${e.toString()}`, para, cgiObj, trace);
+		throwError(`Error when executing procedure\n${sqlStatement}\n${err instanceof Error ? err.toString() : ''}`, para, cgiObj, trace);
 	}
 
 	//
@@ -332,9 +332,9 @@ async function getArguments(procedure: string, databaseConnection: oracledb.Conn
 
 	try {
 		result = await databaseConnection.execute<{names: Array<string>; types: Array<string>}>(sql.join('\n'), bind);
-	} catch (e) {
+	} catch (err) {
 		/* istanbul ignore next */
-		const message = `Error when retrieving arguments\n${sql.join('\n')}\n${e.stack()}`;
+		const message = `Error when retrieving arguments\n${sql.join('\n')}\n${err instanceof Error ? err.stack : ''}`;
 		/* istanbul ignore next */
 		throw new RequestError(message);
 	}

package/src/procedureError.ts

@@ -8,9 +8,9 @@ export class ProcedureError extends Error {
 	timestamp: Date;
 	environment: environmentType;
 	sql: string;
-	bind: any;
+	bind: unknown;
 
-	constructor(message: string, environment: environmentType, sql: string, bind: any) { // eslint-disable-line @typescript-eslint/explicit-module-boundary-types
+	constructor(message: string, environment: environmentType, sql: string, bind: unknown) {
 		super(message);
 
 		// Maintains proper stack trace for where our error was thrown (only available on V8)

package/src/request.ts

@@ -32,18 +32,18 @@ export async function processRequest(req: express.Request, res: express.Response
 	try {
 		databasePool = await databasePoolPromise;
 		trace.write('processRequest: Connection pool has been allocated');
-	} catch (e) {
+	} catch (err) {
 		/* istanbul ignore next */
-		throw new RequestError(`Unable to create database pool.\n${e.message}`);
+		throw new RequestError(`Unable to create database pool.\n${err instanceof Error ? err.message : ''}`);
 	}
 
 	// open database connection
 	try {
 		databaseConnection = await databasePool.getConnection();
 		trace.write('processRequest: Connection has been allocated');
-	} catch (e) {
+	} catch (err) {
 		/* istanbul ignore next */
-		throw new RequestError(`Unable to open database connection\n${e.message}`);
+		throw new RequestError(`Unable to open database connection\n${err instanceof Error ? err.message: ''}`);
 	}
 
 	// execute request
@@ -53,9 +53,9 @@ export async function processRequest(req: express.Request, res: express.Response
 	try {
 		await databaseConnection.release();
 		trace.write('processRequest: Connection has been released');
-	} catch (e) {
+	} catch (err) {
 		/* istanbul ignore next */
-		console.error(`Unable to release database connection\n${e.message}`);
+		console.error(`Unable to release database connection\n${err instanceof Error ? err.message : ''}`);
 	}
 
 	trace.write('processRequest: EXIT');

package/test/{cgi.ts → __tests__/cgi.ts}

@@ -1,8 +1,8 @@
-import {assert} from 'chai';
-import {getCGI} from '../src/cgi';
+import {describe, it, expect} from '@jest/globals';
+import {getCGI} from '../../src/cgi';
 import express from 'express';
 import os from 'os';
-import type {oracleExpressMiddleware$options} from '../src/config';
+import type {oracleExpressMiddleware$options} from '../../src/config';
 
 describe('cgi', () => {
 	it('with a proper configuration object and request', () => {
@@ -59,9 +59,9 @@ describe('cgi', () => {
 
 		const cgi = getCGI(req as unknown as express.Request, options as unknown as oracleExpressMiddleware$options);
 
-		assert.strictEqual(Object.keys(cgi).length, 29);
+		expect(Object.keys(cgi)).toHaveLength(29);
 
-		assert.deepEqual(cgi, {
+		expect(cgi).toStrictEqual({
 			'PLSQL_GATEWAY': 'WebDb',
 			'GATEWAY_IVERSION': '2',
 			'SERVER_SOFTWARE': 'web_plsql',

package/test/{config.ts → __tests__/config.ts}

@@ -1,5 +1,5 @@
-import {assert} from 'chai';
-import {validate} from '../src/config';
+import {describe, it, expect} from '@jest/globals';
+import {validate} from '../../src/config';
 
 describe('configuration options', () => {
 	it('should allow the following options', () => {
@@ -10,7 +10,7 @@ describe('configuration options', () => {
 			{pathAlias: {alias: 'r', procedure: 'p'}},
 			{errorStyle: 'debug'}
 		].forEach(options => {
-			assert.strictEqual(typeof validate(options as unknown as Record<string, unknown>), 'object', JSON.stringify(options));
+			expect(typeof validate(options as unknown as Record<string, unknown>)).toBe('object');
 		});
 	});
 });
@@ -33,9 +33,9 @@ describe('configuration errors', () => {
 		{config: {trace: 'enabled'}, error: 'The optional option "trace" must be "on" or "off"'},
 	].forEach(test => {
 		it(`should throw the exception "${test.error}"`, () => {
-			assert.throws(() => {
+			expect(() => {
 				validate(test.config as unknown as Record<string, unknown>);
-			}, test.error);
+			}).toThrow(test.error);
 		});
 	});
 });

package/test/__tests__/errorPage.ts

@@ -0,0 +1,101 @@
+import {describe, beforeAll, afterAll, it, expect} from '@jest/globals';
+import {errorPage} from '../../src/errorPage';
+import {RequestError} from '../../src/requestError';
+import {ProcedureError} from '../../src/procedureError';
+import {oracleExpressMiddleware$options} from '../../src/config';
+
+describe('errorPage', () => {
+	let errorSave: any;
+
+	beforeAll(() => {
+		errorSave = console.error;
+		console.error = () => {}; // eslint-disable-line @typescript-eslint/no-empty-function
+	});
+
+	afterAll(() => {
+		console.error = errorSave;
+	});
+
+	let errorText = '';
+	let errorHtml = '';
+
+	const options: oracleExpressMiddleware$options = {
+		errorStyle: 'debug',
+		trace: 'off'
+	};
+
+	const req: any = {};
+	const res: any = {
+		status() {
+			return this;
+		},
+		send(error: string) {
+			errorHtml = error;
+			return this;
+		}
+	};
+	const trace: any = {
+		write(error: string) {
+			errorText = error;
+		}
+	};
+
+	it('should report a "error message" in text and html format', () => {
+		errorPage(req, res, options, trace, new Error('error message'));
+
+		expect(/error message/.test(errorText)).toBeTruthy();
+		expect(/ERROR/.test(errorText)).toBeTruthy();
+		expect(/REQUEST/.test(errorText)).toBeTruthy();
+		expect(/error message/.test(errorHtml)).toBeTruthy();
+		expect(/TIMESTAMP/.test(errorHtml)).toBeTruthy();
+		expect(/ERROR/.test(errorHtml)).toBeTruthy();
+	});
+
+	it('should report a "Error" in text and html format', () => {
+		errorPage(req, res, options, trace, new Error('throw Error'));
+
+		expect(/throw Error/.test(errorText)).toBeTruthy();
+		expect(/ERROR/.test(errorText)).toBeTruthy();
+		expect(/REQUEST/.test(errorText)).toBeTruthy();
+		expect(/throw Error/.test(errorHtml)).toBeTruthy();
+		expect(/TIMESTAMP/.test(errorHtml)).toBeTruthy();
+		expect(/ERROR/.test(errorHtml)).toBeTruthy();
+	});
+
+	it('should report a "RequestError" in text and html format', () => {
+		errorPage(req, res, options, trace, new RequestError('throw RequestError'));
+
+		expect(/throw RequestError/.test(errorText)).toBeTruthy();
+		expect(/ERROR/.test(errorText)).toBeTruthy();
+		expect(/REQUEST/.test(errorText)).toBeTruthy();
+		expect(/throw RequestError/.test(errorHtml)).toBeTruthy();
+		expect(/TIMESTAMP/.test(errorHtml)).toBeTruthy();
+		expect(/ERROR/.test(errorHtml)).toBeTruthy();
+	});
+
+	it('should report a "ProcedureError" in text and html format', () => {
+		const environment = {dad: 'dad'};
+		const sql = 'sql';
+		const bind = {p1: '1'};
+
+		errorPage(req, res, options, trace, new ProcedureError('throw ProcedureError', environment, sql, bind));
+
+		expect(/throw ProcedureError/.test(errorText)).toBeTruthy();
+		expect(/ERROR/.test(errorText)).toBeTruthy();
+		expect(/REQUEST/.test(errorText)).toBeTruthy();
+		expect(/PROCEDURE/.test(errorText)).toBeTruthy();
+		expect(/ENVIRONMENT/.test(errorText)).toBeTruthy();
+		expect(/throw ProcedureError/.test(errorHtml)).toBeTruthy();
+		expect(/TIMESTAMP/.test(errorHtml)).toBeTruthy();
+		expect(/ERROR/.test(errorHtml)).toBeTruthy();
+		expect(/PROCEDURE/.test(errorHtml)).toBeTruthy();
+		expect(/ENVIRONMENT/.test(errorHtml)).toBeTruthy();
+	});
+
+	it('should only report a "404" error when in basic mode', () => {
+		options.errorStyle = 'basic';
+		errorPage(req, res, options, trace, new Error('error message'));
+
+		expect(/error message/.test(errorText)).toBeTruthy();
+	});
+});

package/test/{oracledb_mock.ts → __tests__/oracledb_mock.ts}

@@ -1,16 +1,16 @@
-import {assert} from 'chai';
-import {setExecuteCallback, createPool, Connection, getConnection, ConnectionPool, Lob, BLOB} from './mock/oracledb';
+import {describe, beforeEach, it, expect} from '@jest/globals';
+import {setExecuteCallback, createPool, Connection, getConnection, ConnectionPool, Lob, BLOB} from '../mock/oracledb';
 
 describe('oracledb', () => {
 	it('createPool', async () => {
 		const connectionPool = await _createPool();
-		assert.isTrue(connectionPool instanceof ConnectionPool);
+		expect(connectionPool).toBeInstanceOf(ConnectionPool);
 		return connectionPool;
 	});
 
 	it('getConnection', async () => {
 		const connection = await _getConnection();
-		assert.isTrue(connection instanceof Connection);
+		expect(connection).toBeInstanceOf(Connection);
 		return connection;
 	});
 });
@@ -20,7 +20,7 @@ describe('ConnectionPool', () => {
 		const connectionPool = await _createPool();
 		const connection = await connectionPool.getConnection();
 
-		assert.isTrue(connection instanceof Connection);
+		expect(connection).toBeInstanceOf(Connection);
 
 		return connection;
 	});
@@ -34,14 +34,14 @@ describe('ConnectionPool', () => {
 describe('Connection', () => {
 	it('getConnection', async () => {
 		const connection = await _getConnection();
-		assert.isTrue(connection instanceof Connection);
+		expect(connection).toBeInstanceOf(Connection);
 		return connection;
 	});
 
 	it('createLob', async () => {
 		const connection = await _getConnection();
 		const lob = await connection.createLob(BLOB);
-		assert.isTrue(lob instanceof Lob);
+		expect(lob).toBeInstanceOf(Lob);
 		return lob;
 	});
 
@@ -58,7 +58,7 @@ describe('Connection.execute', () => {
 
 	it('execute', async () => {
 		const connection = await _getConnection();
-		assert.deepEqual(await connection.execute('select * from dual'), {});
+		expect(await connection.execute('select * from dual')).toStrictEqual({});
 	});
 
 	it('execute with execution callback', async () => {
@@ -67,11 +67,11 @@ describe('Connection.execute', () => {
 
 		// register an execute callback
 		setExecuteCallback((sql: string) => {
-			assert.strictEqual(sql, SQL);
+			expect(sql).toBe(SQL);
 			return {sql: SQL};
 		});
 
-		assert.deepEqual(await connection.execute(SQL), {sql: SQL});
+		expect(await connection.execute(SQL)).toStrictEqual({sql: SQL});
 	});
 });
 

package/test/{server.ts → __tests__/server.ts}

@@ -1,4 +1,4 @@
-import {assert} from 'chai';
+import {describe, beforeAll, afterAll, beforeEach, it, expect} from '@jest/globals';
 import util from 'util';
 import express from 'express';
 import http from 'http';
@@ -10,9 +10,9 @@ import multipart from 'connect-multiparty';
 import cookieParser from 'cookie-parser';
 import compression from 'compression';
 import request from 'supertest';
-import {setExecuteCallback, createPool} from './mock/oracledb';
+import {setExecuteCallback, createPool} from '../mock/oracledb';
 
-const webplsql = require('../src/index'); // eslint-disable-line @typescript-eslint/no-var-requires
+const webplsql = require('../../src/index'); // eslint-disable-line @typescript-eslint/no-var-requires
 
 const PORT = 8765;
 const PATH = '/base';
@@ -29,10 +29,10 @@ describe('server utilities', () => {
 	it('should start a server', async () => {
 		const serverConfig = await serverStart();
 
-		assert.strictEqual(Object.prototype.toString.call(serverConfig), '[object Object]');
-		assert.strictEqual(Object.prototype.toString.call(serverConfig.app.listen), '[object Function]');
-		assert.strictEqual(Object.prototype.toString.call(serverConfig.server), '[object Object]');
-		//assert.isTrue(serverConfig.connectionPool instanceof oracledb.Pool);
+		expect(Object.prototype.toString.call(serverConfig)).toBe('[object Object]');
+		expect(Object.prototype.toString.call(serverConfig.app.listen)).toBe('[object Function]');
+		expect(Object.prototype.toString.call(serverConfig.server)).toBe('[object Object]');
+		//expect(serverConfig.connectionPool).toBeInstanceOf(oracledb.Pool);
 
 		await serverStop(serverConfig);
 	});
@@ -41,15 +41,15 @@ describe('server utilities', () => {
 describe('server static', () => {
 	let serverConfig: any;
 
-	before('Start the server', async () => {
+	beforeAll(async () => {
 		serverConfig = await serverStart();
 	});
 
-	after('Stop the server', async () => {
+	afterAll(async () => {
 		await serverStop(serverConfig);
 	});
 
-	beforeEach('Reset the execute callback', () => {
+	beforeEach(() => {
 		setExecuteCallback();
 	});
 

package/test/{stream.ts → __tests__/stream.ts}

@@ -1,5 +1,5 @@
-import {assert} from 'chai';
-import {streamToBuffer} from '../src/stream';
+import {describe, it, expect} from '@jest/globals';
+import {streamToBuffer} from '../../src/stream';
 import fs from 'fs';
 
 describe('stream', () => {
@@ -14,7 +14,7 @@ describe('stream', () => {
 		const readStream = fs.createReadStream('file.tmp');
 		const readBuffer = await streamToBuffer(readStream);
 
-		assert.isTrue(buffer.equals(readBuffer));
+		expect(buffer.equals(readBuffer)).toBeTruthy();
 
 		fs.unlinkSync(filename);
 	});

package/test/errorPage.ts

@@ -1,101 +0,0 @@
-import {assert} from 'chai';
-import {errorPage} from '../src/errorPage';
-import {RequestError} from '../src/requestError';
-import {ProcedureError} from '../src/procedureError';
-import {oracleExpressMiddleware$options} from '../src/config';
-
-describe('errorPage', () => {
-	let errorSave: any;
-
-	before(() => {
-		errorSave = console.error;
-		console.error = () => {}; // eslint-disable-line @typescript-eslint/no-empty-function
-	});
-
-	after(() => {
-		console.error = errorSave;
-	});
-
-	let errorText = '';
-	let errorHtml = '';
-
-	const options: oracleExpressMiddleware$options = {
-		errorStyle: 'debug',
-		trace: 'off'
-	};
-
-	const req: any = {};
-	const res: any = {
-		status() {
-			return this;
-		},
-		send(error: string) {
-			errorHtml = error;
-			return this;
-		}
-	};
-	const trace: any = {
-		write(error: string) {
-			errorText = error;
-		}
-	};
-
-	it('should report a "error message" in text and html format', () => {
-		errorPage(req, res, options, trace, new Error('error message'));
-
-		assert.isTrue(/error message/.test(errorText), 'text: error message');
-		assert.isTrue(/ERROR/.test(errorText), 'text: ERROR');
-		assert.isTrue(/REQUEST/.test(errorText), 'text: REQUEST');
-		assert.isTrue(/error message/.test(errorHtml), 'html: error message');
-		assert.isTrue(/TIMESTAMP/.test(errorHtml), 'html: TIMESTAMP');
-		assert.isTrue(/ERROR/.test(errorHtml), 'html: ERROR');
-	});
-
-	it('should report a "Error" in text and html format', () => {
-		errorPage(req, res, options, trace, new Error('throw Error'));
-
-		assert.isTrue(/throw Error/.test(errorText), 'text: exception message');
-		assert.isTrue(/ERROR/.test(errorText), 'text: ERROR');
-		assert.isTrue(/REQUEST/.test(errorText), 'text: REQUEST');
-		assert.isTrue(/throw Error/.test(errorHtml), 'html: exception message');
-		assert.isTrue(/TIMESTAMP/.test(errorHtml), 'html: TIMESTAMP');
-		assert.isTrue(/ERROR/.test(errorHtml), 'html: ERROR');
-	});
-
-	it('should report a "RequestError" in text and html format', () => {
-		errorPage(req, res, options, trace, new RequestError('throw RequestError'));
-
-		assert.isTrue(/throw RequestError/.test(errorText), 'text: exception message');
-		assert.isTrue(/ERROR/.test(errorText), 'text: ERROR');
-		assert.isTrue(/REQUEST/.test(errorText), 'text: REQUEST');
-		assert.isTrue(/throw RequestError/.test(errorHtml), 'html: exception message');
-		assert.isTrue(/TIMESTAMP/.test(errorHtml), 'html: TIMESTAMP');
-		assert.isTrue(/ERROR/.test(errorHtml), 'html: ERROR');
-	});
-
-	it('should report a "ProcedureError" in text and html format', () => {
-		const environment = {dad: 'dad'};
-		const sql = 'sql';
-		const bind = {p1: '1'};
-
-		errorPage(req, res, options, trace, new ProcedureError('throw ProcedureError', environment, sql, bind));
-
-		assert.isTrue(/throw ProcedureError/.test(errorText), 'text: exception message');
-		assert.isTrue(/ERROR/.test(errorText), 'text: ERROR');
-		assert.isTrue(/REQUEST/.test(errorText), 'text: REQUEST');
-		assert.isTrue(/PROCEDURE/.test(errorText), 'text: PROCEDURE');
-		assert.isTrue(/ENVIRONMENT/.test(errorText), 'text: ENVIRONMENT');
-		assert.isTrue(/throw ProcedureError/.test(errorHtml), 'html: exception message');
-		assert.isTrue(/TIMESTAMP/.test(errorHtml), 'html: TIMESTAMP');
-		assert.isTrue(/ERROR/.test(errorHtml), 'html: ERROR');
-		assert.isTrue(/PROCEDURE/.test(errorHtml), 'html: REQUEST');
-		assert.isTrue(/ENVIRONMENT/.test(errorHtml), 'text: ENVIRONMENT');
-	});
-
-	it('should only report a "404" error when in basic mode', () => {
-		options.errorStyle = 'basic';
-		errorPage(req, res, options, trace, new Error('error message'));
-
-		assert.isTrue(/error message/.test(errorText), 'Page not found');
-	});
-});

package/tsconfig.test.json

@@ -1,20 +0,0 @@
-{
-  "compilerOptions": {
-    "skipLibCheck": true,
-    "moduleResolution": "node",
-    "baseUrl": ".",
-    "outDir": "lib",
-    "target": "es6",
-    "lib": [
-      "es2015",
-      "es2016",
-      "es2017",
-      "es2018"
-    ],
-    "module": "commonjs",
-    "sourceMap": true,
-    "strict": true,
-    "alwaysStrict": true,
-    "esModuleInterop": true
-  }
-}