repositories
/
poolifier.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build(deps-dev): apply updates
[poolifier.git]
/
src
/
worker
/
thread-worker.ts
diff --git
a/src/worker/thread-worker.ts
b/src/worker/thread-worker.ts
index a8658f03a797ed649cbd583a14ed5d924949a235..8057d6f343caddda5091954cd1ed80e96f2e4b79 100644
(file)
--- a/
src/worker/thread-worker.ts
+++ b/
src/worker/thread-worker.ts
@@
-1,13
+1,14
@@
import {
import {
- type MessagePort,
isMainThread,
isMainThread,
+ type MessagePort,
parentPort,
parentPort,
- threadId
+ threadId
,
} from 'node:worker_threads'
} from 'node:worker_threads'
-import type { MessageValue } from '../utility-types'
-import { AbstractWorker } from './abstract-worker'
-import type { WorkerOptions } from './worker-options'
-import type { TaskFunctions, WorkerFunction } from './worker-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`.
/**
* A thread worker used by a poolifier `ThreadPool`.
@@
-17,7
+18,6
@@
import type { TaskFunctions, WorkerFunction } from './worker-functions'
*
* If you use a `DynamicThreadPool` the extra workers that were created will be terminated,
* but the minimum number of workers will be guaranteed.
*
* 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)
* @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)
@@
-28,57
+28,71
@@
export class ThreadWorker<
Response = unknown
> extends AbstractWorker<MessagePort, Data, Response> {
/**
Response = unknown
> extends AbstractWorker<MessagePort, Data, Response> {
/**
- * Message port used to communicate with the main
thread
.
+ * Message port used to communicate with the main
worker
.
*/
*/
- private port!: MessagePort
+ private port?: MessagePort
+
/**
* Constructs a new poolifier thread worker.
/**
* 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.
*/
public constructor (
* @param taskFunctions - Task function(s) processed by the worker when the pool's `execution` function is invoked.
* @param opts - Options for the worker.
*/
public constructor (
- taskFunctions:
- | WorkerFunction<Data, Response>
- | TaskFunctions<Data, Response>,
+ taskFunctions: TaskFunction<Data, Response> | TaskFunctions<Data, Response>,
opts: WorkerOptions = {}
) {
opts: WorkerOptions = {}
) {
- super(
- 'worker-thread-pool:poolifier',
- isMainThread,
- parentPort as MessagePort,
- taskFunctions,
- opts
- )
+ super(isMainThread, parentPort, taskFunctions, opts)
}
/** @inheritDoc */
protected handleReadyMessage (message: MessageValue<Data>): void {
if (
message.workerId === this.id &&
}
/** @inheritDoc */
protected handleReadyMessage (message: MessageValue<Data>): void {
if (
message.workerId === this.id &&
- message.ready
!= null
&&
+ message.ready
=== false
&&
message.port != null
) {
message.port != null
) {
-
if (!this.isMain)
{
+
try
{
this.port = message.port
this.port.on('message', this.messageListener.bind(this))
this.port = message.port
this.port.on('message', this.messageListener.bind(this))
- this.sendToMainWorker({ ready: true, workerId: this.id })
+ this.sendToMainWorker({
+ ready: true,
+ taskFunctionsProperties: this.listTaskFunctionsProperties(),
+ })
+ } catch {
+ this.sendToMainWorker({
+ ready: false,
+ taskFunctionsProperties: this.listTaskFunctionsProperties(),
+ })
}
}
}
}
}
}
+ /** @inheritDoc */
+ protected handleKillMessage (message: MessageValue<Data>): void {
+ super.handleKillMessage(message)
+ this.port?.unref()
+ this.port?.close()
+ }
+
/** @inheritDoc */
protected get id (): number {
return threadId
}
/** @inheritDoc */
/** @inheritDoc */
protected get id (): number {
return threadId
}
/** @inheritDoc */
- protected sendToMainWorker (message: MessageValue<Response>): void {
- this.port.postMessage(message)
+ protected readonly sendToMainWorker = (
+ message: MessageValue<Response>
+ ): void => {
+ this.port?.postMessage({
+ ...message,
+ workerId: this.id,
+ } satisfies MessageValue<Response>)
}
}
- /** @inheritDoc */
- protected handleError (e: Error | string): string {
- return e as string
+ /**
+ * @inheritDoc
+ */
+ protected handleError (error: Error | string): string {
+ return error as string
}
}
}
}