X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2Fthread-worker.ts;h=7b92caf67201795797f6e3e06fff4fc593f4ee94;hb=037af3175d6121a6c08a631c992aa0d7fe853a9f;hp=75cd9da505b709a954f188ab209145221c90bc84;hpb=82888165d01dba6a57f5047d4a4c27c6da6025f3;p=poolifier.git

diff --git a/src/worker/thread-worker.ts b/src/worker/thread-worker.ts
index 75cd9da5..7b92caf6 100644
--- a/src/worker/thread-worker.ts
+++ b/src/worker/thread-worker.ts
@@ -1,12 +1,13 @@
-import type { MessagePort } from 'node:worker_threads'
-import { isMainThread, parentPort } from 'node:worker_threads'
-import type {
-  MessageValue,
-  TaskFunctions,
-  WorkerFunction
-} from '../utility-types'
+import {
+  type MessagePort,
+  isMainThread,
+  parentPort,
+  threadId
+} from 'node:worker_threads'
+import type { MessageValue } from '../utility-types'
 import { AbstractWorker } from './abstract-worker'
 import type { WorkerOptions } from './worker-options'
+import type { TaskFunction, TaskFunctions } from './task-functions'
 
 /**
  * A thread worker used by a poolifier `ThreadPool`.
@@ -17,8 +18,8 @@ import type { WorkerOptions } from './worker-options'
  * 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 serializable data.
- * @typeParam Response - Type of response the worker sends back to the main thread. This can only be serializable data.
+ * @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)
  * @since 0.0.1
  */
@@ -26,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.
    *
@@ -33,22 +38,60 @@ 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,
-      parentPort,
       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,
+          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.getMainWorker().postMessage(message)
+    this.port.postMessage({ ...message, workerId: this.id })
+  }
+
+  /** @inheritDoc */
+  protected handleError (error: Error | string): string {
+    return error as string
   }
 }