Improve error messages

[e-mobility-charging-stations-simulator.git] / src / charging-station / ocpp / 1.6 / OCPP16IncomingRequestService.ts

diff --git a/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts b/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts
index e1d29e6f791bfe618d753de8287ca6dc3b43aeaf..f951fc77145cceda22e15f77b0f873da8a901e12 100644 (file)
--- a/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts
+++ b/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts
@@ -69,7 +69,6 @@ import type { OCPPConfigurationKey } from '../../../types/ocpp/Configuration';
 import { ErrorType } from '../../../types/ocpp/ErrorType';
 import type { IncomingRequestHandler } from '../../../types/ocpp/Requests';
 import type { DefaultResponse } from '../../../types/ocpp/Responses';
-import { StopTransactionReason } from '../../../types/ocpp/Transaction';
 import Constants from '../../../utils/Constants';
 import logger from '../../../utils/Logger';
 import Utils from '../../../utils/Utils';
@@ -381,12 +380,7 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer
   ): DefaultResponse {
     // eslint-disable-next-line @typescript-eslint/no-misused-promises
     setImmediate(async (): Promise<void> => {
-      if (chargingStation.getNumberOfRunningTransactions() > 0) {
-        await chargingStation.stopRunningTransactions(
-          (commandPayload.type + 'Reset') as OCPP16StopTransactionReason
-        );
-      }
-      await chargingStation.reset();
+      await chargingStation.reset((commandPayload.type + 'Reset') as OCPP16StopTransactionReason);
     });
     logger.info(
       `${chargingStation.logPrefix()} ${
@@ -441,12 +435,12 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer
   ): GetConfigurationResponse {
     const configurationKey: OCPPConfigurationKey[] = [];
     const unknownKey: string[] = [];
-    if (Utils.isEmptyArray(commandPayload.key)) {
+    if (Utils.isEmptyArray(commandPayload.key) === true) {
       for (const configuration of chargingStation.ocppConfiguration.configurationKey) {
-        if (Utils.isUndefined(configuration.visible)) {
+        if (Utils.isUndefined(configuration.visible) === true) {
           configuration.visible = true;
         }
-        if (!configuration.visible) {
+        if (configuration.visible === false) {
           continue;
         }
         configurationKey.push({
@@ -462,10 +456,10 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer
           key
         );
         if (keyFound) {
-          if (Utils.isUndefined(keyFound.visible)) {
+          if (Utils.isUndefined(keyFound.visible) === true) {
             keyFound.visible = true;
           }
-          if (!keyFound.visible) {
+          if (keyFound.visible === false) {
             continue;
           }
           configurationKey.push({
@@ -956,7 +950,7 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer
         chargingStation.getConnectorStatus(connectorId).status = OCPP16ChargePointStatus.FINISHING;
         const stopResponse = await chargingStation.stopTransactionOnConnector(
           connectorId,
-          StopTransactionReason.REMOTE
+          OCPP16StopTransactionReason.REMOTE
         );
         if (stopResponse.idTagInfo?.status === OCPP16AuthorizationStatus.ACCEPTED) {
           return Constants.OCPP_RESPONSE_ACCEPTED;
@@ -1122,23 +1116,11 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer
               .requestHandler<OCPP16BootNotificationRequest, OCPP16BootNotificationResponse>(
                 chargingStation,
                 OCPP16RequestCommand.BOOT_NOTIFICATION,
-                {
-                  chargePointModel: chargingStation.bootNotificationRequest.chargePointModel,
-                  chargePointVendor: chargingStation.bootNotificationRequest.chargePointVendor,
-                  chargeBoxSerialNumber:
-                    chargingStation.bootNotificationRequest.chargeBoxSerialNumber,
-                  firmwareVersion: chargingStation.bootNotificationRequest.firmwareVersion,
-                  chargePointSerialNumber:
-                    chargingStation.bootNotificationRequest.chargePointSerialNumber,
-                  iccid: chargingStation.bootNotificationRequest.iccid,
-                  imsi: chargingStation.bootNotificationRequest.imsi,
-                  meterSerialNumber: chargingStation.bootNotificationRequest.meterSerialNumber,
-                  meterType: chargingStation.bootNotificationRequest.meterType,
-                },
+                chargingStation.bootNotificationRequest,
                 { skipBufferingOnError: true, triggerMessage: true }
               )
-              .then((value) => {
-                chargingStation.bootNotificationResponse = value;
+              .then((response) => {
+                chargingStation.bootNotificationResponse = response;
               })
               .catch(() => {
                 /* This is intentional */