From 6617ece90ce0330061c9aa75e813affeca2ae4b1 Mon Sep 17 00:00:00 2001
From: Roberto Tonino <roberto.tonino5@gmail.com>
Date: Fri, 4 Jun 2021 21:29:55 +0200
Subject: [PATCH] feat(server): support for --host flag

---
 server/package.json |  4 +++-
 server/src/app.ts   | 18 +++++++++++++----
 server/src/types.ts |  8 ++++++++
 server/yarn.lock    | 47 +++++++++++++++++++++++++++++++++++++++++++--
 4 files changed, 70 insertions(+), 7 deletions(-)

diff --git a/server/package.json b/server/package.json
index 41d1532..ccdc8da 100644
--- a/server/package.json
+++ b/server/package.json
@@ -13,6 +13,7 @@
 		"test-watch": "jest --watch"
 	},
 	"dependencies": {
+		"@types/yargs": "17.0.0",
 		"cookie-parser": "1.4.5",
 		"debug": "2.6.9",
 		"deemix": "^0.1.3",
@@ -23,7 +24,8 @@
 		"morgan": "1.10.0",
 		"ramda": "0.27.1",
 		"uuid": "8.3.2",
-		"ws": "7.4.5"
+		"ws": "7.4.5",
+		"yargs": "17.0.1"
 	},
 	"devDependencies": {
 		"@nuxtjs/eslint-config": "6.0.0",
diff --git a/server/src/app.ts b/server/src/app.ts
index c69f93a..b10eab0 100644
--- a/server/src/app.ts
+++ b/server/src/app.ts
@@ -1,7 +1,9 @@
 import http from 'http'
 import express, { Application } from 'express'
 import { Server as WsServer } from 'ws'
+import yargs from 'yargs'
 import initDebug from 'debug'
+import { hideBin } from 'yargs/helpers'
 
 import { registerMiddlewares } from './middlewares'
 
@@ -11,8 +13,16 @@ import { normalizePort } from './helpers/port'
 import { getErrorCb, getListeningCb } from './helpers/server-callbacks'
 import { registerApis } from './routes/api/register'
 import { registerWebsocket } from './websocket'
+import type { Arguments } from './types'
 
-const PORT = normalizePort(process.env.PORT || '6595')
+// TODO: Remove type assertion while keeping correct types
+const argv = yargs(hideBin(process.argv)).options({
+	port: { type: 'string', default: '6595' },
+	host: { type: 'string', default: 'localhost' }
+}).argv as Arguments
+
+const DEEMIX_PORT = normalizePort(process.env.PORT ?? argv.port)
+const DEEMIX_HOST = process.env.HOST ?? argv.host
 
 const debug = initDebug('deemix-gui:server')
 export const app: Application = express()
@@ -29,11 +39,11 @@ app.use('/', indexRouter)
 registerApis(app)
 
 /* === Config === */
-app.set('port', PORT)
+app.set('port', DEEMIX_PORT)
 
 /* === Server port === */
 if (process.env.NODE_ENV !== 'test') {
-	server.listen(PORT)
+	server.listen({ port: DEEMIX_PORT, host: DEEMIX_HOST })
 }
 
 registerWebsocket(wss)
@@ -44,5 +54,5 @@ server.on('upgrade', (request, socket, head) => {
 		wss.emit('connection', socket, request)
 	})
 })
-server.on('error', getErrorCb(PORT))
+server.on('error', getErrorCb(DEEMIX_PORT))
 server.on('listening', getListeningCb(server, debug))
diff --git a/server/src/types.ts b/server/src/types.ts
index 629aefc..9fe1c16 100644
--- a/server/src/types.ts
+++ b/server/src/types.ts
@@ -231,3 +231,11 @@ export interface GetAlbumResponse extends BaseDeezerObject, CoveredDeezerObject
 	artist: DeezerAlbumArtist
 	tracks: DeezerTracks
 }
+
+export interface Arguments {
+	port: string
+	host: string
+
+	[x: string]: unknown
+	$0: string
+}
diff --git a/server/yarn.lock b/server/yarn.lock
index 797952f..fe59081 100644
--- a/server/yarn.lock
+++ b/server/yarn.lock
@@ -854,6 +854,13 @@
   resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.0.tgz#dd3e6699ba3237f0348cd085e4698780204842f9"
   integrity sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==
 
+"@types/yargs@17.0.0":
+  version "17.0.0"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.0.tgz#32f740934eedf0a5cd19470249f317755c91f1ae"
+  integrity sha512-RS7u2X7vdXjVQs160PWY1pjLBw6GJj04utojn0KU8p2rRZR37FSzzK6XOT+KLzT/DVbDYRyezroc0LHIvM5Z2A==
+  dependencies:
+    "@types/yargs-parser" "*"
+
 "@types/yargs@^15.0.0":
   version "15.0.13"
   resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.13.tgz#34f7fec8b389d7f3c1fd08026a5763e072d3c6dc"
@@ -1605,6 +1612,15 @@ cliui@^6.0.0:
     strip-ansi "^6.0.0"
     wrap-ansi "^6.2.0"
 
+cliui@^7.0.2:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
+  integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^7.0.0"
+
 clone-response@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
@@ -2791,7 +2807,7 @@ gensync@^1.0.0-beta.2:
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
   integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
-get-caller-file@^2.0.1:
+get-caller-file@^2.0.1, get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
@@ -6359,6 +6375,15 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -6404,12 +6429,17 @@ y18n@^4.0.0:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
   integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
 
+y18n@^5.0.5:
+  version "5.0.8"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
+  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
+
 yallist@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
-yargs-parser@20.x:
+yargs-parser@20.x, yargs-parser@^20.2.2:
   version "20.2.7"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz#61df85c113edfb5a7a4e36eb8aa60ef423cbc90a"
   integrity sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==
@@ -6422,6 +6452,19 @@ yargs-parser@^18.1.2:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
+yargs@17.0.1:
+  version "17.0.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.0.1.tgz#6a1ced4ed5ee0b388010ba9fd67af83b9362e0bb"
+  integrity sha512-xBBulfCc8Y6gLFcrPvtqKz9hz8SO0l1Ni8GgDekvBX2ro0HRQImDGnikfc33cgzcYUSncapnNcZDjVFIH3f6KQ==
+  dependencies:
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.0"
+    y18n "^5.0.5"
+    yargs-parser "^20.2.2"
+
 yargs@^15.4.1:
   version "15.4.1"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"