X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fpools%2Fthread%2Ffixed.ts;h=ddda04b113ec9028b0cd24c8f53001d12714a901;hb=7c48b2a96e4a42d627bc08f67173956f1d2e30af;hp=32107e48635314e25269cc37e2c0ad7fdd3fcd75;hpb=b8508dfc38a7612364981ad5b01811708193f9a2;p=poolifier.git

diff --git a/src/pools/thread/fixed.ts b/src/pools/thread/fixed.ts
index 32107e48..ddda04b1 100644
--- a/src/pools/thread/fixed.ts
+++ b/src/pools/thread/fixed.ts
@@ -58,16 +58,17 @@ 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]
     const worker = workerNode.worker
-    const waitWorkerExit = new Promise<void>((resolve) => {
-      worker.on('exit', () => {
+    const waitWorkerExit = new Promise<void>(resolve => {
+      worker.once('exit', () => {
         resolve()
       })
     })
-    await this.sendKillMessageToWorker(workerNodeKey, worker.threadId)
+    await this.sendKillMessageToWorker(workerNodeKey)
     workerNode.closeChannel()
     await worker.terminate()
     await waitWorkerExit
@@ -80,20 +81,22 @@ export class FixedThreadPool<
     transferList?: TransferListItem[]
   ): void {
     (
-      this.workerNodes[workerNodeKey].messageChannel as MessageChannel
-    ).port1.postMessage(message, transferList)
+      this.workerNodes[workerNodeKey]?.messageChannel as MessageChannel
+    )?.port1?.postMessage(
+      { ...message, workerId: this.getWorkerInfo(workerNodeKey).id },
+      transferList
+    )
   }
 
   /** @inheritDoc */
   protected sendStartupMessageToWorker (workerNodeKey: number): void {
-    const worker = this.workerNodes[workerNodeKey].worker
-    const port2: MessagePort = (
-      this.workerNodes[workerNodeKey].messageChannel as MessageChannel
-    ).port2
-    worker.postMessage(
+    const workerNode = this.workerNodes[workerNodeKey]
+    const port2: MessagePort = (workerNode.messageChannel as MessageChannel)
+      .port2
+    workerNode.worker.postMessage(
       {
         ready: false,
-        workerId: worker.threadId,
+        workerId: this.getWorkerInfo(workerNodeKey).id,
         port: port2
       },
       [port2]
@@ -106,10 +109,30 @@ 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)
   }
 
+  /** @inheritDoc */
+  protected registerOnceWorkerMessageListener<Message extends Data | Response>(
+    workerNodeKey: number,
+    listener: (message: MessageValue<Message>) => void
+  ): void {
+    (
+      this.workerNodes[workerNodeKey]?.messageChannel as MessageChannel
+    ).port1.once('message', listener)
+  }
+
+  /** @inheritDoc */
+  protected deregisterWorkerMessageListener<Message extends Data | Response>(
+    workerNodeKey: number,
+    listener: (message: MessageValue<Message>) => void
+  ): void {
+    (
+      this.workerNodes[workerNodeKey]?.messageChannel as MessageChannel
+    ).port1.off('message', listener)
+  }
+
   /** @inheritDoc */
   protected createWorker (): Worker {
     return new Worker(this.filePath, {