refactor: cleanup performance statistics code

[e-mobility-charging-stations-simulator.git] / src / worker / WorkerSet.ts

diff --git a/src/worker/WorkerSet.ts b/src/worker/WorkerSet.ts
index da5684b0345bb2546fd0094e30e991edbb12634a..270f57b1f100c8ab80c0e3fe56fb9bebdb3adf24 100644 (file)
--- a/src/worker/WorkerSet.ts
+++ b/src/worker/WorkerSet.ts
@@ -20,21 +20,33 @@ export class WorkerSet extends WorkerAbstract<WorkerData> {
   private readonly workerSet: Set<WorkerSetElement>;
 
   /**
-   * Create a new `WorkerSet`.
+   * Creates a new `WorkerSet`.
    *
    * @param workerScript -
    * @param workerOptions -
    */
   constructor(workerScript: string, workerOptions?: WorkerOptions) {
     super(workerScript, workerOptions);
+    this.workerOptions.poolOptions = {
+      ...{
+        enableEvents: true,
+        restartWorkerOnError: true,
+      },
+      ...this.workerOptions.poolOptions,
+    };
     this.workerSet = new Set<WorkerSetElement>();
-    this.emitter = new EventEmitterAsyncResource();
+    if (this.workerOptions?.poolOptions?.enableEvents) {
+      this.emitter = new EventEmitterAsyncResource();
+    }
   }
 
   get info(): SetInfo {
     return {
+      version: WorkerConstants.version,
+      type: 'set',
+      worker: 'thread',
       size: this.size,
-      runningElements: [...this.workerSet].reduce(
+      elementsExecuting: [...this.workerSet].reduce(
         (accumulator, workerSetElement) => accumulator + workerSetElement.numberOfWorkerElements,
         0
       ),
@@ -83,7 +95,7 @@ export class WorkerSet extends WorkerAbstract<WorkerData> {
   }
 
   /**
-   * Add a new `WorkerSetElement`.
+   * Adds a new `WorkerSetElement`.
    */
   private addWorkerSetElement(): WorkerSetElement {
     const worker = new Worker(this.workerScript, {
@@ -99,8 +111,12 @@ export class WorkerSet extends WorkerAbstract<WorkerData> {
       this.workerOptions?.poolOptions?.errorHandler ?? WorkerConstants.EMPTY_FUNCTION
     );
     worker.on('error', (error) => {
-      this.emitter.emit(WorkerSetEvents.error, error);
-      this.addWorkerSetElement();
+      if (this.emitter !== undefined) {
+        this.emitter.emit(WorkerSetEvents.error, error);
+      }
+      if (this.workerOptions?.poolOptions?.restartWorkerOnError) {
+        this.addWorkerSetElement();
+      }
     });
     worker.on(
       'online',
@@ -110,7 +126,7 @@ export class WorkerSet extends WorkerAbstract<WorkerData> {
       'exit',
       this.workerOptions?.poolOptions?.exitHandler ?? WorkerConstants.EMPTY_FUNCTION
     );
-    worker.on('exit', () => this.workerSet.delete(this.getWorkerSetElementByWorker(worker)));
+    worker.once('exit', () => this.workerSet.delete(this.getWorkerSetElementByWorker(worker)));
     const workerSetElement: WorkerSetElement = { worker, numberOfWorkerElements: 0 };
     this.workerSet.add(workerSetElement);
     return workerSetElement;