repositories
/
poolifier.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of github.com:poolifier/poolifier
[poolifier.git]
/
src
/
worker
/
thread-worker.ts
diff --git
a/src/worker/thread-worker.ts
b/src/worker/thread-worker.ts
index a8658f03a797ed649cbd583a14ed5d924949a235..7b92caf67201795797f6e3e06fff4fc593f4ee94 100644
(file)
--- a/
src/worker/thread-worker.ts
+++ b/
src/worker/thread-worker.ts
@@
-7,7
+7,7
@@
import {
import type { MessageValue } from '../utility-types'
import { AbstractWorker } from './abstract-worker'
import type { WorkerOptions } from './worker-options'
import type { MessageValue } from '../utility-types'
import { AbstractWorker } from './abstract-worker'
import type { WorkerOptions } from './worker-options'
-import type { TaskFunction
s, WorkerFunction } from './worker
-functions'
+import type { TaskFunction
, TaskFunctions } from './task
-functions'
/**
* A thread worker used by a poolifier `ThreadPool`.
/**
* A thread worker used by a poolifier `ThreadPool`.
@@
-28,7
+28,7
@@
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
/**
@@
-38,9
+38,7
@@
export class ThreadWorker<
* @param opts - Options for the worker.
*/
public constructor (
* @param opts - Options for the worker.
*/
public constructor (
- taskFunctions:
- | WorkerFunction<Data, Response>
- | TaskFunctions<Data, Response>,
+ taskFunctions: TaskFunction<Data, Response> | TaskFunctions<Data, Response>,
opts: WorkerOptions = {}
) {
super(
opts: WorkerOptions = {}
) {
super(
@@
-56,17
+54,32
@@
export class ThreadWorker<
protected handleReadyMessage (message: MessageValue<Data>): void {
if (
message.workerId === this.id &&
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,
+ taskFunctionNames: this.listTaskFunctionNames()
+ })
+ } catch {
+ this.sendToMainWorker({
+ ready: false,
+ taskFunctionNames: this.listTaskFunctionNames()
+ })
}
}
}
}
}
}
+ /** @inheritDoc */
+ protected handleKillMessage (message: MessageValue<Data>): void {
+ super.handleKillMessage(message)
+ this.port?.unref()
+ this.port?.close()
+ }
+
/** @inheritDoc */
protected get id (): number {
return threadId
/** @inheritDoc */
protected get id (): number {
return threadId
@@
-74,11
+87,11
@@
export class ThreadWorker<
/** @inheritDoc */
protected sendToMainWorker (message: MessageValue<Response>): void {
/** @inheritDoc */
protected sendToMainWorker (message: MessageValue<Response>): void {
- this.port.postMessage(
message
)
+ this.port.postMessage(
{ ...message, workerId: this.id }
)
}
/** @inheritDoc */
}
/** @inheritDoc */
- protected handleError (e: Error | string): string {
- return e as string
+ protected handleError (e
rror
: Error | string): string {
+ return e
rror
as string
}
}
}
}