X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fcluster%2Ffixed.ts;h=dbf1d470b7e7f36eb12dec0bba28c081fac60786;hb=2e2ef9c39a37f5d32bfaf75b7cfe886aac69d8cb;hp=592b3fe7d4234fe3df267074963b10301ee23707;hpb=82f36766232abd4e4ffde72ecd68462adf59cca7;p=poolifier.git

diff --git a/src/pools/cluster/fixed.ts b/src/pools/cluster/fixed.ts
index 592b3fe7..dbf1d470 100644
--- a/src/pools/cluster/fixed.ts
+++ b/src/pools/cluster/fixed.ts
@@ -1,13 +1,8 @@
 import cluster, { type ClusterSettings, type Worker } from 'node:cluster'
 import type { MessageValue } from '../../utility-types'
 import { AbstractPool } from '../abstract-pool'
-import {
-  type PoolOptions,
-  type PoolType,
-  PoolTypes,
-  type WorkerType,
-  WorkerTypes
-} from '../pool'
+import { type PoolOptions, type PoolType, PoolTypes } from '../pool'
+import { type WorkerType, WorkerTypes } from '../worker'
 
 /**
  * Options for a poolifier cluster pool.
@@ -30,12 +25,8 @@ export interface ClusterPoolOptions extends PoolOptions<Worker> {
 /**
  * A cluster pool with a fixed number of workers.
  *
- * It is possible to perform tasks in sync or asynchronous mode as you prefer.
- *
- * This pool selects the workers in a round robin fashion.
- *
- * @typeParam Data - Type of data sent to the worker. This can only be serializable data.
- * @typeParam Response - Type of execution response. 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 [Christopher Quadflieg](https://github.com/Shinigami92)
  * @since 2.0.0
  */
@@ -70,8 +61,11 @@ export class FixedClusterPool<
 
   /** @inheritDoc */
   protected destroyWorker (worker: Worker): void {
-    this.sendToWorker(worker, { kill: 1 })
-    worker.kill()
+    this.sendToWorker(worker, { kill: true, workerId: worker.id })
+    worker.on('disconnect', () => {
+      worker.kill()
+    })
+    worker.disconnect()
   }
 
   /** @inheritDoc */
@@ -79,6 +73,14 @@ export class FixedClusterPool<
     worker.send(message)
   }
 
+  /** @inheritDoc */
+  protected sendStartupMessageToWorker (worker: Worker): void {
+    this.sendToWorker(worker, {
+      ready: false,
+      workerId: worker.id
+    })
+  }
+
   /** @inheritDoc */
   protected registerWorkerMessageListener<Message extends Data | Response>(
     worker: Worker,
@@ -92,12 +94,6 @@ export class FixedClusterPool<
     return cluster.fork(this.opts.env)
   }
 
-  /** @inheritDoc */
-  protected afterWorkerSetup (worker: Worker): void {
-    // Listen to worker messages.
-    this.registerWorkerMessageListener(worker, super.workerListener())
-  }
-
   /** @inheritDoc */
   protected get type (): PoolType {
     return PoolTypes.fixed