From e12bb726328f93c5e8415039c65269c0c82fd2ef Mon Sep 17 00:00:00 2001
From: peter <peter.millauer@gmail.com>
Date: Thu, 13 Aug 2020 13:07:26 +0200
Subject: [PATCH] change port mapping so i dont get rekt

---
 src/backend/Admin/Admin.ts                    | 36 +++++++++++--------
 src/backend/Components/User/UserManager.ts    |  4 +--
 .../services/ApiService/client-login-api.ts   |  2 +-
 .../services/ApiService/server-login-api.ts   |  2 +-
 4 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/src/backend/Admin/Admin.ts b/src/backend/Admin/Admin.ts
index b68fd69..fd1e926 100644
--- a/src/backend/Admin/Admin.ts
+++ b/src/backend/Admin/Admin.ts
@@ -66,11 +66,18 @@ export class FrontworkAdmin
     }
 
     async start() {
+        let port: number = this.config.getConfig().httpPort
+
         await this.makeKnex()
-        this.startWebsocket()
+        const app = await this.makeExpress()
+        const httpServer = new http.Server(app)
+        await this.startWebsocket(httpServer)
+        httpServer.listen(port)
+        await this.attachAngularSSR(app)
+        getLogger('Admin#startWebsocket').debug("Webserver up on", port)
+
         await Promise.all(this.frontworkComponents.map(c => c.initialize ? c.initialize() : undefined))
         getLogger('Admin#start').debug(this.frontworkComponents.length + " components initialized")
-        await this.startWebserver()
     }
 
     stop() {
@@ -106,7 +113,7 @@ export class FrontworkAdmin
             .flatMap(exp => exp.getTableDefinitions())
     }
 
-    private startWebsocket() {
+    private startWebsocket(httpServer: http.Server) {
         this.rpcServer = new RPCServer([
             ...this.frontworkComponents,
             {
@@ -119,24 +126,20 @@ export class FrontworkAdmin
         ], {
             errorHandler: (sock, err, rpc, args) => {
                 console.log(rpc, err);
-                
             }
-
-        }).listen(20000)
-        getLogger('Admin#startWebsocket').debug("Websocket up on", 20000)
+        })
+        .attach(httpServer)
     }
 
-    private async startWebserver() {
+    private async makeExpress() {
         if (this.httpServer != null || this.express != null) {
             getLogger('Admin#startWebserver').warn("Webserver is already running")
             return
         }
 
-        let port: number = this.config.getConfig().httpPort
         this.express = express()
 
         const distFolder = "../../../../dist"
-        const ngExpressServer = Path.join(__dirname, distFolder, 'server.js')
 
         this.express.get('*.*', (req, res) => {
             //console.log('*.*', req.path);
@@ -153,20 +156,23 @@ export class FrontworkAdmin
                 res.status(404)
             }
         })
+        return this.express
+    }
+
+    attachAngularSSR = async (express : express.Application) => {
+        const distFolder = "../../../../dist"
+        const ngExpressServer = Path.join(__dirname, distFolder, 'server.js')
+        let port: number = this.config.getConfig().httpPort
 
         try {
             const req = require(distFolder + "/server.js")
-            await req.attachExpress(this.express, './dist', getLogger('angularSSR#'))
+            await req.attachExpress(express, './dist', getLogger('angularSSR#'))
             getLogger('Admin#startWebserver').debug('Frontend from ' + ngExpressServer + " loaded")
         } catch (e) {
             getLogger('Admin#startWebserver').error(e)
             getLogger('Admin#startWebserver').warn("No angular SSR module was provided in " + ngExpressServer)
             getLogger('Admin#startWebserver').warn("This is not fatal, but your page will not render on *" + port)
         }
-
-        this.express.listen(port, () => {
-            getLogger('Admin#startWebserver').info('Admin panel listening for HTTP on *' + port)
-        })
     }
 
     private stopWebserver() {
diff --git a/src/backend/Components/User/UserManager.ts b/src/backend/Components/User/UserManager.ts
index 73df724..25479b6 100644
--- a/src/backend/Components/User/UserManager.ts
+++ b/src/backend/Components/User/UserManager.ts
@@ -144,10 +144,10 @@ export class UserManager
                 }
             })))
 
-        const rankServer = await this.startRankServer(20001)
+        const rankServer = await this.startRankServer(20002)
         this.rankServer = {
             server: rankServer,
-            port: 20001
+            port: 20002
         }
         //setInterval(this.checkExpiredSessions, 600_000)
     }
diff --git a/src/frontend/src/app/frontcraft/services/ApiService/client-login-api.ts b/src/frontend/src/app/frontcraft/services/ApiService/client-login-api.ts
index 7ab4353..15d0f2a 100644
--- a/src/frontend/src/app/frontcraft/services/ApiService/client-login-api.ts
+++ b/src/frontend/src/app/frontcraft/services/ApiService/client-login-api.ts
@@ -132,7 +132,7 @@ export class ClientApiService implements IApiService{
         }
 
         try{
-            let conn = new RPCSocket<FrontcraftIfc>(20000, window.location.hostname)
+            let conn = new RPCSocket<FrontcraftIfc>(8080, window.location.hostname)
             conn.on('close', async () => {
             })                        
 
diff --git a/src/frontend/src/app/frontcraft/services/ApiService/server-login-api.ts b/src/frontend/src/app/frontcraft/services/ApiService/server-login-api.ts
index 99c793e..c9cb992 100644
--- a/src/frontend/src/app/frontcraft/services/ApiService/server-login-api.ts
+++ b/src/frontend/src/app/frontcraft/services/ApiService/server-login-api.ts
@@ -83,7 +83,7 @@ export class ServerApiService implements IApiService {
         }
 
         try {
-            let conn = new RPCSocket<FrontcraftIfc>(20000, window.location.hostname)
+            let conn = new RPCSocket<FrontcraftIfc>(8080, window.location.hostname)
             conn.on('close', async () => {
             })