refactor: move worker setup into worker node constructor

[poolifier.git] / src / pools / thread / fixed.ts

diff --git a/src/pools/thread/fixed.ts b/src/pools/thread/fixed.ts
index 28f8fceba679e5f9053820b8436583caf69f20af..e5074e392b45a94c1e9b80376cc08d3624a5c155 100644 (file)
--- a/src/pools/thread/fixed.ts
+++ b/src/pools/thread/fixed.ts
@@ -1,10 +1,8 @@
 import {
   type MessageChannel,
   type MessagePort,
-  SHARE_ENV,
   type TransferListItem,
-  Worker,
-  type WorkerOptions,
+  type Worker,
   isMainThread
 } from 'node:worker_threads'
 import type { MessageValue } from '../../utility-types'
@@ -12,18 +10,6 @@ import { AbstractPool } from '../abstract-pool'
 import { type PoolOptions, type PoolType, PoolTypes } from '../pool'
 import { type WorkerType, WorkerTypes } from '../worker'
 
-/**
- * Options for a poolifier thread pool.
- */
-export interface ThreadPoolOptions extends PoolOptions<Worker> {
-  /**
-   * Worker options.
-   *
-   * @see https://nodejs.org/api/worker_threads.html#new-workerfilename-options
-   */
-  workerOptions?: WorkerOptions
-}
-
 /**
  * A thread pool with a fixed number of threads.
  *
@@ -46,7 +32,7 @@ export class FixedThreadPool<
   public constructor (
     numberOfThreads: number,
     filePath: string,
-    protected readonly opts: ThreadPoolOptions = {}
+    protected readonly opts: PoolOptions<Worker> = {}
   ) {
     super(numberOfThreads, filePath, opts)
   }
@@ -62,16 +48,15 @@ export class FixedThreadPool<
     this.flushTasksQueue(workerNodeKey)
     // FIXME: wait for tasks to be finished
     const workerNode = this.workerNodes[workerNodeKey]
-    const worker = workerNode.worker
     const waitWorkerExit = new Promise<void>(resolve => {
-      worker.once('exit', () => {
+      workerNode.registerOnceWorkerEventHandler('exit', () => {
         resolve()
       })
     })
     await this.sendKillMessageToWorker(workerNodeKey)
     workerNode.closeChannel()
     workerNode.removeAllListeners()
-    await worker.terminate()
+    await workerNode.worker.terminate()
     await waitWorkerExit
   }
 
@@ -135,14 +120,6 @@ export class FixedThreadPool<
     )
   }
 
-  /** @inheritDoc */
-  protected createWorker (): Worker {
-    return new Worker(this.filePath, {
-      env: SHARE_ENV,
-      ...this.opts.workerOptions
-    })
-  }
-
   /** @inheritDoc */
   protected get type (): PoolType {
     return PoolTypes.fixed