From 3bcbd4c5be5678988281342a1fc1f6a62f9c77d7 Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= <jerome.benoit@piment-noir.org>
Date: Mon, 1 Jan 2024 22:10:22 +0100
Subject: [PATCH] refactor: add type alias for worker event handler
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>
---
 src/pools/worker-node.ts | 17 +++--------------
 src/pools/worker.ts      | 41 +++++++++++++++-------------------------
 2 files changed, 18 insertions(+), 40 deletions(-)

diff --git a/src/pools/worker-node.ts b/src/pools/worker-node.ts
index 6a5881da..73b2c70c 100644
--- a/src/pools/worker-node.ts
+++ b/src/pools/worker-node.ts
@@ -5,12 +5,9 @@ import type { Task } from '../utility-types.js'
 import { DEFAULT_TASK_NAME, getWorkerId, getWorkerType } from '../utils.js'
 import { Deque } from '../deque.js'
 import {
-  type ErrorHandler,
-  type ExitHandler,
+  type EventHandler,
   type IWorker,
   type IWorkerNode,
-  type MessageHandler,
-  type OnlineHandler,
   type StrategyData,
   type WorkerInfo,
   type WorkerNodeOptions,
@@ -151,11 +148,7 @@ export class WorkerNode<Worker extends IWorker, Data = unknown>
   /** @inheritdoc */
   public registerWorkerEventHandler (
     event: string,
-    handler:
-    | OnlineHandler<Worker>
-    | MessageHandler<Worker>
-    | ErrorHandler<Worker>
-    | ExitHandler<Worker>
+    handler: EventHandler<Worker>
   ): void {
     this.worker.on(event, handler)
   }
@@ -163,11 +156,7 @@ export class WorkerNode<Worker extends IWorker, Data = unknown>
   /** @inheritdoc */
   public registerOnceWorkerEventHandler (
     event: string,
-    handler:
-    | OnlineHandler<Worker>
-    | MessageHandler<Worker>
-    | ErrorHandler<Worker>
-    | ExitHandler<Worker>
+    handler: EventHandler<Worker>
   ): void {
     this.worker.once(event, handler)
   }
diff --git a/src/pools/worker.ts b/src/pools/worker.ts
index c7a9dcb3..f439c882 100644
--- a/src/pools/worker.ts
+++ b/src/pools/worker.ts
@@ -40,6 +40,17 @@ export type ExitHandler<Worker extends IWorker> = (
   exitCode: number
 ) => void
 
+/**
+ * Worker event handler.
+ *
+ * @typeParam Worker - Type of worker.
+ */
+export type EventHandler<Worker extends IWorker> =
+  | OnlineHandler<Worker>
+  | MessageHandler<Worker>
+  | ErrorHandler<Worker>
+  | ExitHandler<Worker>
+
 /**
  * Measurement statistics.
  *
@@ -216,28 +227,14 @@ export interface IWorker {
    * @param event - The event.
    * @param handler - The event handler.
    */
-  readonly on: (
-    event: string,
-    handler:
-    | OnlineHandler<this>
-    | MessageHandler<this>
-    | ErrorHandler<this>
-    | ExitHandler<this>
-  ) => void
+  readonly on: (event: string, handler: EventHandler<this>) => void
   /**
    * Registers once an event handler.
    *
    * @param event - The event.
    * @param handler - The event handler.
    */
-  readonly once: (
-    event: string,
-    handler:
-    | OnlineHandler<this>
-    | MessageHandler<this>
-    | ErrorHandler<this>
-    | ExitHandler<this>
-  ) => void
+  readonly once: (event: string, handler: EventHandler<this>) => void
   /**
    * Stop all JavaScript execution in the worker thread as soon as possible.
    * Returns a Promise for the exit code that is fulfilled when the `'exit' event` is emitted.
@@ -357,11 +354,7 @@ export interface IWorkerNode<Worker extends IWorker, Data = unknown>
    */
   readonly registerWorkerEventHandler: (
     event: string,
-    handler:
-    | OnlineHandler<Worker>
-    | MessageHandler<Worker>
-    | ErrorHandler<Worker>
-    | ExitHandler<Worker>
+    handler: EventHandler<Worker>
   ) => void
   /**
    * Registers once a worker event handler.
@@ -371,11 +364,7 @@ export interface IWorkerNode<Worker extends IWorker, Data = unknown>
    */
   readonly registerOnceWorkerEventHandler: (
     event: string,
-    handler:
-    | OnlineHandler<Worker>
-    | MessageHandler<Worker>
-    | ErrorHandler<Worker>
-    | ExitHandler<Worker>
+    handler: EventHandler<Worker>
   ) => void
   /**
    * Gets task function worker usage statistics.
-- 
2.34.1