TaskPerformance,
WorkerStatistics
} from '../utility-types'
-import { EMPTY_FUNCTION, isPlainObject } from '../utils'
+import { EMPTY_FUNCTION, isAsyncFunction, isPlainObject } from '../utils'
import {
type KillBehavior,
KillBehaviors,
/**
* Handler id of the `aliveInterval` worker alive check.
*/
- protected readonly aliveInterval?: NodeJS.Timeout
+ protected aliveInterval?: NodeJS.Timeout
/**
* Constructs a new poolifier worker.
*
this.checkWorkerOptions(this.opts)
this.checkTaskFunctions(taskFunctions)
if (!this.isMain) {
- this.lastTaskTimestamp = performance.now()
- this.aliveInterval = setInterval(
- this.checkAlive.bind(this),
- (this.opts.maxInactiveTime ?? DEFAULT_MAX_INACTIVE_TIME) / 2
- )
- this.checkAlive.bind(this)()
this.mainWorker?.on('message', this.messageListener.bind(this))
}
}
* @param message - Message received.
*/
protected messageListener (message: MessageValue<Data, Data>): void {
- if (message.id != null && message.data != null) {
+ if (message.dynamic === true) {
+ // Worker dynamic message received
+ this.startCheckAlive()
+ } else if (message.statistics != null) {
+ // Statistics message received
+ this.statistics = message.statistics
+ } else if (message.id != null && message.data != null) {
// Task message received
const fn = this.getTaskFunction(message.name)
- if (fn?.constructor.name === 'AsyncFunction') {
+ if (isAsyncFunction(fn)) {
this.runInAsyncScope(this.runAsync.bind(this), this, fn, message)
} else {
this.runInAsyncScope(this.runSync.bind(this), this, fn, message)
}
- } 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)
}
}
+ private startCheckAlive (): void {
+ this.lastTaskTimestamp = performance.now()
+ this.aliveInterval = setInterval(
+ this.checkAlive.bind(this),
+ (this.opts.maxInactiveTime ?? DEFAULT_MAX_INACTIVE_TIME) / 2
+ )
+ this.checkAlive.bind(this)()
+ }
+
/**
* Returns the main worker.
*
* @returns The error message.
*/
protected handleError (e: Error | string): string {
- return e as string
+ return e instanceof Error ? e.message : e
}
/**
id: message.id
})
} catch (e) {
- const err = this.handleError(e as Error)
+ const errorMessage = this.handleError(e as Error | string)
this.sendToMainWorker({
taskError: {
- message: err,
+ workerId: this.id,
+ message: errorMessage,
data: message.data
},
- workerId: this.id,
id: message.id
})
} finally {
- !this.isMain && (this.lastTaskTimestamp = performance.now())
+ if (!this.isMain && this.aliveInterval != null) {
+ this.lastTaskTimestamp = performance.now()
+ }
}
}
return null
})
.catch(e => {
- const err = this.handleError(e as Error)
+ const errorMessage = this.handleError(e as Error | string)
this.sendToMainWorker({
taskError: {
- message: err,
+ workerId: this.id,
+ message: errorMessage,
data: message.data
},
- workerId: this.id,
id: message.id
})
})
.finally(() => {
- !this.isMain && (this.lastTaskTimestamp = performance.now())
+ if (!this.isMain && this.aliveInterval != null) {
+ this.lastTaskTimestamp = performance.now()
+ }
})
.catch(EMPTY_FUNCTION)
}