X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2Fthread-worker.ts;h=bf8647c53b68f972c1dbe2cf806689d7889d2d2f;hb=refs%2Fheads%2Fmaster;hp=4d4c1c3479f14970db523ff96d873f0b4cdac79f;hpb=984dc9c8adc66d4ed982e76391db751dd685f0b2;p=poolifier.git

diff --git a/src/worker/thread-worker.ts b/src/worker/thread-worker.ts
index 4d4c1c34..8057d6f3 100644
--- a/src/worker/thread-worker.ts
+++ b/src/worker/thread-worker.ts
@@ -1,13 +1,14 @@
 import {
-  type MessagePort,
   isMainThread,
+  type MessagePort,
   parentPort,
-  threadId
+  threadId,
 } from 'node:worker_threads'
-import type { MessageValue } from '../utility-types'
-import { AbstractWorker } from './abstract-worker'
-import type { WorkerOptions } from './worker-options'
-import type { TaskFunctions, WorkerFunction } from './worker-functions'
+
+import type { MessageValue } from '../utility-types.js'
+import { AbstractWorker } from './abstract-worker.js'
+import type { TaskFunction, TaskFunctions } from './task-functions.js'
+import type { WorkerOptions } from './worker-options.js'
 
 /**
  * A thread worker used by a poolifier `ThreadPool`.
@@ -17,7 +18,6 @@ import type { TaskFunctions, WorkerFunction } from './worker-functions'
  *
  * If you use a `DynamicThreadPool` the extra workers that were created will be terminated,
  * but the minimum number of workers will be guaranteed.
- *
  * @typeParam Data - Type of data this worker receives from pool's execution. This can only be structured-cloneable data.
  * @typeParam Response - Type of response the worker sends back to the main thread. This can only be structured-cloneable data.
  * @author [Alessandro Pio Ardizio](https://github.com/pioardi)
@@ -28,46 +28,47 @@ export class ThreadWorker<
   Response = unknown
 > extends AbstractWorker<MessagePort, Data, Response> {
   /**
-   * Message port used to communicate with the main thread.
+   * Message port used to communicate with the main worker.
    */
-  private port!: MessagePort
+  private port?: MessagePort
+
   /**
    * Constructs a new poolifier thread worker.
-   *
    * @param taskFunctions - Task function(s) processed by the worker when the pool's `execution` function is invoked.
    * @param opts - Options for the worker.
    */
   public constructor (
-    taskFunctions:
-    | WorkerFunction<Data, Response>
-    | TaskFunctions<Data, Response>,
+    taskFunctions: TaskFunction<Data, Response> | TaskFunctions<Data, Response>,
     opts: WorkerOptions = {}
   ) {
-    super(
-      'worker-thread-pool:poolifier',
-      isMainThread,
-      parentPort as MessagePort,
-      taskFunctions,
-      opts
-    )
+    super(isMainThread, parentPort, taskFunctions, opts)
   }
 
   /** @inheritDoc */
   protected handleReadyMessage (message: MessageValue<Data>): void {
     if (
-      !this.isMain &&
       message.workerId === this.id &&
-      message.ready != null &&
+      message.ready === false &&
       message.port != null
     ) {
-      this.port = message.port
-      this.port.on('message', this.messageListener.bind(this))
-      this.sendToMainWorker({ ready: true, workerId: this.id })
+      try {
+        this.port = message.port
+        this.port.on('message', this.messageListener.bind(this))
+        this.sendToMainWorker({
+          ready: true,
+          taskFunctionsProperties: this.listTaskFunctionsProperties(),
+        })
+      } catch {
+        this.sendToMainWorker({
+          ready: false,
+          taskFunctionsProperties: this.listTaskFunctionsProperties(),
+        })
+      }
     }
   }
 
   /** @inheritDoc */
-  protected handleKillMessage (message: MessageValue<Data, unknown>): void {
+  protected handleKillMessage (message: MessageValue<Data>): void {
     super.handleKillMessage(message)
     this.port?.unref()
     this.port?.close()
@@ -79,12 +80,19 @@ export class ThreadWorker<
   }
 
   /** @inheritDoc */
-  protected sendToMainWorker (message: MessageValue<Response>): void {
-    this.port.postMessage(message)
+  protected readonly sendToMainWorker = (
+    message: MessageValue<Response>
+  ): void => {
+    this.port?.postMessage({
+      ...message,
+      workerId: this.id,
+    } satisfies MessageValue<Response>)
   }
 
-  /** @inheritDoc */
-  protected handleError (e: Error | string): string {
-    return e as string
+  /**
+   * @inheritDoc
+   */
+  protected handleError (error: Error | string): string {
+    return error as string
   }
 }