X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2Fthread-worker.ts;h=bf8647c53b68f972c1dbe2cf806689d7889d2d2f;hb=refs%2Fheads%2Fmaster;hp=bc143a1f914b7e7dba14b395ac456be40c59ed80;hpb=498900302ba93560b59953a7da4be695986f89bc;p=poolifier.git diff --git a/src/worker/thread-worker.ts b/src/worker/thread-worker.ts index bc143a1f..8057d6f3 100644 --- a/src/worker/thread-worker.ts +++ b/src/worker/thread-worker.ts @@ -1,13 +1,14 @@ import { - type MessagePort, isMainThread, + type MessagePort, parentPort, - threadId + threadId, } from 'node:worker_threads' -import type { MessageValue } from '../utility-types' -import { AbstractWorker } from './abstract-worker' -import type { WorkerOptions } from './worker-options' -import type { TaskFunction, TaskFunctions } from './task-functions' + +import type { MessageValue } from '../utility-types.js' +import { AbstractWorker } from './abstract-worker.js' +import type { TaskFunction, TaskFunctions } from './task-functions.js' +import type { WorkerOptions } from './worker-options.js' /** * A thread worker used by a poolifier `ThreadPool`. @@ -17,7 +18,6 @@ import type { TaskFunction, TaskFunctions } from './task-functions' * * If you use a `DynamicThreadPool` the extra workers that were created will be terminated, * but the minimum number of workers will be guaranteed. - * * @typeParam Data - Type of data this worker receives from pool's execution. This can only be structured-cloneable data. * @typeParam Response - Type of response the worker sends back to the main thread. This can only be structured-cloneable data. * @author [Alessandro Pio Ardizio](https://github.com/pioardi) @@ -34,7 +34,6 @@ export class ThreadWorker< /** * Constructs a new poolifier thread worker. - * * @param taskFunctions - Task function(s) processed by the worker when the pool's `execution` function is invoked. * @param opts - Options for the worker. */ @@ -42,7 +41,7 @@ export class ThreadWorker< taskFunctions: TaskFunction | TaskFunctions, opts: WorkerOptions = {} ) { - super(isMainThread, parentPort as MessagePort, taskFunctions, opts) + super(isMainThread, parentPort, taskFunctions, opts) } /** @inheritDoc */ @@ -57,12 +56,12 @@ export class ThreadWorker< this.port.on('message', this.messageListener.bind(this)) this.sendToMainWorker({ ready: true, - taskFunctionNames: this.listTaskFunctionNames() + taskFunctionsProperties: this.listTaskFunctionsProperties(), }) } catch { this.sendToMainWorker({ ready: false, - taskFunctionNames: this.listTaskFunctionNames() + taskFunctionsProperties: this.listTaskFunctionsProperties(), }) } } @@ -84,12 +83,14 @@ export class ThreadWorker< protected readonly sendToMainWorker = ( message: MessageValue ): void => { - this.port?.postMessage({ ...message, workerId: this.id }) + this.port?.postMessage({ + ...message, + workerId: this.id, + } satisfies MessageValue) } /** * @inheritDoc - * @override */ protected handleError (error: Error | string): string { return error as string