X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftypes%2FConfigurationData.ts;h=fb67bced00fdf3ac8f75f107a74f1383ff61a02e;hb=2a61222f10b8abdb97d022790e4ad543c4bd1d6c;hp=93b0b75c6b60058630ea1399f762093e96fc3201;hpb=662710925f570077ed9af59519912546f9bb8eaa;p=e-mobility-charging-stations-simulator.git

diff --git a/src/types/ConfigurationData.ts b/src/types/ConfigurationData.ts
index 93b0b75c..fb67bced 100644
--- a/src/types/ConfigurationData.ts
+++ b/src/types/ConfigurationData.ts
@@ -1,10 +1,12 @@
-import { ServerOptions as HttpServerOptions } from 'http';
-import { StorageType } from './Storage';
-import { ServerOptions as WSServerOptions } from 'ws';
+import type { ListenOptions } from 'net';
+
 import type { WorkerChoiceStrategy } from 'poolifier';
-import { WorkerProcessType } from './Worker';
 
-export type ServerOptions = WSServerOptions & HttpServerOptions;
+import type { StorageType } from './Storage';
+import type { ApplicationProtocol, AuthenticationType } from './UIProtocol';
+import type { WorkerProcessType } from './Worker';
+
+export type ServerOptions = ListenOptions;
 
 export enum SupervisionUrlDistribution {
   ROUND_ROBIN = 'round-robin',
@@ -19,7 +21,14 @@ export interface StationTemplateUrl {
 
 export interface UIServerConfiguration {
   enabled?: boolean;
+  type?: ApplicationProtocol;
   options?: ServerOptions;
+  authentication?: {
+    enabled: boolean;
+    type: AuthenticationType;
+    username?: string;
+    password?: string;
+  };
 }
 
 export interface StorageConfiguration {
@@ -28,19 +37,37 @@ export interface StorageConfiguration {
   uri?: string;
 }
 
+export interface WorkerConfiguration {
+  processType?: WorkerProcessType;
+  startDelay?: number;
+  elementsPerWorker?: number;
+  elementStartDelay?: number;
+  poolMinSize?: number;
+  poolMaxSize?: number;
+  poolStrategy?: WorkerChoiceStrategy;
+}
+
 export default interface ConfigurationData {
   supervisionUrls?: string | string[];
   supervisionUrlDistribution?: SupervisionUrlDistribution;
   stationTemplateUrls: StationTemplateUrl[];
   uiServer?: UIServerConfiguration;
   performanceStorage?: StorageConfiguration;
+  worker?: WorkerConfiguration;
   autoReconnectMaxRetries?: number;
+  // deprecated
   workerProcess?: WorkerProcessType;
+  // deprecated
   workerStartDelay?: number;
+  // deprecated
   elementStartDelay?: number;
+  // deprecated
   workerPoolMinSize?: number;
+  // deprecated
   workerPoolMaxSize?: number;
+  // deprecated
   workerPoolStrategy?: WorkerChoiceStrategy;
+  // deprecated
   chargingStationsPerWorker?: number;
   logStatisticsInterval?: number;
   logFormat?: string;