Merge branch 'master' into feature/task-functions

[poolifier.git] / src / worker / thread-worker.ts

diff --git a/src/worker/thread-worker.ts b/src/worker/thread-worker.ts
index 4666fbc7590dda3974df88770b874703c0189e17..7b92caf67201795797f6e3e06fff4fc593f4ee94 100644 (file)
--- a/src/worker/thread-worker.ts
+++ b/src/worker/thread-worker.ts
@@ -53,14 +53,23 @@ export class ThreadWorker<
   /** @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,
+          taskFunctionNames: this.listTaskFunctionNames()
+        })
+      } catch {
+        this.sendToMainWorker({
+          ready: false,
+          taskFunctionNames: this.listTaskFunctionNames()
+        })
+      }
     }
   }
 
@@ -78,11 +87,11 @@ export class ThreadWorker<
 
   /** @inheritDoc */
   protected sendToMainWorker (message: MessageValue<Response>): void {
-    this.port.postMessage(message)
+    this.port.postMessage({ ...message, workerId: this.id })
   }
 
   /** @inheritDoc */
-  protected handleError (e: Error | string): string {
-    return e as string
+  protected handleError (error: Error | string): string {
+    return error as string
   }
 }