X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fthread%2Ffixed.ts;h=c9145f571186a9d5783531236414aff7eadd463e;hb=21f710aa73abbb5d90328cfb199adfc0f7a70406;hp=2c4f66f0ff4d8be12d192f4028b1b1a17262bbc7;hpb=c2ade475e1b3b24aa2a1757b6d97a26063ec708c;p=poolifier.git

diff --git a/src/pools/thread/fixed.ts b/src/pools/thread/fixed.ts
index 2c4f66f0..c9145f57 100644
--- a/src/pools/thread/fixed.ts
+++ b/src/pools/thread/fixed.ts
@@ -1,35 +1,38 @@
 import {
-  isMainThread,
-  MessageChannel,
   SHARE_ENV,
-  Worker
+  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 } from '../pool'
-import { PoolType } from '../pool-internal'
+import { type PoolOptions, type PoolType, PoolTypes } from '../pool'
+import { type WorkerType, WorkerTypes } from '../worker'
 
 /**
- * A thread worker with message channels for communication between main thread and thread worker.
+ * Options for a poolifier thread pool.
  */
-export type ThreadWorkerWithMessageChannel = Worker & Draft<MessageChannel>
+export interface ThreadPoolOptions extends PoolOptions<Worker> {
+  /**
+   * Worker options.
+   *
+   * @see https://nodejs.org/api/worker_threads.html#new-workerfilename-options
+   */
+  workerOptions?: WorkerOptions
+}
 
 /**
  * A thread pool with a fixed number of threads.
  *
- * It is possible to perform tasks in sync or asynchronous mode as you prefer.
- *
- * This pool selects the threads in a round robin fashion.
- *
- * @typeParam Data - Type of data sent to the worker. This can only be serializable data.
- * @typeParam Response - Type of response of execution. 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.
    *
@@ -40,69 +43,57 @@ export class FixedThreadPool<
   public constructor (
     numberOfThreads: number,
     filePath: string,
-    opts: PoolOptions<ThreadWorkerWithMessageChannel> = {}
+    protected readonly opts: ThreadPoolOptions = {}
   ) {
     super(numberOfThreads, filePath, opts)
   }
 
-  /** {@inheritDoc} */
+  /** @inheritDoc */
   protected isMain (): boolean {
     return isMainThread
   }
 
-  /** {@inheritDoc} */
-  public async destroyWorker (
-    worker: ThreadWorkerWithMessageChannel
-  ): Promise<void> {
-    this.sendToWorker(worker, { kill: 1 })
+  /** @inheritDoc */
+  protected async destroyWorker (worker: Worker): Promise<void> {
+    this.sendToWorker(worker, { kill: true, workerId: worker.threadId })
     await worker.terminate()
   }
 
-  /** {@inheritDoc} */
-  protected sendToWorker (
-    worker: ThreadWorkerWithMessageChannel,
-    message: MessageValue<Data>
-  ): void {
+  /** @inheritDoc */
+  protected sendToWorker (worker: Worker, message: MessageValue<Data>): void {
     worker.postMessage(message)
   }
 
-  /** {@inheritDoc} */
-  public registerWorkerMessageListener<Message extends Data | Response>(
-    messageChannel: ThreadWorkerWithMessageChannel,
-    listener: (message: MessageValue<Message>) => void
-  ): void {
-    messageChannel.port2?.on('message', listener)
-  }
-
-  /** {@inheritDoc} */
-  protected createWorker (): ThreadWorkerWithMessageChannel {
+  /** @inheritDoc */
+  protected createWorker (): Worker {
     return new Worker(this.filePath, {
-      env: SHARE_ENV
+      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
+  }
+
+  /** @inheritDoc */
+  protected get worker (): WorkerType {
+    return WorkerTypes.thread
   }
 
-  /** {@inheritDoc} */
-  public get type (): PoolType {
-    return PoolType.FIXED
+  /** @inheritDoc */
+  protected get minSize (): number {
+    return this.numberOfWorkers
   }
 
-  /** {@inheritDoc} */
-  public get full (): boolean {
-    return this.workers.length === this.numberOfWorkers
+  /** @inheritDoc */
+  protected get maxSize (): number {
+    return this.numberOfWorkers
   }
 
-  /** {@inheritDoc} */
-  public get busy (): boolean {
+  /** @inheritDoc */
+  protected get busy (): boolean {
     return this.internalBusy()
   }
 }