Add amperage limitation support via vendor specific OCPP key

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

diff --git a/src/charging-station/ocpp/1.6/OCPP16RequestService.ts b/src/charging-station/ocpp/1.6/OCPP16RequestService.ts
index 241e42f5d4e62533dcb512936fe3d7f4345d60a3..3d91576bb5b85b41e667e5354174ae2d815ac119 100644 (file)
--- a/src/charging-station/ocpp/1.6/OCPP16RequestService.ts
+++ b/src/charging-station/ocpp/1.6/OCPP16RequestService.ts
@@ -1,32 +1,15 @@
 // Partial Copyright Jerome Benoit. 2021. All Rights Reserved.
 
-import {
-  AuthorizeRequest,
-  OCPP16StartTransactionResponse,
-  OCPP16StopTransactionReason,
-  OCPP16StopTransactionResponse,
-  StartTransactionRequest,
-  StopTransactionRequest,
-} from '../../../types/ocpp/1.6/Transaction';
-import {
-  DiagnosticsStatusNotificationRequest,
-  HeartbeatRequest,
-  OCPP16BootNotificationRequest,
-  OCPP16RequestCommand,
-  StatusNotificationRequest,
-} from '../../../types/ocpp/1.6/Requests';
-import { MeterValuesRequest, OCPP16MeterValue } from '../../../types/ocpp/1.6/MeterValues';
-import { ResponseType, SendParams } from '../../../types/ocpp/Requests';
-
 import type ChargingStation from '../../ChargingStation';
 import Constants from '../../../utils/Constants';
 import { ErrorType } from '../../../types/ocpp/ErrorType';
 import { JsonType } from '../../../types/JsonType';
-import { OCPP16DiagnosticsStatus } from '../../../types/ocpp/1.6/DiagnosticsStatus';
+import { OCPP16RequestCommand } from '../../../types/ocpp/1.6/Requests';
 import { OCPP16ServiceUtils } from './OCPP16ServiceUtils';
 import OCPPError from '../../../exception/OCPPError';
 import OCPPRequestService from '../OCPPRequestService';
 import type OCPPResponseService from '../OCPPResponseService';
+import { SendParams } from '../../../types/ocpp/Requests';
 import Utils from '../../../utils/Utils';
 
 const moduleName = 'OCPP16RequestService';
@@ -39,18 +22,18 @@ export default class OCPP16RequestService extends OCPPRequestService {
     super(chargingStation, ocppResponseService);
   }
 
