X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Focpp%2F1.6%2FOCPP16ResponseService.ts;h=3b91fba1f028f2a16b38f6abc99f77f55e37938b;hb=298be10c5c800e43b0b9dcd6c50f6d49e2cb786b;hp=f3855a1abeea5ea0c66ab6acb525e54ef7e828d5;hpb=aa63c9b772ff17bce2febf68a57720eab96d5f8e;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 f3855a1a..3b91fba1 100644 --- a/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts +++ b/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts @@ -1,6 +1,6 @@ -// Partial Copyright Jerome Benoit. 2021-2023. All Rights Reserved. +// Partial Copyright Jerome Benoit. 2021-2024. All Rights Reserved. -import type { JSONSchemaType } from 'ajv' +import type { ValidateFunction } from 'ajv' import { secondsToMilliseconds } from 'date-fns' import { OCPP16ServiceUtils } from './OCPP16ServiceUtils.js' @@ -57,17 +57,17 @@ import { OCPPResponseService } from '../OCPPResponseService.js' const moduleName = 'OCPP16ResponseService' export class OCPP16ResponseService extends OCPPResponseService { - public jsonIncomingRequestResponseSchemas: Map< + public jsonSchemasIncomingRequestResponseValidateFunction: Map< OCPP16IncomingRequestCommand, - JSONSchemaType + ValidateFunction > + protected jsonSchemasValidateFunction: Map> private readonly responseHandlers: Map - private readonly 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([ @@ -75,7 +75,7 @@ export class OCPP16ResponseService extends OCPPResponseService { OCPP16RequestCommand.BOOT_NOTIFICATION, this.handleResponseBootNotification.bind(this) as ResponseHandler ], - [OCPP16RequestCommand.HEARTBEAT, this.emptyResponseHandler.bind(this) as ResponseHandler], + [OCPP16RequestCommand.HEARTBEAT, this.emptyResponseHandler], [OCPP16RequestCommand.AUTHORIZE, this.handleResponseAuthorize.bind(this) as ResponseHandler], [ OCPP16RequestCommand.START_TRANSACTION, @@ -89,242 +89,346 @@ export class OCPP16ResponseService extends OCPPResponseService { OCPP16RequestCommand.STATUS_NOTIFICATION, this.emptyResponseHandler.bind(this) as ResponseHandler ], - [OCPP16RequestCommand.METER_VALUES, this.emptyResponseHandler.bind(this) as ResponseHandler], + [OCPP16RequestCommand.METER_VALUES, this.emptyResponseHandler], [ 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 - ] + [OCPP16RequestCommand.DATA_TRANSFER, this.emptyResponseHandler], + [OCPP16RequestCommand.FIRMWARE_STATUS_NOTIFICATION, this.emptyResponseHandler] ]) - this.jsonSchemas = new Map>([ + this.jsonSchemasValidateFunction = new Map>([ [ OCPP16RequestCommand.BOOT_NOTIFICATION, - OCPP16ServiceUtils.parseJsonSchemaFile( - 'assets/json-schemas/ocpp/1.6/BootNotificationResponse.json', - moduleName, - 'constructor' - ) + this.ajv + .compile( + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/BootNotificationResponse.json', + moduleName, + 'constructor' + ) + ) + .bind(this) ], [ OCPP16RequestCommand.HEARTBEAT, - OCPP16ServiceUtils.parseJsonSchemaFile( - 'assets/json-schemas/ocpp/1.6/HeartbeatResponse.json', - moduleName, - 'constructor' - ) + this.ajv + .compile( + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/HeartbeatResponse.json', + moduleName, + 'constructor' + ) + ) + .bind(this) ], [ OCPP16RequestCommand.AUTHORIZE, - OCPP16ServiceUtils.parseJsonSchemaFile( - 'assets/json-schemas/ocpp/1.6/AuthorizeResponse.json', - moduleName, - 'constructor' - ) + this.ajv + .compile( + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/AuthorizeResponse.json', + moduleName, + 'constructor' + ) + ) + .bind(this) ], [ OCPP16RequestCommand.START_TRANSACTION, - OCPP16ServiceUtils.parseJsonSchemaFile( - 'assets/json-schemas/ocpp/1.6/StartTransactionResponse.json', - moduleName, - 'constructor' - ) + this.ajv + .compile( + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/StartTransactionResponse.json', + moduleName, + 'constructor' + ) + ) + .bind(this) ], [ OCPP16RequestCommand.STOP_TRANSACTION, - OCPP16ServiceUtils.parseJsonSchemaFile( - 'assets/json-schemas/ocpp/1.6/StopTransactionResponse.json', - moduleName, - 'constructor' - ) + this.ajv + .compile( + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/StopTransactionResponse.json', + moduleName, + 'constructor' + ) + ) + .bind(this) ], [ OCPP16RequestCommand.STATUS_NOTIFICATION, - OCPP16ServiceUtils.parseJsonSchemaFile( - 'assets/json-schemas/ocpp/1.6/StatusNotificationResponse.json', - moduleName, - 'constructor' - ) + this.ajv + .compile( + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/StatusNotificationResponse.json', + moduleName, + 'constructor' + ) + ) + .bind(this) ], [ OCPP16RequestCommand.METER_VALUES, - OCPP16ServiceUtils.parseJsonSchemaFile( - 'assets/json-schemas/ocpp/1.6/MeterValuesResponse.json', - moduleName, - 'constructor' - ) + this.ajv + .compile( + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/MeterValuesResponse.json', + moduleName, + 'constructor' + ) + ) + .bind(this) ], [ OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION, - OCPP16ServiceUtils.parseJsonSchemaFile( - 'assets/json-schemas/ocpp/1.6/DiagnosticsStatusNotificationResponse.json', - moduleName, - 'constructor' - ) + this.ajv + .compile( + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/DiagnosticsStatusNotificationResponse.json', + moduleName, + 'constructor' + ) + ) + .bind(this) ], [ OCPP16RequestCommand.DATA_TRANSFER, - OCPP16ServiceUtils.parseJsonSchemaFile( - 'assets/json-schemas/ocpp/1.6/DataTransferResponse.json', - moduleName, - 'constructor' - ) + this.ajv + .compile( + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/DataTransferResponse.json', + moduleName, + 'constructor' + ) + ) + .bind(this) ], [ OCPP16RequestCommand.FIRMWARE_STATUS_NOTIFICATION, - OCPP16ServiceUtils.parseJsonSchemaFile( - 'assets/json-schemas/ocpp/1.6/FirmwareStatusNotificationResponse.json', - moduleName, - 'constructor' - ) + this.ajv + .compile( + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/FirmwareStatusNotificationResponse.json', + moduleName, + 'constructor' + ) + ) + .bind(this) ] ]) - this.jsonIncomingRequestResponseSchemas = new Map([ + this.jsonSchemasIncomingRequestResponseValidateFunction = new Map< + OCPP16IncomingRequestCommand, + ValidateFunction + >([ [ OCPP16IncomingRequestCommand.RESET, - OCPP16ServiceUtils.parseJsonSchemaFile( - 'assets/json-schemas/ocpp/1.6/ResetResponse.json', - moduleName, - 'constructor' - ) + this.ajvIncomingRequest + .compile( + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/ResetResponse.json', + moduleName, + 'constructor' + ) + ) + .bind(this) ], [ OCPP16IncomingRequestCommand.CLEAR_CACHE, - OCPP16ServiceUtils.parseJsonSchemaFile( - 'assets/json-schemas/ocpp/1.6/ClearCacheResponse.json', - moduleName, - 'constructor' - ) + this.ajvIncomingRequest + .compile( + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/ClearCacheResponse.json', + moduleName, + 'constructor' + ) + ) + .bind(this) ], [ OCPP16IncomingRequestCommand.CHANGE_AVAILABILITY, - OCPP16ServiceUtils.parseJsonSchemaFile( - 'assets/json-schemas/ocpp/1.6/ChangeAvailabilityResponse.json', - moduleName, - 'constructor' - ) + this.ajvIncomingRequest + .compile( + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/ChangeAvailabilityResponse.json', + moduleName, + 'constructor' + ) + ) + .bind(this) ], [ OCPP16IncomingRequestCommand.UNLOCK_CONNECTOR, - OCPP16ServiceUtils.parseJsonSchemaFile( - 'assets/json-schemas/ocpp/1.6/UnlockConnectorResponse.json', - moduleName, - 'constructor' - ) + this.ajvIncomingRequest + .compile( + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/UnlockConnectorResponse.json', + moduleName, + 'constructor' + ) + ) + .bind(this) ], [ OCPP16IncomingRequestCommand.GET_CONFIGURATION, - OCPP16ServiceUtils.parseJsonSchemaFile( - 'assets/json-schemas/ocpp/1.6/GetConfigurationResponse.json', - moduleName, - 'constructor' - ) + this.ajvIncomingRequest + .compile( + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/GetConfigurationResponse.json', + moduleName, + 'constructor' + ) + ) + .bind(this) ], [ OCPP16IncomingRequestCommand.CHANGE_CONFIGURATION, - OCPP16ServiceUtils.parseJsonSchemaFile( - 'assets/json-schemas/ocpp/1.6/ChangeConfigurationResponse.json', - moduleName, - 'constructor' - ) + this.ajvIncomingRequest + .compile( + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/ChangeConfigurationResponse.json', + moduleName, + 'constructor' + ) + ) + .bind(this) ], [ OCPP16IncomingRequestCommand.GET_COMPOSITE_SCHEDULE, - OCPP16ServiceUtils.parseJsonSchemaFile( - 'assets/json-schemas/ocpp/1.6/GetCompositeScheduleResponse.json', - moduleName, - 'constructor' - ) + this.ajvIncomingRequest + .compile( + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/GetCompositeScheduleResponse.json', + moduleName, + 'constructor' + ) + ) + .bind(this) ], [ OCPP16IncomingRequestCommand.SET_CHARGING_PROFILE, - OCPP16ServiceUtils.parseJsonSchemaFile( - 'assets/json-schemas/ocpp/1.6/SetChargingProfileResponse.json', - moduleName, - 'constructor' - ) + this.ajvIncomingRequest + .compile( + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/SetChargingProfileResponse.json', + moduleName, + 'constructor' + ) + ) + .bind(this) ], [ OCPP16IncomingRequestCommand.CLEAR_CHARGING_PROFILE, - OCPP16ServiceUtils.parseJsonSchemaFile( - 'assets/json-schemas/ocpp/1.6/ClearChargingProfileResponse.json', - moduleName, - 'constructor' - ) + this.ajvIncomingRequest + .compile( + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/ClearChargingProfileResponse.json', + moduleName, + 'constructor' + ) + ) + .bind(this) ], [ OCPP16IncomingRequestCommand.REMOTE_START_TRANSACTION, - OCPP16ServiceUtils.parseJsonSchemaFile( - 'assets/json-schemas/ocpp/1.6/RemoteStartTransactionResponse.json', - moduleName, - 'constructor' - ) + this.ajvIncomingRequest + .compile( + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/RemoteStartTransactionResponse.json', + moduleName, + 'constructor' + ) + ) + .bind(this) ], [ OCPP16IncomingRequestCommand.REMOTE_STOP_TRANSACTION, - OCPP16ServiceUtils.parseJsonSchemaFile( - 'assets/json-schemas/ocpp/1.6/RemoteStopTransactionResponse.json', - moduleName, - 'constructor' - ) + this.ajvIncomingRequest + .compile( + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/RemoteStopTransactionResponse.json', + moduleName, + 'constructor' + ) + ) + .bind(this) ], [ OCPP16IncomingRequestCommand.GET_DIAGNOSTICS, - OCPP16ServiceUtils.parseJsonSchemaFile( - 'assets/json-schemas/ocpp/1.6/GetDiagnosticsResponse.json', - moduleName, - 'constructor' - ) + this.ajvIncomingRequest + .compile( + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/GetDiagnosticsResponse.json', + moduleName, + 'constructor' + ) + ) + .bind(this) ], [ OCPP16IncomingRequestCommand.TRIGGER_MESSAGE, - OCPP16ServiceUtils.parseJsonSchemaFile( - 'assets/json-schemas/ocpp/1.6/TriggerMessageResponse.json', - moduleName, - 'constructor' - ) + this.ajvIncomingRequest + .compile( + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/TriggerMessageResponse.json', + moduleName, + 'constructor' + ) + ) + .bind(this) ], [ OCPP16IncomingRequestCommand.DATA_TRANSFER, - OCPP16ServiceUtils.parseJsonSchemaFile( - 'assets/json-schemas/ocpp/1.6/DataTransferResponse.json', - moduleName, - 'constructor' - ) + this.ajvIncomingRequest + .compile( + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/DataTransferResponse.json', + moduleName, + 'constructor' + ) + ) + .bind(this) ], [ OCPP16IncomingRequestCommand.UPDATE_FIRMWARE, - OCPP16ServiceUtils.parseJsonSchemaFile( - 'assets/json-schemas/ocpp/1.6/UpdateFirmwareResponse.json', - moduleName, - 'constructor' - ) + this.ajvIncomingRequest + .compile( + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/UpdateFirmwareResponse.json', + moduleName, + 'constructor' + ) + ) + .bind(this) ], [ OCPP16IncomingRequestCommand.RESERVE_NOW, - OCPP16ServiceUtils.parseJsonSchemaFile( - 'assets/json-schemas/ocpp/1.6/ReserveNowResponse.json', - moduleName, - 'constructor' - ) + this.ajvIncomingRequest + .compile( + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/ReserveNowResponse.json', + moduleName, + 'constructor' + ) + ) + .bind(this) ], [ OCPP16IncomingRequestCommand.CANCEL_RESERVATION, - OCPP16ServiceUtils.parseJsonSchemaFile( - 'assets/json-schemas/ocpp/1.6/CancelReservationResponse.json', - moduleName, - 'constructor' - ) + this.ajvIncomingRequest + .compile( + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/CancelReservationResponse.json', + moduleName, + 'constructor' + ) + ) + .bind(this) ] ]) - this.validatePayload = this.validatePayload.bind(this) as ( - chargingStation: ChargingStation, - commandName: OCPP16RequestCommand, - payload: JsonType - ) => boolean + this.validatePayload = this.validatePayload.bind(this) } public async responseHandler( @@ -381,17 +485,11 @@ export class OCPP16ResponseService extends OCPPResponseService { commandName: OCPP16RequestCommand, payload: JsonType ): boolean { - if (this.jsonSchemas.has(commandName)) { - return this.validateResponsePayload( - chargingStation, - commandName, - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - this.jsonSchemas.get(commandName)!, - payload - ) + if (this.jsonSchemasValidateFunction.has(commandName)) { + return this.validateResponsePayload(chargingStation, commandName, payload) } logger.warn( - `${chargingStation.logPrefix()} ${moduleName}.validatePayload: No JSON schema found for command '${commandName}' PDU validation` + `${chargingStation.logPrefix()} ${moduleName}.validatePayload: No JSON schema validation function found for command '${commandName}' PDU validation` ) return false } @@ -442,7 +540,7 @@ export class OCPP16ResponseService extends OCPPResponseService { for (const [evseId, evseStatus] of chargingStation.evses) { if (evseId > 0) { for (const [connectorId, connectorStatus] of evseStatus.connectors) { - if (connectorStatus?.authorizeIdTag === requestPayload.idTag) { + if (connectorStatus.authorizeIdTag === requestPayload.idTag) { authorizeConnectorId = connectorId break } @@ -460,29 +558,30 @@ export class OCPP16ResponseService extends OCPPResponseService { } } } - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - const authorizeConnectorStatus = chargingStation.getConnectorStatus(authorizeConnectorId!) - const authorizeConnectorIdDefined = authorizeConnectorId != null - if (payload.idTagInfo.status === OCPP16AuthorizationStatus.ACCEPTED) { - if (authorizeConnectorIdDefined) { - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - authorizeConnectorStatus!.idTagAuthorized = true + if (authorizeConnectorId != null) { + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + const authorizeConnectorStatus = chargingStation.getConnectorStatus(authorizeConnectorId)! + if (payload.idTagInfo.status === OCPP16AuthorizationStatus.ACCEPTED) { + authorizeConnectorStatus.idTagAuthorized = true + logger.debug( + `${chargingStation.logPrefix()} idTag '${ + requestPayload.idTag + }' accepted on connector id ${authorizeConnectorId}` + ) + } else { + authorizeConnectorStatus.idTagAuthorized = false + delete authorizeConnectorStatus.authorizeIdTag + logger.debug( + `${chargingStation.logPrefix()} idTag '${requestPayload.idTag}' rejected with status '${ + payload.idTagInfo.status + }` + ) } - logger.debug( - `${chargingStation.logPrefix()} idTag '${requestPayload.idTag}' accepted${ - authorizeConnectorIdDefined ? ` on connector id ${authorizeConnectorId}` : '' - }` - ) } else { - if (authorizeConnectorIdDefined) { - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - authorizeConnectorStatus!.idTagAuthorized = false - delete authorizeConnectorStatus?.authorizeIdTag - } - logger.debug( - `${chargingStation.logPrefix()} idTag '${requestPayload.idTag}' rejected with status '${ - payload.idTagInfo.status - }'${authorizeConnectorIdDefined ? ` on connector id ${authorizeConnectorId}` : ''}` + logger.error( + `${chargingStation.logPrefix()} idTag '${ + requestPayload.idTag + }' has no authorize request pending` ) } } @@ -505,10 +604,12 @@ export class OCPP16ResponseService extends OCPPResponseService { chargingStation.getAuthorizeRemoteTxRequests() && chargingStation.getLocalAuthListEnabled() && chargingStation.hasIdTags() && - connectorStatus?.idTagLocalAuthorized === false + connectorStatus.idTagLocalAuthorized === false ) { logger.error( - `${chargingStation.logPrefix()} Trying to start a transaction with a not local authorized idTag ${connectorStatus?.localAuthorizeIdTag} on connector id ${connectorId}` + `${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 @@ -517,42 +618,50 @@ export class OCPP16ResponseService extends OCPPResponseService { connectorStatus?.transactionRemoteStarted === true && chargingStation.getAuthorizeRemoteTxRequests() && chargingStation.stationInfo?.remoteAuthorization === true && - connectorStatus?.idTagLocalAuthorized === false && - connectorStatus?.idTagAuthorized === false + connectorStatus.idTagLocalAuthorized === false && + connectorStatus.idTagAuthorized === false ) { logger.error( - `${chargingStation.logPrefix()} Trying to start a transaction with a not authorized idTag ${connectorStatus?.authorizeIdTag} on connector id ${connectorId}` + `${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 ( connectorStatus?.idTagAuthorized === true && - connectorStatus?.authorizeIdTag !== requestPayload.idTag + connectorStatus.authorizeIdTag !== requestPayload.idTag ) { logger.error( `${chargingStation.logPrefix()} Trying to start a transaction with an idTag ${ requestPayload.idTag - } different from the authorize request one ${connectorStatus?.authorizeIdTag} on connector id ${connectorId}` + } different from the authorize request one ${ + connectorStatus.authorizeIdTag + } on connector id ${connectorId}` ) await this.resetConnectorOnStartTransactionError(chargingStation, connectorId) return } if ( connectorStatus?.idTagLocalAuthorized === true && - connectorStatus?.localAuthorizeIdTag !== requestPayload.idTag + connectorStatus.localAuthorizeIdTag !== requestPayload.idTag ) { logger.error( `${chargingStation.logPrefix()} Trying to start a transaction with an idTag ${ requestPayload.idTag - } different from the local authorized one ${connectorStatus?.localAuthorizeIdTag} on connector id ${connectorId}` + } different from the local authorized one ${ + connectorStatus.localAuthorizeIdTag + } on connector id ${connectorId}` ) await this.resetConnectorOnStartTransactionError(chargingStation, connectorId) return } if (connectorStatus?.transactionStarted === true) { logger.error( - `${chargingStation.logPrefix()} Trying to start a transaction on an already used connector id ${connectorId} by idTag ${connectorStatus?.transactionIdTag}` + `${chargingStation.logPrefix()} Trying to start a transaction on an already used connector id ${connectorId} by idTag ${ + connectorStatus.transactionIdTag + }` ) return } @@ -560,9 +669,11 @@ export class OCPP16ResponseService extends OCPPResponseService { 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) { + 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}` + `${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 @@ -589,7 +700,7 @@ export class OCPP16ResponseService extends OCPPResponseService { payload.transactionId = convertToInt(payload.transactionId) } - if (payload.idTagInfo?.status === OCPP16AuthorizationStatus.ACCEPTED) { + if (payload.idTagInfo.status === OCPP16AuthorizationStatus.ACCEPTED) { connectorStatus.transactionStarted = true connectorStatus.transactionStart = requestPayload.timestamp connectorStatus.transactionId = payload.transactionId @@ -602,33 +713,40 @@ export class OCPP16ResponseService extends OCPPResponseService { requestPayload.meterStart ) if (requestPayload.reservationId != null) { - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion 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 (reservation != null) { + 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 ) - } - if (hasReservationExpired(reservation)) { + } else { logger.warn( `${chargingStation.logPrefix()} Reserved transaction ${ payload.transactionId - } started with expired reservation ${ - requestPayload.reservationId - } (expiry date: ${reservation.expiryDate.toISOString()}))` + } started with unknown reservation ${requestPayload.reservationId}` ) } - await chargingStation.removeReservation( - reservation, - ReservationTerminationReason.TRANSACTION_STARTED - ) } chargingStation.stationInfo?.beginEndMeterValues === true && (await chargingStation.ocppRequestService.requestHandler< @@ -645,12 +763,15 @@ export class OCPP16ResponseService extends OCPPResponseService { OCPP16ChargePointStatus.Charging ) logger.info( - `${chargingStation.logPrefix()} Transaction with id ${payload.transactionId} STARTED on ${ - chargingStation.stationInfo.chargingStationId - }#${connectorId} for idTag '${requestPayload.idTag}'` + `${chargingStation.logPrefix()} Transaction with id ${ + payload.transactionId + } STARTED on ${chargingStation.stationInfo?.chargingStationId}#${connectorId} for idTag '${ + requestPayload.idTag + }'` ) - if (chargingStation.stationInfo.powerSharedByConnectors === true) { - ++chargingStation.powerDivider + if (chargingStation.stationInfo?.powerSharedByConnectors === true) { + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + ++chargingStation.powerDivider! } const configuredMeterValueSampleInterval = getConfigurationKey( chargingStation, @@ -667,8 +788,8 @@ export class OCPP16ResponseService extends OCPPResponseService { `${chargingStation.logPrefix()} Starting transaction with id ${ payload.transactionId } REJECTED on ${ - chargingStation.stationInfo.chargingStationId - }#${connectorId} with status '${payload.idTagInfo?.status}', idTag '${ + chargingStation.stationInfo?.chargingStationId + }#${connectorId} with status '${payload.idTagInfo.status}', idTag '${ requestPayload.idTag }'${ OCPP16ServiceUtils.hasReservation(chargingStation, connectorId, requestPayload.idTag) @@ -685,8 +806,7 @@ export class OCPP16ResponseService extends OCPPResponseService { connectorId: number ): Promise { const connectorStatus = chargingStation.getConnectorStatus(connectorId) - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - resetConnectorStatus(connectorStatus!) + resetConnectorStatus(connectorStatus) chargingStation.stopMeterValues(connectorId) if (connectorStatus?.status !== OCPP16ChargePointStatus.Available) { await OCPP16ServiceUtils.sendAndSetConnectorStatus( @@ -714,8 +834,8 @@ export class OCPP16ResponseService extends OCPPResponseService { return } chargingStation.stationInfo?.beginEndMeterValues === true && - chargingStation.stationInfo?.ocppStrictCompliance === false && - chargingStation.stationInfo?.outOfOrderEndMeterValues === true && + chargingStation.stationInfo.ocppStrictCompliance === false && + chargingStation.stationInfo.outOfOrderEndMeterValues === true && (await chargingStation.ocppRequestService.requestHandler< OCPP16MeterValuesRequest, OCPP16MeterValuesResponse @@ -746,20 +866,20 @@ export class OCPP16ResponseService extends OCPPResponseService { OCPP16ChargePointStatus.Available ) } - if (chargingStation.stationInfo.powerSharedByConnectors === true) { - chargingStation.powerDivider-- + if (chargingStation.stationInfo?.powerSharedByConnectors === true) { + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + chargingStation.powerDivider!-- } - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - resetConnectorStatus(chargingStation.getConnectorStatus(transactionConnectorId)!) + resetConnectorStatus(chargingStation.getConnectorStatus(transactionConnectorId)) chargingStation.stopMeterValues(transactionConnectorId) const logMsg = `${chargingStation.logPrefix()} Transaction with id ${ requestPayload.transactionId } STOPPED on ${ - chargingStation.stationInfo.chargingStationId + chargingStation.stationInfo?.chargingStationId }#${transactionConnectorId} with status '${payload.idTagInfo?.status}'` if ( payload.idTagInfo == null || - payload.idTagInfo?.status === OCPP16AuthorizationStatus.ACCEPTED + payload.idTagInfo.status === OCPP16AuthorizationStatus.ACCEPTED ) { logger.info(logMsg) } else {