X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2Fthread-worker.ts;h=8d30ef21a8874dcfb6802e2436a7d6033a4fa8ec;hb=46afa741041dee3404b17a6f7f18a61825e4813b;hp=2b3df58361eb28a9d0ccc2f694208bb0e4426c02;hpb=e8a4c3ea4d5123ff7c158d139ca142144ccc1117;p=poolifier.git

diff --git a/src/worker/thread-worker.ts b/src/worker/thread-worker.ts
index 2b3df583..8d30ef21 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`.
@@ -27,6 +27,10 @@ export class ThreadWorker<
   Data = unknown,
   Response = unknown
 > extends AbstractWorker<MessagePort, Data, Response> {
+  /**
+   * Message port used to communicate with the main worker.
+   */
+  private port!: MessagePort
   /**
    * Constructs a new poolifier thread worker.
    *
@@ -34,26 +38,62 @@ 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,
-      taskFunctions,
       parentPort as MessagePort,
+      taskFunctions,
       opts
     )
   }
 
+  /** @inheritDoc */
+  protected handleReadyMessage (message: MessageValue<Data>): void {
+    if (
+      message.workerId === this.id &&
+      message.ready === false &&
+      message.port != null
+    ) {
+      try {
+        this.port = message.port
+        this.port.on('message', this.messageListener.bind(this))
+        this.sendToMainWorker({
+          ready: true,
+          taskFunctions: this.listTaskFunctions(),
+          workerId: this.id
+        })
+      } catch {
+        this.sendToMainWorker({
+          ready: false,
+          taskFunctions: this.listTaskFunctions(),
+          workerId: this.id
+        })
+      }
+    }
+  }
+
+  /** @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.getMainWorker().postMessage(message)
+    this.port.postMessage(message)
+  }
+
+  /** @inheritDoc */
+  protected handleError (e: Error | string): string {
+    return e as string
   }
 }