X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcharging-station%2FChargingStation.ts;h=93042f20ae6db111bae72b6383da070c358a3c30;hb=83e00df1c1ba02de8b637ca4cb0464eb909ebb18;hp=9d7bdae7cf330399f547b44173d39dcfa341b27c;hpb=0d8852a590c91d7d24509d6c24defe4e56004f9c;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/ChargingStation.ts b/src/charging-station/ChargingStation.ts
index 9d7bdae7..93042f20 100644
--- a/src/charging-station/ChargingStation.ts
+++ b/src/charging-station/ChargingStation.ts
@@ -14,7 +14,7 @@ import PerformanceStatistics from '../performance/PerformanceStatistics';
 import type { AutomaticTransactionGeneratorConfiguration } from '../types/AutomaticTransactionGenerator';
 import type ChargingStationConfiguration from '../types/ChargingStationConfiguration';
 import type ChargingStationInfo from '../types/ChargingStationInfo';
-import type ChargingStationOcppConfiguration from '../types/ChargingStationOcppConfiguration';
+import type { ChargingStationOcppConfiguration } from '../types/ChargingStationOcppConfiguration';
 import ChargingStationTemplate, {
   CurrentType,
   PowerUnits,
@@ -731,6 +731,7 @@ export default class ChargingStation {
     } else {
       this.automaticTransactionGenerator.start();
     }
+    parentPort.postMessage(MessageChannelUtils.buildUpdatedMessage(this));
   }
 
   public stopAutomaticTransactionGenerator(connectorIds?: number[]): void {
@@ -740,8 +741,8 @@ export default class ChargingStation {
       }
     } else {
       this.automaticTransactionGenerator?.stop();
-      this.automaticTransactionGenerator = null;
     }
+    parentPort.postMessage(MessageChannelUtils.buildUpdatedMessage(this));
   }
 
   public async stopTransactionOnConnector(
@@ -1205,7 +1206,7 @@ export default class ChargingStation {
           const lastConnectorId = Utils.convertToInt(lastConnector);
           if (
             lastConnectorId === 0 &&
-            this.getUseConnectorId0(stationInfo) &&
+            this.getUseConnectorId0(stationInfo) === true &&
             stationInfo?.Connectors[lastConnector]
           ) {
             this.connectors.set(
@@ -1452,7 +1453,7 @@ export default class ChargingStation {
           // Incoming Message
           case MessageType.CALL_MESSAGE:
             [, , commandName, commandPayload] = request as IncomingRequest;
-            if (this.getEnableStatistics()) {
+            if (this.getEnableStatistics() === true) {
               this.performanceStatistics.addRequestStatistic(commandName, messageType);
             }
             logger.debug(
@@ -1471,7 +1472,7 @@ export default class ChargingStation {
           // Outcome Message
           case MessageType.CALL_RESULT_MESSAGE:
             [, , commandPayload] = request as Response;
-            if (!this.requests.has(messageId)) {
+            if (this.requests.has(messageId) === false) {
               // Error
               throw new OCPPError(
                 ErrorType.INTERNAL_ERROR,
@@ -1483,7 +1484,7 @@ export default class ChargingStation {
             // Respond
             cachedRequest = this.requests.get(messageId);
             if (Array.isArray(cachedRequest) === true) {
-              [responseCallback, , requestCommandName, requestPayload] = cachedRequest;
+              [responseCallback, errorCallback, requestCommandName, requestPayload] = cachedRequest;
             } else {
               throw new OCPPError(
                 ErrorType.PROTOCOL_ERROR,
@@ -1502,7 +1503,7 @@ export default class ChargingStation {
           // Error Message
           case MessageType.CALL_ERROR_MESSAGE:
             [, , errorType, errorMessage, errorDetails] = request as ErrorResponse;
-            if (!this.requests.has(messageId)) {
+            if (this.requests.has(messageId) === false) {
               // Error
               throw new OCPPError(
                 ErrorType.INTERNAL_ERROR,
@@ -1539,7 +1540,7 @@ export default class ChargingStation {
         parentPort.postMessage(MessageChannelUtils.buildUpdatedMessage(this));
       } else {
         throw new OCPPError(ErrorType.PROTOCOL_ERROR, 'Incoming message is not an array', null, {
-          payload: request,
+          request,
         });
       }
     } catch (error) {
@@ -1547,12 +1548,14 @@ export default class ChargingStation {
       logger.error(
         `${this.logPrefix()} Incoming OCPP command '${
           commandName ?? requestCommandName ?? null
-        }' message '${data.toString()}' matching cached request '${JSON.stringify(
-          this.requests.get(messageId)
-        )}' processing error:`,
+        }' message '${data.toString()}'${
+          messageType !== MessageType.CALL_MESSAGE
+            ? ` matching cached request '${JSON.stringify(this.requests.get(messageId))}'`
+            : ''
+        } processing error:`,
         error
       );
-      if (!(error instanceof OCPPError)) {
+      if (error instanceof OCPPError === false) {
         logger.warn(
           `${this.logPrefix()} Error thrown at incoming OCPP command '${
             commandName ?? requestCommandName ?? null
@@ -1560,14 +1563,25 @@ export default class ChargingStation {
           error
         );
       }
-      // Send error
-      messageType === MessageType.CALL_MESSAGE &&
-        (await this.ocppRequestService.sendError(
+      if (messageType === MessageType.CALL_MESSAGE) {
+        // Send error
+        await this.ocppRequestService.sendError(
           this,
           messageId,
           error as OCPPError,
           commandName ?? requestCommandName ?? null
-        ));
+        );
+      } else if (
+        [MessageType.CALL_RESULT_MESSAGE, MessageType.CALL_ERROR_MESSAGE].includes(messageType) ===
+        true
+      ) {
+        // Always remove the request from the cache in case of error at response handling
+        this.requests.delete(messageId);
+        // Always reject the deferred promise in case of error at response handling (rejecting an already fulfilled promise is a no-op)
+        if (errorCallback) {
+          errorCallback(error as OCPPError, false);
+        }
+      }
     }
   }
 
@@ -1588,7 +1602,7 @@ export default class ChargingStation {
     connectorStatus: ConnectorStatus,
     meterStop = false
   ): number {
-    if (this.getMeteringPerTransaction()) {
+    if (this.getMeteringPerTransaction() === true) {
       return (
         (meterStop === true
           ? Math.round(connectorStatus?.transactionEnergyActiveImportRegisterValue)
@@ -1602,7 +1616,7 @@ export default class ChargingStation {
     );
   }
 
-  private getUseConnectorId0(stationInfo?: ChargingStationInfo): boolean | undefined {
+  private getUseConnectorId0(stationInfo?: ChargingStationInfo): boolean {
     const localStationInfo = stationInfo ?? this.stationInfo;
     return !Utils.isUndefined(localStationInfo.useConnectorId0)
       ? localStationInfo.useConnectorId0