X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fabstract-pool.ts;h=122e9fa5c9dbbad12f7eaf01b1db4f0b38ab35e4;hb=a9d9ea34ae4621d0babc235b10614c7c8c37d88b;hp=1b10e03c01ed8d0ce2a82b94cdd327ebca8c25df;hpb=b4904890be69e53510b67172dda7b6bbf50a635a;p=poolifier.git diff --git a/src/pools/abstract-pool.ts b/src/pools/abstract-pool.ts index 1b10e03c..122e9fa5 100644 --- a/src/pools/abstract-pool.ts +++ b/src/pools/abstract-pool.ts @@ -3,7 +3,7 @@ import type { PromiseWorkerResponseWrapper } from '../utility-types' import { EMPTY_FUNCTION } from '../utils' -import { isKillBehavior, KillBehaviors } from '../worker/worker-options' +import { KillBehaviors, isKillBehavior } from '../worker/worker-options' import type { PoolOptions } from './pool' import { PoolEmitter } from './pool' import type { IPoolInternal, TasksUsage } from './pool-internal' @@ -11,37 +11,34 @@ import { PoolType } from './pool-internal' import type { IPoolWorker } from './pool-worker' import { WorkerChoiceStrategies, - WorkerChoiceStrategy + type WorkerChoiceStrategy } from './selection-strategies/selection-strategies-types' import { WorkerChoiceStrategyContext } from './selection-strategies/worker-choice-strategy-context' /** * Base class that implements some shared logic for all poolifier pools. * - * @template Worker Type of worker which manages this pool. - * @template Data Type of data sent to the worker. This can only be serializable data. - * @template Response Type of response of execution. This can only be serializable data. + * @typeParam Worker - Type of worker which manages this pool. + * @typeParam Data - Type of data sent to the worker. This can only be serializable data. + * @typeParam Response - Type of response of execution. This can only be serializable data. */ export abstract class AbstractPool< Worker extends IPoolWorker, Data = unknown, Response = unknown > implements IPoolInternal { - /** @inheritDoc */ + /** {@inheritDoc} */ public readonly workers: Worker[] = [] - /** @inheritDoc */ + /** {@inheritDoc} */ public readonly workersTasksUsage: Map = new Map< - Worker, - TasksUsage + Worker, + TasksUsage >() - /** @inheritDoc */ + /** {@inheritDoc} */ public readonly emitter?: PoolEmitter - /** @inheritDoc */ - public readonly max?: number - /** * The promise map. * @@ -51,8 +48,8 @@ export abstract class AbstractPool< * When we receive a message from the worker we get a map entry and resolve/reject the promise based on the message. */ protected promiseMap: Map< - number, - PromiseWorkerResponseWrapper + number, + PromiseWorkerResponseWrapper > = new Map>() /** @@ -66,24 +63,24 @@ export abstract class AbstractPool< * Default to a strategy implementing a round robin algorithm. */ protected workerChoiceStrategyContext: WorkerChoiceStrategyContext< - Worker, - Data, - Response + Worker, + Data, + Response > /** * Constructs a new poolifier pool. * - * @param numberOfWorkers Number of workers that this pool should manage. - * @param filePath Path to the worker-file. - * @param opts Options for the pool. + * @param numberOfWorkers - Number of workers that this pool should manage. + * @param filePath - Path to the worker-file. + * @param opts - Options for the pool. */ public constructor ( public readonly numberOfWorkers: number, public readonly filePath: string, public readonly opts: PoolOptions ) { - if (this.isMain() === false) { + if (!this.isMain()) { throw new Error('Cannot start a pool from a worker!') } this.checkNumberOfWorkers(this.numberOfWorkers) @@ -108,7 +105,7 @@ export abstract class AbstractPool< this.getWorkerRunningTasks(workerCreated) === 0 ) { // Kill received from the worker, means that no new tasks are submitted to that worker for a while ( > maxInactiveTime) - this.destroyWorker(workerCreated) as void + void this.destroyWorker(workerCreated) } }) return workerCreated @@ -118,7 +115,7 @@ export abstract class AbstractPool< } private checkFilePath (filePath: string): void { - if (!filePath) { + if (filePath == null || filePath.length === 0) { throw new Error('Please specify a file with a worker implementation') } } @@ -128,12 +125,12 @@ export abstract class AbstractPool< throw new Error( 'Cannot instantiate a pool without specifying the number of workers' ) - } else if (Number.isSafeInteger(numberOfWorkers) === false) { - throw new Error( + } else if (!Number.isSafeInteger(numberOfWorkers)) { + throw new TypeError( 'Cannot instantiate a pool with a non integer number of workers' ) } else if (numberOfWorkers < 0) { - throw new Error( + throw new RangeError( 'Cannot instantiate a pool with a negative number of workers' ) } else if (this.type === PoolType.FIXED && numberOfWorkers === 0) { @@ -147,30 +144,30 @@ export abstract class AbstractPool< this.opts.enableEvents = opts.enableEvents ?? true } - /** @inheritDoc */ + /** {@inheritDoc} */ public abstract get type (): PoolType - /** @inheritDoc */ + /** {@inheritDoc} */ public get numberOfRunningTasks (): number { return this.promiseMap.size } - /** @inheritDoc */ + /** {@inheritDoc} */ public getWorkerIndex (worker: Worker): number { return this.workers.indexOf(worker) } - /** @inheritDoc */ + /** {@inheritDoc} */ public getWorkerRunningTasks (worker: Worker): number | undefined { return this.workersTasksUsage.get(worker)?.running } - /** @inheritDoc */ + /** {@inheritDoc} */ public getWorkerAverageTasksRunTime (worker: Worker): number | undefined { return this.workersTasksUsage.get(worker)?.avgRunTime } - /** @inheritDoc */ + /** {@inheritDoc} */ public setWorkerChoiceStrategy ( workerChoiceStrategy: WorkerChoiceStrategy ): void { @@ -183,7 +180,7 @@ export abstract class AbstractPool< ) } - /** @inheritDoc */ + /** {@inheritDoc} */ public abstract get busy (): boolean protected internalGetBusyStatus (): boolean { @@ -193,7 +190,7 @@ export abstract class AbstractPool< ) } - /** @inheritDoc */ + /** {@inheritDoc} */ public findFreeWorker (): Worker | false { for (const worker of this.workers) { if (this.getWorkerRunningTasks(worker) === 0) { @@ -204,29 +201,35 @@ export abstract class AbstractPool< return false } - /** @inheritDoc */ - public execute (data: Data): Promise { + /** {@inheritDoc} */ + public async execute (data: Data): Promise { // Configure worker to handle message with the specified task const worker = this.chooseWorker() const res = this.internalExecute(worker, this.nextMessageId) this.checkAndEmitBusy() this.sendToWorker(worker, { + // eslint-disable-next-line @typescript-eslint/consistent-type-assertions data: data ?? ({} as Data), id: this.nextMessageId }) ++this.nextMessageId + // eslint-disable-next-line @typescript-eslint/return-await return res } - /** @inheritDoc */ + /** {@inheritDoc} */ public async destroy (): Promise { - await Promise.all(this.workers.map(worker => this.destroyWorker(worker))) + await Promise.all( + this.workers.map(async worker => { + await this.destroyWorker(worker) + }) + ) } /** * Shutdowns given worker. * - * @param worker A worker within `workers`. + * @param worker - A worker within `workers`. */ protected abstract destroyWorker (worker: Worker): void | Promise @@ -247,7 +250,7 @@ export abstract class AbstractPool< * Hook executed before the worker task promise resolution. * Can be overridden. * - * @param worker The worker. + * @param worker - The worker. */ protected beforePromiseWorkerResponseHook (worker: Worker): void { this.increaseWorkerRunningTasks(worker) @@ -257,8 +260,8 @@ export abstract class AbstractPool< * Hook executed after the worker task promise resolution. * Can be overridden. * - * @param message The received message. - * @param promise The Promise response. + * @param message - The received message. + * @param promise - The Promise response. */ protected afterPromiseWorkerResponseHook ( message: MessageValue, @@ -272,7 +275,7 @@ export abstract class AbstractPool< /** * Removes the given worker from the pool. * - * @param worker The worker that will be removed. + * @param worker - The worker that will be removed. */ protected removeWorker (worker: Worker): void { // Clean worker from data structure @@ -294,8 +297,8 @@ export abstract class AbstractPool< /** * Sends a message to the given worker. * - * @param worker The worker which should receive the message. - * @param message The message. + * @param worker - The worker which should receive the message. + * @param message - The message. */ protected abstract sendToWorker ( worker: Worker, @@ -305,22 +308,12 @@ export abstract class AbstractPool< /** * Registers a listener callback on a given worker. * - * @param worker The worker which should register a listener. - * @param listener The message listener callback. + * @param worker - The worker which should register a listener. + * @param listener - The message listener callback. */ protected abstract registerWorkerMessageListener< Message extends Data | Response - > (worker: Worker, listener: (message: MessageValue) => void): void - - protected internalExecute ( - worker: Worker, - messageId: number - ): Promise { - this.beforePromiseWorkerResponseHook(worker) - return new Promise((resolve, reject) => { - this.promiseMap.set(messageId, { resolve, reject, worker }) - }) - } + >(worker: Worker, listener: (message: MessageValue) => void): void /** * Returns a newly created worker. @@ -330,9 +323,9 @@ export abstract class AbstractPool< /** * Function that can be hooked up when a worker has been newly created and moved to the workers registry. * - * Can be used to update the `maxListeners` or binding the `main-worker`<->`worker` connection if not bind by default. + * Can be used to update the `maxListeners` or binding the `main-worker`\<-\>`worker` connection if not bind by default. * - * @param worker The newly created worker. + * @param worker - The newly created worker. */ protected abstract afterWorkerSetup (worker: Worker): void @@ -348,7 +341,9 @@ export abstract class AbstractPool< worker.on('error', this.opts.errorHandler ?? EMPTY_FUNCTION) worker.on('online', this.opts.onlineHandler ?? EMPTY_FUNCTION) worker.on('exit', this.opts.exitHandler ?? EMPTY_FUNCTION) - worker.once('exit', () => this.removeWorker(worker)) + worker.once('exit', () => { + this.removeWorker(worker) + }) this.workers.push(worker) @@ -370,7 +365,7 @@ export abstract class AbstractPool< if (message.id !== undefined) { const promise = this.promiseMap.get(message.id) if (promise !== undefined) { - if (message.error) { + if (message.error != null) { promise.reject(message.error) } else { promise.resolve(message.data as Response) @@ -382,8 +377,18 @@ export abstract class AbstractPool< } } + private async internalExecute ( + worker: Worker, + messageId: number + ): Promise { + this.beforePromiseWorkerResponseHook(worker) + return await new Promise((resolve, reject) => { + this.promiseMap.set(messageId, { resolve, reject, worker }) + }) + } + private checkAndEmitBusy (): void { - if (this.opts.enableEvents === true && this.busy === true) { + if (this.opts.enableEvents === true && this.busy) { this.emitter?.emit('busy') } } @@ -391,7 +396,7 @@ export abstract class AbstractPool< /** * Increases the number of tasks that the given worker has applied. * - * @param worker Worker which running tasks is increased. + * @param worker - Worker which running tasks is increased. */ private increaseWorkerRunningTasks (worker: Worker): void { this.stepWorkerRunningTasks(worker, 1) @@ -400,7 +405,7 @@ export abstract class AbstractPool< /** * Decreases the number of tasks that the given worker has applied. * - * @param worker Worker which running tasks is decreased. + * @param worker - Worker which running tasks is decreased. */ private decreaseWorkerRunningTasks (worker: Worker): void { this.stepWorkerRunningTasks(worker, -1) @@ -409,11 +414,11 @@ export abstract class AbstractPool< /** * Steps the number of tasks that the given worker has applied. * - * @param worker Worker which running tasks are stepped. - * @param step Number of running tasks step. + * @param worker - Worker which running tasks are stepped. + * @param step - Number of running tasks step. */ private stepWorkerRunningTasks (worker: Worker, step: number): void { - if (this.checkWorkerTasksUsage(worker) === true) { + if (this.checkWorkerTasksUsage(worker)) { const tasksUsage = this.workersTasksUsage.get(worker) as TasksUsage tasksUsage.running = tasksUsage.running + step this.workersTasksUsage.set(worker, tasksUsage) @@ -423,11 +428,11 @@ export abstract class AbstractPool< /** * Steps the number of tasks that the given worker has run. * - * @param worker Worker which has run tasks. - * @param step Number of run tasks step. + * @param worker - Worker which has run tasks. + * @param step - Number of run tasks step. */ private stepWorkerRunTasks (worker: Worker, step: number): void { - if (this.checkWorkerTasksUsage(worker) === true) { + if (this.checkWorkerTasksUsage(worker)) { const tasksUsage = this.workersTasksUsage.get(worker) as TasksUsage tasksUsage.run = tasksUsage.run + step this.workersTasksUsage.set(worker, tasksUsage) @@ -437,8 +442,8 @@ export abstract class AbstractPool< /** * Updates tasks runtime for the given worker. * - * @param worker Worker which run the task. - * @param taskRunTime Worker task runtime. + * @param worker - Worker which run the task. + * @param taskRunTime - Worker task runtime. */ private updateWorkerTasksRunTime ( worker: Worker, @@ -446,8 +451,8 @@ export abstract class AbstractPool< ): void { if ( this.workerChoiceStrategyContext.getWorkerChoiceStrategy() - .requiredStatistics.runTime === true && - this.checkWorkerTasksUsage(worker) === true + .requiredStatistics.runTime && + this.checkWorkerTasksUsage(worker) ) { const tasksUsage = this.workersTasksUsage.get(worker) as TasksUsage tasksUsage.runTime += taskRunTime ?? 0 @@ -461,12 +466,12 @@ export abstract class AbstractPool< /** * Checks if the given worker is registered in the workers tasks usage map. * - * @param worker Worker to check. + * @param worker - Worker to check. * @returns `true` if the worker is registered in the workers tasks usage map. `false` otherwise. */ private checkWorkerTasksUsage (worker: Worker): boolean { const hasTasksUsage = this.workersTasksUsage.has(worker) - if (hasTasksUsage === false) { + if (!hasTasksUsage) { throw new Error('Worker could not be found in workers tasks usage map') } return hasTasksUsage @@ -475,9 +480,9 @@ export abstract class AbstractPool< /** * Initializes tasks usage statistics. * - * @param worker The worker. + * @param worker - The worker. */ - initWorkerTasksUsage (worker: Worker): void { + private initWorkerTasksUsage (worker: Worker): void { this.workersTasksUsage.set(worker, { run: 0, running: 0, @@ -489,7 +494,7 @@ export abstract class AbstractPool< /** * Removes worker tasks usage statistics. * - * @param worker The worker. + * @param worker - The worker. */ private removeWorkerTasksUsage (worker: Worker): void { this.workersTasksUsage.delete(worker) @@ -498,7 +503,7 @@ export abstract class AbstractPool< /** * Resets worker tasks usage statistics. * - * @param worker The worker. + * @param worker - The worker. */ private resetWorkerTasksUsage (worker: Worker): void { this.removeWorkerTasksUsage(worker)