X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Fui-server%2FAbstractUIServer.ts;h=d27ea616bfe98591e9afbc8a3dff65c8f7a412df;hb=6a4032b5d8f3cbaa18d3beddcdfe9d335c1cba90;hp=2f6f950b938fd94e74557e4b4f3206d5ae0e2939;hpb=6bd808fd1dc554c8d55521b20a064447835ef04c;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/ui-server/AbstractUIServer.ts b/src/charging-station/ui-server/AbstractUIServer.ts index 2f6f950b..d27ea616 100644 --- a/src/charging-station/ui-server/AbstractUIServer.ts +++ b/src/charging-station/ui-server/AbstractUIServer.ts @@ -1,4 +1,5 @@ import { type IncomingMessage, Server, type ServerResponse } from 'node:http'; +import { type Http2Server, createServer } from 'node:http2'; import type { WebSocket } from 'ws'; @@ -6,12 +7,13 @@ import type { AbstractUIService } from './ui-services/AbstractUIService'; import { UIServiceFactory } from './ui-services/UIServiceFactory'; import { BaseError } from '../../exception'; import { + ApplicationProtocolVersion, AuthenticationType, type ChargingStationData, type ProcedureName, type ProtocolRequest, type ProtocolResponse, - type ProtocolVersion, + ProtocolVersion, type RequestPayload, type ResponsePayload, type UIServerConfiguration, @@ -19,13 +21,24 @@ import { export abstract class AbstractUIServer { public readonly chargingStations: Map; - protected readonly httpServer: Server; + protected readonly httpServer: Server | Http2Server; protected readonly responseHandlers: Map; protected readonly uiServices: Map; public constructor(protected readonly uiServerConfiguration: UIServerConfiguration) { this.chargingStations = new Map(); - this.httpServer = new Server(); + switch (this.uiServerConfiguration.version) { + case ApplicationProtocolVersion.VERSION_11: + this.httpServer = new Server(); + break; + case ApplicationProtocolVersion.VERSION_20: + this.httpServer = createServer(); + break; + default: + throw new BaseError( + `Unsupported application protocol version ${this.uiServerConfiguration.version}`, + ); + } this.responseHandlers = new Map(); this.uiServices = new Map(); } @@ -33,7 +46,7 @@ export abstract class AbstractUIServer { public buildProtocolRequest( id: string, procedureName: ProcedureName, - requestPayload: RequestPayload + requestPayload: RequestPayload, ): ProtocolRequest { return [id, procedureName, requestPayload]; } @@ -43,17 +56,20 @@ export abstract class AbstractUIServer { } public stop(): void { + this.stopHttpServer(); this.chargingStations.clear(); } - public async sendBroadcastChannelRequest( - id: string, - procedureName: ProcedureName, - requestPayload: RequestPayload - ): Promise { - for (const uiService of this.uiServices.values()) { - await uiService.requestHandler(this.buildProtocolRequest(id, procedureName, requestPayload)); - } + public async sendInternalRequest(request: ProtocolRequest): Promise { + const protocolVersion = ProtocolVersion['0.0.1']; + this.registerProtocolVersionUIService(protocolVersion); + return this.uiServices + .get(protocolVersion) + ?.requestHandler(request) as Promise; + } + + public hasResponseHandler(id: string): boolean { + return this.responseHandlers.has(id); } protected startHttpServer(): void { @@ -78,6 +94,12 @@ export abstract class AbstractUIServer { next(); } + private stopHttpServer(): void { + if (this.httpServer.listening === true) { + this.httpServer.close(); + } + } + private isBasicAuthEnabled(): boolean { return ( this.uiServerConfiguration.authentication?.enabled === true && @@ -104,6 +126,6 @@ export abstract class AbstractUIServer { public abstract logPrefix( moduleName?: string, methodName?: string, - prefixSuffix?: string + prefixSuffix?: string, ): string; }