Finalize commander move

Author: rinatkhaziev

src/bin/vip-dev-env-exec.js

@@ -17,6 +17,26 @@ import UserError from '../lib/user-error';
 
 const exampleUsage = 'vip dev-env exec';
 const usage = 'vip dev-env exec';
+const ENV_UP_CHECK_ATTEMPTS = 5;
+const ENV_UP_CHECK_DELAY_MS = 1500;
+
+const sleep = ms => new Promise( resolve => setTimeout( resolve, ms ) );
+
+async function waitForEnvironmentReadiness( lando, slug ) {
+	const instancePath = getEnvironmentPath( slug );
+
+	for ( let attempt = 1; attempt <= ENV_UP_CHECK_ATTEMPTS; attempt++ ) {
+		if ( await isEnvUp( lando, instancePath ) ) {
+			return true;
+		}
+
+		if ( attempt < ENV_UP_CHECK_ATTEMPTS ) {
+			await sleep( ENV_UP_CHECK_DELAY_MS );
+		}
+	}
+
+	return false;
+}
 
 const examples = [
 	{
@@ -80,7 +100,7 @@ command( {
 			}
 
 			if ( ! opt.force ) {
-				const isUp = await isEnvUp( lando, getEnvironmentPath( slug ) );
+				const isUp = await waitForEnvironmentReadiness( lando, slug );
 				if ( ! isUp ) {
 					throw new UserError(
 						'A WP-CLI command can only be executed on a running local environment.'

src/lib/cli/command.js

@@ -38,6 +38,7 @@ process.on( 'unhandledRejection', uncaughtError );
 let _opts = {};
 
 let alreadyConfirmedDebugAttachment = false;
+const RESERVED_AUTO_SHORT_ALIASES = new Set( [ 'h', 'v', 'd' ] );
 
 function normalizeUsage( program, usage ) {
 	if ( ! usage ) {
@@ -57,12 +58,29 @@ function normalizeUsage( program, usage ) {
 	}
 }
 
-function createOptionDefinition( name, description, defaultValue, parseFn ) {
+function createOptionDefinition( name, description, defaultValue, parseFn, usedShortNames ) {
 	const isArray = Array.isArray( name );
 	const shortName = isArray ? name[ 0 ] : null;
 	const longName = isArray ? name[ 1 ] : name;
 	const normalizedLongName = String( longName ).trim().replace( /^--?/, '' );
-	const normalizedShortName = shortName ? String( shortName ).trim().replace( /^-/, '' ) : null;
+	const explicitShortName = shortName ? String( shortName ).trim().replace( /^-/, '' ) : null;
+	let normalizedShortName = explicitShortName;
+
+	if ( ! normalizedShortName ) {
+		const autoShortName = normalizedLongName.charAt( 0 );
+		const canUseAutoShortName =
+			autoShortName &&
+			! RESERVED_AUTO_SHORT_ALIASES.has( autoShortName ) &&
+			! usedShortNames.has( autoShortName );
+
+		if ( canUseAutoShortName ) {
+			normalizedShortName = autoShortName;
+		}
+	}
+
+	if ( normalizedShortName ) {
+		usedShortNames.add( normalizedShortName );
+	}
 	const isBooleanOption = typeof defaultValue === 'boolean';
 	const usesOptionalValue = ! isBooleanOption;
 	const parseOptionValue = value => {
@@ -113,6 +131,7 @@ class CommanderArgsCompat {
 		};
 		this.sub = [];
 		this.examplesList = [];
+		this.usedShortNames = new Set();
 		this._opts = opts;
 		this.program = new Command();
 		this.program.allowUnknownOption( true );
@@ -122,7 +141,13 @@ class CommanderArgsCompat {
 	}
 
 	option( name, description, defaultValue, parseFn ) {
-		const definition = createOptionDefinition( name, description, defaultValue, parseFn );
+		const definition = createOptionDefinition(
+			name,
+			description,
+			defaultValue,
+			parseFn,
+			this.usedShortNames
+		);
 		const { flags, parser } = definition;
 
 		if ( parser && defaultValue !== undefined ) {

src/lib/dev-environment/dev-environment-core.ts

@@ -28,6 +28,7 @@ import {
 	LandoLogsOptions,
 	LandoExecOptions,
 	getProxyContainer,
+	isEnvUp,
 	removeProxyCache,
 } from './dev-environment-lando';
 import { AppEnvironment } from '../../graphqlTypes';
@@ -99,6 +100,25 @@ interface WordPressTag {
 	prerelease: boolean;
 }
 
+const STARTUP_READY_ATTEMPTS = 6;
+const STARTUP_READY_DELAY_MS = 2000;
+
+const sleep = ( ms: number ): Promise< void > => new Promise( resolve => setTimeout( resolve, ms ) );
+
+async function waitForEnvironmentToBeUp( lando: Lando, instancePath: string ): Promise< boolean > {
+	for ( let attempt = 1; attempt <= STARTUP_READY_ATTEMPTS; attempt++ ) {
+		if ( await isEnvUp( lando, instancePath ) ) {
+			return true;
+		}
+
+		if ( attempt < STARTUP_READY_ATTEMPTS ) {
+			await sleep( STARTUP_READY_DELAY_MS );
+		}
+	}
+
+	return false;
+}
+
 export interface PostStartOptions {
 	openVSCode: boolean;
 	openCursor: boolean;
@@ -141,6 +161,21 @@ export async function startEnvironment(
 		await landoRebuild( lando, instancePath );
 	}
 
+	let isEnvironmentUp = await waitForEnvironmentToBeUp( lando, instancePath );
+	if ( ! isEnvironmentUp ) {
+		// A second startup pass helps recover after Docker network auto-cleanup edge cases.
+		await landoStart( lando, instancePath );
+		isEnvironmentUp = await waitForEnvironmentToBeUp( lando, instancePath );
+	}
+
+	if ( ! isEnvironmentUp ) {
+		throw new UserError(
+			`Environment "${ slug }" did not reach a running state. Please try "${ chalk.bold(
+				`vip dev-env start --slug ${ slug }`
+			) }" again.`
+		);
+	}
+
 	await printEnvironmentInfo( lando, slug, { extended: false } );
 }