X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftypes%2FChargingStationWorker.ts;h=64849fc1aaad5af2ccfde7a2653021a109831362;hb=e0d3c3592f990eadb77780b324ceaa105ba44dfa;hp=3164414ae59a5b558a8a70693f8dc3f879510a02;hpb=52952bf8f73e5ad1a85c0c9205412a9198bfc720;p=e-mobility-charging-stations-simulator.git

diff --git a/src/types/ChargingStationWorker.ts b/src/types/ChargingStationWorker.ts
index 3164414a..64849fc1 100644
--- a/src/types/ChargingStationWorker.ts
+++ b/src/types/ChargingStationWorker.ts
@@ -1,15 +1,14 @@
 import type { WebSocket } from 'ws';
 
-import type {
-  BootNotificationResponse,
-  ChargingStationAutomaticTransactionGeneratorConfiguration,
-  ChargingStationInfo,
-  ChargingStationOcppConfiguration,
-  ConnectorStatus,
-  EvseStatus,
-  JsonObject,
-  Statistics,
-} from './internal';
+import type { ChargingStationAutomaticTransactionGeneratorConfiguration } from './AutomaticTransactionGenerator';
+import { ChargingStationEvents } from './ChargingStationEvents';
+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 {
@@ -22,7 +21,7 @@ export interface ChargingStationWorkerData extends WorkerData {
   chargingStationWorkerOptions?: ChargingStationWorkerOptions;
 }
 
-type EvseStatusType = Omit<EvseStatus, 'connectors'> & {
+export type EvseStatusWorkerType = Omit<EvseStatus, 'connectors'> & {
   connectors?: ConnectorStatus[];
 };
 
@@ -30,7 +29,7 @@ export interface ChargingStationData extends WorkerData {
   started: boolean;
   stationInfo: ChargingStationInfo;
   connectors: ConnectorStatus[];
-  evses: EvseStatusType[];
+  evses: EvseStatusWorkerType[];
   ocppConfiguration: ChargingStationOcppConfiguration;
   wsState?:
     | typeof WebSocket.CONNECTING
@@ -42,23 +41,24 @@ export interface ChargingStationData extends WorkerData {
 }
 
 enum ChargingStationMessageEvents {
-  started = 'started',
-  stopped = 'stopped',
-  updated = 'updated',
   performanceStatistics = 'performanceStatistics',
 }
 
 export const ChargingStationWorkerMessageEvents = {
   ...WorkerMessageEvents,
+  ...ChargingStationEvents,
   ...ChargingStationMessageEvents,
 } as const;
-export type ChargingStationWorkerMessageEvents = WorkerMessageEvents | ChargingStationMessageEvents;
+export type ChargingStationWorkerMessageEvents =
+  | WorkerMessageEvents
+  | ChargingStationEvents
+  | ChargingStationMessageEvents;
 
 export type ChargingStationWorkerMessageData = ChargingStationData | Statistics;
 
 export type ChargingStationWorkerMessage<T extends ChargingStationWorkerMessageData> = Omit<
   WorkerMessage<T>,
-  'id'
+  'event'
 > & {
-  id: ChargingStationWorkerMessageEvents;
+  event: ChargingStationWorkerMessageEvents;
 };