refactor: start DNS resolution early

Author: sjinks

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

@@ -105,6 +105,7 @@ cmd.examples( examples ).argv( process.argv, async ( arg, opt ) => {
 		skipWpVersionsCheck: Boolean( opt.skipWpVersionsCheck ),
 		autofixDomains: Boolean( opt.autofixDomainResolution ),
 	};
+
 	try {
 		await startEnvironment( lando, slug, options );
 

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

@@ -137,15 +137,12 @@ export async function startEnvironment(
 	}
 
 	if ( options.skipRebuild && ! updated ) {
-		await landoStart( lando, instancePath );
+		await landoStart( lando, instancePath, options.autofixDomains );
 	} else {
-		await landoRebuild( lando, instancePath );
+		await landoRebuild( lando, instancePath, options.autofixDomains );
 	}
 
-	await printEnvironmentInfo( lando, slug, {
-		extended: false,
-		autofixDomains: options.autofixDomains,
-	} );
+	await printEnvironmentInfo( lando, slug, { extended: false } );
 }
 
 export async function stopEnvironment( lando: Lando, slug: string ): Promise< void > {
@@ -295,7 +292,6 @@ export async function destroyEnvironment(
 interface PrintOptions {
 	extended?: boolean;
 	suppressWarnings?: boolean;
-	autofixDomains?: boolean;
 }
 
 export async function printAllEnvironmentsInfo(
@@ -385,7 +381,6 @@ export async function printEnvironmentInfo(
 	const appInfo = await landoInfo( lando, instancePath, {
 		suppressWarnings: Boolean( options.suppressWarnings ),
 		autologinKey: environmentData.autologinKey,
-		autofixDomains: Boolean( options.autofixDomains ),
 	} );
 
 	if ( options.extended ) {

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

@@ -432,12 +432,37 @@ export async function bootstrapLando( options: LandoBootstrapOptions = {} ): Pro
 	}
 }
 
-export async function landoStart( lando: Lando, instancePath: string ): Promise< void > {
+function installDnsAutofixer( app: App ): void {
+	app.events.on( 'post-start', 9, async () => {
+		const urlsToScan: string[] = [];
+		app.info
+			.filter( service => service.urls.length )
+			.forEach( service => {
+				service.urls.forEach( url => {
+					if ( ! /^https?:\/\/(localhost|127\.0\.0\.1):/.exec( url ) && ! url.includes( '*' ) ) {
+						urlsToScan.push( url );
+					}
+				} );
+			} );
+
+		await tryResolveDomains( urlsToScan, true );
+	} );
+}
+
+export async function landoStart(
+	lando: Lando,
+	instancePath: string,
+	autoFixDomainResolution = false
+): Promise< void > {
 	const started = new Date();
 	try {
 		debug( 'Will start lando app on path:', instancePath );
 
 		const app = await getLandoApplication( lando, instancePath );
+		if ( autoFixDomainResolution ) {
+			installDnsAutofixer( app );
+		}
+
 		await app.start();
 	} finally {
 		const duration = new Date().getTime() - started.getTime();
@@ -471,12 +496,19 @@ export async function landoLogs( lando: Lando, instancePath: string, options: La
 	}
 }
 
-export async function landoRebuild( lando: Lando, instancePath: string ): Promise< void > {
+export async function landoRebuild(
+	lando: Lando,
+	instancePath: string,
+	autoFixDomainResolution = false
+): Promise< void > {
 	const started = new Date();
 	try {
 		debug( 'Will rebuild lando app on path:', instancePath );
 
 		const app = await getLandoApplication( lando, instancePath );
+		if ( autoFixDomainResolution ) {
+			installDnsAutofixer( app );
+		}
 
 		await ensureNoOrphantProxyContainer( lando );
 		await app.rebuild();
@@ -550,7 +582,6 @@ export async function landoDestroy( lando: Lando, instancePath: string ): Promis
 interface LandoInfoOptions {
 	suppressWarnings?: boolean;
 	autologinKey?: string;
-	autofixDomains?: boolean;
 }
 
 interface LandoInfoResult extends AppInfo {
@@ -577,7 +608,7 @@ export async function landoInfo(
 		const reachableServices = app.info.filter( service => service.urls.length );
 		reachableServices.forEach( service => ( info[ `${ service.service } urls` ] = service.urls ) );
 
-		const health = await checkEnvHealth( lando, app, Boolean( options.autofixDomains ) );
+		const health = await checkEnvHealth( lando, app );
 		const frontEndUrl = app.info.find( service => 'nginx' === service.service )?.urls[ 0 ] ?? '';
 
 		const extraService = await getExtraServicesConnections( lando, app );
@@ -701,7 +732,7 @@ async function getExtraServicesConnections(
 	return extraServices;
 }
 
-async function tryResolveDomains( urls: string[], autofix: boolean ): Promise< void > {
+export async function tryResolveDomains( urls: string[], autofix: boolean ): Promise< void > {
 	const domains = [
 		...new Set(
 			urls
@@ -822,8 +853,7 @@ async function getRunningServicesForProject(
 
 export async function checkEnvHealth(
 	lando: Lando,
-	app: App,
-	autofixDomainResolution: boolean = false
+	app: App
 ): Promise< Record< string, boolean > > {
 	const urls: Record< string, string > = {};
 
@@ -841,7 +871,7 @@ export async function checkEnvHealth(
 		} );
 
 	const urlsToScan = Object.keys( urls ).filter( url => ! url.includes( '*' ) );
-	await tryResolveDomains( urlsToScan, autofixDomainResolution );
+	await tryResolveDomains( urlsToScan, false );
 	app.urls.forEach( entry => {
 		// We use different status codes to see if the service is up.
 		// We may consider the service is up when Lando considers it is down.