Add UI HTTP server (#6)

[e-mobility-charging-stations-simulator.git] / src / charging-station / ui-server / ui-services / AbstractUIService.ts

diff --git a/src/charging-station/ui-server/ui-services/AbstractUIService.ts b/src/charging-station/ui-server/ui-services/AbstractUIService.ts
index 092742b718c6e294f44b5e83165f9633182d9292..e27577d353e004491a7e926facc24cce4efa41d4 100644 (file)
--- a/src/charging-station/ui-server/ui-services/AbstractUIService.ts
+++ b/src/charging-station/ui-server/ui-services/AbstractUIService.ts
@@ -36,7 +36,7 @@ export default abstract class AbstractUIService {
     this.uiServiceWorkerBroadcastChannel = new UIServiceWorkerBroadcastChannel(this);
   }
 
-  public async requestHandler(request: RawData): Promise<void> {
+  public async requestHandler(request: RawData | JsonType): Promise<void> {
     let messageId: string;
     let command: ProcedureName;
     let requestPayload: RequestPayload | undefined;
@@ -58,10 +58,7 @@ export default abstract class AbstractUIService {
       responsePayload = await this.requestHandlers.get(command)(messageId, requestPayload);
     } catch (error) {
       // Log
-      logger.error(
-        `${this.uiServer.logPrefix(moduleName, 'messageHandler')} Handle request error:`,
-        error
-      );
+      logger.error(`${this.logPrefix(moduleName, 'messageHandler')} Handle request error:`, error);
       responsePayload = {
         status: ResponseStatus.FAILURE,
         command,
@@ -74,7 +71,7 @@ export default abstract class AbstractUIService {
 
     if (responsePayload !== undefined) {
       // Send the response
-      this.uiServer.sendResponse(this.buildProtocolResponse(messageId ?? 'error', responsePayload));
+      this.sendResponse(messageId ?? 'error', responsePayload);
     }
   }
 
@@ -108,12 +105,12 @@ export default abstract class AbstractUIService {
 
   // Validate the raw data received from the WebSocket
   // TODO: should probably be moved to the ws verify clients callback
-  private requestValidation(rawData: RawData): ProtocolRequest {
+  private requestValidation(rawData: RawData | JsonType): ProtocolRequest {
     // logger.debug(
-    //   `${this.uiServer.logPrefix(
+    //   `${this.logPrefix(
     //     moduleName,
-    //     'dataValidation'
-    //   )} Raw data received: ${rawData.toString()}`
+    //     'requestValidation'
+    //   )} Data received in string format: ${rawData.toString()}`
     // );
 
     const data = JSON.parse(rawData.toString()) as JsonType[];