refactor: cleanup variables namespace

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

diff --git a/src/pools/thread/fixed.ts b/src/pools/thread/fixed.ts
index e3a94b329d4cfcee6f05cd6e2f8ad06e555a6dfc..7199baf8fdf5ad52bc43bcfdfe107de84719589a 100644 (file)
--- a/src/pools/thread/fixed.ts
+++ b/src/pools/thread/fixed.ts
@@ -56,25 +56,37 @@ export class FixedThreadPool<
   }
 
   /** @inheritDoc */
-  protected async destroyWorker (worker: Worker): Promise<void> {
-    this.sendToWorker(worker, { kill: true, workerId: worker.threadId })
-    const workerInfo = this.getWorkerInfoByWorker(worker)
-    workerInfo.messageChannel?.port1.close()
-    workerInfo.messageChannel?.port2.close()
+  protected async destroyWorkerNode (workerNodeKey: number): Promise<void> {
+    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.on('exit', () => {
+        resolve()
+      })
+    })
+    this.sendToWorker(workerNodeKey, { kill: true, workerId: worker.threadId })
+    workerNode.closeChannel()
     await worker.terminate()
+    await waitWorkerExit
   }
 
   /** @inheritDoc */
-  protected sendToWorker (worker: Worker, message: MessageValue<Data>): void {
+  protected sendToWorker (
+    workerNodeKey: number,
+    message: MessageValue<Data>
+  ): void {
     (
-      this.getWorkerInfoByWorker(worker).messageChannel as MessageChannel
+      this.getWorkerInfo(workerNodeKey).messageChannel as MessageChannel
     ).port1.postMessage(message)
   }
 
   /** @inheritDoc */
-  protected sendStartupMessageToWorker (worker: Worker): void {
+  protected sendStartupMessageToWorker (workerNodeKey: number): void {
+    const worker = this.workerNodes[workerNodeKey].worker
     const port2: MessagePort = (
-      this.getWorkerInfoByWorker(worker).messageChannel as MessageChannel
+      this.getWorkerInfo(workerNodeKey).messageChannel as MessageChannel
     ).port2
     worker.postMessage(
       {
@@ -88,11 +100,11 @@ export class FixedThreadPool<
 
   /** @inheritDoc */
   protected registerWorkerMessageListener<Message extends Data | Response>(
-    worker: Worker,
+    workerNodeKey: number,
     listener: (message: MessageValue<Message>) => void
   ): void {
     (
-      this.getWorkerInfoByWorker(worker).messageChannel as MessageChannel
+      this.getWorkerInfo(workerNodeKey).messageChannel as MessageChannel
     ).port1.on('message', listener)
   }