fix: fix possible null exception with worker_threads pools

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

diff --git a/src/pools/thread/fixed.ts b/src/pools/thread/fixed.ts
index ac629e1fb0ff7f363be0a3fe5107f2b02748c8d8..28f8fceba679e5f9053820b8436583caf69f20af 100644 (file)
--- a/src/pools/thread/fixed.ts
+++ b/src/pools/thread/fixed.ts
@@ -1,18 +1,16 @@
 import {
+  type MessageChannel,
+  type MessagePort,
   SHARE_ENV,
+  type TransferListItem,
   Worker,
   type WorkerOptions,
   isMainThread
 } from 'node:worker_threads'
 import type { MessageValue } from '../../utility-types'
 import { AbstractPool } from '../abstract-pool'
-import {
-  type PoolOptions,
-  type PoolType,
-  PoolTypes,
-  type WorkerType,
-  WorkerTypes
-} from '../pool'
+import { type PoolOptions, type PoolType, PoolTypes } from '../pool'
+import { type WorkerType, WorkerTypes } from '../worker'
 
 /**
  * Options for a poolifier thread pool.
@@ -59,14 +57,82 @@ export class FixedThreadPool<
   }
 
   /** @inheritDoc */
-  protected async destroyWorker (worker: Worker): Promise<void> {
-    this.sendToWorker(worker, { kill: 1 })
+  protected async destroyWorkerNode (workerNodeKey: number): Promise<void> {
+    this.flagWorkerNodeAsNotReady(workerNodeKey)
+    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', () => {
+        resolve()
+      })
+    })
+    await this.sendKillMessageToWorker(workerNodeKey)
+    workerNode.closeChannel()
+    workerNode.removeAllListeners()
     await worker.terminate()
+    await waitWorkerExit
+  }
+
+  /** @inheritDoc */
+  protected sendToWorker (
+    workerNodeKey: number,
+    message: MessageValue<Data>,
+    transferList?: TransferListItem[]
+  ): void {
+    this.workerNodes[workerNodeKey].messageChannel?.port1?.postMessage(
+      { ...message, workerId: this.getWorkerInfo(workerNodeKey).id },
+      transferList
+    )
+  }
+
+  /** @inheritDoc */
+  protected sendStartupMessageToWorker (workerNodeKey: number): void {
+    const workerNode = this.workerNodes[workerNodeKey]
+    const port2: MessagePort = (workerNode.messageChannel as MessageChannel)
+      .port2
+    workerNode.worker.postMessage(
+      {
+        ready: false,
+        workerId: this.getWorkerInfo(workerNodeKey).id,
+        port: port2
+      },
+      [port2]
+    )
+  }
+
+  /** @inheritDoc */
+  protected registerWorkerMessageListener<Message extends Data | Response>(
+    workerNodeKey: number,
+    listener: (message: MessageValue<Message>) => void
+  ): void {
+    this.workerNodes[workerNodeKey].messageChannel?.port1?.on(
+      'message',
+      listener
+    )
   }
 
   /** @inheritDoc */
-  protected sendToWorker (worker: Worker, message: MessageValue<Data>): void {
-    worker.postMessage(message)
+  protected registerOnceWorkerMessageListener<Message extends Data | Response>(
+    workerNodeKey: number,
+    listener: (message: MessageValue<Message>) => void
+  ): void {
+    this.workerNodes[workerNodeKey].messageChannel?.port1?.once(
+      'message',
+      listener
+    )
+  }
+
+  /** @inheritDoc */
+  protected deregisterWorkerMessageListener<Message extends Data | Response>(
+    workerNodeKey: number,
+    listener: (message: MessageValue<Message>) => void
+  ): void {
+    this.workerNodes[workerNodeKey].messageChannel?.port1?.off(
+      'message',
+      listener
+    )
   }
 
   /** @inheritDoc */
@@ -87,16 +153,6 @@ export class FixedThreadPool<
     return WorkerTypes.thread
   }
 
-  /** @inheritDoc */
-  protected get minSize (): number {
-    return this.numberOfWorkers
-  }
-
-  /** @inheritDoc */
-  protected get maxSize (): number {
-    return this.numberOfWorkers
-  }
-
   /** @inheritDoc */
   protected get busy (): boolean {
     return this.internalBusy()