X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2FWorkerFactory.ts;h=f64d27810ed04a3e2a7752918f94d0ea3b7ec006;hb=42371a2ed3ad187c91417fa759fd260ae86dee7c;hp=e590ad14749974bacd9b0c6aa4022164d3323b48;hpb=01f4001e733ebc61423d3023d87b1399b6afa215;p=e-mobility-charging-stations-simulator.git diff --git a/src/worker/WorkerFactory.ts b/src/worker/WorkerFactory.ts index e590ad14..f64d2781 100644 --- a/src/worker/WorkerFactory.ts +++ b/src/worker/WorkerFactory.ts @@ -1,6 +1,6 @@ -import { type Worker, isMainThread } from 'node:worker_threads'; +import { isMainThread } from 'node:worker_threads'; -import type { PoolOptions } from 'poolifier'; +import type { ThreadPoolOptions } from 'poolifier'; import type { WorkerAbstract } from './WorkerAbstract'; import { WorkerConstants } from './WorkerConstants'; @@ -17,7 +17,7 @@ export class WorkerFactory { public static getWorkerImplementation( workerScript: string, workerProcessType: WorkerProcessType, - workerOptions?: WorkerOptions + workerOptions?: WorkerOptions, ): WorkerAbstract | null { if (!isMainThread) { throw new Error('Cannot get a worker implementation outside the main thread'); @@ -27,22 +27,20 @@ export class WorkerFactory { workerOptions?.workerStartDelay ?? WorkerConstants.DEFAULT_WORKER_START_DELAY; workerOptions.elementStartDelay = workerOptions?.elementStartDelay ?? WorkerConstants.DEFAULT_ELEMENT_START_DELAY; - workerOptions.poolOptions = workerOptions?.poolOptions ?? ({} as PoolOptions); - workerOptions?.messageHandler && - (workerOptions.poolOptions.messageHandler = workerOptions.messageHandler); + workerOptions.poolOptions = workerOptions?.poolOptions ?? ({} as ThreadPoolOptions); let workerImplementation: WorkerAbstract | null = null; switch (workerProcessType) { - case WorkerProcessType.WORKER_SET: + case WorkerProcessType.workerSet: workerOptions.elementsPerWorker = workerOptions?.elementsPerWorker ?? WorkerConstants.DEFAULT_ELEMENTS_PER_WORKER; workerImplementation = new WorkerSet(workerScript, workerOptions); break; - case WorkerProcessType.STATIC_POOL: + case WorkerProcessType.staticPool: workerOptions.poolMaxSize = workerOptions?.poolMaxSize ?? WorkerConstants.DEFAULT_POOL_MAX_SIZE; workerImplementation = new WorkerStaticPool(workerScript, workerOptions); break; - case WorkerProcessType.DYNAMIC_POOL: + case WorkerProcessType.dynamicPool: workerOptions.poolMinSize = workerOptions?.poolMinSize ?? WorkerConstants.DEFAULT_POOL_MIN_SIZE; workerOptions.poolMaxSize =