Merge pull request #815 from poolifier/dependabot/npm_and_yarn/examples/typescript...

[poolifier.git] / src / pools / thread / fixed.ts

diff --git a/src/pools/thread/fixed.ts b/src/pools/thread/fixed.ts
index f4f712dfd6cc6c720c5872291670c59cc4e3aef3..2e708d973891be533e0d66f632ee5e4d983fed7a 100644 (file)
--- a/src/pools/thread/fixed.ts
+++ b/src/pools/thread/fixed.ts
@@ -2,6 +2,7 @@ import {
   type MessageChannel,
   type MessagePort,
   SHARE_ENV,
+  type TransferListItem,
   Worker,
   type WorkerOptions,
   isMainThread
@@ -57,21 +58,30 @@ export class FixedThreadPool<
 
   /** @inheritDoc */
   protected async destroyWorkerNode (workerNodeKey: number): Promise<void> {
+    this.flushTasksQueue(workerNodeKey)
+    // FIXME: wait for tasks to be finished
     const workerNode = this.workerNodes[workerNodeKey]
     const worker = workerNode.worker
+    const waitWorkerExit = new Promise<void>(resolve => {
+      worker.on('exit', () => {
+        resolve()
+      })
+    })
     this.sendToWorker(workerNodeKey, { kill: true, workerId: worker.threadId })
     workerNode.closeChannel()
     await worker.terminate()
+    await waitWorkerExit
   }
 
   /** @inheritDoc */
   protected sendToWorker (
     workerNodeKey: number,
-    message: MessageValue<Data>
+    message: MessageValue<Data>,
+    transferList?: TransferListItem[]
   ): void {
     (
       this.getWorkerInfo(workerNodeKey).messageChannel as MessageChannel
-    ).port1.postMessage(message)
+    ).port1.postMessage(message, transferList)
   }
 
   /** @inheritDoc */