X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fabstract-pool.ts;h=0c4b59c92fef071bbddd487d1490ed5d2f8db38b;hb=4a6952ffec2bc4dba2d73bd747c003d0fe59fe7c;hp=7024f0998797936be1fe8d43710e1e2f1c827633;hpb=4c3da3c6b141e7f740b048824d002b80ce056d7c;p=poolifier.git

diff --git a/src/pools/abstract-pool.ts b/src/pools/abstract-pool.ts
index 7024f099..0c4b59c9 100644
--- a/src/pools/abstract-pool.ts
+++ b/src/pools/abstract-pool.ts
@@ -2,6 +2,7 @@ import type {
   MessageValue,
   PromiseWorkerResponseWrapper
 } from '../utility-types'
+import { isKillBehavior, KillBehaviors } from '../worker/worker-options'
 import type { IPoolInternal } from './pool-internal'
 import { PoolEmitter } from './pool-internal'
 import type { WorkerChoiceStrategy } from './selection-strategies'
@@ -100,6 +101,15 @@ export abstract class AbstractPool<
   Data = unknown,
   Response = unknown
 > implements IPoolInternal<Worker, Data, Response> {
+  /** @inheritdoc */
+  public readonly workers: Worker[] = []
+
+  /** @inheritdoc */
+  public readonly tasks: Map<Worker, number> = new Map<Worker, number>()
+
+  /** @inheritdoc */
+  public readonly emitter: PoolEmitter
+
   /**
    * The promise map.
    *
@@ -113,15 +123,6 @@ export abstract class AbstractPool<
     PromiseWorkerResponseWrapper<Worker, Response>
   > = new Map<number, PromiseWorkerResponseWrapper<Worker, Response>>()
 
-  /** @inheritdoc */
-  public readonly workers: Worker[] = []
-
-  /** @inheritdoc */
-  public readonly tasks: Map<Worker, number> = new Map<Worker, number>()
-
-  /** @inheritdoc */
-  public readonly emitter: PoolEmitter
-
   /**
    * ID of the next message.
    */
@@ -164,6 +165,20 @@ export abstract class AbstractPool<
     this.emitter = new PoolEmitter()
     this.workerChoiceStrategyContext = new WorkerChoiceStrategyContext(
       this,
+      () => {
+        const workerCreated = this.createAndSetupWorker()
+        this.registerWorkerMessageListener(workerCreated, message => {
+          const tasksInProgress = this.tasks.get(workerCreated)
+          if (
+            isKillBehavior(KillBehaviors.HARD, message.kill) ||
+            tasksInProgress === 0
+          ) {
+            // Kill received from the worker, means that no new tasks are submitted to that worker for a while ( > maxInactiveTime)
+            void this.destroyWorker(workerCreated)
+          }
+        })
+        return workerCreated
+      },
       opts.workerChoiceStrategy ?? WorkerChoiceStrategies.ROUND_ROBIN
     )
   }
@@ -223,8 +238,12 @@ export abstract class AbstractPool<
     await Promise.all(this.workers.map(worker => this.destroyWorker(worker)))
   }
 
-  /** @inheritdoc */
-  public abstract destroyWorker (worker: Worker): void | Promise<void>
+  /**
+   * Shut down given worker.
+   *
+   * @param worker A worker within `workers`.
+   */
+  protected abstract destroyWorker (worker: Worker): void | Promise<void>
 
   /**
    * Setup hook that can be overridden by a Poolifier pool implementation
@@ -306,8 +325,13 @@ export abstract class AbstractPool<
     message: MessageValue<Data>
   ): void
 
-  /** @inheritdoc */
-  public abstract registerWorkerMessageListener<
+  /**
+   * Register a listener callback on a given worker.
+   *
+   * @param worker A worker.
+   * @param listener A message listener callback.
+   */
+  protected abstract registerWorkerMessageListener<
     Message extends Data | Response
   > (worker: Worker, listener: (message: MessageValue<Message>) => void): void
 
@@ -334,8 +358,12 @@ export abstract class AbstractPool<
    */
   protected abstract afterWorkerSetup (worker: Worker): void
 
-  /** @inheritdoc */
-  public createAndSetupWorker (): Worker {
+  /**
+   * Creates a new worker for this pool and sets it up completely.
+   *
+   * @returns New, completely set up worker.
+   */
+  protected createAndSetupWorker (): Worker {
     const worker: Worker = this.createWorker()
 
     worker.on('error', this.opts.errorHandler ?? EMPTY_FUNCTION)
@@ -359,7 +387,7 @@ export abstract class AbstractPool<
    * @returns The listener function to execute when a message is sent from a worker.
    */
   protected workerListener (): (message: MessageValue<Response>) => void {
-    const listener: (message: MessageValue<Response>) => void = message => {
+    return message => {
       if (message.id) {
         const value = this.promiseMap.get(message.id)
         if (value) {
@@ -370,6 +398,5 @@ export abstract class AbstractPool<
         }
       }
     }
-    return listener
   }
 }