X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fworker%2Fabstract-worker.ts;h=8a38b4e576464ecb88078540cc8604d7b3ad323f;hb=eafd70acfa479361cab41e2bcb2a285ee2674a5e;hp=163736696b8ec7080ee17556a52e18aa40e07466;hpb=f34fdabe7562f0c1da21643162d5b6c8ad298812;p=poolifier.git diff --git a/src/worker/abstract-worker.ts b/src/worker/abstract-worker.ts index 16373669..8a38b4e5 100644 --- a/src/worker/abstract-worker.ts +++ b/src/worker/abstract-worker.ts @@ -87,7 +87,7 @@ export abstract class AbstractWorker< this.opts.killBehavior = opts.killBehavior ?? DEFAULT_KILL_BEHAVIOR this.opts.maxInactiveTime = opts.maxInactiveTime ?? DEFAULT_MAX_INACTIVE_TIME - this.opts.async = opts.async ?? false + delete this.opts.async } /** @@ -207,12 +207,14 @@ export abstract class AbstractWorker< ): void { try { const startTimestamp = performance.now() + const waitTime = startTimestamp - (message.submissionTimestamp ?? 0) const res = fn(message.data) const runTime = performance.now() - startTimestamp this.sendToMainWorker({ data: res, id: message.id, - runTime + runTime, + waitTime }) } catch (e) { const err = this.handleError(e as Error) @@ -233,13 +235,15 @@ export abstract class AbstractWorker< message: MessageValue ): void { const startTimestamp = performance.now() + const waitTime = startTimestamp - (message.submissionTimestamp ?? 0) fn(message.data) .then(res => { const runTime = performance.now() - startTimestamp this.sendToMainWorker({ data: res, id: message.id, - runTime + runTime, + waitTime }) return null }) @@ -262,7 +266,7 @@ export abstract class AbstractWorker< name = name ?? DEFAULT_FUNCTION_NAME const fn = this.taskFunctions.get(name) if (fn == null) { - throw new Error(`Task function "${name}" not found`) + throw new Error(`Task function '${name}' not found`) } return fn }