X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2Fabstract-worker.ts;h=2359758dc72c2a362b60e513890664731fdc7fea;hb=43f8444644bd23ed8b01e7bbb386a51a6144fff8;hp=5fcc3419b2c1acc8d9ea39ca556c199a9ff44ea9;hpb=69b70a7e1d5238ebb186171275941ec4bcffc882;p=poolifier.git diff --git a/src/worker/abstract-worker.ts b/src/worker/abstract-worker.ts index 5fcc3419..2359758d 100644 --- a/src/worker/abstract-worker.ts +++ b/src/worker/abstract-worker.ts @@ -6,26 +6,26 @@ import type { Task, TaskPerformance, WorkerStatistics -} from '../utility-types' +} from '../utility-types.js' import { DEFAULT_TASK_NAME, EMPTY_FUNCTION, isAsyncFunction, isPlainObject -} from '../utils' -import { KillBehaviors, type WorkerOptions } from './worker-options' +} from '../utils.js' +import { KillBehaviors, type WorkerOptions } from './worker-options.js' import type { TaskAsyncFunction, TaskFunction, TaskFunctionOperationResult, TaskFunctions, TaskSyncFunction -} from './task-functions' +} from './task-functions.js' import { checkTaskFunctionName, checkValidTaskFunctionEntry, checkValidWorkerOptions -} from './utils' +} from './utils.js' const DEFAULT_MAX_INACTIVE_TIME = 60000 const DEFAULT_WORKER_OPTIONS: WorkerOptions = { @@ -76,23 +76,21 @@ export abstract class AbstractWorker< * Handler id of the `activeInterval` worker activity check. */ protected activeInterval?: NodeJS.Timeout + /** * Constructs a new poolifier worker. * - * @param type - The type of async event. * @param isMain - Whether this is the main worker or not. * @param mainWorker - Reference to main worker. * @param taskFunctions - Task function(s) processed by the worker when the pool's `execution` function is invoked. The first function is the default function. * @param opts - Options for the worker. */ public constructor ( - type: string, protected readonly isMain: boolean, private readonly mainWorker: MainWorker, taskFunctions: TaskFunction | TaskFunctions, protected opts: WorkerOptions = DEFAULT_WORKER_OPTIONS ) { - // super(type) if (this.isMain == null) { throw new Error('isMain parameter is mandatory') } @@ -279,10 +277,8 @@ export abstract class AbstractWorker< 'Cannot set the default task function to a non-existing task function' ) } - this.taskFunctions.set( - DEFAULT_TASK_NAME, - this.taskFunctions.get(name) as TaskFunction - ) + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + this.taskFunctions.set(DEFAULT_TASK_NAME, this.taskFunctions.get(name)!) this.sendTaskFunctionNamesToMainWorker() return { status: true } } catch (error) { @@ -330,19 +326,22 @@ export abstract class AbstractWorker< switch (taskFunctionOperation) { case 'add': response = this.addTaskFunction( - taskFunctionName as string, - // eslint-disable-next-line @typescript-eslint/no-implied-eval, no-new-func - new Function(`return ${taskFunction as string}`)() as TaskFunction< + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + taskFunctionName!, + // eslint-disable-next-line @typescript-eslint/no-implied-eval, no-new-func, @typescript-eslint/no-non-null-assertion + new Function(`return ${taskFunction!}`)() as TaskFunction< Data, Response > ) break case 'remove': - response = this.removeTaskFunction(taskFunctionName as string) + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + response = this.removeTaskFunction(taskFunctionName!) break case 'default': - response = this.setDefaultTaskFunction(taskFunctionName as string) + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + response = this.setDefaultTaskFunction(taskFunctionName!) break default: response = { status: false, error: new Error('Unknown task operation') } @@ -355,7 +354,8 @@ export abstract class AbstractWorker< ...(!response.status && response?.error != null && { workerError: { - name: taskFunctionName as string, + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + name: taskFunctionName!, message: this.handleError(response.error as Error | string) } }) @@ -484,14 +484,16 @@ export abstract class AbstractWorker< * * @param task - The task to execute. */ - protected run (task: Task): void { + protected readonly run = (task: Task): void => { const { name, taskId, data } = task const taskFunctionName = name ?? DEFAULT_TASK_NAME if (!this.taskFunctions.has(taskFunctionName)) { this.sendToMainWorker({ workerError: { - name: name as string, - message: `Task function '${name as string}' not found`, + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + name: name!, + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + message: `Task function '${name!}' not found`, data }, taskId @@ -512,10 +514,10 @@ export abstract class AbstractWorker< * @param fn - Task function that will be executed. * @param task - Input data for the task function. */ - protected runSync ( + protected readonly runSync = ( fn: TaskSyncFunction, task: Task - ): void { + ): void => { const { name, taskId, data } = task try { let taskPerformance = this.beginTaskPerformance(name) @@ -529,7 +531,8 @@ export abstract class AbstractWorker< } catch (error) { this.sendToMainWorker({ workerError: { - name: name as string, + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + name: name!, message: this.handleError(error as Error | string), data }, @@ -546,10 +549,10 @@ export abstract class AbstractWorker< * @param fn - Task function that will be executed. * @param task - Input data for the task function. */ - protected runAsync ( + protected readonly runAsync = ( fn: TaskAsyncFunction, task: Task - ): void { + ): void => { const { name, taskId, data } = task let taskPerformance = this.beginTaskPerformance(name) fn(data) @@ -565,7 +568,8 @@ export abstract class AbstractWorker< .catch(error => { this.sendToMainWorker({ workerError: { - name: name as string, + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + name: name!, message: this.handleError(error as Error | string), data },