From a83d5817141081ac28f84a436c177af63decd831 Mon Sep 17 00:00:00 2001
From: Ben Holmes <hey@bholmes.dev>
Date: Tue, 7 Jun 2022 17:12:35 -0400
Subject: [PATCH] Fix: `--host` flag logs when no network IPs are found (#3547)

* feat: add fallback log if no network interfaces found

* fix: extra newline on missing network log

* chore: changeset
---
 .changeset/tough-papayas-jam.md     |  5 ++++
 packages/astro/src/core/messages.ts | 45 ++++++++++++++---------------
 2 files changed, 27 insertions(+), 23 deletions(-)
 create mode 100644 .changeset/tough-papayas-jam.md

diff --git a/.changeset/tough-papayas-jam.md b/.changeset/tough-papayas-jam.md
new file mode 100644
index 000000000..af72144df
--- /dev/null
+++ b/.changeset/tough-papayas-jam.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fix: show "unable to find network to expose" with local network log when using --host without suitable networks
diff --git a/packages/astro/src/core/messages.ts b/packages/astro/src/core/messages.ts
index d6a263ec4..82815e7d7 100644
--- a/packages/astro/src/core/messages.ts
+++ b/packages/astro/src/core/messages.ts
@@ -76,31 +76,29 @@ export function devStart({
 	const networkLogging = getNetworkLogging(config.server.host);
 	const toDisplayUrl = (hostname: string) =>
 		`${https ? 'https' : 'http'}://${hostname}:${port}${rootPath}`;
-	let addresses = [];
 
-	if (networkLogging === 'none') {
-		addresses = [`${localPrefix}${bold(cyan(toDisplayUrl(localAddress)))}`];
-	} else if (networkLogging === 'host-to-expose') {
-		addresses = [
-			`${localPrefix}${bold(cyan(toDisplayUrl(localAddress)))}`,
-			`${networkPrefix}${dim('use --host to expose')}`,
-		];
-	} else {
-		addresses = Object.values(os.networkInterfaces())
+	let local = `${localPrefix}${bold(cyan(toDisplayUrl(localAddress)))}`;
+	let network = null;
+
+	if (networkLogging === 'host-to-expose') {
+		network = `${networkPrefix}${dim('use --host to expose')}`;
+	} else if (networkLogging === 'visible') {
+		const ipv4Networks = Object.values(os.networkInterfaces())
 			.flatMap((networkInterface) => networkInterface ?? [])
 			.filter(
 				(networkInterface) => networkInterface?.address && networkInterface?.family === 'IPv4'
-			)
-			.map(({ address }) => {
-				if (address.includes('127.0.0.1')) {
-					const displayAddress = address.replace('127.0.0.1', localAddress);
-					return `${localPrefix}${bold(cyan(toDisplayUrl(displayAddress)))}`;
-				} else {
-					return `${networkPrefix}${bold(cyan(toDisplayUrl(address)))}`;
-				}
-			})
-			// ensure Local logs come before Network
-			.sort((msg) => (msg.startsWith(localPrefix) ? -1 : 1));
+			);
+		for (let { address } of ipv4Networks) {
+			if (address.includes('127.0.0.1')) {
+				const displayAddress = address.replace('127.0.0.1', localAddress);
+				local = `${localPrefix}${bold(cyan(toDisplayUrl(displayAddress)))}`;
+			} else {
+				network = `${networkPrefix}${bold(cyan(toDisplayUrl(address)))}`;
+			}
+		}
+		if (!network) {
+			network = `${networkPrefix}${dim('unable to find network to expose')}`;
+		}
 	}
 
 	const messages = [
@@ -108,10 +106,11 @@ export function devStart({
 			`started in ${Math.round(startupTime)}ms`
 		)}`,
 		'',
-		...addresses,
+		local,
+		network,
 		'',
 	];
-	return messages.map((msg) => `  ${msg}`).join('\n');
+	return messages.filter((msg) => typeof msg === 'string').map((msg) => `  ${msg}`).join('\n');
 }
 
 export function telemetryNotice() {