repositories
/
poolifier.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix: register message handler on worker only
[poolifier.git]
/
src
/
worker
/
abstract-worker.ts
diff --git
a/src/worker/abstract-worker.ts
b/src/worker/abstract-worker.ts
index b7c542aa469f40bf4feb50aa99599b52bb7bc44e..25be4820a0e8c59faa8917e0a809633c0d97de83 100644
(file)
--- a/
src/worker/abstract-worker.ts
+++ b/
src/worker/abstract-worker.ts
@@
-1,8
+1,12
@@
import { AsyncResource } from 'node:async_hooks'
import type { Worker } from 'node:cluster'
import type { MessagePort } from 'node:worker_threads'
import { AsyncResource } from 'node:async_hooks'
import type { Worker } from 'node:cluster'
import type { MessagePort } from 'node:worker_threads'
-import { type EventLoopUtilization, performance } from 'node:perf_hooks'
-import type { MessageValue, WorkerStatistics } from '../utility-types'
+import { performance } from 'node:perf_hooks'
+import type {
+ MessageValue,
+ TaskPerformance,
+ WorkerStatistics
+} from '../utility-types'
import { EMPTY_FUNCTION, isPlainObject } from '../utils'
import {
type KillBehavior,
import { EMPTY_FUNCTION, isPlainObject } from '../utils'
import {
type KillBehavior,
@@
-20,22
+24,12
@@
const DEFAULT_FUNCTION_NAME = 'default'
const DEFAULT_MAX_INACTIVE_TIME = 60000
const DEFAULT_KILL_BEHAVIOR: KillBehavior = KillBehaviors.SOFT
const DEFAULT_MAX_INACTIVE_TIME = 60000
const DEFAULT_KILL_BEHAVIOR: KillBehavior = KillBehaviors.SOFT
-/**
- * Task performance.
- */
-export interface TaskPerformance {
- timestamp: number
- waitTime?: number
- runTime?: number
- elu?: EventLoopUtilization
-}
-
/**
* Base class that implements some shared logic for all poolifier workers.
*
* @typeParam MainWorker - Type of main worker.
/**
* Base class that implements some shared logic for all poolifier workers.
*
* @typeParam MainWorker - Type of main worker.
- * @typeParam Data - Type of data this worker receives from pool's execution. This can only be s
erializ
able data.
- * @typeParam Response - Type of response the worker sends back to the main worker. This can only be s
erializ
able data.
+ * @typeParam Data - Type of data this worker receives from pool's execution. This can only be s
tructured-clone
able data.
+ * @typeParam Response - Type of response the worker sends back to the main worker. This can only be s
tructured-clone
able data.
*/
export abstract class AbstractWorker<
MainWorker extends Worker | MessagePort,
*/
export abstract class AbstractWorker<
MainWorker extends Worker | MessagePort,
@@
-51,7
+45,7
@@
export abstract class AbstractWorker<
*/
protected lastTaskTimestamp!: number
/**
*/
protected lastTaskTimestamp!: number
/**
- * Performance statistics computation.
+ * Performance statistics computation
requirements
.
*/
protected statistics!: WorkerStatistics
/**
*/
protected statistics!: WorkerStatistics
/**
@@
-73,7
+67,7
@@
export abstract class AbstractWorker<
taskFunctions:
| WorkerFunction<Data, Response>
| TaskFunctions<Data, Response>,
taskFunctions:
| WorkerFunction<Data, Response>
| TaskFunctions<Data, Response>,
- protected
mainWorker: MainWorker | undefined | null
,
+ protected
readonly mainWorker: MainWorker
,
protected readonly opts: WorkerOptions = {
/**
* The kill behavior option on this worker or its default value.
protected readonly opts: WorkerOptions = {
/**
* The kill behavior option on this worker or its default value.
@@
-96,8
+90,8
@@
export abstract class AbstractWorker<
(this.opts.maxInactiveTime ?? DEFAULT_MAX_INACTIVE_TIME) / 2
)
this.checkAlive.bind(this)()
(this.opts.maxInactiveTime ?? DEFAULT_MAX_INACTIVE_TIME) / 2
)
this.checkAlive.bind(this)()
+ this.mainWorker?.on('message', this.messageListener.bind(this))
}
}
- this.mainWorker?.on('message', this.messageListener.bind(this))
}
private checkWorkerOptions (opts: WorkerOptions): void {
}
private checkWorkerOptions (opts: WorkerOptions): void {
@@
-152,7
+146,7
@@
export abstract class AbstractWorker<
*
* @param message - Message received.
*/
*
* @param message - Message received.
*/
- protected messageListener (message: MessageValue<Data,
MainWorker
>): void {
+ protected messageListener (message: MessageValue<Data,
Data
>): void {
if (message.id != null && message.data != null) {
// Task message received
const fn = this.getTaskFunction(message.name)
if (message.id != null && message.data != null) {
// Task message received
const fn = this.getTaskFunction(message.name)
@@
-161,16
+155,13
@@
export abstract class AbstractWorker<
} else {
this.runInAsyncScope(this.runSync.bind(this), this, fn, message)
}
} else {
this.runInAsyncScope(this.runSync.bind(this), this, fn, message)
}
- } else if (message.
parent
!= null) {
- //
Main worker reference
message received
- this.
mainWorker = message.parent
+ } else if (message.
statistics
!= null) {
+ //
Statistics
message received
+ this.
statistics = message.statistics
} else if (message.kill != null) {
// Kill message received
this.aliveInterval != null && clearInterval(this.aliveInterval)
this.emitDestroy()
} else if (message.kill != null) {
// Kill message received
this.aliveInterval != null && clearInterval(this.aliveInterval)
this.emitDestroy()
- } else if (message.statistics != null) {
- // Statistics message received
- this.statistics = message.statistics
}
}
}
}
@@
-181,7
+172,7
@@
export abstract class AbstractWorker<
*/
protected getMainWorker (): MainWorker {
if (this.mainWorker == null) {
*/
protected getMainWorker (): MainWorker {
if (this.mainWorker == null) {
- throw new Error('Main worker
was
not set')
+ throw new Error('Main worker not set')
}
return this.mainWorker
}
}
return this.mainWorker
}
@@
-191,7
+182,9
@@
export abstract class AbstractWorker<
*
* @param message - The response message.
*/
*
* @param message - The response message.
*/
- protected abstract sendToMainWorker (message: MessageValue<Response>): void
+ protected abstract sendToMainWorker (
+ message: MessageValue<Response, Data>
+ ): void
/**
* Checks if the worker should be terminated, because its living too long.
/**
* Checks if the worker should be terminated, because its living too long.
@@
-226,22
+219,21
@@
export abstract class AbstractWorker<
message: MessageValue<Data>
): void {
try {
message: MessageValue<Data>
): void {
try {
-
const taskPerformance = this.beginTaskPerformance(message
)
+
let taskPerformance = this.beginTaskPerformance(
)
const res = fn(message.data)
const res = fn(message.data)
- const { runTime, waitTime, elu } =
- this.endTaskPerformance(taskPerformance)
+ taskPerformance = this.endTaskPerformance(taskPerformance)
this.sendToMainWorker({
data: res,
this.sendToMainWorker({
data: res,
- runTime,
- waitTime,
- elu,
+ taskPerformance,
id: message.id
})
} catch (e) {
const err = this.handleError(e as Error)
this.sendToMainWorker({
id: message.id
})
} catch (e) {
const err = this.handleError(e as Error)
this.sendToMainWorker({
- error: err,
- errorData: message.data,
+ taskError: {
+ message: err,
+ data: message.data
+ },
id: message.id
})
} finally {
id: message.id
})
} finally {
@@
-259,16
+251,13
@@
export abstract class AbstractWorker<
fn: WorkerAsyncFunction<Data, Response>,
message: MessageValue<Data>
): void {
fn: WorkerAsyncFunction<Data, Response>,
message: MessageValue<Data>
): void {
-
const taskPerformance = this.beginTaskPerformance(message
)
+
let taskPerformance = this.beginTaskPerformance(
)
fn(message.data)
.then(res => {
fn(message.data)
.then(res => {
- const { runTime, waitTime, elu } =
- this.endTaskPerformance(taskPerformance)
+ taskPerformance = this.endTaskPerformance(taskPerformance)
this.sendToMainWorker({
data: res,
this.sendToMainWorker({
data: res,
- runTime,
- waitTime,
- elu,
+ taskPerformance,
id: message.id
})
return null
id: message.id
})
return null
@@
-276,8
+265,10
@@
export abstract class AbstractWorker<
.catch(e => {
const err = this.handleError(e as Error)
this.sendToMainWorker({
.catch(e => {
const err = this.handleError(e as Error)
this.sendToMainWorker({
- error: err,
- errorData: message.data,
+ taskError: {
+ message: err,
+ data: message.data
+ },
id: message.id
})
})
id: message.id
})
})
@@
-301,13
+292,10
@@
export abstract class AbstractWorker<
return fn
}
return fn
}
- private beginTaskPerformance (
message: MessageValue<Data>
): TaskPerformance {
-
const timestamp = performance.now
()
+ private beginTaskPerformance (): TaskPerformance {
+
this.checkStatistics
()
return {
return {
- timestamp,
- ...(this.statistics.waitTime && {
- waitTime: timestamp - (message.timestamp ?? timestamp)
- }),
+ timestamp: performance.now(),
...(this.statistics.elu && { elu: performance.eventLoopUtilization() })
}
}
...(this.statistics.elu && { elu: performance.eventLoopUtilization() })
}
}
@@
-315,6
+303,7
@@
export abstract class AbstractWorker<
private endTaskPerformance (
taskPerformance: TaskPerformance
): TaskPerformance {
private endTaskPerformance (
taskPerformance: TaskPerformance
): TaskPerformance {
+ this.checkStatistics()
return {
...taskPerformance,
...(this.statistics.runTime && {
return {
...taskPerformance,
...(this.statistics.runTime && {
@@
-325,4
+314,10
@@
export abstract class AbstractWorker<
})
}
}
})
}
}
+
+ private checkStatistics (): void {
+ if (this.statistics == null) {
+ throw new Error('Performance statistics computation requirements not set')
+ }
+ }
}
}