Merge pull request #4 from mangledbottles/interfaces

Typescript Interfaces

Author: mangledbottles

Server/src/Router.ts

@@ -7,25 +7,17 @@ const switcherPort: number = 51510;
 const Router = dgram.createSocket('udp4');
 let routerId: String;
 
+/** Import required Typescript Interfaces */
+import { Router } from "./interfaces/Router.interface";
+
 /** Handle errors and close Socket */
 Router.on('error', (err) => {
     console.log(`Server error:\n${err.stack}`);
     Router.close();
 });
 
-interface Router {
-    routerIn?: String; // eg E1
-    routerOut?: String; // eg R2
-    routerId?: String; // eg R1
-    address?: String; // eg 127.0.0.1
-    port?: number; // eg 69902
-    forwardAddress?: string; // eg 127.0.0.1
-    forwardPort?: number; // eg 61984
-}
-
 let currentRouter: Router = {};
 
-
 // Listen for incoming messages from Clients and the Switcher
 Router.on('message', (msg, senderInfo) => {
     // Type -1: An error has occured
@@ -76,11 +68,12 @@ Router.on('message', (msg, senderInfo) => {
             break;
     }
 
+    // Log message
     console.log({ currentRouter });
-
     console.log(JSON.parse(msg.toString()));
 });
 
+// Forward message to next Router or Client
 function forwardMessage(message: Buffer, address: string, port: number) {
     console.log(`Forwarding message ${message} to ${address}:${port}`);
     Router.send(message, port, address, (err) => {

Server/src/Switcher.ts

@@ -6,6 +6,9 @@ import dgram from "dgram";
 const socketPort: number = 51510;
 const Switcher = dgram.createSocket('udp4');
 
+/** Import required Typescript Interfaces */
+import { Client, Router } from "./interfaces/Switcher.interface";
+
 /** Handle errors and close Socket */
 Switcher.on('error', (err) => {
   console.log(`Server error:\n${err.stack}`);
@@ -160,17 +163,7 @@ function prepareMessage(type: number, message: any) {
   return Buffer.from(JSON.stringify({ type, message }));
 }
 
-
 /** Broadcast Information from Server to all Clients */
-interface Client {
-  address: string;
-  port: number
-}
-interface Router extends Client {
-  in?: Router | Client;
-  out?: Router | Client;
-  routerId: String;
-}
 
 let Routers: Set<string> = new Set();
 

Server/src/interfaces/Router.interface.ts

@@ -0,0 +1,9 @@
+export interface Router {
+    routerIn?: String; // eg E1
+    routerOut?: String; // eg R2
+    routerId?: String; // eg R1
+    address?: String; // eg 127.0.0.1
+    port?: number; // eg 69902
+    forwardAddress?: string; // eg 127.0.0.1
+    forwardPort?: number; // eg 61984
+}

Server/src/interfaces/Switcher.interface.ts

@@ -0,0 +1,10 @@
+export interface Client {
+    address: string;
+    port: number
+}
+
+export interface Router extends Client {
+    in?: Router | Client;
+    out?: Router | Client;
+    routerId: String;
+}