X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2Fabstract-worker.ts;h=9b170330fabe7ea7514733b4553aac535a2528c8;hb=0f3efafd05a3fa733a0f49c336f42cc61ab52e6a;hp=03d954fe62f1933594e4f556511e9762b7093fb5;hpb=8bc7762018845abb73680eb1bbd65802b002ea08;p=poolifier.git diff --git a/src/worker/abstract-worker.ts b/src/worker/abstract-worker.ts index 03d954fe..9b170330 100644 --- a/src/worker/abstract-worker.ts +++ b/src/worker/abstract-worker.ts @@ -2,6 +2,7 @@ import { AsyncResource } from 'async_hooks' import type { Worker } from 'cluster' import type { MessagePort } from 'worker_threads' import type { MessageValue } from '../utility-types' +import { EMPTY_FUNCTION } from '../utils' import type { KillBehavior, WorkerOptions } from './worker-options' import { KillBehaviors } from './worker-options' @@ -12,8 +13,8 @@ const DEFAULT_KILL_BEHAVIOR: KillBehavior = KillBehaviors.SOFT * Base class containing some shared logic for all poolifier workers. * * @template MainWorker Type of main worker. - * @template Data Type of data this worker receives from pool's execution. - * @template Response Type of response the worker sends back to the main worker. + * @template Data Type of data this worker receives from pool's execution. This can only be serializable data. + * @template Response Type of response the worker sends back to the main worker. This can only be serializable data. */ export abstract class AbstractWorker< MainWorker extends Worker | MessagePort, @@ -21,26 +22,17 @@ export abstract class AbstractWorker< Response = unknown > extends AsyncResource { /** - * The maximum time to keep this worker alive while idle. The pool automatically checks and terminates this worker when the time expires. - */ - protected readonly maxInactiveTime: number - /** - * The kill behavior set as option on the Worker constructor or a default value. - */ - protected readonly killBehavior: KillBehavior - /** - * Whether the worker is working asynchronously or not. + * Timestamp of the last task processed by this worker. */ - protected readonly async: boolean + protected lastTaskTimestamp: number /** - * Timestamp of the last task processed by this worker. + * Handler Id of the `aliveInterval` worker alive check. */ - protected lastTask: number + protected readonly aliveInterval?: NodeJS.Timeout /** - * Handler ID of the `interval` alive check. + * Options for the worker. */ - protected readonly interval?: NodeJS.Timeout - + public readonly opts: WorkerOptions /** * Constructs a new poolifier worker. * @@ -54,54 +46,76 @@ export abstract class AbstractWorker< type: string, isMain: boolean, fn: (data: Data) => Response, - protected mainWorker?: MainWorker | null, - public readonly opts: WorkerOptions = { + protected mainWorker: MainWorker | undefined | null, + opts: WorkerOptions = { + /** + * The kill behavior option on this Worker or its default value. + */ killBehavior: DEFAULT_KILL_BEHAVIOR, + /** + * The maximum time to keep this worker alive while idle. + * The pool automatically checks and terminates this worker when the time expires. + */ maxInactiveTime: DEFAULT_MAX_INACTIVE_TIME } ) { super(type) - this.killBehavior = this.opts.killBehavior ?? DEFAULT_KILL_BEHAVIOR - this.maxInactiveTime = - this.opts.maxInactiveTime ?? DEFAULT_MAX_INACTIVE_TIME - this.async = !!this.opts.async - this.lastTask = Date.now() + this.opts = opts this.checkFunctionInput(fn) + this.checkWorkerOptions(this.opts) + this.lastTaskTimestamp = Date.now() // Keep the worker active - if (!isMain) { - this.interval = setInterval( + if (isMain === false) { + this.aliveInterval = setInterval( this.checkAlive.bind(this), - this.maxInactiveTime / 2 + (this.opts.maxInactiveTime ?? DEFAULT_MAX_INACTIVE_TIME) / 2 ) this.checkAlive.bind(this)() } this.mainWorker?.on('message', (value: MessageValue) => { - if (value?.data && value.id) { - // Here you will receive messages - if (this.async) { - this.runInAsyncScope(this.runAsync.bind(this), this, fn, value) - } else { - this.runInAsyncScope(this.run.bind(this), this, fn, value) - } - } else if (value.parent) { - // Save a reference of the main worker to communicate with it - // This will be received once - this.mainWorker = value.parent - } else if (value.kill) { - // Here is time to kill this worker, just clearing the interval - if (this.interval) clearInterval(this.interval) - this.emitDestroy() - } + this.messageListener(value, fn) }) } + protected messageListener ( + value: MessageValue, + fn: (data: Data) => Response + ): void { + if (value.data !== undefined && value.id !== undefined) { + // Here you will receive messages + if (this.opts.async) { + this.runInAsyncScope(this.runAsync.bind(this), this, fn, value) + } else { + this.runInAsyncScope(this.run.bind(this), this, fn, value) + } + } else if (value.parent !== undefined) { + // Save a reference of the main worker to communicate with it + // This will be received once + this.mainWorker = value.parent + } else if (value.kill !== undefined) { + // Here is time to kill this worker, just clearing the interval + if (this.aliveInterval) clearInterval(this.aliveInterval) + this.emitDestroy() + } + } + + private checkWorkerOptions (opts: WorkerOptions) { + this.opts.killBehavior = opts.killBehavior ?? DEFAULT_KILL_BEHAVIOR + this.opts.maxInactiveTime = + opts.maxInactiveTime ?? DEFAULT_MAX_INACTIVE_TIME + /** + * Whether the worker is working asynchronously or not. + */ + this.opts.async = !!opts.async + } + /** * Check if the `fn` parameter is passed to the constructor. * * @param fn The function that should be defined. */ - private checkFunctionInput (fn: (data: Data) => Response) { + private checkFunctionInput (fn: (data: Data) => Response): void { if (!fn) throw new Error('fn parameter is mandatory') } @@ -128,8 +142,11 @@ export abstract class AbstractWorker< * Check to see if the worker should be terminated, because its living too long. */ protected checkAlive (): void { - if (Date.now() - this.lastTask > this.maxInactiveTime) { - this.sendToMainWorker({ kill: this.killBehavior }) + if ( + Date.now() - this.lastTaskTimestamp > + (this.opts.maxInactiveTime ?? DEFAULT_MAX_INACTIVE_TIME) + ) { + this.sendToMainWorker({ kill: this.opts.killBehavior }) } } @@ -140,7 +157,7 @@ export abstract class AbstractWorker< * @returns Message of the error. */ protected handleError (e: Error | string): string { - return (e as unknown) as string + return e as string } /** @@ -154,13 +171,15 @@ export abstract class AbstractWorker< value: MessageValue ): void { try { + const startTaskTimestamp = Date.now() const res = fn(value.data) - this.sendToMainWorker({ data: res, id: value.id }) - this.lastTask = Date.now() + const taskRunTime = Date.now() - startTaskTimestamp + this.sendToMainWorker({ data: res, id: value.id, taskRunTime }) } catch (e) { - const err = this.handleError(e) + const err = this.handleError(e as Error) this.sendToMainWorker({ error: err, id: value.id }) - this.lastTask = Date.now() + } finally { + this.lastTaskTimestamp = Date.now() } } @@ -174,16 +193,20 @@ export abstract class AbstractWorker< fn: (data?: Data) => Promise, value: MessageValue ): void { + const startTaskTimestamp = Date.now() fn(value.data) .then(res => { - this.sendToMainWorker({ data: res, id: value.id }) - this.lastTask = Date.now() + const taskRunTime = Date.now() - startTaskTimestamp + this.sendToMainWorker({ data: res, id: value.id, taskRunTime }) return null }) .catch(e => { - const err = this.handleError(e) + const err = this.handleError(e as Error) this.sendToMainWorker({ error: err, id: value.id }) - this.lastTask = Date.now() }) + .finally(() => { + this.lastTaskTimestamp = Date.now() + }) + .catch(EMPTY_FUNCTION) } }