fix: ensure reservation expiration internal is > 0

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

diff --git a/src/charging-station/ui-server/UIServerFactory.ts b/src/charging-station/ui-server/UIServerFactory.ts
index b0020b2e872e11dc6a59b0a5491f265203453a45..2a6b521e42446cf0713b3a138db2051bf5eb53ba 100644 (file)
--- a/src/charging-station/ui-server/UIServerFactory.ts
+++ b/src/charging-station/ui-server/UIServerFactory.ts
@@ -1,31 +1,46 @@
 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';
+import { UIHttpServer } from './UIHttpServer';
+import { UIServerUtils } from './UIServerUtils';
+import { UIWebSocketServer } from './UIWebSocketServer';
+import { ApplicationProtocol, ConfigurationSection, type UIServerConfiguration } from '../../types';
+import { Configuration } from '../../utils';
 
-export default class UIServerFactory {
+export class UIServerFactory {
   private constructor() {
     // This is intentional
   }
 
   public static getUIServerImplementation(
-    applicationProtocol: ApplicationProtocol,
-    options?: ServerOptions
+    uiServerConfiguration?: UIServerConfiguration,
   ): AbstractUIServer | null {
-    if (!UIServiceUtils.isLoopback(options?.host)) {
+    if (UIServerUtils.isLoopback(uiServerConfiguration!.options!.host!) === false) {
       console.warn(
-        chalk.magenta(
-          'Loopback address not detected in UI server configuration. This is not recommended.'
-        )
+        chalk.yellow(
+          'Loopback address not detected in UI server configuration. This is not recommended.',
+        ),
       );
     }
-    switch (applicationProtocol) {
+    switch (
+      uiServerConfiguration?.type ??
+      Configuration.getConfigurationSection<UIServerConfiguration>(ConfigurationSection.uiServer)
+        .type
+    ) {
       case ApplicationProtocol.WS:
-        return new UIWebSocketServer(options ?? Configuration.getUIServer().options);
+        return new UIWebSocketServer(
+          uiServerConfiguration ??
+            Configuration.getConfigurationSection<UIServerConfiguration>(
+              ConfigurationSection.uiServer,
+            ),
+        );
+      case ApplicationProtocol.HTTP:
+        return new UIHttpServer(
+          uiServerConfiguration ??
+            Configuration.getConfigurationSection<UIServerConfiguration>(
+              ConfigurationSection.uiServer,
+            ),
+        );
       default:
         return null;
     }