瀏覽代碼

change port mapping so i dont get rekt

master
peter 5 年之前
父節點
當前提交
e12bb72632

+ 21
- 15
src/backend/Admin/Admin.ts 查看文件

66
     }
66
     }
67
 
67
 
68
     async start() {
68
     async start() {
69
+        let port: number = this.config.getConfig().httpPort
70
+
69
         await this.makeKnex()
71
         await this.makeKnex()
70
-        this.startWebsocket()
72
+        const app = await this.makeExpress()
73
+        const httpServer = new http.Server(app)
74
+        await this.startWebsocket(httpServer)
75
+        httpServer.listen(port)
76
+        await this.attachAngularSSR(app)
77
+        getLogger('Admin#startWebsocket').debug("Webserver up on", port)
78
+
71
         await Promise.all(this.frontworkComponents.map(c => c.initialize ? c.initialize() : undefined))
79
         await Promise.all(this.frontworkComponents.map(c => c.initialize ? c.initialize() : undefined))
72
         getLogger('Admin#start').debug(this.frontworkComponents.length + " components initialized")
80
         getLogger('Admin#start').debug(this.frontworkComponents.length + " components initialized")
73
-        await this.startWebserver()
74
     }
81
     }
75
 
82
 
76
     stop() {
83
     stop() {
106
             .flatMap(exp => exp.getTableDefinitions())
113
             .flatMap(exp => exp.getTableDefinitions())
107
     }
114
     }
108
 
115
 
109
-    private startWebsocket() {
116
+    private startWebsocket(httpServer: http.Server) {
110
         this.rpcServer = new RPCServer([
117
         this.rpcServer = new RPCServer([
111
             ...this.frontworkComponents,
118
             ...this.frontworkComponents,
112
             {
119
             {
119
         ], {
126
         ], {
120
             errorHandler: (sock, err, rpc, args) => {
127
             errorHandler: (sock, err, rpc, args) => {
121
                 console.log(rpc, err);
128
                 console.log(rpc, err);
122
-                
123
             }
129
             }
124
-
125
-        }).listen(20000)
126
-        getLogger('Admin#startWebsocket').debug("Websocket up on", 20000)
130
+        })
131
+        .attach(httpServer)
127
     }
132
     }
128
 
133
 
129
-    private async startWebserver() {
134
+    private async makeExpress() {
130
         if (this.httpServer != null || this.express != null) {
135
         if (this.httpServer != null || this.express != null) {
131
             getLogger('Admin#startWebserver').warn("Webserver is already running")
136
             getLogger('Admin#startWebserver').warn("Webserver is already running")
132
             return
137
             return
133
         }
138
         }
134
 
139
 
135
-        let port: number = this.config.getConfig().httpPort
136
         this.express = express()
140
         this.express = express()
137
 
141
 
138
         const distFolder = "../../../../dist"
142
         const distFolder = "../../../../dist"
139
-        const ngExpressServer = Path.join(__dirname, distFolder, 'server.js')
140
 
143
 
141
         this.express.get('*.*', (req, res) => {
144
         this.express.get('*.*', (req, res) => {
142
             //console.log('*.*', req.path);
145
             //console.log('*.*', req.path);
153
                 res.status(404)
156
                 res.status(404)
154
             }
157
             }
155
         })
158
         })
159
+        return this.express
160
+    }
161
+
162
+    attachAngularSSR = async (express : express.Application) => {
163
+        const distFolder = "../../../../dist"
164
+        const ngExpressServer = Path.join(__dirname, distFolder, 'server.js')
165
+        let port: number = this.config.getConfig().httpPort
156
 
166
 
157
         try {
167
         try {
158
             const req = require(distFolder + "/server.js")
168
             const req = require(distFolder + "/server.js")
159
-            await req.attachExpress(this.express, './dist', getLogger('angularSSR#'))
169
+            await req.attachExpress(express, './dist', getLogger('angularSSR#'))
160
             getLogger('Admin#startWebserver').debug('Frontend from ' + ngExpressServer + " loaded")
170
             getLogger('Admin#startWebserver').debug('Frontend from ' + ngExpressServer + " loaded")
161
         } catch (e) {
171
         } catch (e) {
162
             getLogger('Admin#startWebserver').error(e)
172
             getLogger('Admin#startWebserver').error(e)
163
             getLogger('Admin#startWebserver').warn("No angular SSR module was provided in " + ngExpressServer)
173
             getLogger('Admin#startWebserver').warn("No angular SSR module was provided in " + ngExpressServer)
164
             getLogger('Admin#startWebserver').warn("This is not fatal, but your page will not render on *" + port)
174
             getLogger('Admin#startWebserver').warn("This is not fatal, but your page will not render on *" + port)
165
         }
175
         }
166
-
167
-        this.express.listen(port, () => {
168
-            getLogger('Admin#startWebserver').info('Admin panel listening for HTTP on *' + port)
169
-        })
170
     }
176
     }
171
 
177
 
172
     private stopWebserver() {
178
     private stopWebserver() {

+ 2
- 2
src/backend/Components/User/UserManager.ts 查看文件

144
                 }
144
                 }
145
             })))
145
             })))
146
 
146
 
147
-        const rankServer = await this.startRankServer(20001)
147
+        const rankServer = await this.startRankServer(20002)
148
         this.rankServer = {
148
         this.rankServer = {
149
             server: rankServer,
149
             server: rankServer,
150
-            port: 20001
150
+            port: 20002
151
         }
151
         }
152
         //setInterval(this.checkExpiredSessions, 600_000)
152
         //setInterval(this.checkExpiredSessions, 600_000)
153
     }
153
     }

+ 1
- 1
src/frontend/src/app/frontcraft/services/ApiService/client-login-api.ts 查看文件

132
         }
132
         }
133
 
133
 
134
         try{
134
         try{
135
-            let conn = new RPCSocket<FrontcraftIfc>(20000, window.location.hostname)
135
+            let conn = new RPCSocket<FrontcraftIfc>(8080, window.location.hostname)
136
             conn.on('close', async () => {
136
             conn.on('close', async () => {
137
             })                        
137
             })                        
138
 
138
 

+ 1
- 1
src/frontend/src/app/frontcraft/services/ApiService/server-login-api.ts 查看文件

83
         }
83
         }
84
 
84
 
85
         try {
85
         try {
86
-            let conn = new RPCSocket<FrontcraftIfc>(20000, window.location.hostname)
86
+            let conn = new RPCSocket<FrontcraftIfc>(8080, window.location.hostname)
87
             conn.on('close', async () => {
87
             conn.on('close', async () => {
88
             })
88
             })
89
 
89
 

Loading…
取消
儲存