X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftypes%2FChargingStationWorker.ts;h=2326d765c7ddd05f3021cb46d1d001ae2f4da0b9;hb=20558952fb18725ad134a5148a873a30fcced31d;hp=945d3d207d00865674b9fc7346f3d81a27d57a5b;hpb=8114d10e3893e96bb725ce2fca9744429ee4b75b;p=e-mobility-charging-stations-simulator.git

diff --git a/src/types/ChargingStationWorker.ts b/src/types/ChargingStationWorker.ts
index 945d3d20..2326d765 100644
--- a/src/types/ChargingStationWorker.ts
+++ b/src/types/ChargingStationWorker.ts
@@ -1,7 +1,16 @@
-import { JsonObject } from './JsonType';
-import { WorkerData, WorkerMessage, WorkerMessageEvents } from './Worker';
+import type { WebSocket } from 'ws';
 
-export interface ChargingStationWorkerOptions extends JsonObject {
+import type { ChargingStationAutomaticTransactionGeneratorConfiguration } from './AutomaticTransactionGenerator';
+import type { ChargingStationInfo } from './ChargingStationInfo';
+import type { ChargingStationOcppConfiguration } from './ChargingStationOcppConfiguration';
+import type { ConnectorStatus } from './ConnectorStatus';
+import type { EvseStatus } from './Evse';
+import type { JsonObject } from './JsonType';
+import type { BootNotificationResponse } from './ocpp/Responses';
+import type { Statistics } from './Statistics';
+import { type WorkerData, type WorkerMessage, WorkerMessageEvents } from '../worker';
+
+interface ChargingStationWorkerOptions extends JsonObject {
   elementStartDelay?: number;
 }
 
@@ -11,22 +20,43 @@ export interface ChargingStationWorkerData extends WorkerData {
   chargingStationWorkerOptions?: ChargingStationWorkerOptions;
 }
 
-enum InternalChargingStationWorkerMessageEvents {
-  STARTED = 'started',
-  STOPPED = 'stopped',
-  PERFORMANCE_STATISTICS = 'performanceStatistics',
+export type EvseStatusWorkerType = Omit<EvseStatus, 'connectors'> & {
+  connectors?: ConnectorStatus[];
+};
+
+export interface ChargingStationData extends WorkerData {
+  started: boolean;
+  stationInfo: ChargingStationInfo;
+  connectors: ConnectorStatus[];
+  evses: EvseStatusWorkerType[];
+  ocppConfiguration: ChargingStationOcppConfiguration;
+  wsState?:
+    | typeof WebSocket.CONNECTING
+    | typeof WebSocket.OPEN
+    | typeof WebSocket.CLOSING
+    | typeof WebSocket.CLOSED;
+  bootNotificationResponse?: BootNotificationResponse;
+  automaticTransactionGenerator?: ChargingStationAutomaticTransactionGeneratorConfiguration;
 }
 
-export type ChargingStationWorkerMessageEvents =
-  | WorkerMessageEvents
-  | InternalChargingStationWorkerMessageEvents;
+enum ChargingStationMessageEvents {
+  started = 'started',
+  stopped = 'stopped',
+  updated = 'updated',
+  performanceStatistics = 'performanceStatistics',
+}
 
 export const ChargingStationWorkerMessageEvents = {
   ...WorkerMessageEvents,
-  ...InternalChargingStationWorkerMessageEvents,
-};
+  ...ChargingStationMessageEvents,
+} as const;
+export type ChargingStationWorkerMessageEvents = WorkerMessageEvents | ChargingStationMessageEvents;
 
-export interface ChargingStationWorkerMessage
-  extends Omit<WorkerMessage<ChargingStationWorkerData>, 'id'> {
-  id: ChargingStationWorkerMessageEvents;
-}
+export type ChargingStationWorkerMessageData = ChargingStationData | Statistics;
+
+export type ChargingStationWorkerMessage<T extends ChargingStationWorkerMessageData> = Omit<
+  WorkerMessage<T>,
+  'event'
+> & {
+  event: ChargingStationWorkerMessageEvents;
+};