@thzero/library_server 0.18.10 → 0.18.12

package/boot/index.js

@@ -2,7 +2,7 @@ import { createTerminus } from '@godaddy/terminus';
 
 import config from 'config';
 
-import {internalIpV4} from '@thzero/library_server/utility/internalIp/index.js';
+import { internalIpV4 } from '@thzero/library_server/utility/internalIp/index.js';
 
 import LibraryServerConstants from '../constants.js';
 import LibraryCommonServiceConstants from '@thzero/library_common_service/constants.js';
@@ -75,6 +75,7 @@ class BootMain {
 		// https://github.com/lorenwest/node-config/wiki
 		this._appConfig = new configService(config.get('app'));
 
+		this._repositoriesPost = new Map();
 		this._servicesPost = new Map();
 
 		const plugins = this._determinePlugins(args);
@@ -90,17 +91,23 @@ class BootMain {
 
 		const results = await this._initApp(args, plugins);
 
-		function onSignal() {
-			this.loggerServiceI.info2(`server is starting cleanup`);
+		async function onSignal() {
+			console.log('server is starting cleanup');
+			this.loggerServiceI.info2('server is starting cleanup');
 			const cleanupFuncs = [];
 			this._initCleanup(cleanupFuncs);
 			this._initCleanupDiscovery(cleanupFuncs);
-			return Promise.all(cleanupFuncs);
+			await Promise.all(cleanupFuncs);
+			console.log('server is starting cleanup completed');
+			this.loggerServiceI.info2('server is starting cleanup completed');
 		}
 
-		function onShutdown() {
+		async function onShutdown() {
+			console.log('server is shutting down');
+			this.loggerServiceI.info2('server is shutting down');
 			this._initShutdown();
-			this.loggerServiceI.info2(`cleanup finished, server is shutting down`);
+			console.log('server is shutting down completed');
+			this.loggerServiceI.info2('server is shutting down completed');
 		}
 
 		function healthCheck() {
@@ -129,7 +136,7 @@ class BootMain {
 			healthChecks: healthCheckOptions,
 
 			// cleanup options
-			signals: [ 'SIGINT', 'SIGTERM' ],
+			signals: [ 'SIGINT', 'SIGTERM', 'SIGQUIT', 'SIGKILL' ],
 			onSignal: onSignal.bind(this), // [optional] cleanup function, returning a promise (used to be onSigterm)
 			onShutdown: onShutdown.bind(this) // [optional] called right before exiting
 		};
@@ -153,15 +160,39 @@ class BootMain {
 		// 	this.address = await internalIpV4();
 
 		await this._initServer(results.server);
+		
+		console.log('----repositories.init.post-------------');
+
+		for (const [key, value] of this._repositoriesPost) {
+			if (value.initPost) {
+				console.log(`repositories.init.post - ${key}`);
+				await value.initPost();
+			}
+		}
+		
+		console.log('----repositories.init.post.complete----');
+		console.log();
+		
+		console.log('----services.init.post-----------------');
 
 		for (const [key, value] of this._servicesPost) {
-			console.log(`services.init.post - ${key}`);
-			if (value.initPost)
+			if (value.initPost) {
+				console.log(`services.init.post - ${key}`);
 				await value.initPost();
+			}
 		}
-		this._initAppPost(results.app, args);
+		
+		console.log('----services.init.post.complete--------');
+		console.log();
+		
+		console.log('----services.init.app.post-------------');
 
+		this._initAppPost(results.app, args);
+		
+		console.log('----services.init.app.post.complete----');
 		console.log();
+
+		console.log('----server.startup.config--------------');
 		this.ip = this._appConfig.get('ip', null);
 		console.log(`config.ip.override: ${this.ip}`);
 		this.port = this._appConfig.get('port');
@@ -169,14 +200,13 @@ class BootMain {
 		console.log(`process.env.PORT: ${process.env.PORT}`);
 		this.port = process.env.PORT || this.port;
 		console.log(`selected.port: ${this.port}`);
-		console.log();
 
 		const self = this;
 		const listen = async (port, address) => new Promise((resolve, reject) => {
 			self._initAppListen(results.app, results.server, address, port, (err) => {
 				if (err) {
 					reject(err);
-					return;
+					process.exit(1);
 				}
 
 				resolve();
@@ -190,6 +220,9 @@ class BootMain {
 		console.log();
 		console.log(`Starting HTTP on: ${this.address}:${this.port}`);
 
+		console.log('----server.startup.config.complete-----');
+		console.log();
+
 		await this._initServerDiscovery();
 
 		await this._initServerStart(injector);
@@ -241,14 +274,21 @@ class BootMain {
 
 			this._repositories = new Map();
 
+			console.log();
+			console.log('----repository.injection-------------------------');
 			for (const pluginRepository of plugins)
 				await pluginRepository.initRepositories(this._repositories);
 
 			await this._initRepositories();
+
 			this._injectRepository(LibraryServerConstants.InjectorKeys.REPOSITORY_USAGE_METRIC, this._initRepositoriesUsageMetrics());
 
+			console.log('----repository.injection.complete----------------');
+			console.log();
+
 			this._services = new Map();
 
+			console.log('----services.injection---------------------------');
 			this.loggerServiceI = this._initServicesLogger();
 			this._initServicesLoggers();
 			this._injectService(LibraryCommonServiceConstants.InjectorKeys.SERVICE_LOGGER, this.loggerServiceI);
@@ -274,11 +314,21 @@ class BootMain {
 
 			await this._initServices();
 
+			console.log('----services.injection.complete------------------');
+			console.log();
+
+			console.log('----repositories.injection.init------------------');
 			for (const [key, value] of this._repositories) {
 				console.log(`repositories.init - ${key}`);
 				await value.init(injector);
+
+				this._repositoriesPost.set(key, value);
 			}
 
+			console.log('----repositories.injection.init.complete---------');
+			console.log();
+
+			console.log('----services.injection.init----------------------');
 			for (const [key, value] of this._services) {
 				console.log(`services.init - ${key}`);
 				await value.init(injector);
@@ -286,13 +336,22 @@ class BootMain {
 				this._servicesPost.set(key, value);
 			}
 
+			console.log('----services.injection.init.complete-------------');
+			console.log();
+
 			this._services = new Map();
 
+			console.log('----services.injection.secondary-----------------');
 			await this._initServicesSecondary();
 
 			for (const pluginService of plugins)
 				await pluginService.initServicesSecondary(this._services);
 
+			console.log('----services.injection.secondary.complete--------');
+			console.log();
+
+			console.log('----services.injection.initsecondary-------------');
+
 			for (const [key, value] of this._services) {
 				if (value.initialized)
 					continue;
@@ -303,6 +362,9 @@ class BootMain {
 				this._servicesPost.set(key, value);
 			}
 
+			console.log('----services.injection.initsecondary.complete----');
+			console.log();
+
 			LibraryMomentUtility.initDateTime();
 		}
 		finally {
@@ -435,17 +497,7 @@ class BootMain {
 		await this.resourceDiscoveryServiceI.initializeDiscovery(await this._initServerDiscoveryOptsResources(opts));
 	}
 
-	async _initServerStart() {
-		for(const service of injector.getServices()) {
-			if (service.dependency) {
-				if (service.dependency && service.dependency.initialize) {
-					if (service.dependency.initialize.length === 0) {
-						console.log(`services.initialize - ${service.key}`);
-						await service.dependency.initialize();
-					}
-				}
-			}
-		}
+	async _initServerStart(injector) {
 	}
 
 	_injectRepository(key, repository) {

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@thzero/library_server",
   "type": "module",
-  "version": "0.18.10",
+  "version": "0.18.12",
   "version_major": 0,
   "version_minor": 18,
-  "version_patch": 10,
-  "version_date": "04/23/2024",
+  "version_patch": 12,
+  "version_date": "05/01/2024",
   "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/service/utility.js

@@ -129,7 +129,8 @@ class UtilityService extends Service {
 			const dir = path.join(path.resolve(__dirname), 'node_modules', '@thzero');
 			const dirs = await fs.promises.readdir(dir);
 	
-			console.log(`\tOpenSource...`);
+			console.log();
+			console.log('\t----open.source.initialization-----------------');
 			
 			let file;
 			let importPath;
@@ -145,7 +146,7 @@ class UtilityService extends Service {
 					}
 						
 					importPath = ['@thzero', item, 'openSource.js'].join('/');
-					console.log(`\t${importPath}...`);
+					console.log(`\t\t${importPath}...`);
 					fileI = await import(importPath);
 					if (!fileI.default) {
 						console.log(`\t...failed to load.`);
@@ -172,7 +173,8 @@ class UtilityService extends Service {
 			this._logger.warn('UtilityService', '_initializeOopenSource', null, err, correlationId);
 		}
 		finally {
-			console.log(`\t...OpenSource`);
+			console.log('\t----open.source.initialization.complete--------');
+			console.log();
 		}
 
 		// response.results = await this._openSourceServer(correlationId);