feat: ensure charging station add op return its station info

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

diff --git a/src/worker/WorkerAbstract.ts b/src/worker/WorkerAbstract.ts
index 7d8eebd55204d129a0d25f554ab71dad017414a9..f6713f8976d2cdda47d74f5951880f8d1fdfd48d 100644 (file)
--- a/src/worker/WorkerAbstract.ts
+++ b/src/worker/WorkerAbstract.ts
@@ -1,20 +1,17 @@
-import type EventEmitterAsyncResource from 'node:events';
-import fs from 'node:fs';
-import type { Worker } from 'node:worker_threads';
+import type { EventEmitterAsyncResource } from 'node:events'
+import { existsSync } from 'node:fs'
 
-import type { ErrorHandler, ExitHandler, PoolInfo } from 'poolifier';
+import type { PoolInfo } from 'poolifier'
 
-import { WorkerConstants } from './WorkerConstants';
-import type { SetInfo, WorkerData, WorkerOptions } from './WorkerTypes';
-import { defaultErrorHandler, defaultExitHandler } from './WorkerUtils';
+import type { SetInfo, WorkerData, WorkerOptions } from './WorkerTypes.js'
 
-export abstract class WorkerAbstract<T extends WorkerData> {
-  protected readonly workerScript: string;
-  protected readonly workerOptions: WorkerOptions;
-  public abstract readonly info: PoolInfo | SetInfo;
-  public abstract readonly size: number;
-  public abstract readonly maxElementsPerWorker: number | undefined;
-  public abstract readonly emitter: EventEmitterAsyncResource | undefined;
+export abstract class WorkerAbstract<D extends WorkerData, R extends WorkerData> {
+  protected readonly workerScript: string
+  protected readonly workerOptions: WorkerOptions
+  public abstract readonly info: PoolInfo | SetInfo
+  public abstract readonly size: number
+  public abstract readonly maxElementsPerWorker: number | undefined
+  public abstract readonly emitter: EventEmitterAsyncResource | undefined
 
   /**
    * `WorkerAbstract` constructor.
@@ -22,50 +19,35 @@ export abstract class WorkerAbstract<T extends WorkerData> {
    * @param workerScript -
    * @param workerOptions -
    */
-  constructor(
-    workerScript: string,
-    workerOptions: WorkerOptions = {
-      workerStartDelay: WorkerConstants.DEFAULT_WORKER_START_DELAY,
-      elementStartDelay: WorkerConstants.DEFAULT_ELEMENT_START_DELAY,
-      poolMinSize: WorkerConstants.DEFAULT_POOL_MIN_SIZE,
-      poolMaxSize: WorkerConstants.DEFAULT_POOL_MAX_SIZE,
-      elementsPerWorker: WorkerConstants.DEFAULT_ELEMENTS_PER_WORKER,
-      poolOptions: {},
+  constructor (workerScript: string | undefined, workerOptions: WorkerOptions) {
+    if (workerScript == null) {
+      throw new TypeError('Worker script is not defined')
     }
-  ) {
-    if (workerScript === null || workerScript === undefined) {
-      throw new Error('Worker script is not defined');
+    if (typeof workerScript !== 'string') {
+      throw new TypeError('Worker script must be a string')
     }
-    if (typeof workerScript === 'string' && workerScript.trim().length === 0) {
-      throw new Error('Worker script is empty');
+    if (workerScript.trim().length === 0) {
+      throw new Error('Worker script is an empty string')
     }
-    if (!fs.existsSync(workerScript)) {
-      throw new Error('Worker script file does not exist');
+    if (!existsSync(workerScript)) {
+      throw new Error('Worker script file does not exist')
     }
-    this.workerScript = workerScript;
-    this.workerOptions = workerOptions;
-    this.workerOptions.poolOptions?.messageHandler?.bind(this);
-    this.workerOptions.poolOptions.errorHandler = (
-      this.workerOptions?.poolOptions?.errorHandler ?? defaultErrorHandler
-    ).bind(this) as ErrorHandler<Worker>;
-    this.workerOptions.poolOptions?.onlineHandler?.bind(this);
-    this.workerOptions.poolOptions.exitHandler = (
-      this.workerOptions?.poolOptions?.exitHandler ?? defaultExitHandler
-    ).bind(this) as ExitHandler<Worker>;
+    this.workerScript = workerScript
+    this.workerOptions = workerOptions
   }
 
   /**
    * Starts the worker pool/set.
    */
-  public abstract start(): Promise<void>;
+  public abstract start (): void | Promise<void>
   /**
    * Stops the worker pool/set.
    */
-  public abstract stop(): Promise<void>;
+  public abstract stop (): Promise<void>
   /**
    * Adds a task element to the worker pool/set.
    *
    * @param elementData -
    */
-  public abstract addElement(elementData: T): Promise<void>;
+  public abstract addElement (elementData: D): Promise<R>
 }