X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2FWorkerAbstract.ts;h=32319ab2ee87d6faf8af97a2dfcd9c74babaa9fc;hb=b3d7d65476a4ab586b3ccd188f0bfbe8452aba0e;hp=75fc2f6bed5baaf47a9e2aae9f52d1992253eec3;hpb=e1d9a0f4d6ff1a90048e9a694fd12b7031cc6961;p=e-mobility-charging-stations-simulator.git diff --git a/src/worker/WorkerAbstract.ts b/src/worker/WorkerAbstract.ts index 75fc2f6b..32319ab2 100644 --- a/src/worker/WorkerAbstract.ts +++ b/src/worker/WorkerAbstract.ts @@ -1,10 +1,8 @@ import type { EventEmitter } from 'node:events'; import { existsSync } from 'node:fs'; -import type { Worker } from 'node:worker_threads'; -import type { ErrorHandler, ExitHandler, PoolEmitter, PoolInfo } from 'poolifier'; +import type { PoolEmitter, PoolInfo } from 'poolifier'; -import { WorkerConstants } from './WorkerConstants'; import type { SetInfo, WorkerData, WorkerOptions } from './WorkerTypes'; import { defaultErrorHandler, defaultExitHandler } from './WorkerUtils'; @@ -22,17 +20,7 @@ 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: {}, - }, - ) { + constructor(workerScript: string, workerOptions: WorkerOptions) { if (workerScript === null || workerScript === undefined) { throw new Error('Worker script is not defined'); } @@ -44,14 +32,10 @@ export abstract class WorkerAbstract { } 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; - this.workerOptions.poolOptions?.onlineHandler?.bind(this); - this.workerOptions.poolOptions!.exitHandler = ( - this.workerOptions?.poolOptions?.exitHandler ?? defaultExitHandler - ).bind(this) as ExitHandler; + this.workerOptions.poolOptions!.errorHandler = + this.workerOptions.poolOptions?.errorHandler ?? defaultErrorHandler; + this.workerOptions.poolOptions!.exitHandler = + this.workerOptions.poolOptions?.exitHandler ?? defaultExitHandler; } /**