X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Futils%2FMessageChannelUtils.ts;h=1af746daafe67840e536c95a8ef719171b37de4a;hb=8d2a9e1c5a2b21932c77846bdf10cbe726797685;hp=06054d5e80ef3d2787831c0210b6a9e161ff2d1a;hpb=179ed3677e63ff8cc9c49acb55b5d6330ee3802b;p=e-mobility-charging-stations-simulator.git

diff --git a/src/utils/MessageChannelUtils.ts b/src/utils/MessageChannelUtils.ts
index 06054d5e..1af746da 100644
--- a/src/utils/MessageChannelUtils.ts
+++ b/src/utils/MessageChannelUtils.ts
@@ -1,73 +1,88 @@
-import {
-  OutputFormat,
-  buildChargingStationAutomaticTransactionGeneratorConfiguration,
-  buildConnectorsStatus,
-  buildEvsesStatus,
-} from './ChargingStationConfigurationUtils';
-import type { ChargingStation } from '../charging-station';
+import type { ChargingStation } from '../charging-station/index.js'
 import {
   type ChargingStationData,
   type ChargingStationWorkerMessage,
   ChargingStationWorkerMessageEvents,
-  type Statistics,
-} from '../types';
+  type Statistics
+} from '../types/index.js'
+import {
+  buildChargingStationAutomaticTransactionGeneratorConfiguration,
+  buildConnectorsStatus,
+  buildEvsesStatus,
+  OutputFormat
+} from './ChargingStationConfigurationUtils.js'
 
-export class MessageChannelUtils {
-  private constructor() {
-    // This is intentional
+export const buildAddedMessage = (
+  chargingStation: ChargingStation
+): ChargingStationWorkerMessage<ChargingStationData> => {
+  return {
+    event: ChargingStationWorkerMessageEvents.added,
+    data: buildChargingStationDataPayload(chargingStation)
   }
+}
+
+export const buildDeletedMessage = (
+  chargingStation: ChargingStation
+): ChargingStationWorkerMessage<ChargingStationData> => {
+  return {
+    event: ChargingStationWorkerMessageEvents.deleted,
+    data: buildChargingStationDataPayload(chargingStation)
+  }
+}
 
-  public static buildStartedMessage(
-    chargingStation: ChargingStation
-  ): ChargingStationWorkerMessage<ChargingStationData> {
-    return {
-      id: ChargingStationWorkerMessageEvents.started,
-      data: MessageChannelUtils.buildChargingStationDataPayload(chargingStation),
-    };
+export const buildStartedMessage = (
+  chargingStation: ChargingStation
+): ChargingStationWorkerMessage<ChargingStationData> => {
+  return {
+    event: ChargingStationWorkerMessageEvents.started,
+    data: buildChargingStationDataPayload(chargingStation)
   }
+}
 
-  public static buildStoppedMessage(
-    chargingStation: ChargingStation
-  ): ChargingStationWorkerMessage<ChargingStationData> {
-    return {
-      id: ChargingStationWorkerMessageEvents.stopped,
-      data: MessageChannelUtils.buildChargingStationDataPayload(chargingStation),
-    };
+export const buildStoppedMessage = (
+  chargingStation: ChargingStation
+): ChargingStationWorkerMessage<ChargingStationData> => {
+  return {
+    event: ChargingStationWorkerMessageEvents.stopped,
+    data: buildChargingStationDataPayload(chargingStation)
   }
+}
 
-  public static buildUpdatedMessage(
-    chargingStation: ChargingStation
-  ): ChargingStationWorkerMessage<ChargingStationData> {
-    return {
-      id: ChargingStationWorkerMessageEvents.updated,
-      data: MessageChannelUtils.buildChargingStationDataPayload(chargingStation),
-    };
+export const buildUpdatedMessage = (
+  chargingStation: ChargingStation
+): ChargingStationWorkerMessage<ChargingStationData> => {
+  return {
+    event: ChargingStationWorkerMessageEvents.updated,
+    data: buildChargingStationDataPayload(chargingStation)
   }
+}
 
-  public static buildPerformanceStatisticsMessage(
-    statistics: Statistics
-  ): ChargingStationWorkerMessage<Statistics> {
-    return {
-      id: ChargingStationWorkerMessageEvents.performanceStatistics,
-      data: statistics,
-    };
+export const buildPerformanceStatisticsMessage = (
+  statistics: Statistics
+): ChargingStationWorkerMessage<Statistics> => {
+  return {
+    event: ChargingStationWorkerMessageEvents.performanceStatistics,
+    data: statistics
   }
+}
 
-  private static buildChargingStationDataPayload(
-    chargingStation: ChargingStation
-  ): ChargingStationData {
-    return {
-      started: chargingStation.started,
-      stationInfo: chargingStation.stationInfo,
-      connectors: buildConnectorsStatus(chargingStation),
-      evses: buildEvsesStatus(chargingStation, OutputFormat.ipc),
-      ocppConfiguration: chargingStation.ocppConfiguration,
-      wsState: chargingStation?.wsConnection?.readyState,
-      bootNotificationResponse: chargingStation.bootNotificationResponse,
-      ...(chargingStation.automaticTransactionGenerator && {
-        automaticTransactionGenerator:
-          buildChargingStationAutomaticTransactionGeneratorConfiguration(chargingStation),
-      }),
-    };
+export const buildChargingStationDataPayload = (
+  chargingStation: ChargingStation
+): ChargingStationData => {
+  return {
+    started: chargingStation.started,
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    stationInfo: chargingStation.stationInfo!,
+    connectors: buildConnectorsStatus(chargingStation),
+    evses: buildEvsesStatus(chargingStation, OutputFormat.worker),
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    ocppConfiguration: chargingStation.ocppConfiguration!,
+    supervisionUrl: chargingStation.wsConnectionUrl.href,
+    wsState: chargingStation.wsConnection?.readyState,
+    bootNotificationResponse: chargingStation.bootNotificationResponse,
+    ...(chargingStation.automaticTransactionGenerator != null && {
+      automaticTransactionGenerator:
+        buildChargingStationAutomaticTransactionGeneratorConfiguration(chargingStation)
+    })
   }
 }