DEFAULT_TASK_NAME,
DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS,
EMPTY_FUNCTION,
- isAsyncFunction,
isKillBehavior,
isPlainObject,
median,
)
} else if (max === 0) {
throw new RangeError(
- 'Cannot instantiate a dynamic pool with a pool size equal to zero'
+ 'Cannot instantiate a dynamic pool with a maximum pool size equal to zero'
)
} else if (min === max) {
throw new RangeError(
accumulator + workerNode.usage.tasks.executing,
0
),
- queuedTasks: this.workerNodes.reduce(
- (accumulator, workerNode) =>
- accumulator + workerNode.usage.tasks.queued,
- 0
- ),
- maxQueuedTasks: this.workerNodes.reduce(
- (accumulator, workerNode) =>
- accumulator + (workerNode.usage.tasks?.maxQueued ?? 0),
- 0
- ),
+ ...(this.opts.enableTasksQueue === true && {
+ queuedTasks: this.workerNodes.reduce(
+ (accumulator, workerNode) =>
+ accumulator + workerNode.usage.tasks.queued,
+ 0
+ )
+ }),
+ ...(this.opts.enableTasksQueue === true && {
+ maxQueuedTasks: this.workerNodes.reduce(
+ (accumulator, workerNode) =>
+ accumulator + (workerNode.usage.tasks?.maxQueued ?? 0),
+ 0
+ )
+ }),
failedTasks: this.workerNodes.reduce(
(accumulator, workerNode) =>
accumulator + workerNode.usage.tasks.failed,
private checkMessageWorkerId (message: MessageValue<Response>): void {
if (
message.workerId != null &&
- this.getWorkerNodeKeyByWorkerId(message.workerId) == null
+ this.getWorkerNodeKeyByWorkerId(message.workerId) === -1
) {
throw new Error(
`Worker message received from unknown worker '${message.workerId}'`
* @param worker - The worker.
* @returns The worker node key if found in the pool worker nodes, `-1` otherwise.
*/
- private getWorkerNodeKey (worker: Worker): number {
+ private getWorkerNodeKeyByWorker (worker: Worker): number {
return this.workerNodes.findIndex(
workerNode => workerNode.worker === worker
)
* Gets the worker node key given its worker id.
*
* @param workerId - The worker id.
- * @returns The worker node key if the worker id is found in the pool worker nodes, `undefined` otherwise.
+ * @returns The worker node key if the worker id is found in the pool worker nodes, `-1` otherwise.
*/
- private getWorkerNodeKeyByWorkerId (workerId: number): number | undefined {
- for (const [workerNodeKey, workerNode] of this.workerNodes.entries()) {
- if (workerNode.info.id === workerId) {
- return workerNodeKey
- }
- }
+ private getWorkerNodeKeyByWorkerId (workerId: number): number {
+ return this.workerNodes.findIndex(
+ workerNode => workerNode.info.id === workerId
+ )
}
/** @inheritDoc */
protected abstract get busy (): boolean
/**
- * Whether worker nodes are executing at least one task.
+ * Whether worker nodes are executing concurrently their tasks quota or not.
*
* @returns Worker nodes busyness boolean status.
*/
protected internalBusy (): boolean {
- return (
- this.workerNodes.findIndex(workerNode => {
- return workerNode.usage.tasks.executing === 0
- }) === -1
- )
+ if (this.opts.enableTasksQueue === true) {
+ return (
+ this.workerNodes.findIndex(
+ workerNode =>
+ workerNode.info.ready &&
+ workerNode.usage.tasks.executing <
+ (this.opts.tasksQueueOptions?.concurrency as number)
+ ) === -1
+ )
+ } else {
+ return (
+ this.workerNodes.findIndex(
+ workerNode =>
+ workerNode.info.ready && workerNode.usage.tasks.executing === 0
+ ) === -1
+ )
+ }
}
/** @inheritDoc */
data: data ?? ({} as Data),
timestamp,
workerId: this.getWorkerInfo(workerNodeKey).id as number,
- id: randomUUID()
+ taskId: randomUUID()
}
- this.promiseResponseMap.set(task.id as string, {
+ this.promiseResponseMap.set(task.taskId as string, {
resolve,
reject,
workerNodeKey
})
if (
- this.opts.enableTasksQueue === true &&
- (this.busy ||
- this.workerNodes[workerNodeKey].usage.tasks.executing >=
+ this.opts.enableTasksQueue === false ||
+ (this.opts.enableTasksQueue === true &&
+ this.workerNodes[workerNodeKey].usage.tasks.executing <
(this.opts.tasksQueueOptions?.concurrency as number))
) {
- this.enqueueTask(workerNodeKey, task)
- } else {
this.executeTask(workerNodeKey, task)
+ } else {
+ this.enqueueTask(workerNodeKey, task)
}
this.checkAndEmitEvents()
})
/** @inheritDoc */
public async destroy (): Promise<void> {
await Promise.all(
- this.workerNodes.map(async (workerNode, workerNodeKey) => {
- this.flushTasksQueue(workerNodeKey)
- // FIXME: wait for tasks to be finished
- const workerExitPromise = new Promise<void>(resolve => {
- workerNode.worker.on('exit', () => {
- resolve()
- })
- })
+ this.workerNodes.map(async (_, workerNodeKey) => {
await this.destroyWorkerNode(workerNodeKey)
- await workerExitPromise
})
)
}
*
* @param workerNodeKey - The worker node key.
*/
- protected abstract destroyWorkerNode (
- workerNodeKey: number
- ): void | Promise<void>
+ protected abstract destroyWorkerNode (workerNodeKey: number): Promise<void>
/**
* Setup hook to execute code before worker nodes are created in the abstract constructor.
worker.on('message', this.opts.messageHandler ?? EMPTY_FUNCTION)
worker.on('error', this.opts.errorHandler ?? EMPTY_FUNCTION)
worker.on('error', error => {
- const workerNodeKey = this.getWorkerNodeKey(worker)
+ const workerNodeKey = this.getWorkerNodeKeyByWorker(worker)
const workerInfo = this.getWorkerInfo(workerNodeKey)
workerInfo.ready = false
this.workerNodes[workerNodeKey].closeChannel()
this.registerWorkerMessageListener(workerNodeKey, message => {
const localWorkerNodeKey = this.getWorkerNodeKeyByWorkerId(
message.workerId
- ) as number
+ )
const workerUsage = this.workerNodes[localWorkerNodeKey].usage
+ // Kill message received from worker
if (
isKillBehavior(KillBehaviors.HARD, message.kill) ||
(message.kill != null &&
workerUsage.tasks.executing === 0 &&
this.tasksQueueSize(localWorkerNodeKey) === 0)))
) {
- // Kill message received from the worker: no new tasks are submitted to that worker for a while ( > maxInactiveTime)
- const destroyWorkerNodeBounded = this.destroyWorkerNode.bind(this)
- if (isAsyncFunction(destroyWorkerNodeBounded)) {
- (
- destroyWorkerNodeBounded as (workerNodeKey: number) => Promise<void>
- )(localWorkerNodeKey).catch(EMPTY_FUNCTION)
- } else {
- (destroyWorkerNodeBounded as (workerNodeKey: number) => void)(
- localWorkerNodeKey
- )
- }
+ this.destroyWorkerNode(localWorkerNodeKey).catch(EMPTY_FUNCTION)
}
})
const workerInfo = this.getWorkerInfo(workerNodeKey)
return message => {
this.checkMessageWorkerId(message)
if (message.ready != null) {
- // Worker ready response received
+ // Worker ready response received from worker
this.handleWorkerReadyResponse(message)
- } else if (message.id != null) {
- // Task execution response received
+ } else if (message.taskId != null) {
+ // Task execution response received from worker
this.handleTaskExecutionResponse(message)
}
}
private handleWorkerReadyResponse (message: MessageValue<Response>): void {
this.getWorkerInfo(
- this.getWorkerNodeKeyByWorkerId(message.workerId) as number
+ this.getWorkerNodeKeyByWorkerId(message.workerId)
).ready = message.ready as boolean
if (this.emitter != null && this.ready) {
this.emitter.emit(PoolEvents.ready, this.info)
}
private handleTaskExecutionResponse (message: MessageValue<Response>): void {
- const promiseResponse = this.promiseResponseMap.get(message.id as string)
+ const promiseResponse = this.promiseResponseMap.get(
+ message.taskId as string
+ )
if (promiseResponse != null) {
if (message.taskError != null) {
this.emitter?.emit(PoolEvents.taskError, message.taskError)
}
const workerNodeKey = promiseResponse.workerNodeKey
this.afterTaskExecutionHook(workerNodeKey, message)
- this.promiseResponseMap.delete(message.id as string)
+ this.promiseResponseMap.delete(message.taskId as string)
if (
this.opts.enableTasksQueue === true &&
this.tasksQueueSize(workerNodeKey) > 0 &&
workerNode.info.ready = true
}
this.workerNodes.push(workerNode)
- const workerNodeKey = this.getWorkerNodeKey(worker)
+ const workerNodeKey = this.getWorkerNodeKeyByWorker(worker)
if (workerNodeKey === -1) {
throw new Error('Worker node not found')
}
* @param worker - The worker.
*/
private removeWorkerNode (worker: Worker): void {
- const workerNodeKey = this.getWorkerNodeKey(worker)
+ const workerNodeKey = this.getWorkerNodeKeyByWorker(worker)
if (workerNodeKey !== -1) {
this.workerNodes.splice(workerNodeKey, 1)
this.workerChoiceStrategyContext.remove(workerNodeKey)
return this.workerNodes[workerNodeKey].tasksQueueSize()
}
- private flushTasksQueue (workerNodeKey: number): void {
+ protected flushTasksQueue (workerNodeKey: number): void {
while (this.tasksQueueSize(workerNodeKey) > 0) {
this.executeTask(
workerNodeKey,
repositories / poolifier.git / blobdiff