X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2Fthread-worker.ts;h=bfd1c13cdb41775c0c01d031cb0aedf9d364959b;hb=9d96ba4ea0e2e4b06216657cb1641551b59f58ee;hp=69940f960600afe815cbe540d33f5547e242ed19;hpb=90d7d101196cf9702ccc1d220dd33cca67a427b0;p=poolifier.git

diff --git a/src/worker/thread-worker.ts b/src/worker/thread-worker.ts
index 69940f96..bfd1c13c 100644
--- a/src/worker/thread-worker.ts
+++ b/src/worker/thread-worker.ts
@@ -42,7 +42,7 @@ export class ThreadWorker<
     opts: WorkerOptions = {}
   ) {
     super(
-      'worker-thread-pool:poolifier',
+      'poolifier:thread-worker',
       isMainThread,
       parentPort as MessagePort,
       taskFunctions,
@@ -54,13 +54,22 @@ export class ThreadWorker<
   protected handleReadyMessage (message: MessageValue<Data>): void {
     if (
       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.sendTaskFunctionsListToMainWorker()
-      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
   }
 }