From adf638a9b934d0857cd3e44c2342ac39b14a41b6 Mon Sep 17 00:00:00 2001
From: Kyle Carberry <kyle@kwc.io>
Date: Mon, 22 Apr 2019 12:52:31 -0400
Subject: [PATCH 1/2] Add --socket flag

---
 packages/server/src/cli.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/cli.ts b/packages/server/src/cli.ts
index 118ddb5a44b8..746910813af7 100644
--- a/packages/server/src/cli.ts
+++ b/packages/server/src/cli.ts
@@ -30,6 +30,7 @@ commander.version(process.env.VERSION || "development")
 	.option("-H, --allow-http", "Allow http connections.", false)
 	.option("-P, --password <value>", "DEPRECATED: Use the PASSWORD environment variable instead. Specify a password for authentication.")
 	.option("--disable-telemetry", "Disables ALL telemetry.", false)
+	.option("--socket <value>", "Listen on a UNIX socket. Host and port will be ignored when set.")
 	.option("--install-extension <value>", "Install an extension by its ID.")
 	.option("--bootstrap-fork <name>", "Used for development. Never set.")
 	.option("--extra-args <args>", "Used for development. Never set.")
@@ -63,6 +64,7 @@ const bold = (text: string | number): string | number => {
 		readonly open?: boolean;
 		readonly cert?: string;
 		readonly certKey?: string;
+		readonly socket?: string;
 
 		readonly installExtension?: string;
 
@@ -267,7 +269,11 @@ const bold = (text: string | number): string | number => {
 	});
 
 	logger.info("Starting webserver...", field("host", options.host), field("port", options.port));
-	app.server.listen(options.port, options.host);
+	if (options.socket) {
+		app.server.listen(options.socket);
+	} else {
+		app.server.listen(options.port, options.host);
+	}
 	let clientId = 1;
 	app.wss.on("connection", (ws, req) => {
 		const id = clientId++;

From c4dcb71444e2f5f2363bfcf8f2aaaf8155febdb2 Mon Sep 17 00:00:00 2001
From: Kyle Carberry <kyle@kwc.io>
Date: Mon, 22 Apr 2019 13:00:14 -0400
Subject: [PATCH 2/2] Add msg for already bound socket

---
 packages/server/src/cli.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/cli.ts b/packages/server/src/cli.ts
index 746910813af7..9d91b6723ecb 100644
--- a/packages/server/src/cli.ts
+++ b/packages/server/src/cli.ts
@@ -290,7 +290,11 @@ const bold = (text: string | number): string | number => {
 	});
 	app.wss.on("error", (err: NodeJS.ErrnoException) => {
 		if (err.code === "EADDRINUSE") {
-			logger.error(`Port ${bold(options.port)} is in use. Please free up port ${options.port} or specify a different port with the -p flag`);
+			if (options.socket) {
+				logger.error(`Socket ${bold(options.socket)} is in use. Please specify a different socket.`);
+			} else {
+				logger.error(`Port ${bold(options.port)} is in use. Please free up port ${options.port} or specify a different port with the -p flag`);
+			}
 			process.exit(1);
 		}
 	});