X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2FWorkerSet.ts;h=eaa19ac8f384ed5ce591362696e13bfdf765ab5a;hb=42486f2357b011f9244c6b29f4e05185138ce8d1;hp=af753c8fc8dc8f1129e0d4ed2779234554414566;hpb=3e1416d80bd2640a5fe59cb4bc95c421dcd601d6;p=e-mobility-charging-stations-simulator.git

diff --git a/src/worker/WorkerSet.ts b/src/worker/WorkerSet.ts
index af753c8f..eaa19ac8 100644
--- a/src/worker/WorkerSet.ts
+++ b/src/worker/WorkerSet.ts
@@ -1,85 +1,130 @@
-import Constants from '../utils/Constants';
-import Utils from '../utils/Utils';
-import { Worker } from 'worker_threads';
-import WorkerData from '../types/WorkerData';
-import { WorkerEvents } from '../types/WorkerEvents';
-import Wrk from './Wrk';
+// Partial Copyright Jerome Benoit. 2021-2023. All Rights Reserved.
 
-export default class WorkerSet extends Wrk {
-  public maxElementsPerWorker: number;
-  private workers: Set<Worker>;
-  private lastWorkerNumberOfElements: number;
+import { Worker } from 'node:worker_threads';
+
+import { WorkerAbstract } from './WorkerAbstract';
+import { WorkerConstants } from './WorkerConstants';
+import {
+  type MessageHandler,
+  type WorkerData,
+  WorkerMessageEvents,
+  type WorkerOptions,
+  type WorkerSetElement,
+} from './WorkerTypes';
+import { WorkerUtils } from './WorkerUtils';
+
+export class WorkerSet extends WorkerAbstract<WorkerData> {
+  private readonly workerSet: Set<WorkerSetElement>;
 
   /**
    * Create a new `WorkerSet`.
    *
-   * @param {string} workerScript
-   * @param {number} maxElementsPerWorker
+   * @param workerScript -
+   * @param workerOptions -
    */
-  constructor(workerScript: string, maxElementsPerWorker = 1) {
-    super(workerScript);
-    this.workers = new Set<Worker>();
-    this.maxElementsPerWorker = maxElementsPerWorker;
-    this.lastWorkerNumberOfElements = 0;
+  constructor(workerScript: string, workerOptions?: WorkerOptions) {
+    super(workerScript, workerOptions);
+    this.workerSet = new Set<WorkerSetElement>();
   }
 
   get size(): number {
-    return this.workers.size;
+    return this.workerSet.size;
+  }
+
+  get maxElementsPerWorker(): number | undefined {
+    return this.workerOptions.elementsPerWorker;
   }
 
   /**
    *
-   * @return {Promise<void>}
+   * @param elementData -
+   * @returns
    * @public
    */
   public async addElement(elementData: WorkerData): Promise<void> {
-    if (!this.workers) {
-      throw Error('Cannot add a WorkerSet element: workers set does not exist');
+    if (!this.workerSet) {
+      throw new Error("Cannot add a WorkerSet element: workers' set does not exist");
+    }
+    if (
+      this.workerSet.size === 0 ||
+      this.getLastWorkerSetElement().numberOfWorkerElements >= this.workerOptions.elementsPerWorker
+    ) {
+      await this.startWorker();
     }
-    if (this.lastWorkerNumberOfElements >= this.maxElementsPerWorker) {
-      void this.startWorker();
-      this.lastWorkerNumberOfElements = 0;
-      // Start worker sequentially to optimize memory at startup
-      void Utils.sleep(Constants.START_WORKER_DELAY);
+    this.getLastWorker().postMessage({
+      id: WorkerMessageEvents.startWorkerElement,
+      data: elementData,
+    });
+    this.getLastWorkerSetElement().numberOfWorkerElements++;
+    // Start element sequentially to optimize memory at startup
+    if (this.workerOptions.elementStartDelay > 0) {
+      await WorkerUtils.sleep(this.workerOptions.elementStartDelay);
     }
-    this.getLastWorker().postMessage({ id: WorkerEvents.START_WORKER_ELEMENT, workerData: elementData });
-    this.lastWorkerNumberOfElements++;
   }
 
   /**
    *
-   * @return {Promise<void>}
+   * @returns
    * @public
    */
   public async start(): Promise<void> {
     await this.startWorker();
-    // Start worker sequentially to optimize memory at startup
-    await Utils.sleep(Constants.START_WORKER_DELAY);
   }
 
   /**
    *
-   * @return {Promise}
-   * @private
+   * @returns
+   * @public
+   */
+  public async stop(): Promise<void> {
+    for (const workerSetElement of this.workerSet) {
+      await workerSetElement.worker.terminate();
+    }
+    this.workerSet.clear();
+  }
+
+  /**
+   * Start a new `Worker`.
    */
-  private async startWorker() {
-    return new Promise((resolve, reject) => {
-      const worker = new Worker(this.workerScript);
-      worker.on('message', resolve);
-      worker.on('error', reject);
-      worker.on('exit', (code) => {
-        if (code !== 0) {
-          reject(new Error(`Worker stopped with exit code ${code}`));
-        }
-      });
-      this.workers.add(worker);
+  private async startWorker(): Promise<void> {
+    const worker = new Worker(this.workerScript);
+    worker.on(
+      'message',
+      (this.workerOptions?.messageHandler ?? WorkerConstants.EMPTY_FUNCTION).bind(
+        this
+      ) as MessageHandler<Worker>
+    );
+    worker.on('error', WorkerUtils.defaultErrorHandler.bind(this) as (err: Error) => void);
+    worker.on('exit', (code) => {
+      WorkerUtils.defaultExitHandler(code);
+      this.workerSet.delete(this.getWorkerSetElementByWorker(worker));
     });
+    this.workerSet.add({ worker, numberOfWorkerElements: 0 });
+    // Start worker sequentially to optimize memory at startup
+    this.workerOptions.workerStartDelay > 0 &&
+      (await WorkerUtils.sleep(this.workerOptions.workerStartDelay));
+  }
+
+  private getLastWorkerSetElement(): WorkerSetElement {
+    let workerSetElement: WorkerSetElement;
+    for (workerSetElement of this.workerSet) {
+      /* This is intentional */
+    }
+    return workerSetElement;
   }
 
   private getLastWorker(): Worker {
-    let worker: Worker;
-    // eslint-disable-next-line no-empty
-    for (worker of this.workers) { }
-    return worker;
+    return this.getLastWorkerSetElement().worker;
+  }
+
+  private getWorkerSetElementByWorker(worker: Worker): WorkerSetElement {
+    let workerSetElt: WorkerSetElement;
+    for (const workerSetElement of this.workerSet) {
+      if (workerSetElement.worker.threadId === worker.threadId) {
+        workerSetElt = workerSetElement;
+        break;
+      }
+    }
+    return workerSetElt;
   }
 }