fix(server): better default handling for HOST and PORT

jagregory · May 3, 2020 · 69b4648 · 69b4648
1 parent df421d7
commit 69b4648
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 20 deletions.
diff --git a/src/bin/start.ts b/src/bin/start.ts
@@ -4,14 +4,18 @@ import { createDefaultServer } from "../server";
 
 createDefaultServer()
   .then((server) => {
-    const hostname = process.env.HOST || "localhost";
-    const port = parseInt(process.env.PORT || "9229", 10);
+    const hostname = process.env.HOST ?? "localhost";
+    const port = parseInt(process.env.PORT ?? "9229", 10);
     return server.start({ hostname, port });
   })
-  .then((options) => {
-    console.log(
-      `Cognito Local running on http://${options.hostname}:${options.port}`
-    );
+  .then((httpServer) => {
+    const address = httpServer.address()!;
+    const url =
+      typeof address === "string"
+        ? address
+        : `${address.address}:${address.port}`;
+
+    console.log(`Cognito Local running on http://${url}`);
   })
   .catch((err) => {
     console.error(err);

diff --git a/src/server/server.ts b/src/server/server.ts
@@ -1,24 +1,25 @@
 import bodyParser from "body-parser";
 import cors from "cors";
 import express from "express";
+import * as http from "http";
 import { CognitoError, unsupported, UnsupportedError } from "../errors";
 import { Router } from "../targets/router";
 import PublicKey from "../keys/cognitoLocal.public.json";
 
 export interface ServerOptions {
-  port?: number;
-  hostname?: string;
-  development?: boolean;
+  port: number;
+  hostname: string;
+  development: boolean;
 }
 
 export interface Server {
   application: any; // eslint-disable-line
-  start(options?: ServerOptions): Promise<ServerOptions>;
+  start(options?: Partial<ServerOptions>): Promise<http.Server>;
 }
 
 export const createServer = (
   router: Router,
-  options: ServerOptions = {}
+  options: Partial<ServerOptions> = {}
 ): Server => {
   const app = express();
 
@@ -89,20 +90,26 @@ export const createServer = (
   return {
     application: app,
     start(startOptions) {
-      const actualOptions = {
-        ...options,
-        ...startOptions,
+      const actualOptions: ServerOptions = {
         port: options?.port ?? 9229,
         hostname: options?.hostname ?? "localhost",
+        development: options?.development ?? false,
+        ...options,
+        ...startOptions,
       };
+
       return new Promise((resolve, reject) => {
-        app.listen(actualOptions.port, actualOptions.hostname, (err) => {
-          if (err) {
-            reject(err);
-          } else {
-            resolve(actualOptions);
+        const httpServer = app.listen(
+          actualOptions.port,
+          actualOptions.hostname,
+          (err) => {
+            if (err) {
+              reject(err);
+            } else {
+              resolve(httpServer);
+            }
           }
-        });
+        );
       });
     },
   };