X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FUIWebSocketServer.ts;h=110695512093e77426937d1ecc3b74fbb858e139;hb=3e0905a14af7b7e0a96e859d6c4c615044845d54;hp=78ca7516b89a07d53ee59f78e36e0d6ba5162098;hpb=4198ad5c76ad58e444c1dd2d3f81b5f8fd2846d4;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/UIWebSocketServer.ts b/src/charging-station/UIWebSocketServer.ts
index 78ca7516..11069551 100644
--- a/src/charging-station/UIWebSocketServer.ts
+++ b/src/charging-station/UIWebSocketServer.ts
@@ -1,24 +1,31 @@
 import { Protocol, ProtocolCommand, ProtocolRequest, ProtocolVersion } from '../types/UIProtocol';
+import WebSocket, { OPEN, Server, ServerOptions } from 'ws';
 
-import AbstractUIService from './UIWebSocketServices/AbstractUIService';
+import AbstractUIService from './ui-websocket-services/AbstractUIService';
 import BaseError from '../exception/BaseError';
+import Configuration from '../utils/Configuration';
 import { IncomingMessage } from 'http';
-import UIServiceFactory from './UIWebSocketServices/UIServiceFactory';
+import UIServiceFactory from './ui-websocket-services/UIServiceFactory';
 import Utils from '../utils/Utils';
-import WebSocket from 'ws';
 import logger from '../utils/Logger';
 
-export default class UIWebSocketServer extends WebSocket.Server {
-  public uiService: AbstractUIService;
+export default class UIWebSocketServer extends Server {
+  public readonly chargingStations: Set<string>;
+  public readonly uiServices: Map<ProtocolVersion, AbstractUIService>;
 
-  public constructor(options?: WebSocket.ServerOptions, callback?: () => void) {
+  public constructor(options?: ServerOptions, callback?: () => void) {
     // Create the WebSocket Server
-    super(options ?? { port: 80 }, callback);
+    super(options ?? Configuration.getUIWebSocketServer().options, callback);
+    this.chargingStations = new Set<string>();
+    this.uiServices = new Map<ProtocolVersion, AbstractUIService>();
+    for (const version of Object.values(ProtocolVersion)) {
+      this.uiServices.set(version, UIServiceFactory.getUIServiceImplementation(version, this));
+    }
   }
 
-  public broadcastToClients(message: string | Record<string, unknown>): void {
+  public broadcastToClients(message: string): void {
     for (const client of this.clients) {
-      if (client?.readyState === WebSocket.OPEN) {
+      if (client?.readyState === OPEN) {
         client.send(message);
       }
     }
@@ -27,10 +34,13 @@ export default class UIWebSocketServer extends WebSocket.Server {
   public start(): void {
     this.on('connection', (socket: WebSocket, request: IncomingMessage): void => {
       const protocolIndex = socket.protocol.indexOf(Protocol.UI);
-      const version = socket.protocol.substring(protocolIndex + Protocol.UI.length) as ProtocolVersion;
-      this.uiService = UIServiceFactory.getUIServiceImplementation(version, this);
-      if (!this.uiService) {
-        throw new BaseError(`Could not find a UI service implementation for protocol version ${version}`);
+      const version = socket.protocol.substring(
+        protocolIndex + Protocol.UI.length
+      ) as ProtocolVersion;
+      if (!this.uiServices.has(version)) {
+        throw new BaseError(
+          `Could not find a UI service implementation for UI protocol version ${version}`
+        );
       }
       // FIXME: check connection validity
       socket.on('message', (messageData) => {
@@ -39,11 +49,18 @@ export default class UIWebSocketServer extends WebSocket.Server {
         if (Utils.isIterable(protocolRequest)) {
           [command, payload] = protocolRequest;
         } else {
-          throw new BaseError('Protocol request is not iterable');
+          throw new BaseError('UI protocol request is not iterable');
         }
-        this.uiService.handleMessage(command, payload).catch(() => {
-          logger.error(`${this.logPrefix()} Error while handling command %s message: %j`, command, payload);
-        });
+        this.uiServices
+          .get(version)
+          .messageHandler(command, payload)
+          .catch(() => {
+            logger.error(
+              `${this.logPrefix()} Error while handling command %s message: %j`,
+              command,
+              payload
+            );
+          });
       });
       socket.on('error', (error) => {
         logger.error(`${this.logPrefix()} Error on WebSocket: %j`, error);
@@ -56,6 +73,6 @@ export default class UIWebSocketServer extends WebSocket.Server {
   }
 
   public logPrefix(): string {
-    return Utils.logPrefix('WebSocket Server:');
+    return Utils.logPrefix(' UI WebSocket Server:');
   }
 }