Moved window mgmt to util file

Author: benjaminbojko

packages/monitor/lib/launchpad-monitor.js

@@ -6,14 +6,13 @@ import chalk from 'chalk';
 import autoBind from 'auto-bind';
 import pDebounce from 'p-debounce';
 import pm2 from 'pm2';
-import semver from 'semver';
 import { spawn } from 'cross-spawn';
 import { SubEmitterSocket } from 'axon'; // used by PM2
-import { windowManager } from 'node-window-manager';
 
 import { LogManager, Logger } from '@bluecadet/launchpad-utils';
 import AppLogRouter from './app-log-router.js';
 import { AppLogOptions, MonitorOptions, WindowOptions } from './monitor-options.js';
+import sortWindows, { SortApp } from './utils/sort-windows.js';
 
 export class LaunchpadMonitor {
 	/** @type {MonitorOptions} */
@@ -388,71 +387,25 @@ export class LaunchpadMonitor {
 	 * @returns {Promise}
 	 */
 	async _applyWindowSettings(appNames = null) {
-		const currVersion = process.version;
-		const requVersion = this._config.windowsApi.nodeVersion;
-		
-		if (!semver.satisfies(currVersion, requVersion)) {
-			this._logger.warn(`Not applying window settings since your node version '${currVersion}' doesn't satisfy the required version '${requVersion}'. Please upgrade node to apply window settings like foreground/minimize/hide.`);
-			return;
-		}
-		
 		appNames = this._validateAppNames(appNames);
-		
-		this._logger.info(`Applying window settings to ${appNames.length} ${appNames.length === 1 ? 'app' : 'apps'}`);
-
-		
-		const fgPids = new Set();
-		const minPids = new Set();
-		const hidePids = new Set();
-		
-		windowManager.requestAccessibility();
-		const visibleWindows = windowManager.getWindows().filter(win => win.isVisible());
-		const visiblePids = new Set(visibleWindows.map(win => win.processId));
+		const apps = [];
 
 		for (const appName of appNames) {
-			const appOptions = this.getAppOptions(appName);
-			const winOptions = appOptions.windows;
-			const appProcess = await this.getAppProcess(appName);
-			
-			if (!appProcess || appProcess.pm2_env.status !== 'online') {
-				this._logger.warn(`Not applying window settings to ${chalk.blue(appName)} because it's not online.`);
-				continue;
-			}
+			const sortApp = new SortApp();
+			sortApp.options = this.getAppOptions(appName);
 
-			if (!visiblePids.has(appProcess.pid)) {
-				this._logger.warn(`No window found for ${chalk.blue(appName)} with pid ${chalk.blue(appProcess.pid)}.`);
+			try {
+				const process = await this.getAppProcess(appName);
+				sortApp.pid = process.pid;
+			} catch (error) {
+				this._logger.error(`Could not get process for app ${appName}`);
 				continue;
 			}
 
-			if (winOptions.hide) {
-				hidePids.add(appProcess.pid);
-			}
-			if (winOptions.minimize) {
-				minPids.add(appProcess.pid);
-			}
-			if (winOptions.foreground) {
-				fgPids.add(appProcess.pid);
-			}
+			apps.push(sortApp);
 		}
 
-		visibleWindows.filter(win => hidePids.has(win.processId)).forEach(win => {
-			this._logger.info(`Hiding ${chalk.blue(win.getTitle())} (pid: ${chalk.blue(win.processId)})`);
-			win.hide();
-		});
-		visibleWindows.filter(win => minPids.has(win.processId)).forEach(win => {
-			this._logger.info(`Minimizing ${chalk.blue(win.getTitle())} (pid: ${chalk.blue(win.processId)})`);
-			win.minimize();
-		});
-		visibleWindows.filter(win => fgPids.has(win.processId)).forEach(win => {
-			this._logger.info(`Foregrounding ${chalk.blue(win.getTitle())} (pid: ${chalk.blue(win.processId)})`);
-			win.bringToTop();
-		});
-		
-		this._logger.debug(`✅ Done applying window settings.`);
-	}
-	
-	_isWindowsOS() {
-		return process.platform === 'win32';
+		return sortWindows(apps, this._logger, this._config.windowsApi.nodeVersion);
 	}
 
 	async _connectPm2Bus() {

packages/monitor/lib/utils/sort-windows.js

@@ -0,0 +1,74 @@
+import semver from 'semver';
+import chalk from 'chalk';
+import { windowManager } from 'node-window-manager';
+import { Logger } from '@bluecadet/launchpad-utils';
+import { AppOptions } from '../monitor-options.js';
+
+export class SortApp {
+	/**
+	 * @type {AppOptions}
+	 */
+	options = null;
+	/**
+	 * @type {number}
+	 */
+	pid = null;
+}
+
+/**
+ * 
+ * @param {Array.<SortApp>} apps 
+ * @param {Logger} logger
+ * @param {string} minNodeVersion
+ * @returns 
+ */
+const sortWindows = async (apps, logger = console, minNodeVersion = undefined) => {
+	const currNodeVersion = process.version;
+	if (!semver.satisfies(currNodeVersion, minNodeVersion)) {
+		return Promise.reject(`Can't sort windows because the current node version '${currNodeVersion}' doesn't satisfy the required version '${minNodeVersion}'. Please upgrade node to apply window settings like foreground/minimize/hide.`);
+	}
+	
+	logger.debug(`Applying window settings to ${apps.length} ${apps.length === 1 ? 'app' : 'apps'}`);
+
+	const fgPids = new Set();
+	const minPids = new Set();
+	const hidePids = new Set();
+	
+	windowManager.requestAccessibility();
+	const visibleWindows = windowManager.getWindows().filter(win => win.isVisible());
+	const visiblePids = new Set(visibleWindows.map(win => win.processId));
+	
+	for (const app of apps) {
+		if (!visiblePids.has(app.pid)) {
+			logger.warn(`No window found for ${chalk.blue(app.options.pm2.name)} with pid ${chalk.blue(app.pid)}.`);
+			continue;
+		}
+		
+		if (app.options.windows.hide) {
+			hidePids.add(app.pid);
+		}
+		if (app.options.windows.minimize) {
+			minPids.add(app.pid);
+		}
+		if (app.options.windows.foreground) {
+			fgPids.add(app.pid);
+		}
+	}
+	
+	visibleWindows.filter(win => hidePids.has(win.processId)).forEach(win => {
+		logger.info(`Hiding ${chalk.blue(win.getTitle())} (pid: ${chalk.blue(win.processId)})`);
+		win.hide();
+	});
+	visibleWindows.filter(win => minPids.has(win.processId)).forEach(win => {
+		logger.info(`Minimizing ${chalk.blue(win.getTitle())} (pid: ${chalk.blue(win.processId)})`);
+		win.minimize();
+	});
+	visibleWindows.filter(win => fgPids.has(win.processId)).forEach(win => {
+		logger.info(`Foregrounding ${chalk.blue(win.getTitle())} (pid: ${chalk.blue(win.processId)})`);
+		win.bringToTop();
+	});
+	
+	logger.debug(`Done applying window settings.`);
+};
+
+export default sortWindows;