Studio CLI: Fix Windows E2E tests

cli/commands/site/create.ts

@@ -331,7 +331,7 @@ export async function runCommand(
 		logger.reportKeyValuePair( 'id', siteDetails.id );
 		logger.reportKeyValuePair( 'running', String( siteDetails.running ) );
 	} finally {
-		disconnect();
+		await disconnect();
 	}
 }
 

cli/commands/site/delete.ts

@@ -65,14 +65,14 @@ export async function runCommand(
 	deleteFiles: boolean = false
 ): Promise< void > {
 	try {
-		logger.reportStart( LoggerAction.LOAD_SITES, __( 'Loading site…' ) );
-		const site = await getSiteByFolder( siteFolder );
-		logger.reportSuccess( __( 'Site loaded' ) );
-
 		logger.reportStart( LoggerAction.START_DAEMON, __( 'Starting process daemon…' ) );
 		await connect();
 		logger.reportSuccess( __( 'Process daemon started' ) );
 
+		logger.reportStart( LoggerAction.LOAD_SITES, __( 'Loading site…' ) );
+		const site = await getSiteByFolder( siteFolder );
+		logger.reportSuccess( __( 'Site loaded' ) );
+
 		const runningProcess = await isServerRunning( site.id );
 		if ( runningProcess ) {
 			logger.reportStart( LoggerAction.STOP_SITE, __( 'Stopping WordPress server…' ) );
@@ -126,7 +126,7 @@ export async function runCommand(
 			logger.reportSuccess( __( 'Site files deleted' ) );
 		}
 	} finally {
-		disconnect();
+		await disconnect();
 	}
 }
 

cli/commands/site/list.ts

@@ -2,7 +2,7 @@ import { __, _n, sprintf } from '@wordpress/i18n';
 import Table from 'cli-table3';
 import { SiteCommandLoggerAction as LoggerAction } from 'common/logger-actions';
 import { getSiteUrl, readAppdata, type SiteData } from 'cli/lib/appdata';
-import { connect, disconnect } from 'cli/lib/pm2-manager';
+import { connect, disconnect, subscribePm2KillEvent } from 'cli/lib/pm2-manager';
 import { getColumnWidths, getPrettyPath } from 'cli/lib/utils';
 import { isServerRunning, subscribeSiteEvents } from 'cli/lib/wordpress-server-manager';
 import { Logger, LoggerError } from 'cli/logger';
@@ -126,10 +126,24 @@ export async function runCommand( format: 'table' | 'json', watch: boolean ): Pr
 				},
 				{ debounceMs: 500 }
 			);
+
+			await subscribePm2KillEvent( () => {
+				for ( const site of sitesData ) {
+					const payload = {
+						siteId: site.id,
+						status: 'stopped',
+						url: site.url,
+					};
+					logger.reportKeyValuePair( 'site-status', JSON.stringify( payload ) );
+				}
+			} );
+
+			process.on( 'SIGINT', disconnect );
+			process.on( 'SIGTERM', disconnect );
 		}
 	} finally {
 		if ( ! watch ) {
-			disconnect();
+			await disconnect();
 		}
 	}
 }

cli/commands/site/set.ts

@@ -246,7 +246,7 @@ export async function runCommand(
 
 		return { usedWpCli: wpChanged };
 	} finally {
-		disconnect();
+		await disconnect();
 	}
 }
 

cli/commands/site/start.ts

@@ -12,14 +12,14 @@ const logger = new Logger< LoggerAction >();
 
 export async function runCommand( sitePath: string, skipBrowser = false ): Promise< void > {
 	try {
-		logger.reportStart( LoggerAction.LOAD_SITES, __( 'Loading site…' ) );
-		const site = await getSiteByFolder( sitePath );
-		logger.reportSuccess( __( 'Site loaded' ) );
-
 		logger.reportStart( LoggerAction.START_DAEMON, __( 'Starting process daemon…' ) );
 		await connect();
 		logger.reportSuccess( __( 'Process daemon started' ) );
 
+		logger.reportStart( LoggerAction.LOAD_SITES, __( 'Loading site…' ) );
+		const site = await getSiteByFolder( sitePath );
+		logger.reportSuccess( __( 'Site loaded' ) );
+
 		const runningProcess = await isServerRunning( site.id );
 		if ( runningProcess ) {
 			logger.reportSuccess( __( 'WordPress server is already running' ) );
@@ -60,7 +60,7 @@ export async function runCommand( sitePath: string, skipBrowser = false ): Promi
 			throw new LoggerError( __( 'Failed to start WordPress server' ), error );
 		}
 	} finally {
-		disconnect();
+		await disconnect();
 	}
 }
 

cli/commands/site/status.ts

@@ -13,12 +13,14 @@ const logger = new Logger< LoggerAction >();
 
 export async function runCommand( siteFolder: string, format: 'table' | 'json' ): Promise< void > {
 	try {
+		logger.reportStart( LoggerAction.START_DAEMON, __( 'Starting process daemon…' ) );
+		await connect();
+		logger.reportSuccess( __( 'Process daemon started' ) );
+
 		logger.reportStart( LoggerAction.LOAD_SITES, __( 'Loading site…' ) );
 		const site = await getSiteByFolder( siteFolder );
 		logger.reportSuccess( __( 'Site loaded' ) );
 
-		await connect();
-
 		const isOnline = Boolean( await isServerRunning( site.id ) );
 		const status = isOnline ? `🟢 ${ __( 'Online' ) }` : `🔴 ${ __( 'Offline' ) }`;
 		const siteUrl = getSiteUrl( site );
@@ -74,7 +76,7 @@ export async function runCommand( siteFolder: string, format: 'table' | 'json' )
 			console.log( JSON.stringify( logData, null, 2 ) );
 		}
 	} finally {
-		disconnect();
+		await disconnect();
 	}
 }
 