-  public async sendMessageHandler(
+  public async sendMessageHandler<Response extends JsonType>(
     commandName: OCPP16RequestCommand,
     commandParams?: JsonType,
     params?: SendParams
-  ): Promise<ResponseType> {
+  ): Promise<Response> {
     if (Object.values(OCPP16RequestCommand).includes(commandName)) {
-      return this.sendMessage(
+      return (await this.sendMessage(
         Utils.generateUUID(),
         this.buildCommandPayload(commandName, commandParams),
         commandName,
         params
-      );
+      )) as unknown as Response;
     }
     throw new OCPPError(
       ErrorType.NOT_SUPPORTED,
@@ -60,139 +43,18 @@ export default class OCPP16RequestService extends OCPPRequestService {
     );
   }
 
-  public async sendStartTransaction(
-    connectorId: number,
-    idTag?: string
-  ): Promise<OCPP16StartTransactionResponse> {
-    const payload: StartTransactionRequest = {
-      connectorId,
-      ...(!Utils.isUndefined(idTag) ? { idTag } : { idTag: Constants.DEFAULT_IDTAG }),
-      meterStart: this.chargingStation.getEnergyActiveImportRegisterByConnectorId(connectorId),
-      timestamp: new Date().toISOString(),
-    };
-    return (await this.sendMessage(
-      Utils.generateUUID(),
-      payload,
-      OCPP16RequestCommand.START_TRANSACTION
-    )) as OCPP16StartTransactionResponse;
-  }
-
-  public async sendStopTransaction(
-    transactionId: number,
-    meterStop: number,
-    idTag?: string,
-    reason: OCPP16StopTransactionReason = OCPP16StopTransactionReason.NONE
-  ): Promise<OCPP16StopTransactionResponse> {
-    let connectorId: number;
-    for (const id of this.chargingStation.connectors.keys()) {
-      if (id > 0 && this.chargingStation.getConnectorStatus(id)?.transactionId === transactionId) {
-        connectorId = id;
-        break;
-      }
-    }
-    const transactionEndMeterValue = OCPP16ServiceUtils.buildTransactionEndMeterValue(
-      this.chargingStation,
-      connectorId,
-      meterStop
-    );
-    // FIXME: should be a callback, each OCPP commands implementation must do only one job
-    this.chargingStation.getBeginEndMeterValues() &&
-      this.chargingStation.getOcppStrictCompliance() &&
-      !this.chargingStation.getOutOfOrderEndMeterValues() &&
-      (await this.sendTransactionEndMeterValues(
-        connectorId,
-        transactionId,
-        transactionEndMeterValue
-      ));
-    const payload: StopTransactionRequest = {
-      transactionId,
-      ...(!Utils.isUndefined(idTag) && { idTag }),
-      meterStop,
-      timestamp: new Date().toISOString(),
-      ...(reason && { reason }),
-      ...(this.chargingStation.getTransactionDataMeterValues() && {
-        transactionData: OCPP16ServiceUtils.buildTransactionDataMeterValues(
-          this.chargingStation.getConnectorStatus(connectorId).transactionBeginMeterValue,
-          transactionEndMeterValue
-        ),
-      }),
-    };
-    return (await this.sendMessage(
-      Utils.generateUUID(),
-      payload,
-      OCPP16RequestCommand.STOP_TRANSACTION
-    )) as OCPP16StartTransactionResponse;
-  }
-
-  public async sendMeterValues(
-    connectorId: number,
-    transactionId: number,
-    interval: number
-  ): Promise<void> {
-    const meterValue: OCPP16MeterValue = OCPP16ServiceUtils.buildMeterValue(
-      this.chargingStation,
-      connectorId,
-      transactionId,
-      interval
-    );
-    const payload: MeterValuesRequest = {
-      connectorId,
-      transactionId,
-      meterValue: [meterValue],
-    };
-    await this.sendMessage(Utils.generateUUID(), payload, OCPP16RequestCommand.METER_VALUES);
-  }
-
-  public async sendTransactionBeginMeterValues(
-    connectorId: number,
-    transactionId: number,
-    beginMeterValue: OCPP16MeterValue
-  ): Promise<void> {
-    const payload: MeterValuesRequest = {
-      connectorId,
-      transactionId,
-      meterValue: [beginMeterValue],
-    };
-    await this.sendMessage(Utils.generateUUID(), payload, OCPP16RequestCommand.METER_VALUES);
-  }
-
-  public async sendTransactionEndMeterValues(
-    connectorId: number,
-    transactionId: number,
-    endMeterValue: OCPP16MeterValue
-  ): Promise<void> {
-    const payload: MeterValuesRequest = {
-      connectorId,
-      transactionId,
-      meterValue: [endMeterValue],
-    };
-    await this.sendMessage(Utils.generateUUID(), payload, OCPP16RequestCommand.METER_VALUES);
-  }
-
-  public async sendDiagnosticsStatusNotification(
-    diagnosticsStatus: OCPP16DiagnosticsStatus
-  ): Promise<void> {
-    const payload: DiagnosticsStatusNotificationRequest = {
-      status: diagnosticsStatus,
-    };
-    await this.sendMessage(
-      Utils.generateUUID(),
-      payload,
-      OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION
-    );
-  }
-
-  private buildCommandPayload(
+  private buildCommandPayload<Request extends JsonType>(
     commandName: OCPP16RequestCommand,
     commandParams?: JsonType
-  ): JsonType {
+  ): Request {
+    let connectorId: number;
     switch (commandName) {
       case OCPP16RequestCommand.AUTHORIZE:
         return {
           ...(!Utils.isUndefined(commandParams?.idTag)
             ? { idTag: commandParams.idTag }
             : { idTag: Constants.DEFAULT_IDTAG }),
-        } as AuthorizeRequest;
+        } as unknown as Request;
       case OCPP16RequestCommand.BOOT_NOTIFICATION:
         return {
           chargePointModel: commandParams?.chargePointModel,
@@ -214,27 +76,27 @@ export default class OCPP16RequestService extends OCPPRequestService {
           ...(!Utils.isUndefined(commandParams?.meterType) && {
             meterType: commandParams.meterType,
           }),
-        } as OCPP16BootNotificationRequest;
+        } as unknown as Request;
       case OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION:
         return {
           status: commandParams?.diagnosticsStatus,
-        } as DiagnosticsStatusNotificationRequest;
+        } as unknown as Request;
       case OCPP16RequestCommand.HEARTBEAT:
-        return {} as HeartbeatRequest;
+        return {} as unknown as Request;
       case OCPP16RequestCommand.METER_VALUES:
         return {
           connectorId: commandParams?.connectorId,
           transactionId: commandParams?.transactionId,
-          meterValue: Array.isArray(commandParams?.meterValues)
-            ? commandParams?.meterValues
+          meterValue: Array.isArray(commandParams?.meterValue)
+            ? commandParams?.meterValue
             : [commandParams?.meterValue],
-        } as MeterValuesRequest;
+        } as unknown as Request;
       case OCPP16RequestCommand.STATUS_NOTIFICATION:
         return {
           connectorId: commandParams?.connectorId,
           status: commandParams?.status,
           errorCode: commandParams?.errorCode,
-        } as StatusNotificationRequest;
+        } as unknown as Request;
       case OCPP16RequestCommand.START_TRANSACTION:
         return {
           connectorId: commandParams?.connectorId,
@@ -245,8 +107,11 @@ export default class OCPP16RequestService extends OCPPRequestService {
             commandParams?.connectorId as number
           ),
           timestamp: new Date().toISOString(),
-        } as StartTransactionRequest;
+        } as unknown as Request;
       case OCPP16RequestCommand.STOP_TRANSACTION:
+        connectorId = this.chargingStation.getConnectorIdByTransactionId(
+          commandParams?.transactionId as number
+        );
         return {
           transactionId: commandParams?.transactionId,
           ...(!Utils.isUndefined(commandParams?.idTag) && { idTag: commandParams.idTag }),
@@ -255,16 +120,15 @@ export default class OCPP16RequestService extends OCPPRequestService {
           ...(commandParams?.reason && { reason: commandParams.reason }),
           ...(this.chargingStation.getTransactionDataMeterValues() && {
             transactionData: OCPP16ServiceUtils.buildTransactionDataMeterValues(
-              this.chargingStation.getConnectorStatus(commandParams?.connectorId as number)
-                .transactionBeginMeterValue,
+              this.chargingStation.getConnectorStatus(connectorId).transactionBeginMeterValue,
               OCPP16ServiceUtils.buildTransactionEndMeterValue(
                 this.chargingStation,
-                commandParams?.connectorId as number,
+                connectorId,
                 commandParams?.meterStop as number
               )
             ),
           }),
-        } as StopTransactionRequest;
+        } as unknown as Request;
       default:
         throw new OCPPError(
           ErrorType.NOT_SUPPORTED,