@thzero/library_server 0.17.13 → 0.17.14

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@thzero/library_server",
   "type": "module",
-  "version": "0.17.13",
+  "version": "0.17.14",
   "version_major": 0,
   "version_minor": 17,
-  "version_patch": 13,
-  "version_date": "06/16/2023",
+  "version_patch": 14,
+  "version_date": "07/03/2023",
   "description": "An opinionated library of common functionality to bootstrap an API using either Fastify or Koa as the web server.",
   "author": "thZero",
   "license": "MIT",

package/repository/index.js

@@ -130,6 +130,14 @@ class Repository {
 		return Response.error(clazz, method, message, err, code, errors, correlationId);
 	}
 
+	_errorResponse(clazz, method, value, code, correlationId) {
+		if (code)
+			this._logger.error(clazz, method, 'code', code, correlationId);
+		const response = Response.error(null, null, null, null, code, null, correlationId);
+		response.results = value;
+		return response;
+	}
+
 	_hasFailed(response) {
 		return Response.hasFailed(response);
 	}

package/service/baseSecurity.js

@@ -20,95 +20,107 @@ class BaseSecurityService extends Service {
 	}
 	
 	async authorizationCheckClaims(correlationId, claims, roles, logical) {
-		if (!claims)
-			return false;
-		if (!(claims && Array.isArray(claims)))
-			return false;
-		if (!roles)
-			return true;
-
-		if (String.isNullOrEmpty(logical) || (logical !== BaseSecurityService.logicalAnd) || (logical !== BaseSecurityService.logicalOr))
-			logical = BaseSecurityService.logicalOr;
-
-		let success = (logical === BaseSecurityService.logicalOr ? false : true);
-
-		let result;
-		let roleAct;
-		let roleObj;
-		let roleParts;
-		for (const claim of claims) {
-			this._logger.debug('BaseSecurityService', 'authorizationCheckClaims', 'authorization.claim', claim, correlationId);
-
-			for (const role of roles) {
-				this._logger.debug('BaseSecurityService', 'authorizationCheckClaims', 'role', role, correlationId);
-
-				roleParts = role.split('.');
-				if (roleParts && roleParts.length < 1)
-					success = false;
-
-				roleObj = roleParts[0];
-				roleAct = roleParts.length >= 2 ? roleParts[1] : null
-
-				result = await this.validate(claim, null, roleObj, roleAct);
-				this._logger.debug('BaseSecurityService', 'authorizationCheckClaims', 'result', result, correlationId);
-				if (logical === BaseSecurityService.logicalOr)
-					success = success || result;
-				else
-					success = success && result;
+		try {
+			if (!claims)
+				return false;
+			if (!(claims && Array.isArray(claims)))
+				return false;
+			if (!roles)
+				return true;
+
+			if (String.isNullOrEmpty(logical) || (logical !== BaseSecurityService.logicalAnd) || (logical !== BaseSecurityService.logicalOr))
+				logical = BaseSecurityService.logicalOr;
+
+			let success = (logical === BaseSecurityService.logicalOr ? false : true);
+
+			let result;
+			let roleAct;
+			let roleObj;
+			let roleParts;
+			for (const claim of claims) {
+				this._logger.debug('BaseSecurityService', 'authorizationCheckClaims', 'authorization.claim', claim, correlationId);
+
+				for (const role of roles) {
+					this._logger.debug('BaseSecurityService', 'authorizationCheckClaims', 'role', role, correlationId);
+
+					roleParts = role.split('.');
+					if (roleParts && roleParts.length < 1)
+						success = false;
+
+					roleObj = roleParts[0];
+					roleAct = roleParts.length >= 2 ? roleParts[1] : null
+
+					result = await this.validate(claim, null, roleObj, roleAct);
+					this._logger.debug('BaseSecurityService', 'authorizationCheckClaims', 'result', result, correlationId);
+					if (logical === BaseSecurityService.logicalOr)
+						success = success || result;
+					else
+						success = success && result;
+				}
 			}
-		}
 
-		return success;
+			return success;
+		}
+		catch (err) {
+			this._error('BaseSecurityService', 'authorizationCheckClaims', null, err, null, null, correlationId);
+			return false;
+		}
 	}
 
 	async authorizationCheckRoles(correlationId, user, roles, logical) {
-		if (!user)
-			return false;
-		if (!roles)
-			return true;
-
-		this._logger.debug('BaseSecurityService', 'authorizationCheckRoles', 'user', user, correlationId);
-		if (!(user && user.roles && Array.isArray(user.roles)))
-			return false;
-
-		this._logger.debug('BaseSecurityService', 'authorizationCheckRoles', 'logical', logical, correlationId);
-
-		if (String.isNullOrEmpty(logical) || (logical !== BaseSecurityService.logicalAnd) || (logical !== BaseSecurityService.logicalOr))
-			logical = BaseSecurityService.logicalOr;
-
-		let success = (logical === BaseSecurityService.logicalOr ? false : true);
-
-		let result;
-		let roleAct;
-		let roleObj;
-		let roleParts;
-		for (const userRole of user.roles) {
-			this._logger.debug('BaseSecurityService', 'authorizationCheckRoles', 'userRole', userRole, correlationId);
-
-			for (const role of roles) {
-				this._logger.debug('BaseSecurityService', 'authorizationCheckRoles', 'role', role, correlationId);
-
-				roleParts = role.split('.');
-				if (roleParts && roleParts.length < 1)
-					success = false;
-
-				roleObj = roleParts[0];
-				roleAct = roleParts.length >= 2 ? roleParts[1] : null
-
-				result = await this.validate(correlationId, userRole, null, roleObj, roleAct);
-				this._logger.debug('BaseSecurityService', 'authorizationCheckRoles', 'result', result, correlationId);
-				if (logical === BaseSecurityService.logicalOr) {
-					if (result)
-						return result;
-
-					success = false;
+		try {
+			if (!user)
+				return false;
+			if (!roles)
+				return true;
+
+			this._logger.debug('BaseSecurityService', 'authorizationCheckRoles', 'user', user, correlationId);
+			if (!(user && user.roles && Array.isArray(user.roles)))
+				return false;
+
+			this._logger.debug('BaseSecurityService', 'authorizationCheckRoles', 'logical', logical, correlationId);
+
+			if (String.isNullOrEmpty(logical) || (logical !== BaseSecurityService.logicalAnd) || (logical !== BaseSecurityService.logicalOr))
+				logical = BaseSecurityService.logicalOr;
+
+			let success = (logical === BaseSecurityService.logicalOr ? false : true);
+
+			let result;
+			let roleAct;
+			let roleObj;
+			let roleParts;
+			for (const userRole of user.roles) {
+				this._logger.debug('BaseSecurityService', 'authorizationCheckRoles', 'userRole', userRole, correlationId);
+
+				for (const role of roles) {
+					this._logger.debug('BaseSecurityService', 'authorizationCheckRoles', 'role', role, correlationId);
+
+					roleParts = role.split('.');
+					if (roleParts && roleParts.length < 1)
+						success = false;
+
+					roleObj = roleParts[0];
+					roleAct = roleParts.length >= 2 ? roleParts[1] : null
+
+					result = await this.validate(correlationId, userRole, null, roleObj, roleAct);
+					this._logger.debug('BaseSecurityService', 'authorizationCheckRoles', 'result', result, correlationId);
+					if (logical === BaseSecurityService.logicalOr) {
+						if (result)
+							return result;
+
+						success = false;
+					}
+					else
+						success = success && result;
 				}
-				else
-					success = success && result;
 			}
-		}
 
-		return success;
+			return success;
+		}
+		catch (err) {
+			this._error('BaseSecurityService', 'authorizationCheckRoles', null, err, null, null, correlationId);
+			return false;
+		}
 	}
 
 	initializeRoles(correlationId, requestRoles, roles) {
@@ -157,8 +169,7 @@ class BaseSecurityService extends Service {
 			array.push(act);
 
 		const role = array.join(':');
-		const results = await this._enforcer.can(sub, role);
-		return results;
+		return await this._enforcer.can(sub, role);
 	}
 
 	_initModel() {

package/service/config.js

@@ -6,25 +6,30 @@ class ServerConfigService extends ConfigService {
 	}
 
 	getBackend(key) {
-		if (String.isNullOrEmpty(key))
-			return null;
-
-		if (!this._config)
-			return null;
-
-		const configBackend = this._config.get('backend', null);
-		if (!configBackend)
-			return null;
-
-		if (!Array.isArray(configBackend))
-			return null;
-
-		key = key.toLowerCase();
-		for (const item of configBackend) {
-			if (item.key.toLowerCase() === key)
-				return item;
+		try {
+			if (String.isNullOrEmpty(key))
+				return null;
+	
+			if (!this._config)
+				return null;
+	
+			const configBackend = this._config.get('backend', null);
+			if (!configBackend)
+				return null;
+	
+			if (!Array.isArray(configBackend))
+				return null;
+	
+			key = key.toLowerCase();
+			for (const item of configBackend) {
+				if (item.key.toLowerCase() === key)
+					return item;
+			}
 		}
-
+		catch (err) {
+			this._error('ServerConfigService', 'getBackend', null, err, null, null, correlationId);
+		}
+	
 		return null;
 	}
 }

package/service/news/base.js

@@ -21,28 +21,34 @@ class BaseNewsService extends Service {
 
 	async latest(correlationId, user, timestamp) {
 		this._enforceNotEmpty('BaseNewsService', 'latest', timestamp, 'timestamp', correlationId);
+
 		try {
-			timestamp = parseInt(timestamp);
+			try {
+				timestamp = parseInt(timestamp);
+			}
+			catch (err) {
+				return this._error('BaseNewsService', 'latest', 'Invalid timestamp.', null, err, null, correlationId);
+			}
+	
+			const validationCheckNewsTiemstampResponse = this._serviceValidation.check(correlationId, this._serviceValidationNews.newsTimestampSchema, timestamp, null, 'news');
+			if (!validationCheckNewsTiemstampResponse.success)
+				return validationCheckNewsTiemstampResponse;
+	
+			const respositoryResponse = await this._repositoryNews.latest(correlationId, timestamp);
+			if (this._hasFailed(respositoryResponse))
+				return respositoryResponse;
+	
+			let data = respositoryResponse.results.data;
+			if (data)
+				data = data.filter(l => (l.requiresAuth && user) || !l.requiresAuth);
+			respositoryResponse.results.data = data;
+			respositoryResponse.results.count = data.length;
+	
+			return respositoryResponse;
 		}
 		catch (err) {
-			return this._error('BaseNewsService', 'latest', 'Invalid timestamp.', null, err, null, correlationId);
+			return this._error('BaseNewsService', 'latest', null, err, null, null, correlationId);
 		}
-
-		const validationCheckNewsTiemstampResponse = this._serviceValidation.check(correlationId, this._serviceValidationNews.newsTimestampSchema, timestamp, null, 'news');
-		if (!validationCheckNewsTiemstampResponse.success)
-			return validationCheckNewsTiemstampResponse;
-
-		const respositoryResponse = await this._repositoryNews.latest(correlationId, timestamp);
-		if (this._hasFailed(respositoryResponse))
-			return respositoryResponse;
-
-		let data = respositoryResponse.results.data;
-		if (data)
-			data = data.filter(l => (l.requiresAuth && user) || !l.requiresAuth);
-		respositoryResponse.results.data = data;
-		respositoryResponse.results.count = data.length;
-
-		return respositoryResponse;
 	}
 
 	get _repositoryNews() {

package/service/plans.js

@@ -16,8 +16,12 @@ class PlansService extends Service {
 	}
 
 	async listing(correlationId) {
-		const respositoryResponse = await this._repositoryPlans.listing(correlationId);
-		return respositoryResponse;
+		try {
+			return await this._repositoryPlans.listing(correlationId);
+		}
+		catch (err) {
+			return this._error('PlansService', 'correlationId', null, err, null, null, correlationId);
+		}
 	}
 
 	get _repositoryPlans() {

package/service/utility.js

@@ -8,6 +8,8 @@ import LibraryCommonUtility from '@thzero/library_common/utility/index.js';
 
 import Service from './index.js';
 
+import Response from '@thzero/library_common/response/index.js';
+
 class UtilityService extends Service {
 	constructor() {
 		super();
@@ -65,41 +67,50 @@ class UtilityService extends Service {
 			this._initializeResponse = response;
 			return response;
 		}
+		catch (err) {
+			return this._error('UtilityService', 'initialize', null, err, null, null, correlationId);
+		}
 		finally {
 			release();
 		}
 	}
 
 	async logger(content, correlationId) {
-		if (!content)
-			return this._error('UtilityService', 'logger');
-
-		const type = content.type;
-		switch(type) {
-			case 'DEBUG':
-				this._logger.debug('UtilityService', 'logger', content.message, content.data, correlationId, true);
-				break;
-			case 'ERROR':
-				this._logger.error('UtilityService', 'logger', content.message, content.data, correlationId, true);
-				break;
-			case 'EXCEPTION':
-				this._logger.exception('UtilityService', 'logger', content.ex, correlationId, true);
-				break;
-			case 'FATAL':
-				this._logger.fatal('UtilityService', 'logger', content.message, content.data, correlationId, true);
-				break;
-			case 'INFO':
-				this._logger.info('UtilityService', 'logger', content.message, content.data, correlationId, true);
-				break;
-			case 'TRACE':
-				this._logger.trace('UtilityService', 'logger', content.message, content.data, correlationId, true);
-				break;
-			case 'WARN':
-				this._logger.warn('UtilityService', 'logger', content.message, content.data, correlationId, true);
-				break;
+		try {
+			if (!content)
+				return this._error('UtilityService', 'logger');
+	
+			const type = content.type;
+			switch(type) {
+				case 'DEBUG':
+					this._logger.debug('UtilityService', 'logger', content.message, content.data, correlationId, true);
+					break;
+				case 'ERROR':
+					this._logger.error('UtilityService', 'logger', content.message, content.data, correlationId, true);
+					break;
+				case 'EXCEPTION':
+					this._logger.exception('UtilityService', 'logger', content.ex, correlationId, true);
+					break;
+				case 'FATAL':
+					this._logger.fatal('UtilityService', 'logger', content.message, content.data, correlationId, true);
+					break;
+				case 'INFO':
+					this._logger.info('UtilityService', 'logger', content.message, content.data, correlationId, true);
+					break;
+				case 'TRACE':
+					this._logger.trace('UtilityService', 'logger', content.message, content.data, correlationId, true);
+					break;
+				case 'WARN':
+					this._logger.warn('UtilityService', 'logger', content.message, content.data, correlationId, true);
+					break;
+			}
+	
+			return this._success(correlationId);
+		}
+		catch (err) {
+			console.log(`UtilityService.initialize - ${correlationId}`, err);
+			return Response.error('ServerConfigService', 'getBackend', null, err, null, null, correlationId);
 		}
-
-		return this._success(correlationId);
 	}
 	
 	async openSource(correlationId) {

package/service/version.js

@@ -5,16 +5,21 @@ import Service from './index.js';
 
 class VersionService extends Service {
 	async version(correlationId) {
-		const filePath = path.join(process.cwd(), 'package.json');
-		const file = fs.readFileSync(filePath, 'utf8');
-		if (String.isNullOrEmpty(file))
-			throw Error('Invalid package.json file for versioning; expected in the <app root> folder.');
-
-		const packageObj = JSON.parse(file);
-		if (!packageObj)
-			throw Error('Invalid package.json file for versioning.');
-
-		return this._generate(correlationId, packageObj.version_major, packageObj.version_minor, packageObj.version_patch, packageObj.version_date);
+		try {
+			const filePath = path.join(process.cwd(), 'package.json');
+			const file = fs.readFileSync(filePath, 'utf8');
+			if (String.isNullOrEmpty(file))
+				throw Error('Invalid package.json file for versioning; expected in the <app root> folder.');
+	
+			const packageObj = JSON.parse(file);
+			if (!packageObj)
+				throw Error('Invalid package.json file for versioning.');
+	
+			return this._generate(correlationId, packageObj.version_major, packageObj.version_minor, packageObj.version_patch, packageObj.version_date);
+		}
+		catch (err) {
+			return this._error('VersionService', 'version', null, err, null, null, correlationId);
+		}
 	}
 
 	_generate(correlationId, version_major, version_minor, version_patch, version_date) {