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=f651d3ade895fdfee56497e642c7e4ce155ead06;hpb=1927ee6758147bb8a2479b987322564cea20992b;p=poolifier.git

diff --git a/src/pools/cluster/fixed.ts b/src/pools/cluster/fixed.ts
index f651d3ad..09c5e369 100644
--- a/src/pools/cluster/fixed.ts
+++ b/src/pools/cluster/fixed.ts
@@ -1,7 +1,9 @@
-import { fork, isMaster, setupMaster, Worker } from 'cluster'
+import type { Worker } from 'cluster'
+import cluster from 'cluster'
 import type { MessageValue } from '../../utility-types'
-import type { PoolOptions } from '../abstract-pool'
 import { AbstractPool } from '../abstract-pool'
+import type { PoolOptions } from '../pool'
+import { PoolType } from '../pool-internal'
 
 /**
  * Options for a poolifier cluster pool.
@@ -23,9 +25,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 +39,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,27 +49,30 @@ 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 */
+  /** @inheritDoc */
   public destroyWorker (worker: Worker): void {
     this.sendToWorker(worker, { kill: 1 })
     worker.kill()
   }
 
+  /** @inheritDoc */
   protected sendToWorker (worker: Worker, message: MessageValue<Data>): void {
     worker.send(message)
   }
 
-  /** @inheritdoc */
+  /** @inheritDoc */
   public registerWorkerMessageListener<Message extends Data | Response> (
     worker: Worker,
     listener: (message: MessageValue<Message>) => void
@@ -76,12 +80,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()
+  }
 }