X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FChargingStationWorker.ts;h=779c638a49fab5ec30119e184682335afa01b20d;hb=9e9194c977f2100a92a4549e6562750499607706;hp=c8f992f370b39c48b14275bc24a39953ab089f7c;hpb=a6ef1ece74c0d08e86a905571f4f6045c28131cb;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/ChargingStationWorker.ts b/src/charging-station/ChargingStationWorker.ts
index c8f992f3..779c638a 100644
--- a/src/charging-station/ChargingStationWorker.ts
+++ b/src/charging-station/ChargingStationWorker.ts
@@ -1,64 +1,69 @@
-// Partial Copyright Jerome Benoit. 2021-2023. All Rights Reserved.
+// Partial Copyright Jerome Benoit. 2021-2024. All Rights Reserved.
 
-import { parentPort } from 'node:worker_threads';
+import { parentPort } from 'node:worker_threads'
 
-import { ThreadWorker } from 'poolifier';
+import { ThreadWorker } from 'poolifier'
 
-import { ChargingStation } from './ChargingStation.js';
-import { BaseError } from '../exception/index.js';
-import type { ChargingStationWorkerData } from '../types/index.js';
-import { Configuration } from '../utils/index.js';
-import { type WorkerMessage, WorkerMessageEvents } from '../worker/index.js';
+import { BaseError } from '../exception/index.js'
+import type { ChargingStationInfo, ChargingStationWorkerData } from '../types/index.js'
+import { Configuration } from '../utils/index.js'
+import { type WorkerDataError, type WorkerMessage, WorkerMessageEvents } from '../worker/index.js'
+import { ChargingStation } from './ChargingStation.js'
 
-/**
- * Creates and starts a charging station instance
- *
- * @param data - data sent to worker
- */
-const startChargingStation = (data?: ChargingStationWorkerData): void => {
-  new ChargingStation(data!.index, data!.templateFile).start();
-};
-
-class ChargingStationWorker<Data extends ChargingStationWorkerData> {
-  constructor() {
-    // Add message listener to create and start charging station from the main thread
-    parentPort?.on('message', (message: WorkerMessage<Data>) => {
-      switch (message.event) {
-        case WorkerMessageEvents.startWorkerElement:
-          try {
-            startChargingStation(message.data);
-            parentPort?.postMessage({
-              event: WorkerMessageEvents.startedWorkerElement,
-            });
-          } catch (error) {
-            parentPort?.postMessage({
-              event: WorkerMessageEvents.startWorkerElementError,
-              data: {
-                name: (error as Error).name,
-                message: (error as Error).message,
-                stack: (error as Error).stack,
-              },
-            });
-          }
-          break;
-        default:
-          throw new BaseError(
-            `Unknown worker event: '${message.event}' received with data: '${JSON.stringify(
-              message.data,
-              undefined,
-              2,
-            )}'`,
-          );
-      }
-    });
-  }
-}
-
-export let chargingStationWorker:
-  | ChargingStationWorker<ChargingStationWorkerData>
-  | ThreadWorker<ChargingStationWorkerData>;
+export let chargingStationWorker: object
 if (Configuration.workerPoolInUse()) {
-  chargingStationWorker = new ThreadWorker<ChargingStationWorkerData>(startChargingStation);
+  chargingStationWorker = new ThreadWorker<
+  ChargingStationWorkerData,
+  ChargingStationInfo | undefined
+  >((data?: ChargingStationWorkerData): ChargingStationInfo | undefined => {
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const { index, templateFile, options } = data!
+    return new ChargingStation(index, templateFile, options).stationInfo
+  })
 } else {
-  chargingStationWorker = new ChargingStationWorker<ChargingStationWorkerData>();
+  // eslint-disable-next-line @typescript-eslint/no-extraneous-class
+  class ChargingStationWorker<Data extends ChargingStationWorkerData> {
+    constructor () {
+      parentPort?.on('message', (message: WorkerMessage<Data>) => {
+        const { uuid, event, data } = message
+        switch (event) {
+          case WorkerMessageEvents.addWorkerElement:
+            try {
+              const chargingStation = new ChargingStation(
+                data.index,
+                data.templateFile,
+                data.options
+              )
+              parentPort?.postMessage({
+                uuid,
+                event: WorkerMessageEvents.addedWorkerElement,
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                data: chargingStation.stationInfo!
+              } satisfies WorkerMessage<ChargingStationInfo>)
+            } catch (error) {
+              parentPort?.postMessage({
+                uuid,
+                event: WorkerMessageEvents.workerElementError,
+                data: {
+                  event,
+                  name: (error as Error).name,
+                  message: (error as Error).message,
+                  stack: (error as Error).stack
+                }
+              } satisfies WorkerMessage<WorkerDataError>)
+            }
+            break
+          default:
+            throw new BaseError(
+              `Unknown worker event: '${event}' received with data: '${JSON.stringify(
+                data,
+                undefined,
+                2
+              )}'`
+            )
+        }
+      })
+    }
+  }
+  chargingStationWorker = new ChargingStationWorker<ChargingStationWorkerData>()
 }