Simplify WorkerUtils.defaultErrorHandler usage in WorkerSet

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

diff --git a/src/charging-station/AutomaticTransactionGenerator.ts b/src/charging-station/AutomaticTransactionGenerator.ts
index 03297e4a8c99dafdd375f8714db9717d1e78ebbc..3afb86d415c6a91fce7b19dd9979a37b80c1be2d 100644 (file)
--- a/src/charging-station/AutomaticTransactionGenerator.ts
+++ b/src/charging-station/AutomaticTransactionGenerator.ts
@@ -1,5 +1,6 @@
 // Partial Copyright Jerome Benoit. 2021. All Rights Reserved.
 
+import BaseError from '../exception/BaseError';
 import PerformanceStatistics from '../performance/PerformanceStatistics';
 import type {
   AutomaticTransactionGeneratorConfiguration,
@@ -39,14 +40,14 @@ export default class AutomaticTransactionGenerator {
     this.configuration = automaticTransactionGeneratorConfiguration;
     this.chargingStation = chargingStation;
     this.connectorsStatus = new Map<number, Status>();
-    this.stopConnectors();
+    this.initializeConnectorsStatus();
   }
 
   public static getInstance(
     automaticTransactionGeneratorConfiguration: AutomaticTransactionGeneratorConfiguration,
     chargingStation: ChargingStation
   ): AutomaticTransactionGenerator {
-    if (!AutomaticTransactionGenerator.instances.has(chargingStation.stationInfo.hashId)) {
+    if (AutomaticTransactionGenerator.instances.has(chargingStation.stationInfo.hashId) === false) {
       AutomaticTransactionGenerator.instances.set(
         chargingStation.stationInfo.hashId,
         new AutomaticTransactionGenerator(
@@ -77,9 +78,9 @@ export default class AutomaticTransactionGenerator {
   }
 
   public startConnector(connectorId: number): void {
-    if (this.chargingStation.connectors.has(connectorId) === false) {
-      logger.warn(`${this.logPrefix(connectorId)} starting on non existing connector`);
-      return;
+    if (this.connectorsStatus.has(connectorId) === false) {
+      logger.error(`${this.logPrefix(connectorId)} starting on non existing connector`);
+      throw new BaseError(`Connector ${connectorId} does not exist`);
     }
     if (this.connectorsStatus.get(connectorId)?.start === false) {
       // Avoid hogging the event loop with a busy loop
@@ -94,15 +95,12 @@ export default class AutomaticTransactionGenerator {
   }
 
   public stopConnector(connectorId: number): void {
-    if (this.chargingStation.connectors.has(connectorId) === false) {
-      logger.warn(`${this.logPrefix(connectorId)} stopping on non existing connector`);
-      return;
+    if (this.connectorsStatus.has(connectorId) === false) {
+      logger.error(`${this.logPrefix(connectorId)} stopping on non existing connector`);
+      throw new BaseError(`Connector ${connectorId} does not exist`);
     }
     if (this.connectorsStatus.get(connectorId)?.start === true) {
-      this.connectorsStatus.set(connectorId, {
-        ...this.connectorsStatus.get(connectorId),
-        start: false,
-      });
+      this.connectorsStatus.get(connectorId).start = false;
     } else if (this.connectorsStatus.get(connectorId)?.start === false) {
       logger.warn(`${this.logPrefix(connectorId)} is already stopped on connector`);
     }
@@ -114,6 +112,7 @@ export default class AutomaticTransactionGenerator {
       this.connectorsStatus.size !== this.chargingStation.getNumberOfConnectors()
     ) {
       this.connectorsStatus.clear();
+      this.initializeConnectorsStatus();
     }
     for (const connectorId of this.chargingStation.connectors.keys()) {
       if (connectorId > 0) {
@@ -132,6 +131,7 @@ export default class AutomaticTransactionGenerator {
 
   private async internalStartConnector(connectorId: number): Promise<void> {
     this.initializeConnectorStatus(connectorId);
+    this.connectorsStatus.get(connectorId).start = true;
     logger.info(
       this.logPrefix(connectorId) +
         ' started on connector and will run for ' +
@@ -281,7 +281,29 @@ export default class AutomaticTransactionGenerator {
           1000 -
         previousRunDuration
     );
-    this.connectorsStatus.get(connectorId).start = true;
+    this.connectorsStatus.get(connectorId).start =
+      this?.connectorsStatus.get(connectorId)?.start ?? false;
+  }
+
+  private initializeConnectorsStatus(): void {
+    for (const connectorId of this.chargingStation.connectors.keys()) {
+      if (connectorId > 0) {
+        this.connectorsStatus.set(connectorId, {
+          start: false,
+          authorizeRequests: 0,
+          acceptedAuthorizeRequests: 0,
+          rejectedAuthorizeRequests: 0,
+          startTransactionRequests: 0,
+          acceptedStartTransactionRequests: 0,
+          rejectedStartTransactionRequests: 0,
+          stopTransactionRequests: 0,
+          acceptedStopTransactionRequests: 0,
+          rejectedStopTransactionRequests: 0,
+          skippedConsecutiveTransactions: 0,
+          skippedTransactions: 0,
+        });
+      }
+    }
   }
 
   private async startTransaction(