UI server: factor services registration

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>

diff --git a/src/charging-station/ui-server/AbstractUIServer.ts b/src/charging-station/ui-server/AbstractUIServer.ts
index a55d0070abb8fb6b4322203f608a8ea2d1a120cf..48151dc48c49cfe3ceb2dd93f100fa39806eb24a 100644 (file)
--- a/src/charging-station/ui-server/AbstractUIServer.ts
+++ b/src/charging-station/ui-server/AbstractUIServer.ts
@@ -12,6 +12,7 @@ import {
   ResponsePayload,
 } from '../../types/UIProtocol';
 import type AbstractUIService from './ui-services/AbstractUIService';
+import UIServiceFactory from './ui-services/UIServiceFactory';
 
 export abstract class AbstractUIServer {
   public readonly chargingStations: Map<string, ChargingStationData>;
@@ -35,6 +36,12 @@ export abstract class AbstractUIServer {
     return [id, responsePayload];
   }
 
+  protected registerProtocolVersionUIService(version: ProtocolVersion): void {
+    if (this.uiServices.has(version) === false) {
+      this.uiServices.set(version, UIServiceFactory.getUIServiceImplementation(version, this));
+    }
+  }
+
   protected isBasicAuthEnabled(): boolean {
     return (
       this.uiServerConfiguration.authentication?.enabled === true &&

diff --git a/src/charging-station/ui-server/UIHttpServer.ts b/src/charging-station/ui-server/UIHttpServer.ts
index ce52ed4b5dd432a9c9035bbdc0eac01c7a422e4f..4db72bf71e473f21526e6663f3d247ad6c5687e0 100644 (file)
--- a/src/charging-station/ui-server/UIHttpServer.ts
+++ b/src/charging-station/ui-server/UIHttpServer.ts
@@ -16,7 +16,6 @@ import {
 import logger from '../../utils/Logger';
 import Utils from '../../utils/Utils';
 import { AbstractUIServer } from './AbstractUIServer';
-import UIServiceFactory from './ui-services/UIServiceFactory';
 import { UIServiceUtils } from './ui-services/UIServiceUtils';
 
 const moduleName = 'UIHttpServer';
@@ -97,9 +96,7 @@ export default class UIHttpServer extends AbstractUIServer {
           error
         );
       });
-      if (this.uiServices.has(version) === false) {
-        this.uiServices.set(version, UIServiceFactory.getUIServiceImplementation(version, this));
-      }
+      this.registerProtocolVersionUIService(version);
       if (req.method === 'POST') {
         const bodyBuffer = [];
         req

diff --git a/src/charging-station/ui-server/UIWebSocketServer.ts b/src/charging-station/ui-server/UIWebSocketServer.ts
index ea54bec0526da573c31d1c5915dfe27f270ba890..f789d3963e881762b58457e1fa5eed498633b5a4 100644 (file)
--- a/src/charging-station/ui-server/UIWebSocketServer.ts
+++ b/src/charging-station/ui-server/UIWebSocketServer.ts
@@ -11,7 +11,6 @@ import { WebSocketCloseEventStatusCode } from '../../types/WebSocket';
 import logger from '../../utils/Logger';
 import Utils from '../../utils/Utils';
 import { AbstractUIServer } from './AbstractUIServer';
-import UIServiceFactory from './ui-services/UIServiceFactory';
 import { UIServiceUtils } from './ui-services/UIServiceUtils';
 
 const moduleName = 'UIWebSocketServer';
@@ -40,9 +39,7 @@ export default class UIWebSocketServer extends AbstractUIServer {
         );
         ws.close(WebSocketCloseEventStatusCode.CLOSE_PROTOCOL_ERROR);
       }
-      if (this.uiServices.has(version) === false) {
-        this.uiServices.set(version, UIServiceFactory.getUIServiceImplementation(version, this));
-      }
+      this.registerProtocolVersionUIService(version);
       ws.on('message', (rawData) => {
         const request = this.validateRawDataRequest(rawData);
         if (request === false) {