Added shutdownOnExit option; moved onExit to core

Author: benjaminbojko

packages/launchpad/index.js

@@ -4,7 +4,7 @@ import { LaunchpadCore } from './lib/launchpad-core.js';
 import { launch as launchContent } from '@bluecadet/launchpad-content';
 import { launch as launchMonitor, LaunchpadMonitor } from '@bluecadet/launchpad-monitor';
 import { launch as launchScaffold } from '@bluecadet/launchpad-scaffold';
-import { launchFromCli, onExit } from '@bluecadet/launchpad-utils';
+import { launchFromCli } from '@bluecadet/launchpad-utils';
 
 export default LaunchpadCore;
 
@@ -45,10 +45,6 @@ launchFromCli(import.meta, {
 }).then(async config => {
 	const launchpad = new LaunchpadCore(config);
 
-	onExit(async () => {
-		await launchpad.shutdown();
-	});
-	
 	switch (config.startupCommand) {
 		case StartupCommands.SCAFFOLD: {
 			await launchScaffold(config);

packages/launchpad/lib/launchpad-core.js

@@ -5,7 +5,7 @@
 import autoBind from 'auto-bind';
 
 import LaunchpadOptions from './launchpad-options.js';
-import { LogManager, Logger } from '@bluecadet/launchpad-utils';
+import { LogManager, Logger, onExit } from '@bluecadet/launchpad-utils';
 import LaunchpadContent from '@bluecadet/launchpad-content';
 import LaunchpadMonitor from '@bluecadet/launchpad-monitor';
 import CommandCenter, { Command } from './command-center.js';
@@ -55,6 +55,10 @@ export class LaunchpadCore {
 		this._commands.add(new Command({name: 'update-content', callback: this._runUpdateContent}));
 
 		this._commands.addCommandHooks(this._config.hooks);
+		
+		if (this._config.shutdownOnExit) {
+			onExit(this.shutdown);
+		}
 	}
 
 	/**

packages/launchpad/lib/launchpad-options.js

@@ -18,9 +18,17 @@ export class LaunchpadOptions {
 		commands = new CommandOptions(),
 		hooks = new CommandHooks(),
 		logging = new LogOptions(),
+		shutdownOnExit = true,
 		...rest
 	} = {}) {
 
+		/**
+		 * Will listen for exit events 
+		 * @type {boolean}
+		 * @default true
+		 */
+		this.shutdownOnExit = true;
+		
 		/**
 		 * @type {ContentOptions}
 		 */

packages/launchpad/test/test.js

@@ -1,5 +1,5 @@
 import LaunchpadCore from '@bluecadet/launchpad';
-import { ConfigManager, launchFromCli } from '@bluecadet/launchpad-utils';
+import { ConfigManager, launchFromCli, onExit } from '@bluecadet/launchpad-utils';
 
 const getConfig = async (paths = ['user-config.js', 'config.js']) => {
 	return ConfigManager.importJsConfig(paths, import.meta);
@@ -17,17 +17,21 @@ launchFromCli(import.meta, {
 
 	await launchpad.startup();
 
-	const appNames = launchpad._monitor.getAllAppNames();
-	await Promise.all([...appNames, 'fake-app'].map(async (appName) => {
-		const isRunning = await launchpad._monitor.isRunning(appName);
-		console.debug(`App '${appName}' is running: ${isRunning}`);
-	}));
+	// const appNames = launchpad._monitor.getAllAppNames();
+	// await Promise.all([...appNames, 'fake-app'].map(async (appName) => {
+	// 	const isRunning = await launchpad._monitor.isRunning(appName);
+	// 	console.debug(`App '${appName}' is running: ${isRunning}`);
+	// }));
 
-	await wait(10);
-	await launchpad.updateContent();
+	// onExit(async () => {
+	// 	await launchpad.shutdown();
+  // });
 
-	await wait(10);
-	await launchpad.shutdown();
+	// await wait(10);
+	// await launchpad.updateContent();
+	
+	// await wait(10);
+	// await launchpad.shutdown();
 
 }).catch(err => {
 	if (err) {