X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FChargingStationWorker.ts;h=955ce933b5ffb27d4e6315bd4206cd7373b101f3;hb=ee7c1da0e12c70134f31537a1c1e7040d309af5a;hp=ff9dbe6286dab402ec6531ca03d05e4792e538e3;hpb=769d3b106c5e4744487bc633da4e4ee93f8f1bf4;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/ChargingStationWorker.ts b/src/charging-station/ChargingStationWorker.ts
index ff9dbe62..955ce933 100644
--- a/src/charging-station/ChargingStationWorker.ts
+++ b/src/charging-station/ChargingStationWorker.ts
@@ -6,31 +6,32 @@ import { parentPort } from 'node:worker_threads';
 import { ThreadWorker } from 'poolifier';
 
 import { ChargingStation } from './ChargingStation';
+import { BaseError } from '../exception';
 import type { ChargingStationWorkerData } from '../types';
 import { Configuration } from '../utils';
-import { POOL_MAX_INACTIVE_TIME, type WorkerMessage, WorkerMessageEvents } from '../worker';
+import { type WorkerData, type WorkerMessage, WorkerMessageEvents } from '../worker';
 
 const moduleName = 'ChargingStationWorker';
 
 /**
  * Creates and starts a charging station instance
  *
- * @param data - workerData
+ * @param data - data sent to worker
  */
 const startChargingStation = (data?: ChargingStationWorkerData): void => {
   new ChargingStation(data!.index, data!.templateFile).start();
 };
 
-class ChargingStationWorker extends AsyncResource {
+class ChargingStationWorker<Data extends WorkerData> extends AsyncResource {
   constructor() {
     super(moduleName);
     // Add message listener to create and start charging station from the main thread
-    parentPort?.on('message', (message: WorkerMessage<ChargingStationWorkerData>) => {
+    parentPort?.on('message', (message: WorkerMessage<Data>) => {
       switch (message.event) {
         case WorkerMessageEvents.startWorkerElement:
           try {
             this.runInAsyncScope(
-              startChargingStation.bind(this) as (data?: ChargingStationWorkerData) => void,
+              startChargingStation.bind(this) as (data?: Data) => void,
               this,
               message.data,
             );
@@ -41,6 +42,7 @@ class ChargingStationWorker extends AsyncResource {
             parentPort?.postMessage({
               event: WorkerMessageEvents.startWorkerElementError,
               data: {
+                name: (error as Error).name,
                 message: (error as Error).message,
                 stack: (error as Error).stack,
               },
@@ -48,10 +50,10 @@ class ChargingStationWorker extends AsyncResource {
           }
           break;
         default:
-          throw new Error(
+          throw new BaseError(
             `Unknown worker event: '${message.event}' received with data: '${JSON.stringify(
               message.data,
-              null,
+              undefined,
               2,
             )}'`,
           );
@@ -60,11 +62,11 @@ class ChargingStationWorker extends AsyncResource {
   }
 }
 
-export let chargingStationWorker: ChargingStationWorker | ThreadWorker<ChargingStationWorkerData>;
+export let chargingStationWorker:
+  | ChargingStationWorker<ChargingStationWorkerData>
+  | ThreadWorker<ChargingStationWorkerData>;
 if (Configuration.workerPoolInUse()) {
-  chargingStationWorker = new ThreadWorker<ChargingStationWorkerData>(startChargingStation, {
-    maxInactiveTime: POOL_MAX_INACTIVE_TIME,
-  });
+  chargingStationWorker = new ThreadWorker<ChargingStationWorkerData>(startChargingStation);
 } else {
-  chargingStationWorker = new ChargingStationWorker();
+  chargingStationWorker = new ChargingStationWorker<ChargingStationWorkerData>();
 }