X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fworker%2FWorkerAbstract.ts;h=cd4dedf992fca40ff0b7cb787e91468d28020d55;hb=6a4032b5d8f3cbaa18d3beddcdfe9d335c1cba90;hp=41145f803ed448ce60b9a03fa584af5403ae4a92;hpb=a37fc6dc8267e22b2b2d35773525980b81f014e8;p=e-mobility-charging-stations-simulator.git diff --git a/src/worker/WorkerAbstract.ts b/src/worker/WorkerAbstract.ts index 41145f80..cd4dedf9 100644 --- a/src/worker/WorkerAbstract.ts +++ b/src/worker/WorkerAbstract.ts @@ -1,9 +1,8 @@ -import type { EventEmitter } from 'node:events'; +import type { EventEmitterAsyncResource } from 'node:events'; import { existsSync } from 'node:fs'; -import type { PoolEmitter, PoolInfo } from 'poolifier'; +import type { PoolInfo } from 'poolifier'; -import { WorkerConstants } from './WorkerConstants'; import type { SetInfo, WorkerData, WorkerOptions } from './WorkerTypes'; import { defaultErrorHandler, defaultExitHandler } from './WorkerUtils'; @@ -13,7 +12,7 @@ export abstract class WorkerAbstract { public abstract readonly info: PoolInfo | SetInfo; public abstract readonly size: number; public abstract readonly maxElementsPerWorker: number | undefined; - public abstract readonly emitter: EventEmitter | PoolEmitter | undefined; + public abstract readonly emitter: EventEmitterAsyncResource | undefined; /** * `WorkerAbstract` constructor. @@ -21,22 +20,15 @@ export abstract class WorkerAbstract { * @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: {}, - }, - ) { - if (workerScript === null || workerScript === undefined) { - throw new Error('Worker script is not defined'); + constructor(workerScript: string, workerOptions: WorkerOptions) { + if (workerScript == null) { + throw new TypeError('Worker script is not defined'); } - if (typeof workerScript === 'string' && workerScript.trim().length === 0) { - throw new Error('Worker script is empty'); + if (typeof workerScript !== 'string') { + throw new TypeError('Worker script must be a string'); + } + if (workerScript.trim().length === 0) { + throw new Error('Worker script is an empty string'); } if (!existsSync(workerScript)) { throw new Error('Worker script file does not exist');