X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fthread%2Ffixed.ts;h=e3a94b329d4cfcee6f05cd6e2f8ad06e555a6dfc;hb=dc02fc29818293c82727cb43ad5014e30aa6a64d;hp=9861a3c15c15bc79b9ec6e4966dddb8021d8ecc3;hpb=658b9aa08266ed9a8ae3c0fc947d237fa2674f09;p=poolifier.git diff --git a/src/pools/thread/fixed.ts b/src/pools/thread/fixed.ts index 9861a3c1..e3a94b32 100644 --- a/src/pools/thread/fixed.ts +++ b/src/pools/thread/fixed.ts @@ -1,4 +1,6 @@ import { + type MessageChannel, + type MessagePort, SHARE_ENV, Worker, type WorkerOptions, @@ -55,13 +57,43 @@ export class FixedThreadPool< /** @inheritDoc */ protected async destroyWorker (worker: Worker): Promise { - this.sendToWorker(worker, { kill: 1 }) + this.sendToWorker(worker, { kill: true, workerId: worker.threadId }) + const workerInfo = this.getWorkerInfoByWorker(worker) + workerInfo.messageChannel?.port1.close() + workerInfo.messageChannel?.port2.close() await worker.terminate() } /** @inheritDoc */ protected sendToWorker (worker: Worker, message: MessageValue): void { - worker.postMessage(message) + ( + this.getWorkerInfoByWorker(worker).messageChannel as MessageChannel + ).port1.postMessage(message) + } + + /** @inheritDoc */ + protected sendStartupMessageToWorker (worker: Worker): void { + const port2: MessagePort = ( + this.getWorkerInfoByWorker(worker).messageChannel as MessageChannel + ).port2 + worker.postMessage( + { + ready: false, + workerId: worker.threadId, + port: port2 + }, + [port2] + ) + } + + /** @inheritDoc */ + protected registerWorkerMessageListener( + worker: Worker, + listener: (message: MessageValue) => void + ): void { + ( + this.getWorkerInfoByWorker(worker).messageChannel as MessageChannel + ).port1.on('message', listener) } /** @inheritDoc */