web_plsql 0.3.2 → 0.5.0

package/src/fileUpload.ts

@@ -1,132 +1,126 @@
-/*
-*	Process file uploads
-*/
-
-import path from 'path';
-import fs from 'fs';
-import express from 'express';
-import oracledb from 'oracledb';
-
-export type fileUploadType = {
-	fieldValue: string;
-	filename: string;
-	physicalFilename: string;
-	encoding: string;
-	mimetype: string;
-	size: number;
-};
-export type filesUploadType = Array<fileUploadType>;
-
-let sequencialID = 0;
-
-/**
-* Get the files
-*
-* @param {express.Request} req - The req object represents the HTTP request.
-* @returns {Promise<filesUploadType>} - Promise that resolves with an array of files to be uploaded.
-*/
-export function getFiles(req: express.Request): filesUploadType {
-	interface TCustomRequest extends express.Request {
-		files: Array<any>;
-	}
-	const customRequest = req as TCustomRequest;
-	const files: filesUploadType = [];
-
-	// are there any files
-	/* istanbul ignore next */
-	if (typeof customRequest.files !== 'object') {
-		return files;
-	}
-
-	// process the files
-	for (const key in customRequest.files) {
-		const file = customRequest.files[key];
-
-		/* istanbul ignore else */
-		if (typeof file.originalFilename === 'string' && file.originalFilename.length > 0) {
-			// get a temporary filename
-			const filename = getRandomizedFilename(file.originalFilename);
-
-			// Add the field
-			file.filename = filename;
-
-			// Add the file to upload
-			files.push({
-				fieldValue: file.fieldName,
-				filename: file.originalFilename,
-				physicalFilename: path.normalize(path.resolve(file.path)),
-				encoding: '',
-				mimetype: file.type,
-				size: file.size
-			});
-		}
-	}
-
-	return files;
-}
-
-/**
-* Upload the given array of files and return a promise that resolves when all uploads have been finished.
-*
-* @param {Array<string>} files - array of file path's.
-* @param {string} docTableName - name of the oracle table holding the uploaded files.
-* @param {oracledb.Connection} databaseConnection - Database connection.
-* @returns {Promise<void>} - Promise that resolves when the request has been fullfilled.
-*/
-export function uploadFiles(files: filesUploadType, docTableName: string, databaseConnection: oracledb.Connection) {
-	return Promise.all(files.map(file => uploadFile(file, docTableName, databaseConnection)));
-}
-
-/*
-*	Upload the given file and return a promise.
-*/
-export function uploadFile(file: fileUploadType, docTableName: string, databaseConnection: oracledb.Connection): Promise<void> {
-	return new Promise((resolve, reject) => {
-		/* istanbul ignore next */
-		if (typeof docTableName !== 'string' || docTableName.length === 0) {
-			reject(new Error('The option "docTableName" has not been defined or the name is empty'));
-		}
-
-		let blobContent;
-		try {
-			blobContent = fs.readFileSync(file.physicalFilename);
-		} catch (e) {
-			/* istanbul ignore next */
-			reject(new Error(`Unable to read file "${file.physicalFilename}"\n` + e.toString()));
-			/* istanbul ignore next */
-			return;
-		}
-
-		const sql = `INSERT INTO ${docTableName} (name, mime_type, doc_size, dad_charset, last_updated, content_type, blob_content) VALUES (:name, :mime_type, :doc_size, 'ascii', SYSDATE, 'BLOB', :blob_content)`;
-		const bind = {
-			name: file.fieldValue,
-			mime_type: file.mimetype,
-			doc_size: file.size,
-			blob_content: {
-				val: blobContent,
-				type: oracledb.BUFFER
-			}
-		};
-
-		//@ts-ignore
-		databaseConnection.execute(sql, bind, {autoCommit: true})
-			.then((result: oracledb.Result<any>) => {
-				/* istanbul ignore next */
-				if (result.rowsAffected !== 1) {
-					reject(new Error(`Invalid number of affected rows "${result.rowsAffected}"`));
-				} else {
-					resolve();
-				}
-			}).catch(/* istanbul ignore next */(e: any) => {
-				reject(new Error(`Unable to insert file "${file.physicalFilename}"\n` + e.toString()));
-			});
-	});
-}
-
-/*
-*	get a randomized filename
-*/
-function getRandomizedFilename(filename: string): string {
-	++sequencialID;
-	return 'F' + (Date.now() + sequencialID).toString() + '/' + path.basename(filename);
-}
+/*
+*	Process file uploads
+*/
+
+import path from 'path';
+import fs from 'fs';
+import express from 'express';
+import oracledb from 'oracledb';
+
+export type fileUploadType = {
+	fieldValue: string;
+	filename: string;
+	physicalFilename: string;
+	encoding: string;
+	mimetype: string;
+	size: number;
+};
+export type filesUploadType = Array<fileUploadType>;
+
+let sequencialID = 0;
+
+/**
+* Get the files
+*
+* @param {express.Request} req - The req object represents the HTTP request.
+* @returns {Promise<filesUploadType>} - Promise that resolves with an array of files to be uploaded.
+*/
+export function getFiles(req: express.Request): filesUploadType {
+	interface TCustomRequest extends express.Request {
+		files: Array<any>;
+	}
+	const customRequest = req as TCustomRequest;
+	const files: filesUploadType = [];
+
+	// are there any files
+	/* istanbul ignore next */
+	if (typeof customRequest.files !== 'object') {
+		return files;
+	}
+
+	// process the files
+	for (const key in customRequest.files) {
+		const file = customRequest.files[key];
+
+		/* istanbul ignore else */
+		if (typeof file.originalFilename === 'string' && file.originalFilename.length > 0) {
+			// get a temporary filename
+			const filename = getRandomizedFilename(file.originalFilename);
+
+			// Add the field
+			file.filename = filename;
+
+			// Add the file to upload
+			files.push({
+				fieldValue: file.fieldName,
+				filename: file.originalFilename,
+				physicalFilename: path.normalize(path.resolve(file.path)),
+				encoding: '',
+				mimetype: file.type,
+				size: file.size
+			});
+		}
+	}
+
+	return files;
+}
+
+/**
+* Upload the given array of files and return a promise that resolves when all uploads have been finished.
+*
+* @param {Array<string>} files - array of file path's.
+* @param {string} docTableName - name of the oracle table holding the uploaded files.
+* @param {oracledb.Connection} databaseConnection - Database connection.
+* @returns {Promise<void>} - Promise that resolves when the request has been fullfilled.
+*/
+export async function uploadFiles(files: filesUploadType, docTableName: string, databaseConnection: oracledb.Connection): Promise<void> {
+	await Promise.all(files.map(file => uploadFile(file, docTableName, databaseConnection)));
+}
+
+/*
+*	Upload the given file and return a promise.
+*/
+export function uploadFile(file: fileUploadType, docTableName: string, databaseConnection: oracledb.Connection): Promise<void> {
+	return new Promise((resolve, reject) => {
+		/* istanbul ignore next */
+		if (typeof docTableName !== 'string' || docTableName.length === 0) {
+			reject(new Error('The option "docTableName" has not been defined or the name is empty'));
+		}
+
+		let blobContent;
+		try {
+			blobContent = fs.readFileSync(file.physicalFilename);
+		} catch (err) {
+			/* istanbul ignore next */
+			reject(new Error(`Unable to read file "${file.physicalFilename}"\n${err instanceof Error ? err.toString() : ''}`));
+			/* istanbul ignore next */
+			return;
+		}
+
+		const sql = `INSERT INTO ${docTableName} (name, mime_type, doc_size, dad_charset, last_updated, content_type, blob_content) VALUES (:name, :mime_type, :doc_size, 'ascii', SYSDATE, 'BLOB', :blob_content)`;
+		const bind = {
+			name: file.fieldValue,
+			mime_type: file.mimetype,
+			doc_size: file.size,
+			blob_content: {
+				val: blobContent,
+				type: oracledb.BUFFER
+			}
+		};
+
+		databaseConnection.execute(sql, bind, {autoCommit: true})
+			.then(() => {
+				resolve();
+			}).catch(/* istanbul ignore next */(e: any) => {
+				reject(new Error(`Unable to insert file "${file.physicalFilename}"\n` + e.toString()));
+			});
+	});
+}
+
+/*
+*	get a randomized filename
+*/
+function getRandomizedFilename(filename: string): string {
+	++sequencialID;
+	return 'F' + (Date.now() + sequencialID).toString() + '/' + path.basename(filename);
+}

