Fix UI server options type and instantiation signature

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>

diff --git a/src/charging-station/ui-server/UIServerFactory.ts b/src/charging-station/ui-server/UIServerFactory.ts
index cdcd251a5d45e8c5c8bd7175ab7519f4b83c5a6e..1ad64014219ace91a0bdcf3c4afe24e4fb00f8ba 100644 (file)
--- a/src/charging-station/ui-server/UIServerFactory.ts
+++ b/src/charging-station/ui-server/UIServerFactory.ts
@@ -11,12 +11,11 @@ export default class UIServerFactory {
 
   public static getUIServerImplementation(
     applicationProtocol: ApplicationProtocol,
-    options?: ServerOptions,
-    callback?: () => void
+    options?: ServerOptions
   ): AbstractUIServer | null {
     switch (applicationProtocol) {
       case ApplicationProtocol.WS:
-        return new UIWebSocketServer(options ?? Configuration.getUIServer().options, callback);
+        return new UIWebSocketServer(options ?? Configuration.getUIServer().options);
       default:
         return null;
     }

diff --git a/src/charging-station/ui-server/UIWebSocketServer.ts b/src/charging-station/ui-server/UIWebSocketServer.ts
index da476895d5f87dc3476797efd011e389808ade66..fcfc309708811f88eeef7857c6dfec13639f0ce4 100644 (file)
--- a/src/charging-station/ui-server/UIWebSocketServer.ts
+++ b/src/charging-station/ui-server/UIWebSocketServer.ts
@@ -10,9 +10,9 @@ import Utils from '../../utils/Utils';
 import logger from '../../utils/Logger';
 
 export default class UIWebSocketServer extends AbstractUIServer {
-  public constructor(options?: ServerOptions, callback?: () => void) {
+  public constructor(options?: ServerOptions) {
     super();
-    this.uiServer = new Server(options ?? Configuration.getUIServer().options, callback);
+    this.uiServer = new Server(options ?? Configuration.getUIServer().options);
   }
 
   public start(): void {

diff --git a/src/types/ConfigurationData.ts b/src/types/ConfigurationData.ts
index 93b0b75c6b60058630ea1399f762093e96fc3201..9aed2f1fab3fae597ed6b45684aa481241439f31 100644 (file)
--- a/src/types/ConfigurationData.ts
+++ b/src/types/ConfigurationData.ts
@@ -1,10 +1,10 @@
-import { ServerOptions as HttpServerOptions } from 'http';
+import { ListenOptions } from 'net';
 import { StorageType } from './Storage';
 import { ServerOptions as WSServerOptions } from 'ws';
 import type { WorkerChoiceStrategy } from 'poolifier';
 import { WorkerProcessType } from './Worker';
 
-export type ServerOptions = WSServerOptions & HttpServerOptions;
+export type ServerOptions = WSServerOptions & ListenOptions;
 
 export enum SupervisionUrlDistribution {
   ROUND_ROBIN = 'round-robin',