From 28c93612e63fde62fbb470e3f2265f81da1bac19 Mon Sep 17 00:00:00 2001
From: Asher <ash@coder.com>
Date: Mon, 17 Jun 2019 13:44:24 -0500
Subject: [PATCH] Move address output to the listen callback

Since listening is asynchronous, this guarantees the address will be
filled out.
---
 packages/server/src/cli.ts | 46 ++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/packages/server/src/cli.ts b/packages/server/src/cli.ts
index 34edee574..8433a4033 100644
--- a/packages/server/src/cli.ts
+++ b/packages/server/src/cli.ts
@@ -281,10 +281,32 @@ const bold = (text: string | number): string | number => {
 
 	if (options.socket) {
 		logger.info("Starting webserver via socket...", field("socket", options.socket));
-		app.server.listen(options.socket);
+		app.server.listen(options.socket, () => {
+			logger.info(" ");
+			logger.info("Started on socket address:");
+			logger.info(options.socket!);
+			logger.info(" ");
+		});
 	} else {
 		logger.info("Starting webserver...", field("host", options.host), field("port", options.port));
-		app.server.listen(options.port, options.host);
+		app.server.listen(options.port, options.host, async () => {
+			const protocol = options.allowHttp ? "http" : "https";
+			const address = app.server.address();
+			const port = typeof address === "string" ? options.port : address.port;
+			const url = `${protocol}://localhost:${port}/`;
+			logger.info(" ");
+			logger.info("Started (click the link below to open):");
+			logger.info(url);
+			logger.info(" ");
+
+			if (options.open) {
+				try {
+					await opn(url);
+				} catch (e) {
+					logger.warn("Url couldn't be opened automatically.", field("url", url), field("error", e.message));
+				}
+			}
+		});
 	}
 	let clientId = 1;
 	app.wss.on("connection", (ws, req) => {
@@ -327,26 +349,6 @@ const bold = (text: string | number): string | number => {
 		logger.info(" ");
 		logger.info("Telemetry is disabled.");
 	}
-
-	logger.info(" ");
-	if (options.socket) {
-		logger.info("Started on socket address:");
-		logger.info(options.socket);
-	} else {
-		const protocol = options.allowHttp ? "http" : "https";
-		const url = `${protocol}://localhost:${app.server.address().port}/`;
-		logger.info("Started (click the link below to open):");
-		logger.info(url);
-	}
-	logger.info(" ");
-
-	if (options.open) {
-		try {
-			await opn(url);
-		} catch (e) {
-			logger.warn("Url couldn't be opened automatically.", field("url", url), field("exception", e));
-		}
-	}
 })().catch((ex) => {
 	logger.error(ex);
 });