X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Fui-server%2FAbstractUIServer.ts;h=d27ea616bfe98591e9afbc8a3dff65c8f7a412df;hb=42b8cf5cdca8eaab1e7442f7c92c2a5ed97434f6;hp=c21185fe2c890d8bc2f293dcb68ba756f1a517ef;hpb=1ca4a038d1b263b3b66a3c1872742bd98a696e75;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 c21185fe..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,6 +7,7 @@ import type { AbstractUIService } from './ui-services/AbstractUIService';
 import { UIServiceFactory } from './ui-services/UIServiceFactory';
 import { BaseError } from '../../exception';
 import {
+  ApplicationProtocolVersion,
   AuthenticationType,
   type ChargingStationData,
   type ProcedureName,
@@ -19,13 +21,24 @@ import {
 
 export abstract class AbstractUIServer {
   public readonly chargingStations: Map<string, ChargingStationData>;
-  protected readonly httpServer: Server;
+  protected readonly httpServer: Server | Http2Server;
   protected readonly responseHandlers: Map<string, ServerResponse | WebSocket>;
   protected readonly uiServices: Map<ProtocolVersion, AbstractUIService>;
 
   public constructor(protected readonly uiServerConfiguration: UIServerConfiguration) {
     this.chargingStations = new Map<string, ChargingStationData>();
-    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<string, ServerResponse | WebSocket>();
     this.uiServices = new Map<ProtocolVersion, AbstractUIService>();
   }
@@ -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 sendRequestOnBroadcastChannel(request: ProtocolRequest): Promise<ProtocolResponse> {
+  public async sendInternalRequest(request: ProtocolRequest): Promise<ProtocolResponse> {
     const protocolVersion = ProtocolVersion['0.0.1'];
     this.registerProtocolVersionUIService(protocolVersion);
-    return this.uiServices.get(protocolVersion)?.requestHandler(request);
+    return this.uiServices
+      .get(protocolVersion)
+      ?.requestHandler(request) as Promise<ProtocolResponse>;
   }
 
-  public hasResponseHandler(uuid: string): boolean {
-    return this.responseHandlers.has(uuid);
+  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;
 }