X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2FWorkerDynamicPool.ts;h=5217d7fe16a6772a81b946969702fe1189f0d5dc;hb=db0fc072c4f0b42370e213dcc82f75ab3a4fbed8;hp=38d85aea06d0252531076338382cf161e447d991;hpb=d58b442097da31f8b974d51aef63c64470d9ab48;p=e-mobility-charging-stations-simulator.git

diff --git a/src/worker/WorkerDynamicPool.ts b/src/worker/WorkerDynamicPool.ts
index 38d85aea..5217d7fe 100644
--- a/src/worker/WorkerDynamicPool.ts
+++ b/src/worker/WorkerDynamicPool.ts
@@ -1,68 +1,67 @@
-import type EventEmitterAsyncResource from 'node:events';
-import type { Worker } from 'node:worker_threads';
+import type { EventEmitterAsyncResource } from 'node:events'
 
-import { DynamicThreadPool, type ErrorHandler, type ExitHandler, type PoolInfo } from 'poolifier';
+import { DynamicThreadPool, type PoolInfo } from 'poolifier'
 
-import { WorkerAbstract } from './WorkerAbstract';
-import type { WorkerData, WorkerOptions } from './WorkerTypes';
-import { defaultErrorHandler, defaultExitHandler, sleep } from './WorkerUtils';
+import { WorkerAbstract } from './WorkerAbstract.js'
+import type { WorkerData, WorkerOptions } from './WorkerTypes.js'
+import { randomizeDelay, sleep } from './WorkerUtils.js'
 
-export class WorkerDynamicPool extends WorkerAbstract<WorkerData> {
-  private readonly pool: DynamicThreadPool<WorkerData>;
+export class WorkerDynamicPool<D extends WorkerData, R extends WorkerData> extends WorkerAbstract<
+D,
+R
+> {
+  private readonly pool: DynamicThreadPool<D, R>
 
   /**
-   * Create a new `WorkerDynamicPool`.
+   * Creates a new `WorkerDynamicPool`.
    *
    * @param workerScript -
    * @param workerOptions -
    */
-  constructor(workerScript: string, workerOptions?: WorkerOptions) {
-    super(workerScript, workerOptions);
-    this.workerOptions.poolOptions.errorHandler = (
-      this.workerOptions?.poolOptions?.errorHandler ?? defaultErrorHandler
-    ).bind(this) as ErrorHandler<Worker>;
-    this.workerOptions.poolOptions.exitHandler = (
-      this.workerOptions?.poolOptions?.exitHandler ?? defaultExitHandler
-    ).bind(this) as ExitHandler<Worker>;
-    this.workerOptions.poolOptions.messageHandler.bind(this);
-    this.pool = new DynamicThreadPool<WorkerData>(
+  constructor (workerScript: string, workerOptions: WorkerOptions) {
+    super(workerScript, workerOptions)
+    this.pool = new DynamicThreadPool<D, R>(
       this.workerOptions.poolMinSize,
       this.workerOptions.poolMaxSize,
       this.workerScript,
       this.workerOptions.poolOptions
-    );
+    )
   }
 
-  get info(): PoolInfo {
-    return this.pool.info;
+  get info (): PoolInfo {
+    return this.pool.info
   }
 
-  get size(): number {
-    return this.pool.info.workerNodes;
+  get size (): number {
+    return this.pool.info.workerNodes
   }
 
-  get maxElementsPerWorker(): number | undefined {
-    return undefined;
+  get maxElementsPerWorker (): number | undefined {
+    return undefined
   }
 
-  get emitter(): EventEmitterAsyncResource | undefined {
-    return this.pool?.emitter;
+  get emitter (): EventEmitterAsyncResource | undefined {
+    return this.pool.emitter
   }
 
   /** @inheritDoc */
-  public async start(): Promise<void> {
-    // This is intentional
+  public start (): void {
+    this.pool.start()
   }
 
   /** @inheritDoc */
-  public async stop(): Promise<void> {
-    return this.pool.destroy();
+  public async stop (): Promise<void> {
+    await this.pool.destroy()
   }
 
   /** @inheritDoc */
-  public async addElement(elementData: WorkerData): Promise<void> {
-    await this.pool.execute(elementData);
+  public async addElement (elementData: D): Promise<R> {
+    const response = await this.pool.execute(elementData)
     // Start element sequentially to optimize memory at startup
-    this.workerOptions.elementStartDelay > 0 && (await sleep(this.workerOptions.elementStartDelay));
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    this.workerOptions.elementAddDelay! > 0 &&
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      (await sleep(randomizeDelay(this.workerOptions.elementAddDelay!)))
+    return response
   }
 }