X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2Fthread-worker.ts;h=1070ed31d7822a86e6b2d4f96c5a9b7c7274b8dc;hb=deb85c12b77faf6974551cefcd9676e62a392086;hp=b6fbdae257399ac7fa9f8d9fca9e37f6cdfc08d7;hpb=729c563db85562dd7d0f7733b1a3e2d98467134b;p=poolifier.git diff --git a/src/worker/thread-worker.ts b/src/worker/thread-worker.ts index b6fbdae2..1070ed31 100644 --- a/src/worker/thread-worker.ts +++ b/src/worker/thread-worker.ts @@ -1,5 +1,6 @@ +import type { MessagePort } from 'worker_threads' import { isMainThread, parentPort } from 'worker_threads' -import type { JSONValue, MessageValue } from '../utility-types' +import type { MessageValue } from '../utility-types' import { AbstractWorker } from './abstract-worker' import type { WorkerOptions } from './worker-options' @@ -12,21 +13,16 @@ import type { WorkerOptions } from './worker-options' * If you use a `DynamicThreadPool` the extra workers that were created will be terminated, * but the minimum number of workers will be guaranteed. * - * @template Data Type of data this worker receives from pool's execution. - * @template Response Type of response the worker sends back to the main thread. + * @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 thread. This can only be serializable data. * * @author [Alessandro Pio Ardizio](https://github.com/pioardi) * @since 0.0.1 */ export class ThreadWorker< - Data extends JSONValue = JSONValue, - Response extends JSONValue = JSONValue + Data = unknown, + Response = unknown > extends AbstractWorker { - /** - * Reference to main thread. - */ - protected parent?: MessagePort - /** * Constructs a new poolifier thread worker. * @@ -34,34 +30,7 @@ export class ThreadWorker< * @param opts Options for the worker. */ public constructor (fn: (data: Data) => Response, opts: WorkerOptions = {}) { - super('worker-thread-pool:pioardi', isMainThread, fn, opts) - - parentPort?.on('message', (value: MessageValue) => { - if (value?.data && value.id) { - // here you will receive messages - // console.log('This is the main worker ' + isMainThread) - 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 the port to communicate with the main thread - // this will be received once - this.parent = 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() - } - }) - } - - protected getMainWorker (): MessagePort { - if (!this.parent) { - throw new Error('Parent was not set') - } - return this.parent + super('worker-thread-pool:pioardi', isMainThread, fn, parentPort, opts) } protected sendToMainWorker (message: MessageValue): void {