X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Focpp%2F1.6%2FOCPP16ResponseService.ts;h=e978b24fdfee0fcab7a0323383ec87f2f0e595ec;hb=db54d2e00fdb75fa3f25cb08bc7bba94dbebc122;hp=2b40ad4165556f510ec83d09628ea526ea29b8fa;hpb=72092cfcf8a31c06e4592b25e060e2d74d2ed99c;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts b/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts index 2b40ad41..e978b24f 100644 --- a/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts +++ b/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts @@ -1,251 +1,338 @@ // Partial Copyright Jerome Benoit. 2021-2023. All Rights Reserved. -import fs from 'fs'; -import path from 'path'; -import { fileURLToPath } from 'url'; - import type { JSONSchemaType } from 'ajv'; +import { secondsToMilliseconds } from 'date-fns'; import { OCPP16ServiceUtils } from './OCPP16ServiceUtils'; -import OCPPError from '../../../exception/OCPPError'; -import type { JsonObject, JsonType } from '../../../types/JsonType'; -import { OCPP16ChargePointErrorCode } from '../../../types/ocpp/1.6/ChargePointErrorCode'; -import { OCPP16ChargePointStatus } from '../../../types/ocpp/1.6/ChargePointStatus'; -import { OCPP16StandardParametersKey } from '../../../types/ocpp/1.6/Configuration'; -import type { - OCPP16MeterValuesRequest, - OCPP16MeterValuesResponse, -} from '../../../types/ocpp/1.6/MeterValues'; import { - type OCPP16BootNotificationRequest, - OCPP16IncomingRequestCommand, - OCPP16RequestCommand, - type OCPP16StatusNotificationRequest, -} from '../../../types/ocpp/1.6/Requests'; -import type { - ChangeAvailabilityResponse, - ChangeConfigurationResponse, - ClearChargingProfileResponse, - GetConfigurationResponse, - GetDiagnosticsResponse, - OCPP16BootNotificationResponse, - OCPP16DataTransferResponse, - OCPP16DiagnosticsStatusNotificationResponse, - OCPP16FirmwareStatusNotificationResponse, - OCPP16HeartbeatResponse, - OCPP16StatusNotificationResponse, - OCPP16TriggerMessageResponse, - OCPP16UpdateFirmwareResponse, - SetChargingProfileResponse, - UnlockConnectorResponse, -} from '../../../types/ocpp/1.6/Responses'; + type ChargingStation, + addConfigurationKey, + getConfigurationKey, + hasReservationExpired, + resetConnectorStatus, +} from '../../../charging-station'; +import { OCPPError } from '../../../exception'; import { + type ChangeConfigurationResponse, + ChargingStationEvents, + type ClearChargingProfileResponse, + ErrorType, + type GenericResponse, + type GetConfigurationResponse, + type GetDiagnosticsResponse, + type JsonType, OCPP16AuthorizationStatus, type OCPP16AuthorizeRequest, type OCPP16AuthorizeResponse, + type OCPP16BootNotificationResponse, + type OCPP16ChangeAvailabilityResponse, + OCPP16ChargePointStatus, + type OCPP16DataTransferResponse, + type OCPP16DiagnosticsStatusNotificationResponse, + type OCPP16FirmwareStatusNotificationResponse, + type OCPP16GetCompositeScheduleResponse, + type OCPP16HeartbeatResponse, + OCPP16IncomingRequestCommand, + type OCPP16MeterValuesRequest, + type OCPP16MeterValuesResponse, + OCPP16RequestCommand, + type OCPP16ReserveNowResponse, + OCPP16StandardParametersKey, type OCPP16StartTransactionRequest, type OCPP16StartTransactionResponse, + type OCPP16StatusNotificationResponse, type OCPP16StopTransactionRequest, type OCPP16StopTransactionResponse, -} from '../../../types/ocpp/1.6/Transaction'; -import { ErrorType } from '../../../types/ocpp/ErrorType'; -import { OCPPVersion } from '../../../types/ocpp/OCPPVersion'; -import { - type GenericResponse, + type OCPP16TriggerMessageResponse, + type OCPP16UpdateFirmwareResponse, + OCPPVersion, RegistrationStatusEnumType, + ReservationTerminationReason, type ResponseHandler, -} from '../../../types/ocpp/Responses'; -import Constants from '../../../utils/Constants'; -import logger from '../../../utils/Logger'; -import Utils from '../../../utils/Utils'; -import type ChargingStation from '../../ChargingStation'; -import { ChargingStationConfigurationUtils } from '../../ChargingStationConfigurationUtils'; -import OCPPResponseService from '../OCPPResponseService'; + type SetChargingProfileResponse, + type UnlockConnectorResponse, +} from '../../../types'; +import { Constants, convertToInt, isNullOrUndefined, logger } from '../../../utils'; +import { OCPPResponseService } from '../OCPPResponseService'; const moduleName = 'OCPP16ResponseService'; -export default class OCPP16ResponseService extends OCPPResponseService { +export class OCPP16ResponseService extends OCPPResponseService { public jsonIncomingRequestResponseSchemas: Map< OCPP16IncomingRequestCommand, - JSONSchemaType + JSONSchemaType >; private responseHandlers: Map; - private jsonSchemas: Map>; + private jsonSchemas: Map>; public constructor() { - if (new.target?.name === moduleName) { - throw new TypeError(`Cannot construct ${new.target?.name} instances directly`); - } + // if (new.target?.name === moduleName) { + // throw new TypeError(`Cannot construct ${new.target?.name} instances directly`); + // } super(OCPPVersion.VERSION_16); this.responseHandlers = new Map([ - [OCPP16RequestCommand.BOOT_NOTIFICATION, this.handleResponseBootNotification.bind(this)], - [OCPP16RequestCommand.HEARTBEAT, this.emptyResponseHandler.bind(this)], - [OCPP16RequestCommand.AUTHORIZE, this.handleResponseAuthorize.bind(this)], - [OCPP16RequestCommand.START_TRANSACTION, this.handleResponseStartTransaction.bind(this)], - [OCPP16RequestCommand.STOP_TRANSACTION, this.handleResponseStopTransaction.bind(this)], - [OCPP16RequestCommand.STATUS_NOTIFICATION, this.emptyResponseHandler.bind(this)], - [OCPP16RequestCommand.METER_VALUES, this.emptyResponseHandler.bind(this)], - [OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION, this.emptyResponseHandler.bind(this)], - [OCPP16RequestCommand.DATA_TRANSFER, this.emptyResponseHandler.bind(this)], - [OCPP16RequestCommand.FIRMWARE_STATUS_NOTIFICATION, this.emptyResponseHandler.bind(this)], + [ + OCPP16RequestCommand.BOOT_NOTIFICATION, + this.handleResponseBootNotification.bind(this) as ResponseHandler, + ], + [OCPP16RequestCommand.HEARTBEAT, this.emptyResponseHandler.bind(this) as ResponseHandler], + [OCPP16RequestCommand.AUTHORIZE, this.handleResponseAuthorize.bind(this) as ResponseHandler], + [ + OCPP16RequestCommand.START_TRANSACTION, + this.handleResponseStartTransaction.bind(this) as ResponseHandler, + ], + [ + OCPP16RequestCommand.STOP_TRANSACTION, + this.handleResponseStopTransaction.bind(this) as ResponseHandler, + ], + [ + OCPP16RequestCommand.STATUS_NOTIFICATION, + this.emptyResponseHandler.bind(this) as ResponseHandler, + ], + [OCPP16RequestCommand.METER_VALUES, this.emptyResponseHandler.bind(this) as ResponseHandler], + [ + OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION, + this.emptyResponseHandler.bind(this) as ResponseHandler, + ], + [OCPP16RequestCommand.DATA_TRANSFER, this.emptyResponseHandler.bind(this) as ResponseHandler], + [ + OCPP16RequestCommand.FIRMWARE_STATUS_NOTIFICATION, + this.emptyResponseHandler.bind(this) as ResponseHandler, + ], ]); - this.jsonSchemas = new Map>([ + this.jsonSchemas = new Map>([ [ OCPP16RequestCommand.BOOT_NOTIFICATION, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/BootNotificationResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/BootNotificationResponse.json', + moduleName, + 'constructor', ), ], [ OCPP16RequestCommand.HEARTBEAT, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/HeartbeatResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/HeartbeatResponse.json', + moduleName, + 'constructor', ), ], [ OCPP16RequestCommand.AUTHORIZE, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/AuthorizeResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/AuthorizeResponse.json', + moduleName, + 'constructor', ), ], [ OCPP16RequestCommand.START_TRANSACTION, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/StartTransactionResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/StartTransactionResponse.json', + moduleName, + 'constructor', ), ], [ OCPP16RequestCommand.STOP_TRANSACTION, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/StopTransactionResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/StopTransactionResponse.json', + moduleName, + 'constructor', ), ], [ OCPP16RequestCommand.STATUS_NOTIFICATION, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/StatusNotificationResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/StatusNotificationResponse.json', + moduleName, + 'constructor', ), ], [ OCPP16RequestCommand.METER_VALUES, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/MeterValuesResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/MeterValuesResponse.json', + moduleName, + 'constructor', ), ], [ OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/DiagnosticsStatusNotificationResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/DiagnosticsStatusNotificationResponse.json', + moduleName, + 'constructor', ), ], [ OCPP16RequestCommand.DATA_TRANSFER, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/DataTransferResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/DataTransferResponse.json', + moduleName, + 'constructor', ), ], [ OCPP16RequestCommand.FIRMWARE_STATUS_NOTIFICATION, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/FirmwareStatusNotificationResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/FirmwareStatusNotificationResponse.json', + moduleName, + 'constructor', ), ], ]); this.jsonIncomingRequestResponseSchemas = new Map([ [ OCPP16IncomingRequestCommand.RESET, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/ResetResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/ResetResponse.json', + moduleName, + 'constructor', ), ], [ OCPP16IncomingRequestCommand.CLEAR_CACHE, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/ClearCacheResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/ClearCacheResponse.json', + moduleName, + 'constructor', ), ], [ OCPP16IncomingRequestCommand.CHANGE_AVAILABILITY, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/ChangeAvailabilityResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/ChangeAvailabilityResponse.json', + moduleName, + 'constructor', ), ], [ OCPP16IncomingRequestCommand.UNLOCK_CONNECTOR, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/UnlockConnectorResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/UnlockConnectorResponse.json', + moduleName, + 'constructor', ), ], [ OCPP16IncomingRequestCommand.GET_CONFIGURATION, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/GetConfigurationResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/GetConfigurationResponse.json', + moduleName, + 'constructor', ), ], [ OCPP16IncomingRequestCommand.CHANGE_CONFIGURATION, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/ChangeConfigurationResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/ChangeConfigurationResponse.json', + moduleName, + 'constructor', + ), + ], + [ + OCPP16IncomingRequestCommand.GET_COMPOSITE_SCHEDULE, + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/GetCompositeScheduleResponse.json', + moduleName, + 'constructor', ), ], [ OCPP16IncomingRequestCommand.SET_CHARGING_PROFILE, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/SetChargingProfileResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/SetChargingProfileResponse.json', + moduleName, + 'constructor', ), ], [ OCPP16IncomingRequestCommand.CLEAR_CHARGING_PROFILE, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/ClearChargingProfileResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/ClearChargingProfileResponse.json', + moduleName, + 'constructor', ), ], [ OCPP16IncomingRequestCommand.REMOTE_START_TRANSACTION, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/RemoteStartTransactionResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/RemoteStartTransactionResponse.json', + moduleName, + 'constructor', ), ], [ OCPP16IncomingRequestCommand.REMOTE_STOP_TRANSACTION, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/RemoteStopTransactionResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/RemoteStopTransactionResponse.json', + moduleName, + 'constructor', ), ], [ OCPP16IncomingRequestCommand.GET_DIAGNOSTICS, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/GetDiagnosticsResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/GetDiagnosticsResponse.json', + moduleName, + 'constructor', ), ], [ OCPP16IncomingRequestCommand.TRIGGER_MESSAGE, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/TriggerMessageResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/TriggerMessageResponse.json', + moduleName, + 'constructor', ), ], [ OCPP16IncomingRequestCommand.DATA_TRANSFER, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/DataTransferResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/DataTransferResponse.json', + moduleName, + 'constructor', ), ], [ OCPP16IncomingRequestCommand.UPDATE_FIRMWARE, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/UpdateFirmwareResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/UpdateFirmwareResponse.json', + moduleName, + 'constructor', + ), + ], + [ + OCPP16IncomingRequestCommand.RESERVE_NOW, + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/ReserveNowResponse.json', + moduleName, + 'constructor', + ), + ], + [ + OCPP16IncomingRequestCommand.CANCEL_RESERVATION, + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/CancelReservationResponse.json', + moduleName, + 'constructor', ), ], ]); - this.validatePayload.bind(this); + this.validatePayload = this.validatePayload.bind(this) as ( + chargingStation: ChargingStation, + commandName: OCPP16RequestCommand, + payload: JsonType, + ) => boolean; } - public async responseHandler( + public async responseHandler( chargingStation: ChargingStation, commandName: OCPP16RequestCommand, - payload: JsonType, - requestPayload: JsonType + payload: ResType, + requestPayload: ReqType, ): Promise { if ( chargingStation.isRegistered() === true || @@ -257,11 +344,11 @@ export default class OCPP16ResponseService extends OCPPResponseService { ) { try { this.validatePayload(chargingStation, commandName, payload); - await this.responseHandlers.get(commandName)(chargingStation, payload, requestPayload); + await this.responseHandlers.get(commandName)!(chargingStation, payload, requestPayload); } catch (error) { logger.error( `${chargingStation.logPrefix()} ${moduleName}.responseHandler: Handle response error:`, - error + error, ); throw error; } @@ -271,11 +358,11 @@ export default class OCPP16ResponseService extends OCPPResponseService { ErrorType.NOT_IMPLEMENTED, `${commandName} is not implemented to handle response PDU ${JSON.stringify( payload, - null, - 2 + undefined, + 2, )}`, commandName, - payload + payload, ); } } else { @@ -283,11 +370,11 @@ export default class OCPP16ResponseService extends OCPPResponseService { ErrorType.SECURITY_ERROR, `${commandName} cannot be issued to handle response PDU ${JSON.stringify( payload, - null, - 2 + undefined, + 2, )} while the charging station is not registered on the central server.`, commandName, - payload + payload, ); } } @@ -295,44 +382,42 @@ export default class OCPP16ResponseService extends OCPPResponseService { private validatePayload( chargingStation: ChargingStation, commandName: OCPP16RequestCommand, - payload: JsonType + payload: JsonType, ): boolean { if (this.jsonSchemas.has(commandName) === true) { return this.validateResponsePayload( chargingStation, commandName, - this.jsonSchemas.get(commandName), - payload + this.jsonSchemas.get(commandName)!, + payload, ); } logger.warn( - `${chargingStation.logPrefix()} ${moduleName}.validatePayload: No JSON schema found for command '${commandName}' PDU validation` + `${chargingStation.logPrefix()} ${moduleName}.validatePayload: No JSON schema found for command '${commandName}' PDU validation`, ); return false; } private handleResponseBootNotification( chargingStation: ChargingStation, - payload: OCPP16BootNotificationResponse + payload: OCPP16BootNotificationResponse, ): void { if (payload.status === RegistrationStatusEnumType.ACCEPTED) { - ChargingStationConfigurationUtils.addConfigurationKey( + addConfigurationKey( chargingStation, OCPP16StandardParametersKey.HeartbeatInterval, payload.interval.toString(), {}, - { overwrite: true, save: true } + { overwrite: true, save: true }, ); - ChargingStationConfigurationUtils.addConfigurationKey( + addConfigurationKey( chargingStation, OCPP16StandardParametersKey.HeartBeatInterval, payload.interval.toString(), { visible: false }, - { overwrite: true, save: true } + { overwrite: true, save: true }, ); - chargingStation.heartbeatSetInterval - ? chargingStation.restartHeartbeat() - : chargingStation.startHeartbeat(); + OCPP16ServiceUtils.startHeartbeatInterval(chargingStation, payload.interval); } if (Object.values(RegistrationStatusEnumType).includes(payload.status)) { const logMsg = `${chargingStation.logPrefix()} Charging station in '${ @@ -344,7 +429,7 @@ export default class OCPP16ResponseService extends OCPPResponseService { } else { logger.error( `${chargingStation.logPrefix()} Charging station boot notification response received: %j with undefined registration status`, - payload + payload, ); } } @@ -352,36 +437,52 @@ export default class OCPP16ResponseService extends OCPPResponseService { private handleResponseAuthorize( chargingStation: ChargingStation, payload: OCPP16AuthorizeResponse, - requestPayload: OCPP16AuthorizeRequest + requestPayload: OCPP16AuthorizeRequest, ): void { - let authorizeConnectorId: number; - for (const connectorId of chargingStation.connectors.keys()) { - if ( - connectorId > 0 && - chargingStation.getConnectorStatus(connectorId)?.authorizeIdTag === requestPayload.idTag - ) { - authorizeConnectorId = connectorId; - break; + let authorizeConnectorId: number | undefined; + if (chargingStation.hasEvses) { + for (const [evseId, evseStatus] of chargingStation.evses) { + if (evseId > 0) { + for (const [connectorId, connectorStatus] of evseStatus.connectors) { + if (connectorStatus?.authorizeIdTag === requestPayload.idTag) { + authorizeConnectorId = connectorId; + break; + } + } + } + } + } else { + for (const connectorId of chargingStation.connectors.keys()) { + if ( + connectorId > 0 && + chargingStation.getConnectorStatus(connectorId)?.authorizeIdTag === requestPayload.idTag + ) { + authorizeConnectorId = connectorId; + break; + } } } - const authorizeConnectorIdDefined = authorizeConnectorId !== undefined; + const authorizeConnectorStatus = chargingStation.getConnectorStatus(authorizeConnectorId!); + const authorizeConnectorIdDefined = !isNullOrUndefined(authorizeConnectorId); if (payload.idTagInfo.status === OCPP16AuthorizationStatus.ACCEPTED) { - authorizeConnectorIdDefined && - (chargingStation.getConnectorStatus(authorizeConnectorId).idTagAuthorized = true); + if (authorizeConnectorIdDefined) { + // authorizeConnectorStatus!.authorizeIdTag = requestPayload.idTag; + authorizeConnectorStatus!.idTagAuthorized = true; + } logger.debug( - `${chargingStation.logPrefix()} IdTag '${requestPayload.idTag}' accepted${ - authorizeConnectorIdDefined ? ` on connector ${authorizeConnectorId}` : '' - }` + `${chargingStation.logPrefix()} idTag '${requestPayload.idTag}' accepted${ + authorizeConnectorIdDefined ? ` on connector id ${authorizeConnectorId}` : '' + }`, ); } else { if (authorizeConnectorIdDefined) { - chargingStation.getConnectorStatus(authorizeConnectorId).idTagAuthorized = false; - delete chargingStation.getConnectorStatus(authorizeConnectorId).authorizeIdTag; + authorizeConnectorStatus!.idTagAuthorized = false; + delete authorizeConnectorStatus?.authorizeIdTag; } logger.debug( - `${chargingStation.logPrefix()} IdTag '${requestPayload.idTag}' rejected with status '${ + `${chargingStation.logPrefix()} idTag '${requestPayload.idTag}' rejected with status '${ payload.idTagInfo.status - }'${authorizeConnectorIdDefined ? ` on connector ${authorizeConnectorId}` : ''}` + }'${authorizeConnectorIdDefined ? ` on connector id ${authorizeConnectorId}` : ''}`, ); } } @@ -389,122 +490,145 @@ export default class OCPP16ResponseService extends OCPPResponseService { private async handleResponseStartTransaction( chargingStation: ChargingStation, payload: OCPP16StartTransactionResponse, - requestPayload: OCPP16StartTransactionRequest + requestPayload: OCPP16StartTransactionRequest, ): Promise { - const connectorId = requestPayload.connectorId; - - let transactionConnectorId: number; - for (const id of chargingStation.connectors.keys()) { - if (id > 0 && id === connectorId) { - transactionConnectorId = id; - break; - } - } - if (Utils.isNullOrUndefined(transactionConnectorId)) { + const { connectorId } = requestPayload; + if (connectorId === 0 || chargingStation.hasConnector(connectorId) === false) { logger.error( - `${chargingStation.logPrefix()} Trying to start a transaction on a non existing connector Id ${connectorId.toString()}` + `${chargingStation.logPrefix()} Trying to start a transaction on a non existing connector id ${connectorId}`, ); return; } + const connectorStatus = chargingStation.getConnectorStatus(connectorId); if ( - chargingStation.getConnectorStatus(connectorId)?.transactionRemoteStarted === true && + connectorStatus?.transactionRemoteStarted === true && chargingStation.getAuthorizeRemoteTxRequests() === true && chargingStation.getLocalAuthListEnabled() === true && - chargingStation.hasAuthorizedTags() && - chargingStation.getConnectorStatus(connectorId)?.idTagLocalAuthorized === false + chargingStation.hasIdTags() === true && + connectorStatus?.idTagLocalAuthorized === false ) { logger.error( - `${chargingStation.logPrefix()} Trying to start a transaction with a not local authorized idTag ${ - chargingStation.getConnectorStatus(connectorId)?.localAuthorizeIdTag - } on connector Id ${connectorId.toString()}` + `${chargingStation.logPrefix()} Trying to start a transaction with a not local authorized idTag ${connectorStatus?.localAuthorizeIdTag} on connector id ${connectorId}`, ); await this.resetConnectorOnStartTransactionError(chargingStation, connectorId); return; } if ( - chargingStation.getConnectorStatus(connectorId)?.transactionRemoteStarted === true && + connectorStatus?.transactionRemoteStarted === true && chargingStation.getAuthorizeRemoteTxRequests() === true && - chargingStation.getMustAuthorizeAtRemoteStart() === true && - chargingStation.getConnectorStatus(connectorId)?.idTagLocalAuthorized === false && - chargingStation.getConnectorStatus(connectorId)?.idTagAuthorized === false + chargingStation.getRemoteAuthorization() === true && + connectorStatus?.idTagLocalAuthorized === false && + connectorStatus?.idTagAuthorized === false ) { logger.error( - `${chargingStation.logPrefix()} Trying to start a transaction with a not authorized idTag ${ - chargingStation.getConnectorStatus(connectorId)?.authorizeIdTag - } on connector Id ${connectorId.toString()}` + `${chargingStation.logPrefix()} Trying to start a transaction with a not authorized idTag ${connectorStatus?.authorizeIdTag} on connector id ${connectorId}`, ); await this.resetConnectorOnStartTransactionError(chargingStation, connectorId); return; } if ( - chargingStation.getConnectorStatus(connectorId)?.idTagAuthorized && - chargingStation.getConnectorStatus(connectorId)?.authorizeIdTag !== requestPayload.idTag + connectorStatus?.idTagAuthorized && + connectorStatus?.authorizeIdTag !== requestPayload.idTag ) { logger.error( `${chargingStation.logPrefix()} Trying to start a transaction with an idTag ${ requestPayload.idTag - } different from the authorize request one ${ - chargingStation.getConnectorStatus(connectorId)?.authorizeIdTag - } on connector Id ${connectorId.toString()}` + } different from the authorize request one ${connectorStatus?.authorizeIdTag} on connector id ${connectorId}`, ); await this.resetConnectorOnStartTransactionError(chargingStation, connectorId); return; } if ( - chargingStation.getConnectorStatus(connectorId)?.idTagLocalAuthorized && - chargingStation.getConnectorStatus(connectorId)?.localAuthorizeIdTag !== requestPayload.idTag + connectorStatus?.idTagLocalAuthorized && + connectorStatus?.localAuthorizeIdTag !== requestPayload.idTag ) { logger.error( `${chargingStation.logPrefix()} Trying to start a transaction with an idTag ${ requestPayload.idTag - } different from the local authorized one ${ - chargingStation.getConnectorStatus(connectorId)?.localAuthorizeIdTag - } on connector Id ${connectorId.toString()}` + } different from the local authorized one ${connectorStatus?.localAuthorizeIdTag} on connector id ${connectorId}`, ); await this.resetConnectorOnStartTransactionError(chargingStation, connectorId); return; } - if (chargingStation.getConnectorStatus(connectorId)?.transactionStarted === true) { - logger.debug( - `${chargingStation.logPrefix()} Trying to start a transaction on an already used connector ${connectorId.toString()}: %j`, - chargingStation.getConnectorStatus(connectorId) + if (connectorStatus?.transactionStarted === true) { + logger.error( + `${chargingStation.logPrefix()} Trying to start a transaction on an already used connector id ${connectorId} by idTag ${connectorStatus?.transactionIdTag}`, ); return; } + if (chargingStation.hasEvses) { + for (const [evseId, evseStatus] of chargingStation.evses) { + if (evseStatus.connectors.size > 1) { + for (const [id, status] of evseStatus.connectors) { + if (id !== connectorId && status?.transactionStarted === true) { + logger.error( + `${chargingStation.logPrefix()} Trying to start a transaction on an already used evse id ${evseId} by connector id ${id} with idTag ${status?.transactionIdTag}`, + ); + await this.resetConnectorOnStartTransactionError(chargingStation, connectorId); + return; + } + } + } + } + } if ( - chargingStation.getConnectorStatus(connectorId)?.status !== - OCPP16ChargePointStatus.AVAILABLE && - chargingStation.getConnectorStatus(connectorId)?.status !== OCPP16ChargePointStatus.PREPARING + connectorStatus?.status !== OCPP16ChargePointStatus.Available && + connectorStatus?.status !== OCPP16ChargePointStatus.Preparing ) { logger.error( - `${chargingStation.logPrefix()} Trying to start a transaction on connector ${connectorId.toString()} with status ${ - chargingStation.getConnectorStatus(connectorId)?.status - }` + `${chargingStation.logPrefix()} Trying to start a transaction on connector id ${connectorId} with status ${connectorStatus?.status}`, ); return; } - // if (!Number.isInteger(payload.transactionId)) { - // logger.warn( - // `${chargingStation.logPrefix()} Trying to start a transaction on connector ${connectorId.toString()} with a non integer transaction Id ${ - // payload.transactionId - // }, converting to integer` - // ); - // payload.transactionId = Utils.convertToInt(payload.transactionId); - // } + if (!Number.isSafeInteger(payload.transactionId)) { + logger.warn( + `${chargingStation.logPrefix()} Trying to start a transaction on connector id ${connectorId} with a non integer transaction id ${ + payload.transactionId + }, converting to integer`, + ); + payload.transactionId = convertToInt(payload.transactionId); + } if (payload.idTagInfo?.status === OCPP16AuthorizationStatus.ACCEPTED) { - chargingStation.getConnectorStatus(connectorId).transactionStarted = true; - chargingStation.getConnectorStatus(connectorId).transactionId = payload.transactionId; - chargingStation.getConnectorStatus(connectorId).transactionIdTag = requestPayload.idTag; - chargingStation.getConnectorStatus( - connectorId - ).transactionEnergyActiveImportRegisterValue = 0; - chargingStation.getConnectorStatus(connectorId).transactionBeginMeterValue = + connectorStatus.transactionStarted = true; + connectorStatus.transactionStart = requestPayload.timestamp; + connectorStatus.transactionId = payload.transactionId; + connectorStatus.transactionIdTag = requestPayload.idTag; + connectorStatus.transactionEnergyActiveImportRegisterValue = 0; + connectorStatus.transactionBeginMeterValue = OCPP16ServiceUtils.buildTransactionBeginMeterValue( chargingStation, connectorId, - requestPayload.meterStart + requestPayload.meterStart, ); + if (requestPayload.reservationId) { + const reservation = chargingStation.getReservationBy( + 'reservationId', + requestPayload.reservationId, + )!; + if (reservation.idTag !== requestPayload.idTag) { + logger.warn( + `${chargingStation.logPrefix()} Reserved transaction ${ + payload.transactionId + } started with a different idTag ${requestPayload.idTag} than the reservation one ${ + reservation.idTag + }`, + ); + } + if (hasReservationExpired(reservation)) { + logger.warn( + `${chargingStation.logPrefix()} Reserved transaction ${ + payload.transactionId + } started with expired reservation ${ + requestPayload.reservationId + } (expiry date: ${reservation.expiryDate.toISOString()}))`, + ); + } + await chargingStation.removeReservation( + reservation, + ReservationTerminationReason.TRANSACTION_STARTED, + ); + } chargingStation.getBeginEndMeterValues() && (await chargingStation.ocppRequestService.requestHandler< OCPP16MeterValuesRequest, @@ -512,41 +636,44 @@ export default class OCPP16ResponseService extends OCPPResponseService { >(chargingStation, OCPP16RequestCommand.METER_VALUES, { connectorId, transactionId: payload.transactionId, - meterValue: [chargingStation.getConnectorStatus(connectorId).transactionBeginMeterValue], - })); - await chargingStation.ocppRequestService.requestHandler< - OCPP16StatusNotificationRequest, - OCPP16StatusNotificationResponse - >(chargingStation, OCPP16RequestCommand.STATUS_NOTIFICATION, { + meterValue: [connectorStatus.transactionBeginMeterValue], + } as OCPP16MeterValuesRequest)); + await OCPP16ServiceUtils.sendAndSetConnectorStatus( + chargingStation, connectorId, - status: OCPP16ChargePointStatus.CHARGING, - errorCode: OCPP16ChargePointErrorCode.NO_ERROR, - }); - chargingStation.getConnectorStatus(connectorId).status = OCPP16ChargePointStatus.CHARGING; + OCPP16ChargePointStatus.Charging, + ); logger.info( - `${chargingStation.logPrefix()} Transaction ${payload.transactionId.toString()} STARTED on ${ + `${chargingStation.logPrefix()} Transaction with id ${payload.transactionId} STARTED on ${ chargingStation.stationInfo.chargingStationId - }#${connectorId.toString()} for idTag '${requestPayload.idTag}'` + }#${connectorId} for idTag '${requestPayload.idTag}'`, ); if (chargingStation.stationInfo.powerSharedByConnectors) { - chargingStation.powerDivider++; + ++chargingStation.powerDivider; } - const configuredMeterValueSampleInterval = - ChargingStationConfigurationUtils.getConfigurationKey( - chargingStation, - OCPP16StandardParametersKey.MeterValueSampleInterval - ); + const configuredMeterValueSampleInterval = getConfigurationKey( + chargingStation, + OCPP16StandardParametersKey.MeterValueSampleInterval, + ); chargingStation.startMeterValues( connectorId, configuredMeterValueSampleInterval - ? Utils.convertToInt(configuredMeterValueSampleInterval.value) * 1000 - : Constants.DEFAULT_METER_VALUES_INTERVAL + ? secondsToMilliseconds(convertToInt(configuredMeterValueSampleInterval.value)) + : Constants.DEFAULT_METER_VALUES_INTERVAL, ); } else { logger.warn( - `${chargingStation.logPrefix()} Starting transaction id ${payload.transactionId.toString()} REJECTED with status '${ - payload.idTagInfo?.status - }', idTag '${requestPayload.idTag}'` + `${chargingStation.logPrefix()} Starting transaction with id ${ + payload.transactionId + } REJECTED on ${ + chargingStation.stationInfo.chargingStationId + }#${connectorId} with status '${payload.idTagInfo?.status}', idTag '${ + requestPayload.idTag + }'${ + OCPP16ServiceUtils.hasReservation(chargingStation, connectorId, requestPayload.idTag) + ? `, reservationId '${requestPayload.reservationId}'` + : '' + }`, ); await this.resetConnectorOnStartTransactionError(chargingStation, connectorId); } @@ -554,35 +681,34 @@ export default class OCPP16ResponseService extends OCPPResponseService { private async resetConnectorOnStartTransactionError( chargingStation: ChargingStation, - connectorId: number + connectorId: number, ): Promise { - chargingStation.resetConnectorStatus(connectorId); - if ( - chargingStation.getConnectorStatus(connectorId)?.status !== OCPP16ChargePointStatus.AVAILABLE - ) { - await chargingStation.ocppRequestService.requestHandler< - OCPP16StatusNotificationRequest, - OCPP16StatusNotificationResponse - >(chargingStation, OCPP16RequestCommand.STATUS_NOTIFICATION, { + const connectorStatus = chargingStation.getConnectorStatus(connectorId); + resetConnectorStatus(connectorStatus!); + chargingStation.stopMeterValues(connectorId); + if (connectorStatus?.status !== OCPP16ChargePointStatus.Available) { + await OCPP16ServiceUtils.sendAndSetConnectorStatus( + chargingStation, connectorId, - status: OCPP16ChargePointStatus.AVAILABLE, - errorCode: OCPP16ChargePointErrorCode.NO_ERROR, - }); - chargingStation.getConnectorStatus(connectorId).status = OCPP16ChargePointStatus.AVAILABLE; + OCPP16ChargePointStatus.Available, + ); } + chargingStation.emit(ChargingStationEvents.updated); } private async handleResponseStopTransaction( chargingStation: ChargingStation, payload: OCPP16StopTransactionResponse, - requestPayload: OCPP16StopTransactionRequest + requestPayload: OCPP16StopTransactionRequest, ): Promise { const transactionConnectorId = chargingStation.getConnectorIdByTransactionId( - requestPayload.transactionId + requestPayload.transactionId, ); - if (!transactionConnectorId) { + if (isNullOrUndefined(transactionConnectorId)) { logger.error( - `${chargingStation.logPrefix()} Trying to stop a non existing transaction ${requestPayload.transactionId.toString()}` + `${chargingStation.logPrefix()} Trying to stop a non existing transaction with id ${ + requestPayload.transactionId + }`, ); return; } @@ -598,48 +724,40 @@ export default class OCPP16ResponseService extends OCPPResponseService { meterValue: [ OCPP16ServiceUtils.buildTransactionEndMeterValue( chargingStation, - transactionConnectorId, - requestPayload.meterStop + transactionConnectorId!, + requestPayload.meterStop, ), ], })); if ( chargingStation.isChargingStationAvailable() === false || - chargingStation.isConnectorAvailable(transactionConnectorId) === false + chargingStation.isConnectorAvailable(transactionConnectorId!) === false ) { - await chargingStation.ocppRequestService.requestHandler< - OCPP16StatusNotificationRequest, - OCPP16StatusNotificationResponse - >(chargingStation, OCPP16RequestCommand.STATUS_NOTIFICATION, { - connectorId: transactionConnectorId, - status: OCPP16ChargePointStatus.UNAVAILABLE, - errorCode: OCPP16ChargePointErrorCode.NO_ERROR, - }); - chargingStation.getConnectorStatus(transactionConnectorId).status = - OCPP16ChargePointStatus.UNAVAILABLE; + await OCPP16ServiceUtils.sendAndSetConnectorStatus( + chargingStation, + transactionConnectorId!, + OCPP16ChargePointStatus.Unavailable, + ); } else { - await chargingStation.ocppRequestService.requestHandler< - OCPP16BootNotificationRequest, - OCPP16BootNotificationResponse - >(chargingStation, OCPP16RequestCommand.STATUS_NOTIFICATION, { - connectorId: transactionConnectorId, - status: OCPP16ChargePointStatus.AVAILABLE, - errorCode: OCPP16ChargePointErrorCode.NO_ERROR, - }); - chargingStation.getConnectorStatus(transactionConnectorId).status = - OCPP16ChargePointStatus.AVAILABLE; + await OCPP16ServiceUtils.sendAndSetConnectorStatus( + chargingStation, + transactionConnectorId!, + OCPP16ChargePointStatus.Available, + ); } if (chargingStation.stationInfo.powerSharedByConnectors) { chargingStation.powerDivider--; } - chargingStation.resetConnectorStatus(transactionConnectorId); - const logMsg = `${chargingStation.logPrefix()} Transaction ${requestPayload.transactionId.toString()} STOPPED on ${ + resetConnectorStatus(chargingStation.getConnectorStatus(transactionConnectorId!)!); + chargingStation.stopMeterValues(transactionConnectorId!); + chargingStation.emit(ChargingStationEvents.updated); + const logMsg = `${chargingStation.logPrefix()} Transaction with id ${ + requestPayload.transactionId + } STOPPED on ${ chargingStation.stationInfo.chargingStationId - }#${transactionConnectorId.toString()} with status '${ - payload.idTagInfo?.status ?? 'undefined' - }'`; + }#${transactionConnectorId} with status '${payload.idTagInfo?.status ?? 'undefined'}'`; if ( - Utils.isNullOrUndefined(payload.idTagInfo) || + isNullOrUndefined(payload.idTagInfo) || payload.idTagInfo?.status === OCPP16AuthorizationStatus.ACCEPTED ) { logger.info(logMsg); @@ -647,13 +765,4 @@ export default class OCPP16ResponseService extends OCPPResponseService { logger.warn(logMsg); } } - - private parseJsonSchemaFile(relativePath: string): JSONSchemaType { - return JSON.parse( - fs.readFileSync( - path.resolve(path.dirname(fileURLToPath(import.meta.url)), relativePath), - 'utf8' - ) - ) as JSONSchemaType; - } }