Merge dependabot/npm_and_yarn/examples/typescript/websocket-server-pool/ws-worker_thr...

[poolifier.git] / src / pools / thread / dynamic.ts

diff --git a/src/pools/thread/dynamic.ts b/src/pools/thread/dynamic.ts
index 62ddba9fc4792148a47f69c51c8c6f7a01b3adb0..b0a22346690bd36c471b6b45c844af8ffae098ea 100644 (file)
--- a/src/pools/thread/dynamic.ts
+++ b/src/pools/thread/dynamic.ts
@@ -1,6 +1,6 @@
-import type { PoolOptions } from '../pool'
-import { PoolType } from '../pool-internal'
-import type { ThreadWorkerWithMessageChannel } from './fixed'
+import { type Worker } from 'node:worker_threads'
+import { type PoolOptions, type PoolType, PoolTypes } from '../pool'
+import { checkDynamicPoolSize } from '../utils'
 import { FixedThreadPool } from './fixed'
 
 /**
@@ -9,8 +9,8 @@ import { FixedThreadPool } from './fixed'
  * This thread pool creates new threads when the others are busy, up to the maximum number of threads.
  * When the maximum number of threads 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 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
  */
@@ -28,25 +28,24 @@ export class DynamicThreadPool<
    */
   public constructor (
     min: number,
-    private readonly max: number,
+    max: number,
     filePath: string,
-    opts: PoolOptions<ThreadWorkerWithMessageChannel> = {}
+    opts: PoolOptions<Worker> = {}
   ) {
-    super(min, filePath, opts)
+    super(min, filePath, opts, max)
+    checkDynamicPoolSize(
+      this.minimumNumberOfWorkers,
+      this.maximumNumberOfWorkers as number
+    )
   }
 
   /** @inheritDoc */
-  public get type (): PoolType {
-    return PoolType.DYNAMIC
+  protected get type (): PoolType {
+    return PoolTypes.dynamic
   }
 
   /** @inheritDoc */
-  public get full (): boolean {
-    return this.workers.length === this.max
-  }
-
-  /** @inheritDoc */
-  public get busy (): boolean {
-    return this.full && this.findFreeWorkerKey() === -1
+  protected get busy (): boolean {
+    return this.full && this.internalBusy()
   }
 }