X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Focpp%2F1.6%2FOCPP16ResponseService.ts;h=4ba89706feb8a4a38a52edcad386f880122090e9;hb=ed6cfcff3ef6596cdf76c68f600effcb25dece72;hp=c59710560cc956ad3b79b13e3d8a3ee76a7833d8;hpb=6f35d2daed5ff5d26de15c1547ffa3dbd013c5b3;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 c5971056..4ba89706 100644 --- a/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts +++ b/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts @@ -1,80 +1,193 @@ // Partial Copyright Jerome Benoit. 2021. All Rights Reserved. -import { - OCPP16AuthorizationStatus, - OCPP16AuthorizeRequest, - OCPP16AuthorizeResponse, - OCPP16StartTransactionRequest, - OCPP16StartTransactionResponse, - OCPP16StopTransactionRequest, - OCPP16StopTransactionResponse, -} from '../../../types/ocpp/1.6/Transaction'; +import fs from 'fs'; +import path from 'path'; +import { fileURLToPath } from 'url'; + +import type { JSONSchemaType } from 'ajv'; + +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 { OCPP16BootNotificationRequest, - OCPP16HeartbeatRequest, OCPP16RequestCommand, OCPP16StatusNotificationRequest, } from '../../../types/ocpp/1.6/Requests'; import { + DiagnosticsStatusNotificationResponse, OCPP16BootNotificationResponse, OCPP16HeartbeatResponse, OCPP16RegistrationStatus, OCPP16StatusNotificationResponse, } from '../../../types/ocpp/1.6/Responses'; import { - OCPP16MeterValuesRequest, - OCPP16MeterValuesResponse, -} from '../../../types/ocpp/1.6/MeterValues'; - -import type ChargingStation from '../../ChargingStation'; + OCPP16AuthorizationStatus, + OCPP16AuthorizeRequest, + OCPP16AuthorizeResponse, + OCPP16StartTransactionRequest, + OCPP16StartTransactionResponse, + OCPP16StopTransactionRequest, + OCPP16StopTransactionResponse, +} from '../../../types/ocpp/1.6/Transaction'; import { ErrorType } from '../../../types/ocpp/ErrorType'; -import { JsonType } from '../../../types/JsonType'; -import { OCPP16ChargePointErrorCode } from '../../../types/ocpp/1.6/ChargePointErrorCode'; -import { OCPP16ChargePointStatus } from '../../../types/ocpp/1.6/ChargePointStatus'; -import { OCPP16ServiceUtils } from './OCPP16ServiceUtils'; -import { OCPP16StandardParametersKey } from '../../../types/ocpp/1.6/Configuration'; -import OCPPError from '../../../exception/OCPPError'; -import OCPPResponseService from '../OCPPResponseService'; -import { ResponseHandler } from '../../../types/ocpp/Responses'; -import Utils from '../../../utils/Utils'; +import 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'; +import { OCPP16ServiceUtils } from './OCPP16ServiceUtils'; const moduleName = 'OCPP16ResponseService'; export default class OCPP16ResponseService extends OCPPResponseService { private responseHandlers: Map; + private jsonSchemas: Map>; - public constructor(chargingStation: ChargingStation) { + public constructor() { if (new.target?.name === moduleName) { throw new TypeError(`Cannot construct ${new.target?.name} instances directly`); } - super(chargingStation); + super(); this.responseHandlers = new Map([ [OCPP16RequestCommand.BOOT_NOTIFICATION, this.handleResponseBootNotification.bind(this)], - [OCPP16RequestCommand.HEARTBEAT, this.handleResponseHeartbeat.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.handleResponseStatusNotification.bind(this)], - [OCPP16RequestCommand.METER_VALUES, this.handleResponseMeterValues.bind(this)], + [OCPP16RequestCommand.STATUS_NOTIFICATION, this.emptyResponseHandler.bind(this)], + [OCPP16RequestCommand.METER_VALUES, this.emptyResponseHandler.bind(this)], + [OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION, this.emptyResponseHandler.bind(this)], ]); + this.jsonSchemas = new Map>([ + [ + OCPP16RequestCommand.BOOT_NOTIFICATION, + JSON.parse( + fs.readFileSync( + path.resolve( + path.dirname(fileURLToPath(import.meta.url)), + '../../../assets/json-schemas/ocpp/1.6/BootNotificationResponse.json' + ), + 'utf8' + ) + ) as JSONSchemaType, + ], + [ + OCPP16RequestCommand.HEARTBEAT, + JSON.parse( + fs.readFileSync( + path.resolve( + path.dirname(fileURLToPath(import.meta.url)), + '../../../assets/json-schemas/ocpp/1.6/HeartbeatResponse.json' + ), + 'utf8' + ) + ) as JSONSchemaType, + ], + [ + OCPP16RequestCommand.AUTHORIZE, + JSON.parse( + fs.readFileSync( + path.resolve( + path.dirname(fileURLToPath(import.meta.url)), + '../../../assets/json-schemas/ocpp/1.6/AuthorizeResponse.json' + ), + 'utf8' + ) + ) as JSONSchemaType, + ], + [ + OCPP16RequestCommand.START_TRANSACTION, + JSON.parse( + fs.readFileSync( + path.resolve( + path.dirname(fileURLToPath(import.meta.url)), + '../../../assets/json-schemas/ocpp/1.6/StartTransactionResponse.json' + ), + 'utf8' + ) + ) as JSONSchemaType, + ], + [ + OCPP16RequestCommand.STOP_TRANSACTION, + JSON.parse( + fs.readFileSync( + path.resolve( + path.dirname(fileURLToPath(import.meta.url)), + '../../../assets/json-schemas/ocpp/1.6/StopTransactionResponse.json' + ), + 'utf8' + ) + ) as JSONSchemaType, + ], + [ + OCPP16RequestCommand.STATUS_NOTIFICATION, + JSON.parse( + fs.readFileSync( + path.resolve( + path.dirname(fileURLToPath(import.meta.url)), + '../../../assets/json-schemas/ocpp/1.6/StatusNotificationResponse.json' + ), + 'utf8' + ) + ) as JSONSchemaType, + ], + [ + OCPP16RequestCommand.METER_VALUES, + JSON.parse( + fs.readFileSync( + path.resolve( + path.dirname(fileURLToPath(import.meta.url)), + '../../../assets/json-schemas/ocpp/1.6/MeterValuesResponse.json' + ), + 'utf8' + ) + ) as JSONSchemaType, + ], + [ + OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION, + JSON.parse( + fs.readFileSync( + path.resolve( + path.dirname(fileURLToPath(import.meta.url)), + '../../../assets/json-schemas/ocpp/1.6/DiagnosticsStatusNotificationResponse.json' + ), + 'utf8' + ) + ) as JSONSchemaType, + ], + ]); + this.validatePayload.bind(this); } - public async handleResponse( + public async responseHandler( + chargingStation: ChargingStation, commandName: OCPP16RequestCommand, - payload: JsonType | string, + payload: JsonType, requestPayload: JsonType ): Promise { if ( - this.chargingStation.isRegistered() || + chargingStation.isRegistered() === true || commandName === OCPP16RequestCommand.BOOT_NOTIFICATION ) { - if (this.responseHandlers.has(commandName)) { + if ( + this.responseHandlers.has(commandName) === true && + OCPP16ServiceUtils.isRequestCommandSupported(chargingStation, commandName) === true + ) { try { - await this.responseHandlers.get(commandName)(payload, requestPayload); + this.validatePayload(chargingStation, commandName, payload); + await this.responseHandlers.get(commandName)(chargingStation, payload, requestPayload); } catch (error) { logger.error( - this.chargingStation.logPrefix() + ' Handle request response error: %j', + `${chargingStation.logPrefix()} ${moduleName}.responseHandler: Handle response error:`, error ); throw error; @@ -83,47 +196,73 @@ export default class OCPP16ResponseService extends OCPPResponseService { // Throw exception throw new OCPPError( ErrorType.NOT_IMPLEMENTED, - `${commandName} is not implemented to handle request response payload ${JSON.stringify( + `${commandName} is not implemented to handle response PDU ${JSON.stringify( payload, null, 2 )}`, - commandName + commandName, + payload ); } } else { throw new OCPPError( ErrorType.SECURITY_ERROR, - `${commandName} cannot be issued to handle request response payload ${JSON.stringify( + `${commandName} cannot be issued to handle response PDU ${JSON.stringify( payload, null, 2 )} while the charging station is not registered on the central server. `, - commandName + commandName, + payload ); } } - private handleResponseBootNotification(payload: OCPP16BootNotificationResponse): void { + private validatePayload( + chargingStation: ChargingStation, + commandName: OCPP16RequestCommand, + payload: JsonType + ): boolean { + if (this.jsonSchemas.has(commandName)) { + return this.validateResponsePayload( + chargingStation, + commandName, + this.jsonSchemas.get(commandName), + payload + ); + } + logger.warn( + `${chargingStation.logPrefix()} ${moduleName}.validatePayload: No JSON schema found for command ${commandName} PDU validation` + ); + return false; + } + + private handleResponseBootNotification( + chargingStation: ChargingStation, + payload: OCPP16BootNotificationResponse + ): void { if (payload.status === OCPP16RegistrationStatus.ACCEPTED) { - this.chargingStation.addConfigurationKey( - OCPP16StandardParametersKey.HeartBeatInterval, + ChargingStationConfigurationUtils.addConfigurationKey( + chargingStation, + OCPP16StandardParametersKey.HeartbeatInterval, payload.interval.toString(), {}, { overwrite: true, save: true } ); - this.chargingStation.addConfigurationKey( - OCPP16StandardParametersKey.HeartbeatInterval, + ChargingStationConfigurationUtils.addConfigurationKey( + chargingStation, + OCPP16StandardParametersKey.HeartBeatInterval, payload.interval.toString(), { visible: false }, { overwrite: true, save: true } ); - this.chargingStation.heartbeatSetInterval - ? this.chargingStation.restartHeartbeat() - : this.chargingStation.startHeartbeat(); + chargingStation.heartbeatSetInterval + ? chargingStation.restartHeartbeat() + : chargingStation.startHeartbeat(); } if (Object.values(OCPP16RegistrationStatus).includes(payload.status)) { - const logMsg = `${this.chargingStation.logPrefix()} Charging station in '${ + const logMsg = `${chargingStation.logPrefix()} Charging station in '${ payload.status }' state on the central server`; payload.status === OCPP16RegistrationStatus.REJECTED @@ -131,57 +270,59 @@ export default class OCPP16ResponseService extends OCPPResponseService { : logger.info(logMsg); } else { logger.error( - this.chargingStation.logPrefix() + + chargingStation.logPrefix() + ' Charging station boot notification response received: %j with undefined registration status', payload ); } } - // eslint-disable-next-line @typescript-eslint/no-empty-function - private handleResponseHeartbeat(): void {} - private handleResponseAuthorize( + chargingStation: ChargingStation, payload: OCPP16AuthorizeResponse, requestPayload: OCPP16AuthorizeRequest ): void { let authorizeConnectorId: number; - for (const connectorId of this.chargingStation.connectors.keys()) { + for (const connectorId of chargingStation.connectors.keys()) { if ( connectorId > 0 && - this.chargingStation.getConnectorStatus(connectorId)?.authorizeIdTag === - requestPayload.idTag + chargingStation.getConnectorStatus(connectorId)?.authorizeIdTag === requestPayload.idTag ) { authorizeConnectorId = connectorId; break; } } + const isAuthorizeConnectorIdDefined = authorizeConnectorId !== undefined; if (payload.idTagInfo.status === OCPP16AuthorizationStatus.ACCEPTED) { - this.chargingStation.getConnectorStatus(authorizeConnectorId).idTagAuthorized = true; + isAuthorizeConnectorIdDefined && + (chargingStation.getConnectorStatus(authorizeConnectorId).idTagAuthorized = true); logger.debug( - `${this.chargingStation.logPrefix()} IdTag ${ - requestPayload.idTag - } authorized on connector ${authorizeConnectorId}` + `${chargingStation.logPrefix()} IdTag '${requestPayload.idTag}' accepted${ + isAuthorizeConnectorIdDefined ? ` on connector ${authorizeConnectorId}` : '' + }` ); } else { - this.chargingStation.getConnectorStatus(authorizeConnectorId).idTagAuthorized = false; - delete this.chargingStation.getConnectorStatus(authorizeConnectorId).authorizeIdTag; + if (isAuthorizeConnectorIdDefined) { + chargingStation.getConnectorStatus(authorizeConnectorId).idTagAuthorized = false; + delete chargingStation.getConnectorStatus(authorizeConnectorId).authorizeIdTag; + } logger.debug( - `${this.chargingStation.logPrefix()} IdTag ${requestPayload.idTag} refused with status '${ + `${chargingStation.logPrefix()} IdTag '${requestPayload.idTag}' rejected with status '${ payload.idTagInfo.status - }' on connector ${authorizeConnectorId}` + }'${isAuthorizeConnectorIdDefined ? ` on connector ${authorizeConnectorId}` : ''}` ); } } private async handleResponseStartTransaction( + chargingStation: ChargingStation, payload: OCPP16StartTransactionResponse, requestPayload: OCPP16StartTransactionRequest ): Promise { const connectorId = requestPayload.connectorId; let transactionConnectorId: number; - for (const id of this.chargingStation.connectors.keys()) { + for (const id of chargingStation.connectors.keys()) { if (id > 0 && id === connectorId) { transactionConnectorId = id; break; @@ -189,273 +330,277 @@ export default class OCPP16ResponseService extends OCPPResponseService { } if (!transactionConnectorId) { logger.error( - this.chargingStation.logPrefix() + + chargingStation.logPrefix() + ' Trying to start a transaction on a non existing connector Id ' + connectorId.toString() ); return; } if ( - this.chargingStation.getConnectorStatus(connectorId).transactionRemoteStarted && - this.chargingStation.getAuthorizeRemoteTxRequests() && - this.chargingStation.getLocalAuthListEnabled() && - this.chargingStation.hasAuthorizedTags() && - !this.chargingStation.getConnectorStatus(connectorId).idTagLocalAuthorized + chargingStation.getConnectorStatus(connectorId).transactionRemoteStarted === true && + chargingStation.getAuthorizeRemoteTxRequests() && + chargingStation.getLocalAuthListEnabled() && + chargingStation.hasAuthorizedTags() && + chargingStation.getConnectorStatus(connectorId).idTagLocalAuthorized === false ) { logger.error( - this.chargingStation.logPrefix() + + chargingStation.logPrefix() + ' Trying to start a transaction with a not local authorized idTag ' + - this.chargingStation.getConnectorStatus(connectorId).localAuthorizeIdTag + + chargingStation.getConnectorStatus(connectorId).localAuthorizeIdTag + ' on connector Id ' + connectorId.toString() ); - await this.resetConnectorOnStartTransactionError(connectorId); + await this.resetConnectorOnStartTransactionError(chargingStation, connectorId); return; } if ( - this.chargingStation.getConnectorStatus(connectorId).transactionRemoteStarted && - this.chargingStation.getAuthorizeRemoteTxRequests() && - this.chargingStation.getMayAuthorizeAtRemoteStart() && - !this.chargingStation.getConnectorStatus(connectorId).idTagLocalAuthorized && - !this.chargingStation.getConnectorStatus(connectorId).idTagAuthorized + chargingStation.getConnectorStatus(connectorId).transactionRemoteStarted === true && + chargingStation.getAuthorizeRemoteTxRequests() && + chargingStation.getMustAuthorizeAtRemoteStart() && + chargingStation.getConnectorStatus(connectorId).idTagLocalAuthorized === false && + chargingStation.getConnectorStatus(connectorId).idTagAuthorized === false ) { logger.error( - this.chargingStation.logPrefix() + + chargingStation.logPrefix() + ' Trying to start a transaction with a not authorized idTag ' + - this.chargingStation.getConnectorStatus(connectorId).authorizeIdTag + + chargingStation.getConnectorStatus(connectorId).authorizeIdTag + ' on connector Id ' + connectorId.toString() ); - await this.resetConnectorOnStartTransactionError(connectorId); + await this.resetConnectorOnStartTransactionError(chargingStation, connectorId); return; } if ( - this.chargingStation.getConnectorStatus(connectorId).idTagAuthorized && - this.chargingStation.getConnectorStatus(connectorId).authorizeIdTag !== requestPayload.idTag + chargingStation.getConnectorStatus(connectorId).idTagAuthorized && + chargingStation.getConnectorStatus(connectorId).authorizeIdTag !== requestPayload.idTag ) { logger.error( - this.chargingStation.logPrefix() + + chargingStation.logPrefix() + ' Trying to start a transaction with an idTag ' + requestPayload.idTag + ' different from the authorize request one ' + - this.chargingStation.getConnectorStatus(connectorId).authorizeIdTag + + chargingStation.getConnectorStatus(connectorId).authorizeIdTag + ' on connector Id ' + connectorId.toString() ); - await this.resetConnectorOnStartTransactionError(connectorId); + await this.resetConnectorOnStartTransactionError(chargingStation, connectorId); return; } if ( - this.chargingStation.getConnectorStatus(connectorId).idTagLocalAuthorized && - this.chargingStation.getConnectorStatus(connectorId).localAuthorizeIdTag !== - requestPayload.idTag + chargingStation.getConnectorStatus(connectorId).idTagLocalAuthorized && + chargingStation.getConnectorStatus(connectorId).localAuthorizeIdTag !== requestPayload.idTag ) { logger.error( - this.chargingStation.logPrefix() + + chargingStation.logPrefix() + ' Trying to start a transaction with an idTag ' + requestPayload.idTag + ' different from the local authorized one ' + - this.chargingStation.getConnectorStatus(connectorId).localAuthorizeIdTag + + chargingStation.getConnectorStatus(connectorId).localAuthorizeIdTag + ' on connector Id ' + connectorId.toString() ); - await this.resetConnectorOnStartTransactionError(connectorId); + await this.resetConnectorOnStartTransactionError(chargingStation, connectorId); return; } - if (this.chargingStation.getConnectorStatus(connectorId)?.transactionStarted) { + if (chargingStation.getConnectorStatus(connectorId)?.transactionStarted === true) { logger.debug( - this.chargingStation.logPrefix() + + chargingStation.logPrefix() + ' Trying to start a transaction on an already used connector ' + connectorId.toString() + ': %j', - this.chargingStation.getConnectorStatus(connectorId) + chargingStation.getConnectorStatus(connectorId) ); return; } if ( - this.chargingStation.getConnectorStatus(connectorId)?.status !== + chargingStation.getConnectorStatus(connectorId)?.status !== OCPP16ChargePointStatus.AVAILABLE && - this.chargingStation.getConnectorStatus(connectorId)?.status !== - OCPP16ChargePointStatus.PREPARING + chargingStation.getConnectorStatus(connectorId)?.status !== OCPP16ChargePointStatus.PREPARING ) { logger.error( - `${this.chargingStation.logPrefix()} Trying to start a transaction on connector ${connectorId.toString()} with status ${ - this.chargingStation.getConnectorStatus(connectorId)?.status + `${chargingStation.logPrefix()} Trying to start a transaction on connector ${connectorId.toString()} with status ${ + chargingStation.getConnectorStatus(connectorId)?.status }` ); return; } - if (!Number.isInteger(payload.transactionId)) { - logger.warn( - `${this.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.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 (payload.idTagInfo?.status === OCPP16AuthorizationStatus.ACCEPTED) { - this.chargingStation.getConnectorStatus(connectorId).transactionStarted = true; - this.chargingStation.getConnectorStatus(connectorId).transactionId = payload.transactionId; - this.chargingStation.getConnectorStatus(connectorId).transactionIdTag = requestPayload.idTag; - this.chargingStation.getConnectorStatus( + chargingStation.getConnectorStatus(connectorId).transactionStarted = true; + chargingStation.getConnectorStatus(connectorId).transactionId = payload.transactionId; + chargingStation.getConnectorStatus(connectorId).transactionIdTag = requestPayload.idTag; + chargingStation.getConnectorStatus( connectorId ).transactionEnergyActiveImportRegisterValue = 0; - this.chargingStation.getConnectorStatus(connectorId).transactionBeginMeterValue = + chargingStation.getConnectorStatus(connectorId).transactionBeginMeterValue = OCPP16ServiceUtils.buildTransactionBeginMeterValue( - this.chargingStation, + chargingStation, connectorId, requestPayload.meterStart ); - this.chargingStation.getBeginEndMeterValues() && - (await this.chargingStation.ocppRequestService.sendMessageHandler< + chargingStation.getBeginEndMeterValues() && + (await chargingStation.ocppRequestService.requestHandler< OCPP16MeterValuesRequest, OCPP16MeterValuesResponse - >(OCPP16RequestCommand.METER_VALUES, { + >(chargingStation, OCPP16RequestCommand.METER_VALUES, { connectorId, transactionId: payload.transactionId, - meterValue: - this.chargingStation.getConnectorStatus(connectorId).transactionBeginMeterValue, + meterValue: [chargingStation.getConnectorStatus(connectorId).transactionBeginMeterValue], })); - await this.chargingStation.ocppRequestService.sendMessageHandler< + await chargingStation.ocppRequestService.requestHandler< OCPP16StatusNotificationRequest, OCPP16StatusNotificationResponse - >(OCPP16RequestCommand.STATUS_NOTIFICATION, { + >(chargingStation, OCPP16RequestCommand.STATUS_NOTIFICATION, { connectorId, status: OCPP16ChargePointStatus.CHARGING, errorCode: OCPP16ChargePointErrorCode.NO_ERROR, }); - this.chargingStation.getConnectorStatus(connectorId).status = - OCPP16ChargePointStatus.CHARGING; + chargingStation.getConnectorStatus(connectorId).status = OCPP16ChargePointStatus.CHARGING; logger.info( - this.chargingStation.logPrefix() + + chargingStation.logPrefix() + ' Transaction ' + payload.transactionId.toString() + ' STARTED on ' + - this.chargingStation.stationInfo.chargingStationId + + chargingStation.stationInfo.chargingStationId + '#' + connectorId.toString() + - ' for idTag ' + - requestPayload.idTag + " for idTag '" + + requestPayload.idTag + + "'" ); - if (this.chargingStation.stationInfo.powerSharedByConnectors) { - this.chargingStation.stationInfo.powerDivider++; + if (chargingStation.stationInfo.powerSharedByConnectors) { + chargingStation.powerDivider++; } - const configuredMeterValueSampleInterval = this.chargingStation.getConfigurationKey( - OCPP16StandardParametersKey.MeterValueSampleInterval - ); - this.chargingStation.startMeterValues( + const configuredMeterValueSampleInterval = + ChargingStationConfigurationUtils.getConfigurationKey( + chargingStation, + OCPP16StandardParametersKey.MeterValueSampleInterval + ); + chargingStation.startMeterValues( connectorId, configuredMeterValueSampleInterval ? Utils.convertToInt(configuredMeterValueSampleInterval.value) * 1000 - : 60000 + : Constants.DEFAULT_METER_VALUES_INTERVAL ); } else { logger.warn( - this.chargingStation.logPrefix() + + chargingStation.logPrefix() + ' Starting transaction id ' + payload.transactionId.toString() + " REJECTED with status '" + payload?.idTagInfo?.status + - "', idTag " + - requestPayload.idTag + "', idTag '" + + requestPayload.idTag + + "'" ); - await this.resetConnectorOnStartTransactionError(connectorId); + await this.resetConnectorOnStartTransactionError(chargingStation, connectorId); } } - private async resetConnectorOnStartTransactionError(connectorId: number): Promise { - this.chargingStation.resetConnectorStatus(connectorId); + private async resetConnectorOnStartTransactionError( + chargingStation: ChargingStation, + connectorId: number + ): Promise { + chargingStation.resetConnectorStatus(connectorId); if ( - this.chargingStation.getConnectorStatus(connectorId).status !== - OCPP16ChargePointStatus.AVAILABLE + chargingStation.getConnectorStatus(connectorId).status !== OCPP16ChargePointStatus.AVAILABLE ) { - await this.chargingStation.ocppRequestService.sendMessageHandler< + await chargingStation.ocppRequestService.requestHandler< OCPP16StatusNotificationRequest, OCPP16StatusNotificationResponse - >(OCPP16RequestCommand.STATUS_NOTIFICATION, { + >(chargingStation, OCPP16RequestCommand.STATUS_NOTIFICATION, { connectorId, status: OCPP16ChargePointStatus.AVAILABLE, errorCode: OCPP16ChargePointErrorCode.NO_ERROR, }); - this.chargingStation.getConnectorStatus(connectorId).status = - OCPP16ChargePointStatus.AVAILABLE; + chargingStation.getConnectorStatus(connectorId).status = OCPP16ChargePointStatus.AVAILABLE; } } private async handleResponseStopTransaction( + chargingStation: ChargingStation, payload: OCPP16StopTransactionResponse, requestPayload: OCPP16StopTransactionRequest ): Promise { - const transactionConnectorId = this.chargingStation.getConnectorIdByTransactionId( + const transactionConnectorId = chargingStation.getConnectorIdByTransactionId( requestPayload.transactionId ); if (!transactionConnectorId) { logger.error( - this.chargingStation.logPrefix() + + chargingStation.logPrefix() + ' Trying to stop a non existing transaction ' + requestPayload.transactionId.toString() ); return; } if (payload.idTagInfo?.status === OCPP16AuthorizationStatus.ACCEPTED) { - this.chargingStation.getBeginEndMeterValues() && - !this.chargingStation.getOcppStrictCompliance() && - this.chargingStation.getOutOfOrderEndMeterValues() && - (await this.chargingStation.ocppRequestService.sendMessageHandler< + chargingStation.getBeginEndMeterValues() && + !chargingStation.getOcppStrictCompliance() && + chargingStation.getOutOfOrderEndMeterValues() && + (await chargingStation.ocppRequestService.requestHandler< OCPP16MeterValuesRequest, OCPP16MeterValuesResponse - >(OCPP16RequestCommand.METER_VALUES, { + >(chargingStation, OCPP16RequestCommand.METER_VALUES, { connectorId: transactionConnectorId, transactionId: requestPayload.transactionId, - meterValue: OCPP16ServiceUtils.buildTransactionEndMeterValue( - this.chargingStation, - transactionConnectorId, - requestPayload.meterStop - ), + meterValue: [ + OCPP16ServiceUtils.buildTransactionEndMeterValue( + chargingStation, + transactionConnectorId, + requestPayload.meterStop + ), + ], })); if ( - !this.chargingStation.isChargingStationAvailable() || - !this.chargingStation.isConnectorAvailable(transactionConnectorId) + chargingStation.isChargingStationAvailable() === false || + chargingStation.isConnectorAvailable(transactionConnectorId) === false ) { - await this.chargingStation.ocppRequestService.sendMessageHandler< + await chargingStation.ocppRequestService.requestHandler< OCPP16StatusNotificationRequest, OCPP16StatusNotificationResponse - >(OCPP16RequestCommand.STATUS_NOTIFICATION, { + >(chargingStation, OCPP16RequestCommand.STATUS_NOTIFICATION, { connectorId: transactionConnectorId, status: OCPP16ChargePointStatus.UNAVAILABLE, errorCode: OCPP16ChargePointErrorCode.NO_ERROR, }); - this.chargingStation.getConnectorStatus(transactionConnectorId).status = + chargingStation.getConnectorStatus(transactionConnectorId).status = OCPP16ChargePointStatus.UNAVAILABLE; } else { - await this.chargingStation.ocppRequestService.sendMessageHandler< + await chargingStation.ocppRequestService.requestHandler< OCPP16BootNotificationRequest, OCPP16BootNotificationResponse - >(OCPP16RequestCommand.STATUS_NOTIFICATION, { + >(chargingStation, OCPP16RequestCommand.STATUS_NOTIFICATION, { connectorId: transactionConnectorId, status: OCPP16ChargePointStatus.AVAILABLE, errorCode: OCPP16ChargePointErrorCode.NO_ERROR, }); - this.chargingStation.getConnectorStatus(transactionConnectorId).status = + chargingStation.getConnectorStatus(transactionConnectorId).status = OCPP16ChargePointStatus.AVAILABLE; } - if (this.chargingStation.stationInfo.powerSharedByConnectors) { - this.chargingStation.stationInfo.powerDivider--; + if (chargingStation.stationInfo.powerSharedByConnectors) { + chargingStation.powerDivider--; } + chargingStation.resetConnectorStatus(transactionConnectorId); logger.info( - this.chargingStation.logPrefix() + + chargingStation.logPrefix() + ' Transaction ' + requestPayload.transactionId.toString() + ' STOPPED on ' + - this.chargingStation.stationInfo.chargingStationId + + chargingStation.stationInfo.chargingStationId + '#' + transactionConnectorId.toString() ); - this.chargingStation.resetConnectorStatus(transactionConnectorId); } else { logger.warn( - this.chargingStation.logPrefix() + + chargingStation.logPrefix() + ' Stopping transaction id ' + requestPayload.transactionId.toString() + " REJECTED with status '" + @@ -464,10 +609,4 @@ export default class OCPP16ResponseService extends OCPPResponseService { ); } } - - // eslint-disable-next-line @typescript-eslint/no-empty-function - private handleResponseStatusNotification(): void {} - - // eslint-disable-next-line @typescript-eslint/no-empty-function - private handleResponseMeterValues(): void {} }