X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2Fthread-worker.ts;h=bc143a1f914b7e7dba14b395ac456be40c59ed80;hb=b1bbc3658b183a5c7a10c76daa4a775b64bf15ee;hp=a8658f03a797ed649cbd583a14ed5d924949a235;hpb=85aeb3f356d749b96361e74cf17d403a697e3dd7;p=poolifier.git

diff --git a/src/worker/thread-worker.ts b/src/worker/thread-worker.ts
index a8658f03..bc143a1f 100644
--- a/src/worker/thread-worker.ts
+++ b/src/worker/thread-worker.ts
@@ -7,7 +7,7 @@ import {
 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 { TaskFunction, TaskFunctions } from './task-functions'
 
 /**
  * A thread worker used by a poolifier `ThreadPool`.
@@ -28,9 +28,10 @@ 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.
    *
@@ -38,47 +39,59 @@ export class ThreadWorker<
    * @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 as MessagePort, taskFunctions, opts)
   }
 
   /** @inheritDoc */
   protected handleReadyMessage (message: MessageValue<Data>): void {
     if (
       message.workerId === this.id &&
-      message.ready != null &&
+      message.ready === false &&
       message.port != null
     ) {
-      if (!this.isMain) {
+      try {
         this.port = message.port
         this.port.on('message', this.messageListener.bind(this))
-        this.sendToMainWorker({ ready: true, workerId: this.id })
+        this.sendToMainWorker({
+          ready: true,
+          taskFunctionNames: this.listTaskFunctionNames()
+        })
+      } catch {
+        this.sendToMainWorker({
+          ready: false,
+          taskFunctionNames: this.listTaskFunctionNames()
+        })
       }
     }
   }
 
+  /** @inheritDoc */
+  protected handleKillMessage (message: MessageValue<Data>): void {
+    super.handleKillMessage(message)
+    this.port?.unref()
+    this.port?.close()
+  }
+
   /** @inheritDoc */
   protected get id (): number {
     return threadId
   }
 
   /** @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 })
   }
 
-  /** @inheritDoc */
-  protected handleError (e: Error | string): string {
-    return e as string
+  /**
+   * @inheritDoc
+   * @override
+   */
+  protected handleError (error: Error | string): string {
+    return error as string
   }
 }