X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fworker%2Fabstract-worker.ts;h=fbf99ab8f1dfffe8936b4f25140c3d9597772d3b;hb=41aa7dcd8bbc5ff5a5aefe8765fe8a7c57d6be00;hp=5165417924b66cafbb9dceb6e2cab53c24ee7965;hpb=b1989cfdf9af9f2c5e01b9a3f7c81b8c3ed78cb4;p=poolifier.git diff --git a/src/worker/abstract-worker.ts b/src/worker/abstract-worker.ts index 51654179..fbf99ab8 100644 --- a/src/worker/abstract-worker.ts +++ b/src/worker/abstract-worker.ts @@ -1,7 +1,12 @@ import { AsyncResource } from 'node:async_hooks' import type { Worker } from 'node:cluster' import type { MessagePort } from 'node:worker_threads' -import type { MessageValue } from '../utility-types' +import type { + MessageValue, + WorkerAsyncFunction, + WorkerFunction, + WorkerSyncFunction +} from '../utility-types' import { EMPTY_FUNCTION } from '../utils' import type { KillBehavior, WorkerOptions } from './worker-options' import { KillBehaviors } from './worker-options' @@ -26,13 +31,9 @@ export abstract class AbstractWorker< */ protected lastTaskTimestamp!: number /** - * Handler Id of the `aliveInterval` worker alive check. + * Handler id of the `aliveInterval` worker alive check. */ protected readonly aliveInterval?: NodeJS.Timeout - /** - * Options for the worker. - */ - public readonly opts: WorkerOptions /** * Constructs a new poolifier worker. * @@ -45,11 +46,11 @@ export abstract class AbstractWorker< public constructor ( type: string, protected readonly isMain: boolean, - fn: (data: Data) => Response, + fn: WorkerFunction, protected mainWorker: MainWorker | undefined | null, - opts: WorkerOptions = { + protected readonly opts: WorkerOptions = { /** - * The kill behavior option on this Worker or its default value. + * The kill behavior option on this worker or its default value. */ killBehavior: DEFAULT_KILL_BEHAVIOR, /** @@ -60,11 +61,10 @@ export abstract class AbstractWorker< } ) { super(type) - this.opts = opts - this.checkFunctionInput(fn) this.checkWorkerOptions(this.opts) + this.checkFunctionInput(fn) if (!this.isMain) { - this.lastTaskTimestamp = Date.now() + this.lastTaskTimestamp = performance.now() this.aliveInterval = setInterval( this.checkAlive.bind(this), (this.opts.maxInactiveTime ?? DEFAULT_MAX_INACTIVE_TIME) / 2 @@ -72,31 +72,12 @@ export abstract class AbstractWorker< this.checkAlive.bind(this)() } - this.mainWorker?.on('message', (value: MessageValue) => { - this.messageListener(value, fn) - }) - } - - protected messageListener ( - value: MessageValue, - fn: (data: Data) => Response - ): void { - if (value.data != null && value.id != null) { - // Here you will receive messages - if (this.opts.async === true) { - this.runInAsyncScope(this.runAsync.bind(this), this, fn, value) - } else { - this.runInAsyncScope(this.run.bind(this), this, fn, value) + this.mainWorker?.on( + 'message', + (message: MessageValue) => { + this.messageListener(message, fn) } - } else if (value.parent != null) { - // Save a reference of the main worker to communicate with it - // This will be received once - this.mainWorker = value.parent - } else if (value.kill != null) { - // Here is time to kill this worker, just clearing the interval - this.aliveInterval != null && clearInterval(this.aliveInterval) - this.emitDestroy() - } + ) } private checkWorkerOptions (opts: WorkerOptions): void { @@ -111,11 +92,43 @@ export abstract class AbstractWorker< * * @param fn - The function that should be defined. */ - private checkFunctionInput (fn: (data: Data) => Response): void { + private checkFunctionInput (fn: WorkerFunction): void { if (fn == null) throw new Error('fn parameter is mandatory') if (typeof fn !== 'function') { throw new TypeError('fn parameter is not a function') } + if (fn.constructor.name === 'AsyncFunction' && this.opts.async === false) { + throw new Error( + 'fn parameter is an async function, please set the async option to true' + ) + } + } + + /** + * Worker message listener. + * + * @param message - Message received. + * @param fn - Function processed by the worker when the pool's `execution` function is invoked. + */ + protected messageListener ( + message: MessageValue, + fn: WorkerFunction + ): void { + if (message.id != null && message.data != null) { + // Task message received + if (this.opts.async === true) { + this.runInAsyncScope(this.runAsync.bind(this), this, fn, message) + } else { + this.runInAsyncScope(this.run.bind(this), this, fn, message) + } + } else if (message.parent != null) { + // Main worker reference message received + this.mainWorker = message.parent + } else if (message.kill != null) { + // Kill message received + this.aliveInterval != null && clearInterval(this.aliveInterval) + this.emitDestroy() + } } /** @@ -142,7 +155,7 @@ export abstract class AbstractWorker< */ protected checkAlive (): void { if ( - Date.now() - this.lastTaskTimestamp > + performance.now() - this.lastTaskTimestamp > (this.opts.maxInactiveTime ?? DEFAULT_MAX_INACTIVE_TIME) ) { this.sendToMainWorker({ kill: this.opts.killBehavior }) @@ -163,22 +176,26 @@ export abstract class AbstractWorker< * Runs the given function synchronously. * * @param fn - Function that will be executed. - * @param value - Input data for the given function. + * @param message - Input data for the given function. */ protected run ( - fn: (data?: Data) => Response, - value: MessageValue + fn: WorkerSyncFunction, + message: MessageValue ): void { try { - const startTaskTimestamp = Date.now() - const res = fn(value.data) - const taskRunTime = Date.now() - startTaskTimestamp - this.sendToMainWorker({ data: res, id: value.id, taskRunTime }) + const startTimestamp = performance.now() + const res = fn(message.data) + const runTime = performance.now() - startTimestamp + this.sendToMainWorker({ + data: res, + id: message.id, + runTime + }) } catch (e) { const err = this.handleError(e as Error) - this.sendToMainWorker({ error: err, id: value.id }) + this.sendToMainWorker({ error: err, id: message.id }) } finally { - !this.isMain && (this.lastTaskTimestamp = Date.now()) + !this.isMain && (this.lastTaskTimestamp = performance.now()) } } @@ -186,25 +203,29 @@ export abstract class AbstractWorker< * Runs the given function asynchronously. * * @param fn - Function that will be executed. - * @param value - Input data for the given function. + * @param message - Input data for the given function. */ protected runAsync ( - fn: (data?: Data) => Promise, - value: MessageValue + fn: WorkerAsyncFunction, + message: MessageValue ): void { - const startTaskTimestamp = Date.now() - fn(value.data) + const startTimestamp = performance.now() + fn(message.data) .then(res => { - const taskRunTime = Date.now() - startTaskTimestamp - this.sendToMainWorker({ data: res, id: value.id, taskRunTime }) + const runTime = performance.now() - startTimestamp + this.sendToMainWorker({ + data: res, + id: message.id, + runTime + }) return null }) .catch(e => { const err = this.handleError(e as Error) - this.sendToMainWorker({ error: err, id: value.id }) + this.sendToMainWorker({ error: err, id: message.id }) }) .finally(() => { - !this.isMain && (this.lastTaskTimestamp = Date.now()) + !this.isMain && (this.lastTaskTimestamp = performance.now()) }) .catch(EMPTY_FUNCTION) }