X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fcluster%2Ffixed.ts;h=09c5e369a5459d0858559a29eef8e9fc3a563c66;hb=refs%2Ftags%2Fv2.3.1;hp=65f6ce54c738e1b857a7c1d49f68811ca57f5697;hpb=f2fdaa86fd9e6f3a5dc0b3146c065e3a7bfb44e0;p=poolifier.git

diff --git a/src/pools/cluster/fixed.ts b/src/pools/cluster/fixed.ts
index 65f6ce54..09c5e369 100644
--- a/src/pools/cluster/fixed.ts
+++ b/src/pools/cluster/fixed.ts
@@ -1,8 +1,13 @@
-import { fork, isMaster, setupMaster, Worker } from 'cluster'
-import type { JSONValue, MessageValue } from '../../utility-types'
-import type { PoolOptions } from '../abstract-pool'
+import type { Worker } from 'cluster'
+import cluster from 'cluster'
+import type { MessageValue } from '../../utility-types'
 import { AbstractPool } from '../abstract-pool'
+import type { PoolOptions } from '../pool'
+import { PoolType } from '../pool-internal'
 
+/**
+ * Options for a poolifier cluster pool.
+ */
 export interface ClusterPoolOptions extends PoolOptions<Worker> {
   /**
    * Key/value pairs to add to worker process environment.
@@ -14,70 +19,85 @@ export interface ClusterPoolOptions extends PoolOptions<Worker> {
 }
 
 /**
- * A cluster pool with a static number of workers, is possible to execute tasks in sync or async mode as you prefer.
+ * A cluster pool with a fixed number of workers.
  *
- * This pool will select the worker in a round robin fashion.
+ * It is possible to perform tasks in sync or asynchronous mode as you prefer.
  *
+ * This pool selects the workers in a round robin fashion.
+ *
+ * @template DataType of data sent to the worker. This can only be serializable data.
+ * @template ResponseType of response of execution. This can only be serializable data.
  * @author [Christopher Quadflieg](https://github.com/Shinigami92)
  * @since 2.0.0
  */
 export class FixedClusterPool<
-  Data extends JSONValue = JSONValue,
-  Response extends JSONValue = JSONValue
+  Data = unknown,
+  Response = unknown
 > extends AbstractPool<Worker, Data, Response> {
   /**
-   * @param numWorkers Number of workers for this pool.
-   * @param filePath A file path with implementation of `ClusterWorker` class, relative path is fine.
-   * @param opts An object with possible options for example `errorHandler`, `onlineHandler`. Default: `{ maxTasks: 1000 }`
+   * Constructs a new poolifier fixed cluster pool.
+   *
+   * @param numberOfWorkers Number of workers for this pool.
+   * @param filePath Path to an implementation of a `ClusterWorker` file, which can be relative or absolute.
+   * @param [opts={}] Options for this fixed cluster pool.
    */
   public constructor (
-    numWorkers: number,
+    numberOfWorkers: number,
     filePath: string,
-    public readonly opts: ClusterPoolOptions = { maxTasks: 1000 }
+    public readonly opts: ClusterPoolOptions = {}
   ) {
-    super(numWorkers, filePath, opts)
+    super(numberOfWorkers, filePath, opts)
   }
 
+  /** @inheritDoc */
   protected setupHook (): void {
-    setupMaster({
+    cluster.setupPrimary({
       exec: this.filePath
     })
   }
 
+  /** @inheritDoc */
   protected isMain (): boolean {
-    return isMaster
+    return cluster.isPrimary
   }
 
-  protected destroyWorker (worker: Worker): void {
+  /** @inheritDoc */
+  public destroyWorker (worker: Worker): void {
+    this.sendToWorker(worker, { kill: 1 })
     worker.kill()
-    // FIXME: The tests are currently failing, so these must be changed first
   }
 
+  /** @inheritDoc */
   protected sendToWorker (worker: Worker, message: MessageValue<Data>): void {
     worker.send(message)
   }
 
-  protected registerWorkerMessageListener (
-    port: Worker,
-    listener: (message: MessageValue<Response>) => void
+  /** @inheritDoc */
+  public registerWorkerMessageListener<Message extends Data | Response> (
+    worker: Worker,
+    listener: (message: MessageValue<Message>) => void
   ): void {
-    port.on('message', listener)
+    worker.on('message', listener)
   }
 
-  protected unregisterWorkerMessageListener (
-    port: Worker,
-    listener: (message: MessageValue<Response>) => void
-  ): void {
-    port.removeListener('message', listener)
+  /** @inheritDoc */
+  protected createWorker (): Worker {
+    return cluster.fork(this.opts.env)
+  }
+
+  /** @inheritDoc */
+  protected afterWorkerSetup (worker: Worker): void {
+    // Listen worker messages.
+    this.registerWorkerMessageListener(worker, super.workerListener())
   }
 
-  protected newWorker (): Worker {
-    return fork(this.opts.env)
+  /** @inheritDoc */
+  public get type (): PoolType {
+    return PoolType.FIXED
   }
 
-  protected afterNewWorkerPushed (worker: Worker): void {
-    // we will attach a listener for every task,
-    // when task is completed the listener will be removed but to avoid warnings we are increasing the max listeners size
-    worker.setMaxListeners(this.opts.maxTasks ?? 1000)
+  /** @inheritDoc */
+  public get busy (): boolean {
+    return this.internalGetBusyStatus()
   }
 }