X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Fui-server%2FUIServerFactory.ts;h=fe2b36d22a3f39375800447beb895448e1cabd77;hb=b5977da89e7a5d292b060c7af75802ee207eb2cc;hp=b0020b2e872e11dc6a59b0a5491f265203453a45;hpb=8114d10e3893e96bb725ce2fca9744429ee4b75b;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/ui-server/UIServerFactory.ts b/src/charging-station/ui-server/UIServerFactory.ts
index b0020b2e..fe2b36d2 100644
--- a/src/charging-station/ui-server/UIServerFactory.ts
+++ b/src/charging-station/ui-server/UIServerFactory.ts
@@ -1,33 +1,52 @@
-import chalk from 'chalk';
+import chalk from 'chalk'
 
-import { ServerOptions } from '../../types/ConfigurationData';
-import { ApplicationProtocol } from '../../types/UIProtocol';
-import Configuration from '../../utils/Configuration';
-import { AbstractUIServer } from './AbstractUIServer';
-import { UIServiceUtils } from './ui-services/UIServiceUtils';
-import UIWebSocketServer from './UIWebSocketServer';
+import type { AbstractUIServer } from './AbstractUIServer.js'
+import { UIHttpServer } from './UIHttpServer.js'
+import { UIServerUtils } from './UIServerUtils.js'
+import { UIWebSocketServer } from './UIWebSocketServer.js'
+import {
+  ApplicationProtocol,
+  ApplicationProtocolVersion,
+  type UIServerConfiguration
+} from '../../types/index.js'
 
-export default class UIServerFactory {
-  private constructor() {
+// eslint-disable-next-line @typescript-eslint/no-extraneous-class
+export class UIServerFactory {
+  private constructor () {
     // This is intentional
   }
 
-  public static getUIServerImplementation(
-    applicationProtocol: ApplicationProtocol,
-    options?: ServerOptions
-  ): AbstractUIServer | null {
-    if (!UIServiceUtils.isLoopback(options?.host)) {
+  public static getUIServerImplementation (
+    uiServerConfiguration: UIServerConfiguration
+  ): AbstractUIServer | undefined {
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    if (!UIServerUtils.isLoopback(uiServerConfiguration.options!.host!)) {
       console.warn(
-        chalk.magenta(
+        chalk.yellow(
           'Loopback address not detected in UI server configuration. This is not recommended.'
         )
-      );
+      )
     }
-    switch (applicationProtocol) {
+    uiServerConfiguration = {
+      version: ApplicationProtocolVersion.VERSION_11,
+      ...uiServerConfiguration
+    }
+    if (
+      uiServerConfiguration.type === ApplicationProtocol.WS &&
+      uiServerConfiguration.version !== ApplicationProtocolVersion.VERSION_11
+    ) {
+      console.warn(
+        chalk.yellow(
+          `Only version ${ApplicationProtocolVersion.VERSION_11} is supported for WebSocket UI server. Falling back to version ${ApplicationProtocolVersion.VERSION_11}.`
+        )
+      )
+      uiServerConfiguration.version = ApplicationProtocolVersion.VERSION_11
+    }
+    switch (uiServerConfiguration.type) {
       case ApplicationProtocol.WS:
-        return new UIWebSocketServer(options ?? Configuration.getUIServer().options);
-      default:
-        return null;
+        return new UIWebSocketServer(uiServerConfiguration)
+      case ApplicationProtocol.HTTP:
+        return new UIHttpServer(uiServerConfiguration)
     }
   }
 }