470486104/Server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: use values from http.json instead of values in database/server.json

Browse Source 
Cleanup and reordering of HttpServer.ts
This commit is contained in:
Dev 2023-03-25 15:03:20 +00:00
parent cecf4465ed
commit 82ff9dde12
1 changed files with 47 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
project/src/servers/HttpServer.ts
View File

@ -16,6 +16,8 @@ import { WebSocketServer } from "./WebSocketServer";
@injectable() @injectable()
export class HttpServer export class HttpServer
{ {
protected httpConfig: IHttpConfig;
constructor( constructor(
@inject("WinstonLogger") protected logger: ILogger, @inject("WinstonLogger") protected logger: ILogger,
@inject("DatabaseServer") protected databaseServer: DatabaseServer, @inject("DatabaseServer") protected databaseServer: DatabaseServer,
@ -30,59 +32,21 @@ export class HttpServer
this.httpConfig = this.configServer.getConfig(ConfigTypes.HTTP); this.httpConfig = this.configServer.getConfig(ConfigTypes.HTTP);
} }
protected httpConfig: IHttpConfig; /**
* Handle server loading event
public getCookies(req: http.IncomingMessage): any */
{
const found = {};
const cookies = req.headers.cookie;
if (cookies)
{
for (const cookie of cookies.split(";"))
{
const parts = cookie.split("=");
found[parts.shift().trim()] = decodeURI(parts.join("="));
}
}
return found;
}
public handleRequest(req: IncomingMessage, resp: ServerResponse): void
{
const sessionID = this.getCookies(req)["PHPSESSID"];
this.applicationContext.addValue(ContextVariableType.SESSION_ID, sessionID);
// http.json logRequests boolean option to allow the user/server to choose to not log requests
if (this.httpConfig.logRequests)
{
this.logger.info(this.localisationService.getText("client_request", req.url));
}
for (const listener of this.httpListeners)
{
if (listener.canHandle(sessionID, req))
{
listener.handle(sessionID, req, resp);
break;
}
}
}
public load(): void public load(): void
{ {
/* create server */ /* create server */
//this.serverRespond.get();
const httpServer: http.Server = http.createServer((req, res) => const httpServer: http.Server = http.createServer((req, res) =>
{ {
this.handleRequest(req, res); this.handleRequest(req, res);
}); });
this.httpConfig.ip = this.databaseServer.getTables().server.ip; this.databaseServer.getTables().server.ip = this.httpConfig.ip;
this.httpConfig.port = this.databaseServer.getTables().server.port; this.databaseServer.getTables().server.port = this.httpConfig.port;
/* Config server to listen on a port */
httpServer.listen(this.httpConfig.port, this.httpConfig.ip, () => httpServer.listen(this.httpConfig.port, this.httpConfig.ip, () =>
{ {
this.logger.success(this.localisationService.getText("started_webserver_success", this.httpServerHelper.getBackendUrl())); this.logger.success(this.localisationService.getText("started_webserver_success", this.httpServerHelper.getBackendUrl()));
@ -105,4 +69,43 @@ export class HttpServer
this.webSocketServer.setupWebSocket(httpServer); this.webSocketServer.setupWebSocket(httpServer);
} }
protected handleRequest(req: IncomingMessage, resp: ServerResponse): void
{
// Pull sessionId out of cookies and store inside app context
const sessionId = this.getCookies(req)["PHPSESSID"];
this.applicationContext.addValue(ContextVariableType.SESSION_ID, sessionId);
// http.json logRequests boolean option to allow the user/server to choose to not log requests
if (this.httpConfig.logRequests)
{
this.logger.info(this.localisationService.getText("client_request", req.url));
}
for (const listener of this.httpListeners)
{
if (listener.canHandle(sessionId, req))
{
listener.handle(sessionId, req, resp);
break;
}
}
}
protected getCookies(req: http.IncomingMessage): Record<string, string>
{
const found: Record<string, string> = {};
const cookies = req.headers.cookie;
if (cookies)
{
for (const cookie of cookies.split(";"))
{
const parts = cookie.split("=");
found[parts.shift().trim()] = decodeURI(parts.join("="));
}
}
return found;
}
} }