X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fthread%2Ffixed.ts;h=f4f712dfd6cc6c720c5872291670c59cc4e3aef3;hb=aad6fb64175759059c70ddcded4a01b2accd9e8c;hp=d843144c633fd99d5becf18ad1d5918ab570eaf6;hpb=801c948aadfa0041a7870accc0644efb4a31145d;p=poolifier.git

diff --git a/src/pools/thread/fixed.ts b/src/pools/thread/fixed.ts
index d843144c..f4f712df 100644
--- a/src/pools/thread/fixed.ts
+++ b/src/pools/thread/fixed.ts
@@ -1,19 +1,15 @@
 import {
-  MessageChannel,
+  type MessageChannel,
+  type MessagePort,
   SHARE_ENV,
   Worker,
   type WorkerOptions,
   isMainThread
 } from 'node:worker_threads'
-import type { Draft, MessageValue } from '../../utility-types'
+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.
@@ -27,25 +23,18 @@ export interface ThreadPoolOptions extends PoolOptions<Worker> {
   workerOptions?: WorkerOptions
 }
 
-/**
- * A thread worker with message channels for communication between main thread and thread worker.
- */
-export type ThreadWorkerWithMessageChannel = Worker & Draft<MessageChannel>
-
 /**
  * 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 serializable data.
- * @typeParam Response - Type of execution response. This can only be serializable data.
+ * @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)
  * @since 0.0.1
  */
 export class FixedThreadPool<
   Data = unknown,
   Response = unknown
-> extends AbstractPool<ThreadWorkerWithMessageChannel, Data, Response> {
+> extends AbstractPool<Worker, Data, Response> {
   /**
    * Constructs a new poolifier fixed thread pool.
    *
@@ -67,47 +56,58 @@ export class FixedThreadPool<
   }
 
   /** @inheritDoc */
-  protected async destroyWorker (
-    worker: ThreadWorkerWithMessageChannel
-  ): Promise<void> {
-    this.sendToWorker(worker, { kill: 1 })
+  protected async destroyWorkerNode (workerNodeKey: number): Promise<void> {
+    const workerNode = this.workerNodes[workerNodeKey]
+    const worker = workerNode.worker
+    this.sendToWorker(workerNodeKey, { kill: true, workerId: worker.threadId })
+    workerNode.closeChannel()
     await worker.terminate()
   }
 
   /** @inheritDoc */
   protected sendToWorker (
-    worker: ThreadWorkerWithMessageChannel,
+    workerNodeKey: number,
     message: MessageValue<Data>
   ): void {
-    worker.postMessage(message)
+    (
+      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 registerWorkerMessageListener<Message extends Data | Response>(
-    worker: ThreadWorkerWithMessageChannel,
+    workerNodeKey: number,
     listener: (message: MessageValue<Message>) => void
   ): void {
-    worker.port2?.on('message', listener)
+    (
+      this.getWorkerInfo(workerNodeKey).messageChannel as MessageChannel
+    ).port1.on('message', listener)
   }
 
   /** @inheritDoc */
-  protected createWorker (): ThreadWorkerWithMessageChannel {
+  protected createWorker (): Worker {
     return new Worker(this.filePath, {
       env: SHARE_ENV,
       ...this.opts.workerOptions
     })
   }
 
-  /** @inheritDoc */
-  protected afterWorkerSetup (worker: ThreadWorkerWithMessageChannel): void {
-    const { port1, port2 } = new MessageChannel()
-    worker.postMessage({ parent: port1 }, [port1])
-    worker.port1 = port1
-    worker.port2 = port2
-    // Listen to worker messages.
-    this.registerWorkerMessageListener(worker, super.workerListener())
-  }
-
   /** @inheritDoc */
   protected get type (): PoolType {
     return PoolTypes.fixed