From 4581acf33b078cca4a2a3e77c774788149dca5e7 Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= <jerome.benoit@sap.com>
Date: Fri, 4 Mar 2022 00:01:34 +0100
Subject: [PATCH] WorkerSet: consolidate the worker start delay code
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
---
 src/worker/WorkerFactory.ts | 21 ++++++++++++++++++---
 src/worker/WorkerSet.ts     | 12 +++++-------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/worker/WorkerFactory.ts b/src/worker/WorkerFactory.ts
index ccea2a38..a72f2c94 100644
--- a/src/worker/WorkerFactory.ts
+++ b/src/worker/WorkerFactory.ts
@@ -26,16 +26,31 @@ export default class WorkerFactory {
     switch (workerProcessType) {
       case WorkerProcessType.WORKER_SET:
         options.elementsPerWorker = options.elementsPerWorker ?? Constants.DEFAULT_CHARGING_STATIONS_PER_WORKER;
-        workerImplementation = new WorkerSet(workerScript, options.elementsPerWorker, { workerStartDelay: options.workerStartDelay, elementStartDelay: options.elementStartDelay }, options);
+        workerImplementation = new WorkerSet(workerScript, options.elementsPerWorker,
+          {
+            workerStartDelay: options.workerStartDelay,
+            elementStartDelay: options.elementStartDelay
+          },
+          options);
         break;
       case WorkerProcessType.STATIC_POOL:
         options.poolMaxSize = options.poolMaxSize ?? Constants.DEFAULT_WORKER_POOL_MAX_SIZE;
-        workerImplementation = new WorkerStaticPool(workerScript, options.poolMaxSize, { workerStartDelay: options.workerStartDelay, elementStartDelay: options.elementStartDelay }, options.poolOptions);
+        workerImplementation = new WorkerStaticPool(workerScript, options.poolMaxSize,
+          {
+            workerStartDelay: options.workerStartDelay,
+            elementStartDelay: options.elementStartDelay
+          },
+          options.poolOptions);
         break;
       case WorkerProcessType.DYNAMIC_POOL:
         options.poolMinSize = options.poolMinSize ?? Constants.DEFAULT_WORKER_POOL_MIN_SIZE;
         options.poolMaxSize = options.poolMaxSize ?? Constants.DEFAULT_WORKER_POOL_MAX_SIZE;
-        workerImplementation = new WorkerDynamicPool(workerScript, options.poolMinSize, options.poolMaxSize, { workerStartDelay: options.workerStartDelay, elementStartDelay: options.elementStartDelay }, options.poolOptions);
+        workerImplementation = new WorkerDynamicPool(workerScript, options.poolMinSize, options.poolMaxSize,
+          {
+            workerStartDelay: options.workerStartDelay,
+            elementStartDelay: options.elementStartDelay
+          },
+          options.poolOptions);
         break;
       default:
         throw new Error(`Worker implementation type '${workerProcessType}' not found`);
diff --git a/src/worker/WorkerSet.ts b/src/worker/WorkerSet.ts
index dff07f23..5477ab0d 100644
--- a/src/worker/WorkerSet.ts
+++ b/src/worker/WorkerSet.ts
@@ -42,9 +42,7 @@ export default class WorkerSet extends WorkerAbstract<WorkerData> {
       throw new Error('Cannot add a WorkerSet element: workers\' set does not exist');
     }
     if (this.getLastWorkerSetElement().numberOfWorkerElements >= this.maxElementsPerWorker) {
-      this.startWorker();
-      // Start worker sequentially to optimize memory at startup
-      this.workerStartDelay > 0 && await Utils.sleep(this.workerStartDelay);
+      await this.startWorker();
     }
     this.getLastWorker().postMessage({ id: WorkerMessageEvents.START_WORKER_ELEMENT, data: elementData });
     this.getLastWorkerSetElement().numberOfWorkerElements++;
@@ -57,9 +55,7 @@ export default class WorkerSet extends WorkerAbstract<WorkerData> {
    * @public
    */
   public async start(): Promise<void> {
-    this.startWorker();
-    // Start worker sequentially to optimize memory at startup
-    this.workerStartDelay > 0 && await Utils.sleep(this.workerStartDelay);
+    await this.startWorker();
   }
 
   /**
@@ -78,7 +74,7 @@ export default class WorkerSet extends WorkerAbstract<WorkerData> {
    *
    * @private
    */
-  private startWorker(): void {
+  private async startWorker(): Promise<void> {
     const worker = new Worker(this.workerScript);
     worker.on('message', (msg) => {
       (async () => {
@@ -91,6 +87,8 @@ export default class WorkerSet extends WorkerAbstract<WorkerData> {
       this.workerSet.delete(this.getWorkerSetElementByWorker(worker));
     });
     this.workerSet.add({ worker, numberOfWorkerElements: 0 });
+    // Start worker sequentially to optimize memory at startup
+    this.workerStartDelay > 0 && await Utils.sleep(this.workerStartDelay);
   }
 
   private getLastWorkerSetElement(): WorkerSetElement {
-- 
2.34.1