X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fcluster%2Fdynamic.ts;h=47799f5ef6352cd6f3f2fbe68b4545fb67ab420b;hb=HEAD;hp=33c05a9220415fb43317bea9aa172b62d20207c7;hpb=91bfd799ee1722e0181fe158697523b575f28de3;p=poolifier.git

diff --git a/src/pools/cluster/dynamic.ts b/src/pools/cluster/dynamic.ts
index 33c05a92..47799f5e 100644
--- a/src/pools/cluster/dynamic.ts
+++ b/src/pools/cluster/dynamic.ts
@@ -1,15 +1,14 @@
-import { PoolType } from '../pool-internal'
-import type { ClusterPoolOptions } from './fixed'
-import { FixedClusterPool } from './fixed'
+import { PoolEvents, type PoolType, PoolTypes } from '../pool.js'
+import { checkDynamicPoolSize } from '../utils.js'
+import { type ClusterPoolOptions, FixedClusterPool } from './fixed.js'
 
 /**
  * A cluster pool with a dynamic number of workers, but a guaranteed minimum number of workers.
  *
  * This cluster pool creates new workers when the others are busy, up to the maximum number of workers.
- * When the maximum number of workers is reached, an event is emitted. If you want to listen to this event, use the pool's `emitter`.
- *
- * @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.
+ * When the maximum number of workers is reached and workers are busy, an event is emitted. If you want to listen to this event, use the pool's `emitter`.
+ * @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 [Christopher Quadflieg](https://github.com/Shinigami92)
  * @since 2.0.0
  */
@@ -19,28 +18,43 @@ export class DynamicClusterPool<
 > extends FixedClusterPool<Data, Response> {
   /**
    * Constructs a new poolifier dynamic cluster pool.
-   *
-   * @param min Minimum number of workers which are always active.
-   * @param max Maximum number of workers that can be created by this pool.
-   * @param filePath Path to an implementation of a `ClusterWorker` file, which can be relative or absolute.
-   * @param opts Options for this dynamic cluster pool. Default: `{}`
+   * @param min - Minimum number of workers which are always active.
+   * @param max - Maximum number of workers that can be created by this pool.
+   * @param filePath - Path to an implementation of a `ClusterWorker` file, which can be relative or absolute.
+   * @param opts - Options for this dynamic cluster pool.
    */
   public constructor (
     min: number,
-    public readonly max: number,
+    max: number,
     filePath: string,
     opts: ClusterPoolOptions = {}
   ) {
-    super(min, filePath, opts)
+    super(min, filePath, opts, max)
+    checkDynamicPoolSize(
+      this.minimumNumberOfWorkers,
+      this.maximumNumberOfWorkers
+    )
+  }
+
+  /** @inheritDoc */
+  protected shallCreateDynamicWorker (): boolean {
+    return (!this.full && this.internalBusy()) || this.empty
+  }
+
+  /** @inheritDoc */
+  protected checkAndEmitDynamicWorkerCreationEvents (): void {
+    if (this.full) {
+      this.emitter?.emit(PoolEvents.full, this.info)
+    }
   }
 
-  /** @inheritdoc */
-  public get type (): PoolType {
-    return PoolType.DYNAMIC
+  /** @inheritDoc */
+  protected get type (): PoolType {
+    return PoolTypes.dynamic
   }
 
-  /** @inheritdoc */
-  public get busy (): boolean {
-    return this.workers.length === this.max
+  /** @inheritDoc */
+  protected get busy (): boolean {
+    return this.full && this.internalBusy()
   }
 }