X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fthread%2Ffixed.ts;h=e3a94b329d4cfcee6f05cd6e2f8ad06e555a6dfc;hb=dc02fc29818293c82727cb43ad5014e30aa6a64d;hp=ac629e1fb0ff7f363be0a3fe5107f2b02748c8d8;hpb=6677a3d36e9e7241c54db7cd69daa40f52fcbcb3;p=poolifier.git

diff --git a/src/pools/thread/fixed.ts b/src/pools/thread/fixed.ts
index ac629e1f..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,
@@ -6,13 +8,8 @@ import {
 } from 'node:worker_threads'
 import type { MessageValue } from '../../utility-types'
 import { AbstractPool } from '../abstract-pool'
-import {
-  type PoolOptions,
-  type PoolType,
-  PoolTypes,
-  type WorkerType,
-  WorkerTypes
-} from '../pool'
+import { type PoolOptions, type PoolType, PoolTypes } from '../pool'
+import { type WorkerType, WorkerTypes } from '../worker'
 
 /**
  * Options for a poolifier thread pool.
@@ -60,13 +57,43 @@ export class FixedThreadPool<
 
   /** @inheritDoc */
   protected async destroyWorker (worker: Worker): Promise<void> {
-    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<Data>): 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<Message extends Data | Response>(
+    worker: Worker,
+    listener: (message: MessageValue<Message>) => void
+  ): void {
+    (
+      this.getWorkerInfoByWorker(worker).messageChannel as MessageChannel
+    ).port1.on('message', listener)
   }
 
   /** @inheritDoc */