From febc06f4baf6f1baf9bb4232c2ba700e8cce822d Mon Sep 17 00:00:00 2001
From: Peter Somogyvari <peter.somogyvari@accenture.com>
Date: Tue, 2 Feb 2021 15:41:23 -0800
Subject: [PATCH] feat(common): servers.startOnPort() host arg #527

Extends the existing functionality of the utility method so that it can
accept a 'host' parameter where callers can
specify if they want to bind to the wildcard
network interface of `0.0.0.0` for example.

The default option of the host argument is
localhost so that we are *secure by default*
even if this method is only used for testing
code, it cannot hurt to be on the safe side.

Fixes #527

Signed-off-by: Peter Somogyvari <peter.somogyvari@accenture.com>
---
 .../src/main/typescript/servers.ts            | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/packages/cactus-common/src/main/typescript/servers.ts b/packages/cactus-common/src/main/typescript/servers.ts
index ea5b9bbec8..0d721f59c3 100644
--- a/packages/cactus-common/src/main/typescript/servers.ts
+++ b/packages/cactus-common/src/main/typescript/servers.ts
@@ -20,17 +20,14 @@ export class Servers {
    * @param server The server object that will be shut down.
    */
   public static async shutdown(server: Server | SecureServer): Promise<void> {
+    const fnTag = `Servers#shutdown()`;
     if (!server) {
-      throw new TypeError(`Servers#shutdown() server was falsy. Need object.`);
+      throw new TypeError(`${fnTag} server was falsy. Need object.`);
     }
     return new Promise<void>((resolve, reject) => {
-      server.close((err: any) => {
+      server.close((err: Error | undefined) => {
         if (err) {
-          reject(
-            new Error(
-              `Servers#shutdown() Failed to shut down server: ${err.stack}`,
-            ),
-          );
+          reject(new Error(`${fnTag} Failed to shut down server ${err.stack}`));
         } else {
           resolve();
         }
@@ -85,10 +82,11 @@ export class Servers {
    */
   public static async startOnPreferredPort(
     preferredPort?: number,
+    host = "127.0.0.1",
   ): Promise<Server> {
     if (preferredPort) {
       try {
-        return Servers.startOnPort(preferredPort);
+        return Servers.startOnPort(preferredPort, host);
       } catch (ex) {
         // if something else went wrong we still want to just give up
         if (!ex.message.includes("EADDRINUSE")) {
@@ -101,12 +99,15 @@ export class Servers {
     }
   }
 
-  public static async startOnPort(port: number): Promise<Server> {
+  public static async startOnPort(
+    port: number,
+    host = "127.0.0.1",
+  ): Promise<Server> {
     const server: Server = await new Promise((resolve, reject) => {
       const aServer: Server = createServer();
       aServer.once("listening", () => resolve(aServer));
       aServer.once("error", (err: Error) => reject(err));
-      aServer.listen(port, "localhost");
+      aServer.listen(port, host);
     });
 
     return server;