Bug/68 configuration support server websocket port (#72)

* Add `host` and `port` configs to env

* Configure overlay and socket servers to use config values

Author: itanex

bot/overlay/overlay.server.ts

@@ -4,6 +4,7 @@ import { inject, injectable } from 'inversify';
 import path from 'path';
 import winston from 'winston';
 import InjectionTypes from '../../dependency-management/types';
+import environment from '../../configurations/environment';
 
 export interface IOverlayServer {
     configure(): IOverlayServer;
@@ -13,13 +14,17 @@ export interface IOverlayServer {
 @injectable()
 export default class OverlayServer {
     private server: Server;
-    private host = '0.0.0.0';
-    private port = 8070;
+    /** Configured Web Host */
+    private host: string;
+    /** Configured Web Port */
+    private port: number;
     private rootPath = `local-cache/audio/8ball`;
 
     constructor(
         @inject(InjectionTypes.Logger) private logger: winston.Logger,
     ) {
+        this.host = environment.twitchBot.overlay.host;
+        this.port = environment.twitchBot.overlay.port;
     }
 
     configure(): IOverlayServer {

bot/overlay/socket.server.ts

@@ -2,6 +2,7 @@ import { inject, injectable } from 'inversify';
 import { RawData, Server, WebSocket } from 'ws';
 import winston from 'winston';
 import InjectionTypes from '../../dependency-management/types';
+import environment from '../../configurations/environment';
 
 /**
  * Used to track connected Web Socket users
@@ -19,6 +20,8 @@ export interface ISocketServer {
 export default class SocketServer implements ISocketServer {
     /** Instance of the Web Socket server */
     private server: Server;
+    /** Configured Web Socket Host */
+    private host: string;
     /** Configured Web Socket Port */
     private port: number;
     /** Connected Web Socket Users */
@@ -27,12 +30,14 @@ export default class SocketServer implements ISocketServer {
     constructor(
         @inject(InjectionTypes.Logger) private logger: winston.Logger,
     ) {
-        this.port = 8080;
+        this.host = environment.twitchBot.websocket.host;
+        this.port = environment.twitchBot.websocket.port;
     }
 
     /** Initializes and starts the server */
     startServer(): void {
         this.server = new Server({
+            host: this.host,
             port: this.port,
         }, () => {
             this.logger.info(`** Web Socket Server listening on ${this.port}`);

configurations/environment.ts

@@ -24,6 +24,16 @@ const environment = {
             /** Twitch user id / broadcasterId */
             id: process.env.TWITCH_BROADCASTER_ID,
         },
+        /** OBS Overlay Web server */
+        overlay: {
+            host: process.env.TWITCH_OVERLAY_HOST,
+            port: Number(process.env.TWITCH_OVERLAY_PORT),
+        },
+        /** Web Socket server */
+        websocket: {
+            host: process.env.TWITCH_WEBSOCKET_HOST,
+            port: Number(process.env.TWITCH_WEBSOCKET_PORT),
+        },
         /** User Name - TimyTheTermite */
         username: process.env.TWITCH_BOT_USERNAME,
         /** Channel(s) to join - TimyTheTermite */