package/src/index.ts

@@ -1,66 +1,65 @@
-/*
-*	Express middleware for Oracle PL/SQL
-*/
-
-import url from 'url';
-import express from 'express';
-import oracledb from 'oracledb';
-import {processRequest} from './request';
-import {validate, oracleExpressMiddleware$options} from './config';
-import {RequestError} from './requestError';
-import {errorPage} from './errorPage';
-import {Trace} from './trace';
-const version = require('../package.json').version;
-
-/**
-* Express middleware.
-*
-* @param {Promise<oracledb.Pool>} databasePoolPromise - The promise that will be fullfilled when the database pool has been allocated.
-* @param {Object} options - The configuration options.
-* @returns {Function} - The request handler.
-*/
-const webplsql = function (databasePoolPromise: Promise<oracledb.Pool>, options: oracleExpressMiddleware$options) {
-	// validate the configuration options
-	const validOptions = validate(options);
-
-	// instantiate trace object
-	const trace = new Trace(validOptions.trace);
-
-	return function handler(req: express.Request, res: express.Response/*, next: () => void*/) {
-		requestHandler(req, res, databasePoolPromise, validOptions, trace);
-	};
-};
-
-webplsql.version = version;
-exports = module.exports = webplsql;
-
-/*
-* express.Request handler
-*/
-function requestHandler(req: express.Request, res: express.Response, databasePoolPromise: Promise<oracledb.Pool>, options: oracleExpressMiddleware$options, trace: Trace) {
-	try {
-		trace.start(req);
-
-		// should we switch to the default page if there is one defined
-		if (typeof req.params.name !== 'string' || req.params.name.length === 0) {
-			if (typeof options.defaultPage === 'string' && options.defaultPage.length > 0) {
-				const newUrl = url.resolve(req.originalUrl + '/' + options.defaultPage, '');
-				trace.write(`Redirect to the url "${newUrl}"`);
-				res.redirect(newUrl);
-			} else {
-				/* istanbul ignore next */
-				errorPage(req, res, options, trace, new RequestError('No procedure name given and no default page has been specified'));
-			}
-		} else {
-			processRequest(req, res, options, databasePoolPromise, trace)
-				//@ts-ignore
-				.catch(e => {
-					/* istanbul ignore next */
-					errorPage(req, res, options, trace, e);
-				});
-		}
-	} catch (e) {
-		/* istanbul ignore next */
-		errorPage(req, res, options, trace, e);
-	}
-}
+/*
+*	Express middleware for Oracle PL/SQL
+*/
+
+import url from 'url';
+import express from 'express';
+import oracledb from 'oracledb';
+import {processRequest} from './request';
+import {validate, oracleExpressMiddleware$options} from './config';
+import {RequestError} from './requestError';
+import {errorPage} from './errorPage';
+import {Trace} from './trace';
+const version = require('../package.json').version; // eslint-disable-line @typescript-eslint/no-var-requires
+
+/**
+* Express middleware.
+*
+* @param {Promise<oracledb.Pool>} databasePoolPromise - The promise that will be fullfilled when the database pool has been allocated.
+* @param {Object} options - The configuration options.
+* @returns {Function} - The request handler.
+*/
+const webplsql = function (databasePoolPromise: Promise<oracledb.Pool>, options: oracleExpressMiddleware$options) {
+	// validate the configuration options
+	const validOptions = validate(options);
+
+	// instantiate trace object
+	const trace = new Trace(validOptions.trace);
+
+	return function handler(req: express.Request, res: express.Response/*, next: () => void*/) {
+		requestHandler(req, res, databasePoolPromise, validOptions, trace);
+	};
+};
+
+webplsql.version = version;
+exports = module.exports = webplsql;
+
+/*
+* express.Request handler
+*/
+function requestHandler(req: express.Request, res: express.Response, databasePoolPromise: Promise<oracledb.Pool>, options: oracleExpressMiddleware$options, trace: Trace) {
+	try {
+		trace.start(req);
+
+		// should we switch to the default page if there is one defined
+		if (typeof req.params.name !== 'string' || req.params.name.length === 0) {
+			if (typeof options.defaultPage === 'string' && options.defaultPage.length > 0) {
+				const newUrl = url.resolve(req.originalUrl + '/' + options.defaultPage, '');
+				trace.write(`Redirect to the url "${newUrl}"`);
+				res.redirect(newUrl);
+			} else {
+				/* istanbul ignore next */
+				errorPage(req, res, options, trace, new RequestError('No procedure name given and no default page has been specified'));
+			}
+		} else {
+			processRequest(req, res, options, databasePoolPromise, trace)
+				.catch(e => {
+					/* istanbul ignore next */
+					errorPage(req, res, options, trace, e);
+				});
+		}
+	} catch (err) {
+		/* istanbul ignore next */
+		errorPage(req, res, options, trace, err);
+	}
+}