X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fthread%2Ffixed.ts;h=7977cd61abd5263023b855fe9f7f23ba5135de10;hb=720a70ccade062ef5cdd04c7f8ae6190c60cc5e2;hp=11a24e2780dc445a37cdca15808eb71f95dd5bd9;hpb=d35e571704515a8b729d3455e4784054f07c368f;p=poolifier.git diff --git a/src/pools/thread/fixed.ts b/src/pools/thread/fixed.ts index 11a24e27..7977cd61 100644 --- a/src/pools/thread/fixed.ts +++ b/src/pools/thread/fixed.ts @@ -1,10 +1,9 @@ import { - type MessageChannel, - type MessagePort, + isMainThread, type TransferListItem, - type Worker, - isMainThread + type Worker } from 'node:worker_threads' + import type { MessageValue } from '../../utility-types.js' import { AbstractPool } from '../abstract-pool.js' import { type PoolOptions, type PoolType, PoolTypes } from '../pool.js' @@ -52,10 +51,13 @@ export class FixedThreadPool< protected sendToWorker ( workerNodeKey: number, message: MessageValue, - transferList?: TransferListItem[] + transferList?: readonly TransferListItem[] ): void { - this.workerNodes[workerNodeKey].messageChannel?.port1?.postMessage( - { ...message, workerId: this.getWorkerInfo(workerNodeKey).id }, + this.workerNodes[workerNodeKey]?.messageChannel?.port1.postMessage( + { + ...message, + workerId: this.getWorkerInfo(workerNodeKey)?.id + } satisfies MessageValue, transferList ) } @@ -63,14 +65,14 @@ export class FixedThreadPool< /** @inheritDoc */ protected sendStartupMessageToWorker (workerNodeKey: number): void { const workerNode = this.workerNodes[workerNodeKey] - const port2: MessagePort = (workerNode.messageChannel as MessageChannel) - .port2 + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + const port2 = workerNode.messageChannel!.port2 workerNode.worker.postMessage( { ready: false, - workerId: this.getWorkerInfo(workerNodeKey).id, + workerId: this.getWorkerInfo(workerNodeKey)?.id, port: port2 - }, + } satisfies MessageValue, [port2] ) } @@ -80,7 +82,7 @@ export class FixedThreadPool< workerNodeKey: number, listener: (message: MessageValue) => void ): void { - this.workerNodes[workerNodeKey].messageChannel?.port1?.on( + this.workerNodes[workerNodeKey].messageChannel?.port1.on( 'message', listener ) @@ -91,7 +93,7 @@ export class FixedThreadPool< workerNodeKey: number, listener: (message: MessageValue) => void ): void { - this.workerNodes[workerNodeKey].messageChannel?.port1?.once( + this.workerNodes[workerNodeKey].messageChannel?.port1.once( 'message', listener ) @@ -102,7 +104,7 @@ export class FixedThreadPool< workerNodeKey: number, listener: (message: MessageValue) => void ): void { - this.workerNodes[workerNodeKey].messageChannel?.port1?.off( + this.workerNodes[workerNodeKey].messageChannel?.port1.off( 'message', listener )