X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftypes%2FConfigurationData.ts;h=a244aa45d7cfafa99c6e6ca32568c5ac8b5738fd;hb=3e8d029bbd0a072ae80c45e9a50770de3218cbc1;hp=e549368138e2c4d0dfbce04eceea9f08ab9db28c;hpb=8114d10e3893e96bb725ce2fca9744429ee4b75b;p=e-mobility-charging-stations-simulator.git

diff --git a/src/types/ConfigurationData.ts b/src/types/ConfigurationData.ts
index e5493681..a244aa45 100644
--- a/src/types/ConfigurationData.ts
+++ b/src/types/ConfigurationData.ts
@@ -1,36 +1,56 @@
-import { ListenOptions } from 'net';
+import type { ListenOptions } from 'node:net';
 
 import type { WorkerChoiceStrategy } from 'poolifier';
-import { ServerOptions as WSServerOptions } from 'ws';
 
-import { StorageType } from './Storage';
-import { WorkerProcessType } from './Worker';
+import type { StorageType } from './Storage';
+import type { ApplicationProtocol, AuthenticationType } from './UIProtocol';
+import type { WorkerProcessType } from '../worker';
 
-export type ServerOptions = WSServerOptions & ListenOptions;
+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 type LogConfiguration = {
+  enabled?: boolean;
+  file?: string;
+  errorFile?: string;
+  statisticsInterval?: number;
+  level?: string;
+  console?: boolean;
+  format?: string;
+  rotate?: boolean;
+  maxFiles?: string | number;
+  maxSize?: string | number;
+};
 
-export interface UIServerConfiguration {
+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 interface WorkerConfiguration {
+export type WorkerConfiguration = {
   processType?: WorkerProcessType;
   startDelay?: number;
   elementsPerWorker?: number;
@@ -38,36 +58,49 @@ export interface WorkerConfiguration {
   poolMinSize?: number;
   poolMaxSize?: number;
   poolStrategy?: WorkerChoiceStrategy;
-}
+};
 
-export default interface ConfigurationData {
+export type ConfigurationData = {
   supervisionUrls?: string | string[];
   supervisionUrlDistribution?: SupervisionUrlDistribution;
   stationTemplateUrls: StationTemplateUrl[];
+  log?: LogConfiguration;
+  worker?: WorkerConfiguration;
   uiServer?: UIServerConfiguration;
   performanceStorage?: StorageConfiguration;
-  worker?: WorkerConfiguration;
   autoReconnectMaxRetries?: number;
-  // deprecated
+  /** @deprecated Moved to worker configuration section. */
   workerProcess?: WorkerProcessType;
-  // deprecated
+  /** @deprecated Moved to worker configuration section. */
   workerStartDelay?: number;
-  // deprecated
+  /** @deprecated Moved to worker configuration section. */
   elementStartDelay?: number;
-  // deprecated
+  /** @deprecated Moved to worker configuration section. */
   workerPoolMinSize?: number;
-  // deprecated
+  /** @deprecated Moved to worker configuration section. */
   workerPoolMaxSize?: number;
-  // deprecated
+  /** @deprecated Moved to worker configuration section. */
   workerPoolStrategy?: WorkerChoiceStrategy;
-  // deprecated
+  /** @deprecated Moved to worker configuration section. */
   chargingStationsPerWorker?: number;
+  /** @deprecated Moved to log configuration section. */
   logStatisticsInterval?: number;
+  /** @deprecated Moved to log configuration section. */
+  logEnabled?: boolean;
+  /** @deprecated Moved to log configuration section. */
+  logConsole?: boolean;
+  /** @deprecated Moved to log configuration section. */
   logFormat?: string;
+  /** @deprecated Moved to log configuration section. */
   logLevel?: string;
+  /** @deprecated Moved to log configuration section. */
   logRotate?: boolean;
-  logMaxFiles?: number;
+  /** @deprecated Moved to log configuration section. */
+  logMaxFiles?: number | string;
+  /** @deprecated Moved to log configuration section. */
+  logMaxSize?: number | string;
+  /** @deprecated Moved to log configuration section. */
   logFile?: string;
+  /** @deprecated Moved to log configuration section. */
   logErrorFile?: string;
-  logConsole?: boolean;
-}
+};