X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FMessageChannelUtils.ts;h=11ecd3ca5644662db9cd45c351c8cbd087ed4615;hb=7e0bf360b5f927c14f2e309be297883dbd547237;hp=1bc26d622289bf63454e809836b3f45f00bce834;hpb=8d8599f0565ba2121394a3d22214d13dbfa0f2c3;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/MessageChannelUtils.ts b/src/charging-station/MessageChannelUtils.ts index 1bc26d62..11ecd3ca 100644 --- a/src/charging-station/MessageChannelUtils.ts +++ b/src/charging-station/MessageChannelUtils.ts @@ -15,7 +15,7 @@ export class MessageChannelUtils { chargingStation: ChargingStation ): ChargingStationWorkerMessage { return { - id: ChargingStationWorkerMessageEvents.STARTED, + id: ChargingStationWorkerMessageEvents.started, data: MessageChannelUtils.buildChargingStationDataPayload(chargingStation), }; } @@ -24,7 +24,7 @@ export class MessageChannelUtils { chargingStation: ChargingStation ): ChargingStationWorkerMessage { return { - id: ChargingStationWorkerMessageEvents.STOPPED, + id: ChargingStationWorkerMessageEvents.stopped, data: MessageChannelUtils.buildChargingStationDataPayload(chargingStation), }; } @@ -33,7 +33,7 @@ export class MessageChannelUtils { chargingStation: ChargingStation ): ChargingStationWorkerMessage { return { - id: ChargingStationWorkerMessageEvents.UPDATED, + id: ChargingStationWorkerMessageEvents.updated, data: MessageChannelUtils.buildChargingStationDataPayload(chargingStation), }; } @@ -42,7 +42,7 @@ export class MessageChannelUtils { statistics: Statistics ): ChargingStationWorkerMessage { return { - id: ChargingStationWorkerMessageEvents.PERFORMANCE_STATISTICS, + id: ChargingStationWorkerMessageEvents.performanceStatistics, data: statistics, }; } @@ -57,13 +57,22 @@ export class MessageChannelUtils { // eslint-disable-next-line @typescript-eslint/no-unused-vars ({ transactionSetInterval, ...connectorStatusRest }) => connectorStatusRest ), + evses: [...chargingStation.evses.values()].map((evseStatus) => { + return { + ...evseStatus, + connectors: [...evseStatus.connectors.values()].map( + // eslint-disable-next-line @typescript-eslint/no-unused-vars + ({ transactionSetInterval, ...connectorStatusRest }) => connectorStatusRest + ), + }; + }), ocppConfiguration: chargingStation.ocppConfiguration, wsState: chargingStation?.wsConnection?.readyState, bootNotificationResponse: chargingStation.bootNotificationResponse, ...(chargingStation.automaticTransactionGenerator && { automaticTransactionGenerator: { automaticTransactionGenerator: - chargingStation.automaticTransactionGenerator.configuration, + chargingStation.getAutomaticTransactionGeneratorConfiguration(), automaticTransactionGeneratorStatuses: [ ...chargingStation.automaticTransactionGenerator.connectorsStatus.values(), ],