X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Fui-server%2FUIServerFactory.ts;h=fe2b36d22a3f39375800447beb895448e1cabd77;hb=c5ecc04daa3a6102cd586af446547dee585d506b;hp=cdcd251a5d45e8c5c8bd7175ab7519f4b83c5a6e;hpb=fe94fce08a020e0c35e354c2282ec0587a605f4e;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 cdcd251a..fe2b36d2 100644
--- a/src/charging-station/ui-server/UIServerFactory.ts
+++ b/src/charging-station/ui-server/UIServerFactory.ts
@@ -1,24 +1,52 @@
-import { AbstractUIServer } from './AbstractUIServer';
-import { ApplicationProtocol } from '../../types/UIProtocol';
-import Configuration from '../../utils/Configuration';
-import { ServerOptions } from '../../types/ConfigurationData';
-import UIWebSocketServer from './UIWebSocketServer';
+import chalk from 'chalk'
 
-export default class UIServerFactory {
-  private constructor() {
+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'
+
+// eslint-disable-next-line @typescript-eslint/no-extraneous-class
+export class UIServerFactory {
+  private constructor () {
     // This is intentional
   }
 
-  public static getUIServerImplementation(
-    applicationProtocol: ApplicationProtocol,
-    options?: ServerOptions,
-    callback?: () => void
-  ): AbstractUIServer | null {
-    switch (applicationProtocol) {
+  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.yellow(
+          'Loopback address not detected in UI server configuration. This is not recommended.'
+        )
+      )
+    }
+    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, callback);
-      default:
-        return null;
+        return new UIWebSocketServer(uiServerConfiguration)
+      case ApplicationProtocol.HTTP:
+        return new UIHttpServer(uiServerConfiguration)
     }
   }
 }