X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FChargingStationWorker.ts;h=ab32a464fabbcf3ca3ee2e20a7c48d685945f327;hb=ce0abd8248cbc1c976bb298e45daeb0749387619;hp=21050d206d60ec2fb1f5623696a2e633c6e50a8f;hpb=a19b897d3aa5cb0f12177a42d8168121ce6ada97;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/ChargingStationWorker.ts b/src/charging-station/ChargingStationWorker.ts
index 21050d20..ab32a464 100644
--- a/src/charging-station/ChargingStationWorker.ts
+++ b/src/charging-station/ChargingStationWorker.ts
@@ -4,63 +4,69 @@ 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 } from '../types/index.js'
 import { Configuration } from '../utils/index.js'
-import { type WorkerMessage, WorkerMessageEvents } from '../worker/index.js'
-
-/**
- * Creates and starts a charging station instance
- *
- * @param data - data sent to worker
- */
-const startChargingStation = (data?: ChargingStationWorkerData): void => {
-  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-  new ChargingStation(data!.index, data!.templateFile).start()
-}
+import { type WorkerDataError, type WorkerMessage, WorkerMessageEvents } from '../worker/index.js'
+import { ChargingStation } from './ChargingStation.js'
 
-// 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 {
-            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
+export let chargingStationWorker: object
+if (Configuration.workerPoolInUse()) {
+  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 {
+  // 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
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+        if (uuid != null) {
+          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 message event: '${event}' received with data: '${JSON.stringify(
+                  data,
+                  undefined,
+                  2
+                )}'`
+              )
           }
-          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>
-if (Configuration.workerPoolInUse()) {
-  chargingStationWorker = new ThreadWorker<ChargingStationWorkerData>(startChargingStation)
-} else {
   chargingStationWorker = new ChargingStationWorker<ChargingStationWorkerData>()
 }