Strict null check fixes

[e-mobility-charging-stations-simulator.git] / src / charging-station / Bootstrap.ts

diff --git a/src/charging-station/Bootstrap.ts b/src/charging-station/Bootstrap.ts
index 0115cfe3a55ecd41f252acc973a073c5f4dc1369..8a161e54a66e210c9fd856b3cf06295e12db9b5a 100644 (file)
--- a/src/charging-station/Bootstrap.ts
+++ b/src/charging-station/Bootstrap.ts
@@ -1,4 +1,4 @@
-// Partial Copyright Jerome Benoit. 2021. All Rights Reserved.
+// Partial Copyright Jerome Benoit. 2021-2023. All Rights Reserved.
 
 import path from 'path';
 import { fileURLToPath } from 'url';
@@ -6,6 +6,9 @@ import { type Worker, isMainThread } from 'worker_threads';
 
 import chalk from 'chalk';
 
+import { ChargingStationUtils } from './ChargingStationUtils';
+import type { AbstractUIServer } from './ui-server/AbstractUIServer';
+import UIServerFactory from './ui-server/UIServerFactory';
 import { version } from '../../package.json';
 import BaseError from '../exception/BaseError';
 import type { Storage } from '../performance/storage/Storage';
@@ -25,9 +28,6 @@ import logger from '../utils/Logger';
 import Utils from '../utils/Utils';
 import type WorkerAbstract from '../worker/WorkerAbstract';
 import WorkerFactory from '../worker/WorkerFactory';
-import { ChargingStationUtils } from './ChargingStationUtils';
-import type { AbstractUIServer } from './ui-server/AbstractUIServer';
-import UIServerFactory from './ui-server/UIServerFactory';
 
 const moduleName = 'Bootstrap';
 
@@ -41,7 +41,7 @@ export class Bootstrap {
   private workerImplementation: WorkerAbstract<ChargingStationWorkerData> | null;
   private readonly uiServer!: AbstractUIServer;
   private readonly storage!: Storage;
-  private numberOfChargingStationTemplates!: number;
+  private numberOfChargingStationTemplates!: number | undefined;
   private numberOfChargingStations!: number;
   private numberOfStartedChargingStations!: number;
   private readonly version: string = version;
@@ -54,7 +54,7 @@ export class Bootstrap {
     this.workerScript = path.join(
       path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../'),
       'charging-station',
-      'ChargingStationWorker' + path.extname(fileURLToPath(import.meta.url))
+      `ChargingStationWorker${path.extname(fileURLToPath(import.meta.url))}`
     );
     this.initialize();
     Configuration.getUIServer().enabled === true &&
@@ -83,10 +83,10 @@ export class Bootstrap {
         this.logUncaughtException();
         this.initialize();
         await this.storage?.open();
-        await this.workerImplementation.start();
+        await this.workerImplementation?.start();
         this.uiServer?.start();
         const stationTemplateUrls = Configuration.getStationTemplateUrls();
-        this.numberOfChargingStationTemplates = stationTemplateUrls.length;
+        this.numberOfChargingStationTemplates = stationTemplateUrls?.length;
         // Start ChargingStation object in worker thread
         if (!Utils.isEmptyArray(stationTemplateUrls)) {
           for (const stationTemplateUrl of stationTemplateUrls) {
@@ -98,9 +98,7 @@ export class Bootstrap {
             } catch (error) {
               console.error(
                 chalk.red(
-                  'Error at starting charging station with template file ' +
-                    stationTemplateUrl.file +
-                    ': '
+                  `Error at starting charging station with template file ${stationTemplateUrl.file}: `
                 ),
                 error
               );
@@ -124,15 +122,15 @@ export class Bootstrap {
                 this.version
               } started with ${this.numberOfChargingStations.toString()} charging station(s) from ${this.numberOfChargingStationTemplates.toString()} configured charging station template(s) and ${
                 ChargingStationUtils.workerDynamicPoolInUse()
-                  ? `${Configuration.getWorker().poolMinSize.toString()}/`
+                  ? `${Configuration.getWorker().poolMinSize?.toString()}/`
                   : ''
-              }${this.workerImplementation.size}${
+              }${this.workerImplementation?.size}${
                 ChargingStationUtils.workerPoolInUse()
-                  ? `/${Configuration.getWorker().poolMaxSize.toString()}`
+                  ? `/${Configuration.getWorker().poolMaxSize?.toString()}`
                   : ''
               } worker(s) concurrently running in '${Configuration.getWorker().processType}' mode${
-                this.workerImplementation.maxElementsPerWorker
-                  ? ` (${this.workerImplementation.maxElementsPerWorker} charging station(s) per worker)`
+                this.workerImplementation?.maxElementsPerWorker
+                  ? ` (${this.workerImplementation?.maxElementsPerWorker} charging station(s) per worker)`
                   : ''
               }`
             )
@@ -149,7 +147,7 @@ export class Bootstrap {
 
   public async stop(): Promise<void> {
     if (isMainThread && this.started === true) {
-      await this.workerImplementation.stop();
+      await this.workerImplementation?.stop();
       this.workerImplementation = null;
       this.uiServer?.stop();
       await this.storage?.close();
@@ -287,7 +285,7 @@ export class Bootstrap {
         stationTemplateUrl.file
       ),
     };
-    await this.workerImplementation.addElement(workerData);
+    await this.workerImplementation?.addElement(workerData);
     ++this.numberOfChargingStations;
   }