X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftypes%2FConfigurationData.ts;h=fe8b84819452354572011d23388ffc679637d701;hb=48c7e1d6db4b3cbf82d17e191b2255066c462a71;hp=a7b22af6bbcd47c9726398a8ebd5de55d22b057a;hpb=18d3414af1e352238e2888687b02d6e2606fb4f9;p=e-mobility-charging-stations-simulator.git

diff --git a/src/types/ConfigurationData.ts b/src/types/ConfigurationData.ts
index a7b22af6..fe8b8481 100644
--- a/src/types/ConfigurationData.ts
+++ b/src/types/ConfigurationData.ts
@@ -1,50 +1,123 @@
-import { StorageType } from './Storage';
-import { ServerOptions as WSServerOptions } from 'ws';
-import type { WorkerChoiceStrategy } from 'poolifier';
-import { WorkerProcessType } from './Worker';
+import type { ListenOptions } from 'node:net'
+import type { ResourceLimits } from 'node:worker_threads'
+
+import type { WorkerChoiceStrategy } from 'poolifier'
+
+import type { StorageType } from './Storage.js'
+import type { ApplicationProtocol, AuthenticationType } from './UIProtocol.js'
+import type { WorkerProcessType } from '../worker/index.js'
+
+type ServerOptions = ListenOptions
+
+export enum ConfigurationSection {
+  log = 'log',
+  performanceStorage = 'performanceStorage',
+  worker = 'worker',
+  uiServer = 'uiServer'
+}
 
 export enum SupervisionUrlDistribution {
   ROUND_ROBIN = 'round-robin',
   RANDOM = 'random',
-  SEQUENTIAL = 'sequential',
+  CHARGING_STATION_AFFINITY = 'charging-station-affinity'
 }
 
 export interface StationTemplateUrl {
-  file: string;
-  numberOfStations: number;
+  file: string
+  numberOfStations: number
+}
+
+export interface LogConfiguration {
+  enabled?: boolean
+  file?: string
+  errorFile?: string
+  statisticsInterval?: number
+  level?: string
+  console?: boolean
+  format?: string
+  rotate?: boolean
+  maxFiles?: string | number
+  maxSize?: string | number
+}
+
+export enum ApplicationProtocolVersion {
+  VERSION_11 = 1.1,
+  VERSION_20 = 2.0
 }
 
 export interface UIServerConfiguration {
-  enabled?: boolean;
-  options?: WSServerOptions;
+  enabled?: boolean
+  type?: ApplicationProtocol
+  version?: ApplicationProtocolVersion
+  options?: ServerOptions
+  authentication?: {
+    enabled: boolean
+    type: AuthenticationType
+    username?: string
+    password?: string
+  }
 }
 
 export interface StorageConfiguration {
-  enabled?: boolean;
-  type?: StorageType;
-  uri?: string;
-}
-
-export default interface ConfigurationData {
-  supervisionUrls?: string | string[];
-  supervisionUrlDistribution?: SupervisionUrlDistribution;
-  stationTemplateUrls: StationTemplateUrl[];
-  uiServer?: UIServerConfiguration;
-  performanceStorage?: StorageConfiguration;
-  autoReconnectMaxRetries?: number;
-  workerProcess?: WorkerProcessType;
-  workerStartDelay?: number;
-  elementStartDelay?: number;
-  workerPoolMinSize?: number;
-  workerPoolMaxSize?: number;
-  workerPoolStrategy?: WorkerChoiceStrategy;
-  chargingStationsPerWorker?: number;
-  logStatisticsInterval?: number;
-  logFormat?: string;
-  logLevel?: string;
-  logRotate?: boolean;
-  logMaxFiles?: number;
-  logFile?: string;
-  logErrorFile?: string;
-  logConsole?: boolean;
+  enabled?: boolean
+  type?: StorageType
+  uri?: string
+}
+
+export type ElementsPerWorkerType = number | 'auto' | 'all'
+
+export interface WorkerConfiguration {
+  processType?: WorkerProcessType
+  startDelay?: number
+  elementsPerWorker?: ElementsPerWorkerType
+  elementStartDelay?: number
+  poolMinSize?: number
+  poolMaxSize?: number
+  resourceLimits?: ResourceLimits
+}
+
+export interface ConfigurationData {
+  supervisionUrls?: string | string[]
+  supervisionUrlDistribution?: SupervisionUrlDistribution
+  stationTemplateUrls: StationTemplateUrl[]
+  log?: LogConfiguration
+  worker?: WorkerConfiguration
+  uiServer?: UIServerConfiguration
+  performanceStorage?: StorageConfiguration
+  /** @deprecated Moved to charging station template */
+  autoReconnectMaxRetries?: number
+  /** @deprecated Moved to worker configuration section. */
+  workerProcess?: WorkerProcessType
+  /** @deprecated Moved to worker configuration section. */
+  workerStartDelay?: number
+  /** @deprecated Moved to worker configuration section. */
+  elementStartDelay?: number
+  /** @deprecated Moved to worker configuration section. */
+  workerPoolMinSize?: number
+  /** @deprecated Moved to worker configuration section. */
+  workerPoolMaxSize?: number
+  /** @deprecated Moved to worker configuration section. */
+  workerPoolStrategy?: WorkerChoiceStrategy
+  /** @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
+  /** @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
 }