cli/commands/site/stop.ts

@@ -3,11 +3,14 @@ import { SiteCommandLoggerAction as LoggerAction } from 'common/logger-actions';
 import {
 	clearSiteLatestCliPid,
 	getSiteByFolder,
+	lockAppdata,
 	readAppdata,
+	saveAppdata,
+	unlockAppdata,
 	updateSiteAutoStart,
 	type SiteData,
 } from 'cli/lib/appdata';
-import { connect, disconnect } from 'cli/lib/pm2-manager';
+import { connect, disconnect, killDaemonAndAllChildren } from 'cli/lib/pm2-manager';
 import { stopProxyIfNoSitesNeedIt } from 'cli/lib/site-utils';
 import { isServerRunning, stopWordPressServer } from 'cli/lib/wordpress-server-manager';
 import { Logger, LoggerError } from 'cli/logger';
@@ -38,92 +41,76 @@ export async function runCommand(
 	try {
 		await connect();
 
-		const sitesToTarget: SiteData[] = [];
-
 		if ( target === Mode.STOP_SINGLE_SITE && siteFolder ) {
 			const site = await getSiteByFolder( siteFolder );
-			sitesToTarget.push( site );
-
 			const runningProcess = await isServerRunning( site.id );
 			if ( ! runningProcess ) {
 				logger.reportSuccess( __( 'WordPress server is not running' ) );
 				return;
 			}
 
-			logger.reportStart( LoggerAction.STOP_SITE, __( 'Stopping WordPress server…' ) );
+			logger.reportStart( LoggerAction.STOP_SITE, __( 'Stopping WordPress servers…' ) );
+
+			try {
+				await stopWordPressServer( site.id );
+				await clearSiteLatestCliPid( site.id );
+				await updateSiteAutoStart( site.id, autoStart );
+				logger.reportSuccess( __( 'WordPress server stopped' ) );
+				await stopProxyIfNoSitesNeedIt( site.id, logger );
+			} catch ( error ) {
+				throw new LoggerError( __( 'Failed to stop WordPress server' ), error );
+			}
 		} else {
 			const appdata = await readAppdata();
+			const runningSites: SiteData[] = [];
 
 			for ( const site of appdata.sites ) {
 				const runningProcess = await isServerRunning( site.id );
 
 				if ( runningProcess ) {
-					sitesToTarget.push( site );
+					runningSites.push( site );
 				}
 			}
 
-			if ( ! sitesToTarget.length ) {
+			if ( ! runningSites.length ) {
 				logger.reportSuccess( __( 'No sites are currently running' ) );
 				return;
 			}
 
-			logger.reportStart( LoggerAction.STOP_ALL_SITES, __( 'Stopping all WordPress sites...' ) );
-		}
-
-		const stoppedSiteIds: string[] = [];
+			logger.reportStart( LoggerAction.STOP_ALL_SITES, __( 'Stopping all WordPress servers…' ) );
+			await killDaemonAndAllChildren();
 
-		for ( const site of sitesToTarget ) {
 			try {
-				logger.reportProgress(
-					sprintf(
-						__( 'Stopping site "%s" (%d/%d)…' ),
-						site.name,
-						stoppedSiteIds.length + 1,
-						sitesToTarget.length
-					)
-				);
-				await stopWordPressServer( site.id );
-				await clearSiteLatestCliPid( site.id );
-				await updateSiteAutoStart( site.id, autoStart );
-
-				stoppedSiteIds.push( site.id );
-			} catch ( error ) {
-				logger.reportError(
-					new LoggerError( sprintf( __( 'Failed to stop site %s' ), site.name ) )
-				);
+				await lockAppdata();
+				const appdata = await readAppdata();
+				for ( const site of appdata.sites ) {
+					if ( runningSites.find( ( r ) => r.id === site.id ) ) {
+						delete site.latestCliPid;
+						site.autoStart = autoStart;
+					}
+				}
+				await saveAppdata( appdata );
+			} finally {
+				await unlockAppdata();
 			}
-		}
-
-		try {
-			await stopProxyIfNoSitesNeedIt( stoppedSiteIds, logger );
-		} catch ( error ) {
-			throw new LoggerError( __( 'Failed to stop proxy server' ), error );
-		}
 
-		if ( stoppedSiteIds.length === sitesToTarget.length ) {
 			logger.reportSuccess(
 				sprintf(
 					_n(
 						'Successfully stopped %d site',
 						'Successfully stopped %d sites',
-						sitesToTarget.length
+						runningSites.length
 					),
-					sitesToTarget.length
-				)
-			);
-		} else if ( stoppedSiteIds.length === 0 && sitesToTarget.length === 0 ) {
-			throw new LoggerError( __( 'Failed to stop site' ) );
-		} else {
-			throw new LoggerError(
-				sprintf(
-					_n( 'Stopped %d site out of %d', 'Stopped %d sites out of %d', stoppedSiteIds.length ),
-					stoppedSiteIds.length,
-					sitesToTarget.length
+					runningSites.length
 				)
 			);
+
+			// Calling `pm2.killDaemon` requires us to forcefully exit the process. pm2 does the same
+			// thing internally in its CLI.
+			process.exit( 0 );
 		}
 	} finally {
-		disconnect();
+		await disconnect();
 	}
 }