X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fthread%2Ffixed.ts;h=73740baa92110e213b427fe0ca1f8aeafebe307c;hb=ca438ccd304d3b139305672f1d9148b5378b62f1;hp=db278485a097fcb40a1846902ee8a7b36b548c3e;hpb=ae036c3e73796126b7f1138129b6b18ef6bcef8c;p=poolifier.git

diff --git a/src/pools/thread/fixed.ts b/src/pools/thread/fixed.ts
index db278485..73740baa 100644
--- a/src/pools/thread/fixed.ts
+++ b/src/pools/thread/fixed.ts
@@ -58,6 +58,7 @@ export class FixedThreadPool<
 
   /** @inheritDoc */
   protected async destroyWorkerNode (workerNodeKey: number): Promise<void> {
+    this.flagWorkerNodeAsNotReady(workerNodeKey)
     this.flushTasksQueue(workerNodeKey)
     // FIXME: wait for tasks to be finished
     const workerNode = this.workerNodes[workerNodeKey]
@@ -69,6 +70,7 @@ export class FixedThreadPool<
     })
     await this.sendKillMessageToWorker(workerNodeKey)
     workerNode.closeChannel()
+    workerNode.removeAllListeners()
     await worker.terminate()
     await waitWorkerExit
   }
@@ -80,9 +82,9 @@ export class FixedThreadPool<
     transferList?: TransferListItem[]
   ): void {
     (
-      this.workerNodes[workerNodeKey].messageChannel as MessageChannel
-    ).port1.postMessage(
-      { ...message, workerId: this.workerNodes[workerNodeKey].info.id },
+      this.workerNodes[workerNodeKey]?.messageChannel as MessageChannel
+    )?.port1?.postMessage(
+      { ...message, workerId: this.getWorkerInfo(workerNodeKey).id },
       transferList
     )
   }
@@ -95,7 +97,7 @@ export class FixedThreadPool<
     workerNode.worker.postMessage(
       {
         ready: false,
-        workerId: workerNode.info.id,
+        workerId: this.getWorkerInfo(workerNodeKey).id,
         port: port2
       },
       [port2]
@@ -108,7 +110,7 @@ export class FixedThreadPool<
     listener: (message: MessageValue<Message>) => void
   ): void {
     (
-      this.workerNodes[workerNodeKey].messageChannel as MessageChannel
+      this.workerNodes[workerNodeKey]?.messageChannel as MessageChannel
     ).port1.on('message', listener)
   }
 
@@ -118,7 +120,7 @@ export class FixedThreadPool<
     listener: (message: MessageValue<Message>) => void
   ): void {
     (
-      this.workerNodes[workerNodeKey].messageChannel as MessageChannel
+      this.workerNodes[workerNodeKey]?.messageChannel as MessageChannel
     ).port1.once('message', listener)
   }
 
@@ -128,7 +130,7 @@ export class FixedThreadPool<
     listener: (message: MessageValue<Message>) => void
   ): void {
     (
-      this.workerNodes[workerNodeKey].messageChannel as MessageChannel
+      this.workerNodes[workerNodeKey]?.messageChannel as MessageChannel
     ).port1.off('message', listener)
   }