X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftypes%2FChargingStationWorker.ts;h=4d47a5e3698bb96a5bad1e9f3093af396993be32;hb=9388120364d5a2f3b9103f05802e1756d2dad04f;hp=d53152dc00dd4c2cf56f0d23064d35548468d9cc;hpb=8d8599f0565ba2121394a3d22214d13dbfa0f2c3;p=e-mobility-charging-stations-simulator.git

diff --git a/src/types/ChargingStationWorker.ts b/src/types/ChargingStationWorker.ts
index d53152dc..4d47a5e3 100644
--- a/src/types/ChargingStationWorker.ts
+++ b/src/types/ChargingStationWorker.ts
@@ -1,58 +1,68 @@
-import type { WebSocket } from 'ws';
-
-import type {
-  BootNotificationResponse,
-  ChargingStationAutomaticTransactionGeneratorConfiguration,
-  ChargingStationInfo,
-  ChargingStationOcppConfiguration,
-  ConnectorStatus,
-  JsonObject,
-  Statistics,
-} from './internal';
-import { type WorkerData, type WorkerMessage, WorkerMessageEvents } from '../worker';
-
-interface ChargingStationWorkerOptions extends JsonObject {
-  elementStartDelay?: number;
+import type { WebSocket } from 'ws'
+
+import type { WorkerData } from '../worker/index.js'
+import type { ChargingStationAutomaticTransactionGeneratorConfiguration } from './AutomaticTransactionGenerator.js'
+import { ChargingStationEvents } from './ChargingStationEvents.js'
+import type { ChargingStationInfo } from './ChargingStationInfo.js'
+import type { ChargingStationOcppConfiguration } from './ChargingStationOcppConfiguration.js'
+import type { ConnectorStatus } from './ConnectorStatus.js'
+import type { EvseStatus } from './Evse.js'
+import type { JsonObject } from './JsonType.js'
+import type { BootNotificationResponse } from './ocpp/Responses.js'
+import type { Statistics } from './Statistics.js'
+
+export interface ChargingStationOptions extends JsonObject {
+  supervisionUrls?: string | string[]
+  persistentConfiguration?: boolean
+  autoStart?: boolean
+  autoRegister?: boolean
+  enableStatistics?: boolean
+  ocppStrictCompliance?: boolean
+  stopTransactionsOnStopped?: boolean
 }
 
 export interface ChargingStationWorkerData extends WorkerData {
-  index: number;
-  templateFile: string;
-  chargingStationWorkerOptions?: ChargingStationWorkerOptions;
+  index: number
+  templateFile: string
+  options?: ChargingStationOptions
+}
+
+export type EvseStatusWorkerType = Omit<EvseStatus, 'connectors'> & {
+  connectors?: ConnectorStatus[]
 }
 
 export interface ChargingStationData extends WorkerData {
-  started: boolean;
-  stationInfo: ChargingStationInfo;
-  connectors: ConnectorStatus[];
-  ocppConfiguration: ChargingStationOcppConfiguration;
+  started: boolean
+  stationInfo: ChargingStationInfo
+  connectors: ConnectorStatus[]
+  evses: EvseStatusWorkerType[]
+  ocppConfiguration: ChargingStationOcppConfiguration
+  supervisionUrl: string
   wsState?:
-    | typeof WebSocket.CONNECTING
-    | typeof WebSocket.OPEN
-    | typeof WebSocket.CLOSING
-    | typeof WebSocket.CLOSED;
-  bootNotificationResponse?: BootNotificationResponse;
-  automaticTransactionGenerator?: ChargingStationAutomaticTransactionGeneratorConfiguration;
+  | typeof WebSocket.CONNECTING
+  | typeof WebSocket.OPEN
+  | typeof WebSocket.CLOSING
+  | typeof WebSocket.CLOSED
+  bootNotificationResponse?: BootNotificationResponse
+  automaticTransactionGenerator?: ChargingStationAutomaticTransactionGeneratorConfiguration
 }
 
 enum ChargingStationMessageEvents {
-  STARTED = 'started',
-  STOPPED = 'stopped',
-  UPDATED = 'updated',
-  PERFORMANCE_STATISTICS = 'performanceStatistics',
+  performanceStatistics = 'performanceStatistics'
 }
 
 export const ChargingStationWorkerMessageEvents = {
-  ...WorkerMessageEvents,
-  ...ChargingStationMessageEvents,
-} as const;
-export type ChargingStationWorkerMessageEvents = WorkerMessageEvents | ChargingStationMessageEvents;
-
-export type ChargingStationWorkerMessageData = ChargingStationData | Statistics;
-
-export type ChargingStationWorkerMessage<T extends ChargingStationWorkerMessageData> = Omit<
-  WorkerMessage<T>,
-  'id'
-> & {
-  id: ChargingStationWorkerMessageEvents;
-};
+  ...ChargingStationEvents,
+  ...ChargingStationMessageEvents
+} as const
+// eslint-disable-next-line @typescript-eslint/no-redeclare
+export type ChargingStationWorkerMessageEvents =
+  | ChargingStationEvents
+  | ChargingStationMessageEvents
+
+export type ChargingStationWorkerMessageData = ChargingStationData | Statistics
+
+export interface ChargingStationWorkerMessage<T extends ChargingStationWorkerMessageData> {
+  event: ChargingStationWorkerMessageEvents
+  data: T
+}