X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fthread%2Ffixed.ts;h=7199baf8fdf5ad52bc43bcfdfe107de84719589a;hb=1ab67a38cefe2215f89285c2fb6517247b1eef74;hp=881e37f636eb3a5ba4770c0c7b90cbb994ab029e;hpb=e102732c0e3966b81834b2c0bdd087eb051162ad;p=poolifier.git

diff --git a/src/pools/thread/fixed.ts b/src/pools/thread/fixed.ts
index 881e37f6..7199baf8 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.
@@ -29,8 +26,6 @@ export interface ThreadPoolOptions extends PoolOptions<Worker> {
 /**
  * A thread pool with a fixed number of threads.
  *
- * It is possible to perform tasks in sync or asynchronous mode as you prefer.
- *
  * @typeParam Data - Type of data sent to the worker. This can only be structured-cloneable data.
  * @typeParam Response - Type of execution response. This can only be structured-cloneable data.
  * @author [Alessandro Pio Ardizio](https://github.com/pioardi)
@@ -61,14 +56,56 @@ export class FixedThreadPool<
   }
 
   /** @inheritDoc */
-  protected async destroyWorker (worker: Worker): Promise<void> {
-    this.sendToWorker(worker, { kill: 1 })
+  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>
+  ): void {
+    (
+      this.getWorkerInfo(workerNodeKey).messageChannel as MessageChannel
+    ).port1.postMessage(message)
+  }
+
+  /** @inheritDoc */
+  protected sendStartupMessageToWorker (workerNodeKey: number): void {
+    const worker = this.workerNodes[workerNodeKey].worker
+    const port2: MessagePort = (
+      this.getWorkerInfo(workerNodeKey).messageChannel as MessageChannel
+    ).port2
+    worker.postMessage(
+      {
+        ready: false,
+        workerId: worker.threadId,
+        port: port2
+      },
+      [port2]
+    )
   }
 
   /** @inheritDoc */
-  protected sendToWorker (worker: Worker, message: MessageValue<Data>): void {
-    worker.postMessage(message)
+  protected registerWorkerMessageListener<Message extends Data | Response>(
+    workerNodeKey: number,
+    listener: (message: MessageValue<Message>) => void
+  ): void {
+    (
+      this.getWorkerInfo(workerNodeKey).messageChannel as MessageChannel
+    ).port1.on('message', listener)
   }
 
   /** @inheritDoc */