X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FChargingStationWorker.ts;h=042d3d5bfc2b3bc913484c5a0f5d0982b982148f;hb=3b09e788c6dab8e5a8b3314e8e69ede16ff82fcc;hp=5bbfa6dd092ec485d670b02c1b639a1539d2542b;hpb=bb8dc7253e50b925250889c90d931a4dc83c0cd3;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/ChargingStationWorker.ts b/src/charging-station/ChargingStationWorker.ts
index 5bbfa6dd..042d3d5b 100644
--- a/src/charging-station/ChargingStationWorker.ts
+++ b/src/charging-station/ChargingStationWorker.ts
@@ -4,63 +4,67 @@ import { parentPort } from 'node:worker_threads'
 
 import { ThreadWorker } from 'poolifier'
 
-import { ChargingStation } from './ChargingStation.js'
 import { BaseError } from '../exception/index.js'
-import type { ChargingStationWorkerData } from '../types/index.js'
+import type {
+  ChargingStationInfo,
+  ChargingStationWorkerData,
+  ChargingStationWorkerEventError,
+  ChargingStationWorkerMessage
+} from '../types/index.js'
 import { Configuration } from '../utils/index.js'
 import { type WorkerMessage, WorkerMessageEvents } from '../worker/index.js'
+import { ChargingStation } from './ChargingStation.js'
 
-/**
- * Adds and starts a charging station instance
- *
- * @param data - data sent to worker
- */
-const addChargingStation = (data?: ChargingStationWorkerData): void => {
-  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-  new ChargingStation(data!.index, data!.templateFile).start()
-}
-
-// eslint-disable-next-line @typescript-eslint/no-extraneous-class
-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 {
-            addChargingStation(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>(addChargingStation)
+  chargingStationWorker = new ThreadWorker<
+  ChargingStationWorkerData,
+  ChargingStationInfo | undefined
+  >((data?: ChargingStationWorkerData): ChargingStationInfo | undefined => {
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion, no-new
+    return new ChargingStation(data!.index, data!.templateFile, data!.options).stationInfo
+  })
 } else {
+  // eslint-disable-next-line @typescript-eslint/no-extraneous-class
+  class ChargingStationWorker<Data extends ChargingStationWorkerData> {
+    constructor () {
+      parentPort?.on('message', (message: WorkerMessage<Data>) => {
+        switch (message.event) {
+          case WorkerMessageEvents.addWorkerElement:
+            try {
+              const chargingStation = new ChargingStation(
+                message.data.index,
+                message.data.templateFile,
+                message.data.options
+              )
+              parentPort?.postMessage({
+                event: WorkerMessageEvents.addedWorkerElement,
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                data: chargingStation.stationInfo!
+              } satisfies ChargingStationWorkerMessage<ChargingStationInfo>)
+            } catch (error) {
+              parentPort?.postMessage({
+                event: WorkerMessageEvents.workerElementError,
+                data: {
+                  event: message.event,
+                  name: (error as Error).name,
+                  message: (error as Error).message,
+                  stack: (error as Error).stack
+                }
+              } satisfies ChargingStationWorkerMessage<ChargingStationWorkerEventError>)
+            }
+            break
+          default:
+            throw new BaseError(
+              `Unknown worker event: '${message.event}' received with data: '${JSON.stringify(
+                message.data,
+                undefined,
+                2
+              )}'`
+            )
+        }
+      })
+    }
+  }
   chargingStationWorker = new ChargingStationWorker<ChargingStationWorkerData>()
 }