X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftypes%2FConfigurationData.ts;h=58372a3882a5cb064ae7df9c20748c0693ce18e9;hb=ebbfbf1c01e010d051956867484b74a94237f546;hp=fdb83b57486d3b9a1017e254ed874533ee406e25;hpb=324fd4ee84aa8b7bff66c751f1f73c659e449682;p=e-mobility-charging-stations-simulator.git

diff --git a/src/types/ConfigurationData.ts b/src/types/ConfigurationData.ts
index fdb83b57..58372a38 100644
--- a/src/types/ConfigurationData.ts
+++ b/src/types/ConfigurationData.ts
@@ -1,43 +1,73 @@
-import { ServerOptions } from 'ws';
-import { StorageType } from './Storage';
+import type { ListenOptions } from 'net';
+
 import type { WorkerChoiceStrategy } from 'poolifier';
-import { WorkerProcessType } from './Worker';
-import { level } from 'winston';
+
+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',
   RANDOM = 'random',
-  SEQUENTIAL = 'sequential',
+  CHARGING_STATION_AFFINITY = 'charging-station-affinity',
 }
 
-export interface StationTemplateUrl {
+export type StationTemplateUrl = {
   file: string;
   numberOfStations: number;
-}
+};
 
-export interface UIWebSocketServerConfiguration {
+export type UIServerConfiguration = {
   enabled?: boolean;
+  type?: ApplicationProtocol;
   options?: ServerOptions;
-}
+  authentication?: {
+    enabled: boolean;
+    type: AuthenticationType;
+    username?: string;
+    password?: string;
+  };
+};
 
-export interface StorageConfiguration {
+export type StorageConfiguration = {
   enabled?: boolean;
   type?: StorageType;
   uri?: string;
-}
+};
 
-export default interface ConfigurationData {
+export type WorkerConfiguration = {
+  processType?: WorkerProcessType;
+  startDelay?: number;
+  elementsPerWorker?: number;
+  elementStartDelay?: number;
+  poolMinSize?: number;
+  poolMaxSize?: number;
+  poolStrategy?: WorkerChoiceStrategy;
+};
+
+export type ConfigurationData = {
   supervisionUrls?: string | string[];
   supervisionUrlDistribution?: SupervisionUrlDistribution;
   stationTemplateUrls: StationTemplateUrl[];
-  uiWebSocketServer?: UIWebSocketServerConfiguration;
+  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;
@@ -47,4 +77,4 @@ export default interface ConfigurationData {
   logFile?: string;
   logErrorFile?: string;
   logConsole?: boolean;
-}
+};