X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fpools%2Fcluster%2Ffixed.ts;h=9844c4a8a912570c10043e4980b8bb3113aab6f1;hb=0295156c310b5872970aa5dd6674f165b77954e4;hp=f651d3ade895fdfee56497e642c7e4ce155ead06;hpb=1927ee6758147bb8a2479b987322564cea20992b;p=poolifier.git

diff --git a/src/pools/cluster/fixed.ts b/src/pools/cluster/fixed.ts
index f651d3ad..9844c4a8 100644
--- a/src/pools/cluster/fixed.ts
+++ b/src/pools/cluster/fixed.ts
@@ -1,7 +1,8 @@
-import { fork, isMaster, setupMaster, Worker } from 'cluster'
+import cluster, { Worker } from 'cluster'
 import type { MessageValue } from '../../utility-types'
 import type { PoolOptions } from '../abstract-pool'
 import { AbstractPool } from '../abstract-pool'
+import { PoolType } from '../pool-internal'
 
 /**
  * Options for a poolifier cluster pool.
@@ -23,9 +24,8 @@ export interface ClusterPoolOptions extends PoolOptions<Worker> {
  *
  * This pool selects the workers in a round robin fashion.
  *
- * @template Data Type of data sent to the worker. This can only be serializable data.
- * @template Response Type of response of execution. This can only be serializable data.
- *
+ * @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
  */
@@ -38,7 +38,7 @@ export class FixedClusterPool<
    *
    * @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. Default: `{}`
+   * @param [opts={}] Options for this fixed cluster pool.
    */
   public constructor (
     numberOfWorkers: number,
@@ -48,14 +48,16 @@ export class FixedClusterPool<
     super(numberOfWorkers, filePath, opts)
   }
 
+  /** @inheritdoc */
   protected setupHook (): void {
-    setupMaster({
+    cluster.setupPrimary({
       exec: this.filePath
     })
   }
 
+  /** @inheritdoc */
   protected isMain (): boolean {
-    return isMaster
+    return cluster.isPrimary
   }
 
   /** @inheritdoc */
@@ -64,6 +66,7 @@ export class FixedClusterPool<
     worker.kill()
   }
 
+  /** @inheritdoc */
   protected sendToWorker (worker: Worker, message: MessageValue<Data>): void {
     worker.send(message)
   }
@@ -76,12 +79,24 @@ export class FixedClusterPool<
     worker.on('message', listener)
   }
 
+  /** @inheritdoc */
   protected createWorker (): Worker {
-    return fork(this.opts.env)
+    return cluster.fork(this.opts.env)
   }
 
+  /** @inheritdoc */
   protected afterWorkerSetup (worker: Worker): void {
     // Listen worker messages.
     this.registerWorkerMessageListener(worker, super.workerListener())
   }
+
+  /** @inheritdoc */
+  public get type (): PoolType {
+    return PoolType.FIXED
+  }
+
+  /** @inheritdoc */
+  public get busy (): boolean {
+    return this.internalGetBusyStatus()
+  }
 }