fix: untangle worker set message from application message

[e-mobility-charging-stations-simulator.git] / src / charging-station / ChargingStationWorker.ts

diff --git a/src/charging-station/ChargingStationWorker.ts b/src/charging-station/ChargingStationWorker.ts
index 042d3d5bfc2b3bc913484c5a0f5d0982b982148f..779c638a49fab5ec30119e184682335afa01b20d 100644 (file)
--- a/src/charging-station/ChargingStationWorker.ts
+++ b/src/charging-station/ChargingStationWorker.ts
@@ -5,14 +5,9 @@ import { parentPort } from 'node:worker_threads'
 import { ThreadWorker } from 'poolifier'
 
 import { BaseError } from '../exception/index.js'
-import type {
-  ChargingStationInfo,
-  ChargingStationWorkerData,
-  ChargingStationWorkerEventError,
-  ChargingStationWorkerMessage
-} 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'
+import { type WorkerDataError, type WorkerMessage, WorkerMessageEvents } from '../worker/index.js'
 import { ChargingStation } from './ChargingStation.js'
 
 export let chargingStationWorker: object
@@ -21,43 +16,47 @@ if (Configuration.workerPoolInUse()) {
   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
+    // 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>) => {
-        switch (message.event) {
+        const { uuid, event, data } = message
+        switch (event) {
           case WorkerMessageEvents.addWorkerElement:
             try {
               const chargingStation = new ChargingStation(
-                message.data.index,
-                message.data.templateFile,
-                message.data.options
+                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 ChargingStationWorkerMessage<ChargingStationInfo>)
+              } satisfies WorkerMessage<ChargingStationInfo>)
             } catch (error) {
               parentPort?.postMessage({
+                uuid,
                 event: WorkerMessageEvents.workerElementError,
                 data: {
-                  event: message.event,
+                  event,
                   name: (error as Error).name,
                   message: (error as Error).message,
                   stack: (error as Error).stack
                 }
-              } satisfies ChargingStationWorkerMessage<ChargingStationWorkerEventError>)
+              } satisfies WorkerMessage<WorkerDataError>)
             }
             break
           default:
             throw new BaseError(
-              `Unknown worker event: '${message.event}' received with data: '${JSON.stringify(
-                message.data,
+              `Unknown worker event: '${event}' received with data: '${JSON.stringify(
+                data,
                 undefined,
                 2
               )}'`