X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcharging-station%2Focpp%2F1.6%2FOCPP16IncomingRequestService.ts;h=8dc9135fa7b80e314b0880214fd029f0f7c9a8db;hb=5b67712355ba11e0b1bc6603267249aa22cbf75f;hp=b791f713ff954eb065534a5f10e561c9a8a24d3a;hpb=68c993d5b34c191022256f26d4e95e5f3b9974d4;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts b/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts index b791f713..8dc9135f 100644 --- a/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts +++ b/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts @@ -4,12 +4,16 @@ import { ChangeAvailabilityRequest, ChangeConfigurationRequest, ClearChargingProfileRequest, + DiagnosticsStatusNotificationRequest, GetConfigurationRequest, GetDiagnosticsRequest, MessageTrigger, OCPP16AvailabilityType, + OCPP16BootNotificationRequest, + OCPP16HeartbeatRequest, OCPP16IncomingRequestCommand, OCPP16RequestCommand, + OCPP16StatusNotificationRequest, OCPP16TriggerMessageRequest, RemoteStartTransactionRequest, RemoteStopTransactionRequest, @@ -21,8 +25,12 @@ import { ChangeAvailabilityResponse, ChangeConfigurationResponse, ClearChargingProfileResponse, + DiagnosticsStatusNotificationResponse, GetConfigurationResponse, GetDiagnosticsResponse, + OCPP16BootNotificationResponse, + OCPP16HeartbeatResponse, + OCPP16StatusNotificationResponse, OCPP16TriggerMessageResponse, SetChargingProfileResponse, UnlockConnectorResponse, @@ -34,11 +42,22 @@ import { import { Client, FTPResponse } from 'basic-ftp'; import { OCPP16AuthorizationStatus, + OCPP16AuthorizeRequest, OCPP16AuthorizeResponse, + OCPP16StartTransactionRequest, OCPP16StartTransactionResponse, OCPP16StopTransactionReason, + OCPP16StopTransactionRequest, OCPP16StopTransactionResponse, } from '../../../types/ocpp/1.6/Transaction'; +import { + OCPP16MeterValuesRequest, + OCPP16MeterValuesResponse, +} from '../../../types/ocpp/1.6/MeterValues'; +import { + OCPP16StandardParametersKey, + OCPP16SupportedFeatureProfiles, +} from '../../../types/ocpp/1.6/Configuration'; import type ChargingStation from '../../ChargingStation'; import Constants from '../../../utils/Constants'; @@ -50,7 +69,6 @@ import { OCPP16ChargePointErrorCode } from '../../../types/ocpp/1.6/ChargePointE import { OCPP16ChargePointStatus } from '../../../types/ocpp/1.6/ChargePointStatus'; import { OCPP16DiagnosticsStatus } from '../../../types/ocpp/1.6/DiagnosticsStatus'; import { OCPP16ServiceUtils } from './OCPP16ServiceUtils'; -import { OCPP16StandardParametersKey } from '../../../types/ocpp/1.6/Configuration'; import { OCPPConfigurationKey } from '../../../types/ocpp/Configuration'; import OCPPError from '../../../exception/OCPPError'; import OCPPIncomingRequestService from '../OCPPIncomingRequestService'; @@ -108,12 +126,12 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer ]); } - public async handleRequest( + public async incomingRequestHandler( messageId: string, commandName: OCPP16IncomingRequestCommand, commandPayload: JsonType ): Promise { - let result: JsonType; + let response: JsonType; if ( this.chargingStation.getOcppStrictCompliance() && this.chargingStation.isInPendingState() && @@ -136,8 +154,8 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer ) { if (this.incomingRequestHandlers.has(commandName)) { try { - // Call the method to build the result - result = await this.incomingRequestHandlers.get(commandName)(commandPayload); + // Call the method to build the response + response = await this.incomingRequestHandlers.get(commandName)(commandPayload); } catch (error) { // Log logger.error(this.chargingStation.logPrefix() + ' Handle request error: %j', error); @@ -166,19 +184,17 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer commandName ); } - // Send the built result - await this.chargingStation.ocppRequestService.sendResult(messageId, result, commandName); + // Send the built response + await this.chargingStation.ocppRequestService.sendResponse(messageId, response, commandName); } // Simulate charging station restart private handleRequestReset(commandPayload: ResetRequest): DefaultResponse { // eslint-disable-next-line @typescript-eslint/no-misused-promises setImmediate(async (): Promise => { - await this.chargingStation.stop( + await this.chargingStation.reset( (commandPayload.type + 'Reset') as OCPP16StopTransactionReason ); - await Utils.sleep(this.chargingStation.stationInfo.resetTime); - this.chargingStation.start(); }); logger.info( `${this.chargingStation.logPrefix()} ${ @@ -217,35 +233,37 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer connectorId, this.chargingStation.getEnergyActiveImportRegisterByTransactionId(transactionId) ); - await this.chargingStation.ocppRequestService.sendTransactionEndMeterValues( + await this.chargingStation.ocppRequestService.requestHandler< + OCPP16MeterValuesRequest, + OCPP16MeterValuesResponse + >(OCPP16RequestCommand.METER_VALUES, { connectorId, transactionId, - transactionEndMeterValue - ); + meterValue: transactionEndMeterValue, + }); } - const stopResponse = (await this.chargingStation.ocppRequestService.sendMessageHandler( - OCPP16RequestCommand.STOP_TRANSACTION, - { - transactionId, - meterStop: - this.chargingStation.getEnergyActiveImportRegisterByTransactionId(transactionId), - idTag: this.chargingStation.getTransactionIdTag(transactionId), - reason: OCPP16StopTransactionReason.UNLOCK_COMMAND, - } - )) as OCPP16StopTransactionResponse; + const stopResponse = await this.chargingStation.ocppRequestService.requestHandler< + OCPP16StopTransactionRequest, + OCPP16StopTransactionResponse + >(OCPP16RequestCommand.STOP_TRANSACTION, { + transactionId, + meterStop: this.chargingStation.getEnergyActiveImportRegisterByTransactionId(transactionId), + idTag: this.chargingStation.getTransactionIdTag(transactionId), + reason: OCPP16StopTransactionReason.UNLOCK_COMMAND, + }); if (stopResponse.idTagInfo?.status === OCPP16AuthorizationStatus.ACCEPTED) { return Constants.OCPP_RESPONSE_UNLOCKED; } return Constants.OCPP_RESPONSE_UNLOCK_FAILED; } - await this.chargingStation.ocppRequestService.sendMessageHandler( - OCPP16RequestCommand.STATUS_NOTIFICATION, - { - connectorId, - status: OCPP16ChargePointStatus.AVAILABLE, - errorCode: OCPP16ChargePointErrorCode.NO_ERROR, - } - ); + await this.chargingStation.ocppRequestService.requestHandler< + OCPP16StatusNotificationRequest, + OCPP16StatusNotificationResponse + >(OCPP16RequestCommand.STATUS_NOTIFICATION, { + connectorId, + status: OCPP16ChargePointStatus.AVAILABLE, + errorCode: OCPP16ChargePointErrorCode.NO_ERROR, + }); this.chargingStation.getConnectorStatus(connectorId).status = OCPP16ChargePointStatus.AVAILABLE; return Constants.OCPP_RESPONSE_UNLOCKED; } @@ -256,7 +274,7 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer const configurationKey: OCPPConfigurationKey[] = []; const unknownKey: string[] = []; if (Utils.isEmptyArray(commandPayload.key)) { - for (const configuration of this.chargingStation.configuration.configurationKey) { + for (const configuration of this.chargingStation.ocppConfiguration.configurationKey) { if (Utils.isUndefined(configuration.visible)) { configuration.visible = true; } @@ -321,12 +339,13 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer } else if (keyToChange && keyToChange.readonly) { return Constants.OCPP_CONFIGURATION_RESPONSE_REJECTED; } else if (keyToChange && !keyToChange.readonly) { - const keyIndex = this.chargingStation.configuration.configurationKey.indexOf(keyToChange); let valueChanged = false; - if ( - this.chargingStation.configuration.configurationKey[keyIndex].value !== commandPayload.value - ) { - this.chargingStation.configuration.configurationKey[keyIndex].value = commandPayload.value; + if (keyToChange.value !== commandPayload.value) { + this.chargingStation.setConfigurationKeyValue( + commandPayload.key, + commandPayload.value, + true + ); valueChanged = true; } let triggerHeartbeatRestart = false; @@ -360,6 +379,15 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer private handleRequestSetChargingProfile( commandPayload: SetChargingProfileRequest ): SetChargingProfileResponse { + if ( + !OCPP16ServiceUtils.checkFeatureProfile( + this.chargingStation, + OCPP16SupportedFeatureProfiles.SmartCharging, + OCPP16IncomingRequestCommand.SET_CHARGING_PROFILE + ) + ) { + return Constants.OCPP_SET_CHARGING_PROFILE_RESPONSE_NOT_SUPPORTED; + } if (!this.chargingStation.getConnectorStatus(commandPayload.connectorId)) { logger.error( `${this.chargingStation.logPrefix()} Trying to set charging profile(s) to a non existing connector Id ${ @@ -388,7 +416,9 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer commandPayload.csChargingProfiles ); logger.debug( - `${this.chargingStation.logPrefix()} Charging profile(s) set, dump their stack: %j`, + `${this.chargingStation.logPrefix()} Charging profile(s) set on connector id ${ + commandPayload.connectorId + }, dump their stack: %j`, this.chargingStation.getConnectorStatus(commandPayload.connectorId).chargingProfiles ); return Constants.OCPP_SET_CHARGING_PROFILE_RESPONSE_ACCEPTED; @@ -397,7 +427,17 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer private handleRequestClearChargingProfile( commandPayload: ClearChargingProfileRequest ): ClearChargingProfileResponse { - if (!this.chargingStation.getConnectorStatus(commandPayload.connectorId)) { + if ( + !OCPP16ServiceUtils.checkFeatureProfile( + this.chargingStation, + OCPP16SupportedFeatureProfiles.SmartCharging, + OCPP16IncomingRequestCommand.CLEAR_CHARGING_PROFILE + ) + ) { + return Constants.OCPP_CLEAR_CHARGING_PROFILE_RESPONSE_UNKNOWN; + } + const connectorStatus = this.chargingStation.getConnectorStatus(commandPayload.connectorId); + if (!connectorStatus) { logger.error( `${this.chargingStation.logPrefix()} Trying to clear a charging profile(s) to a non existing connector Id ${ commandPayload.connectorId @@ -405,16 +445,13 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer ); return Constants.OCPP_CLEAR_CHARGING_PROFILE_RESPONSE_UNKNOWN; } - if ( - commandPayload.connectorId && - !Utils.isEmptyArray( - this.chargingStation.getConnectorStatus(commandPayload.connectorId).chargingProfiles - ) - ) { - this.chargingStation.getConnectorStatus(commandPayload.connectorId).chargingProfiles = []; + if (commandPayload.connectorId && !Utils.isEmptyArray(connectorStatus.chargingProfiles)) { + connectorStatus.chargingProfiles = []; logger.debug( - `${this.chargingStation.logPrefix()} Charging profile(s) cleared, dump their stack: %j`, - this.chargingStation.getConnectorStatus(commandPayload.connectorId).chargingProfiles + `${this.chargingStation.logPrefix()} Charging profile(s) cleared on connector id ${ + commandPayload.connectorId + }, dump their stack: %j`, + connectorStatus.chargingProfiles ); return Constants.OCPP_CLEAR_CHARGING_PROFILE_RESPONSE_ACCEPTED; } @@ -450,13 +487,12 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer clearCurrentCP = true; } if (clearCurrentCP) { - this.chargingStation.getConnectorStatus( - commandPayload.connectorId - ).chargingProfiles[index] = {} as OCPP16ChargingProfile; + connectorStatus.chargingProfiles[index] = {} as OCPP16ChargingProfile; logger.debug( - `${this.chargingStation.logPrefix()} Charging profile(s) cleared, dump their stack: %j`, - this.chargingStation.getConnectorStatus(commandPayload.connectorId) - .chargingProfiles + `${this.chargingStation.logPrefix()} Matching charging profile(s) cleared on connector id ${ + commandPayload.connectorId + }, dump their stack: %j`, + connectorStatus.chargingProfiles ); clearedCP = true; } @@ -492,14 +528,14 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer } this.chargingStation.getConnectorStatus(id).availability = commandPayload.type; if (response === Constants.OCPP_AVAILABILITY_RESPONSE_ACCEPTED) { - await this.chargingStation.ocppRequestService.sendMessageHandler( - OCPP16RequestCommand.STATUS_NOTIFICATION, - { - connectorId: id, - status: chargePointStatus, - errorCode: OCPP16ChargePointErrorCode.NO_ERROR, - } - ); + await this.chargingStation.ocppRequestService.requestHandler< + OCPP16StatusNotificationRequest, + OCPP16StatusNotificationResponse + >(OCPP16RequestCommand.STATUS_NOTIFICATION, { + connectorId: id, + status: chargePointStatus, + errorCode: OCPP16ChargePointErrorCode.NO_ERROR, + }); this.chargingStation.getConnectorStatus(id).status = chargePointStatus; } } @@ -517,10 +553,14 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer return Constants.OCPP_AVAILABILITY_RESPONSE_SCHEDULED; } this.chargingStation.getConnectorStatus(connectorId).availability = commandPayload.type; - await this.chargingStation.ocppRequestService.sendMessageHandler( - OCPP16RequestCommand.STATUS_NOTIFICATION, - { connectorId, status: chargePointStatus, errorCode: OCPP16ChargePointErrorCode.NO_ERROR } - ); + await this.chargingStation.ocppRequestService.requestHandler< + OCPP16StatusNotificationRequest, + OCPP16StatusNotificationResponse + >(OCPP16RequestCommand.STATUS_NOTIFICATION, { + connectorId, + status: chargePointStatus, + errorCode: OCPP16ChargePointErrorCode.NO_ERROR, + }); this.chargingStation.getConnectorStatus(connectorId).status = chargePointStatus; return Constants.OCPP_AVAILABILITY_RESPONSE_ACCEPTED; } @@ -530,22 +570,19 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer private async handleRequestRemoteStartTransaction( commandPayload: RemoteStartTransactionRequest ): Promise { - const transactionConnectorId: number = commandPayload.connectorId; + const transactionConnectorId = commandPayload.connectorId; + const connectorStatus = this.chargingStation.getConnectorStatus(transactionConnectorId); if (transactionConnectorId) { - await this.chargingStation.ocppRequestService.sendMessageHandler( - OCPP16RequestCommand.STATUS_NOTIFICATION, - { - connectorId: transactionConnectorId, - status: OCPP16ChargePointStatus.PREPARING, - errorCode: OCPP16ChargePointErrorCode.NO_ERROR, - } - ); - this.chargingStation.getConnectorStatus(transactionConnectorId).status = - OCPP16ChargePointStatus.PREPARING; - if ( - this.chargingStation.isChargingStationAvailable() && - this.chargingStation.isConnectorAvailable(transactionConnectorId) - ) { + await this.chargingStation.ocppRequestService.requestHandler< + OCPP16StatusNotificationRequest, + OCPP16StatusNotificationResponse + >(OCPP16RequestCommand.STATUS_NOTIFICATION, { + connectorId: transactionConnectorId, + status: OCPP16ChargePointStatus.PREPARING, + errorCode: OCPP16ChargePointErrorCode.NO_ERROR, + }); + connectorStatus.status = OCPP16ChargePointStatus.PREPARING; + if (this.chargingStation.isChargingStationAvailable() && connectorStatus) { // Check if authorized if (this.chargingStation.getAuthorizeRemoteTxRequests()) { let authorized = false; @@ -554,21 +591,18 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer this.chargingStation.hasAuthorizedTags() && this.chargingStation.authorizedTags.find((value) => value === commandPayload.idTag) ) { - this.chargingStation.getConnectorStatus(transactionConnectorId).localAuthorizeIdTag = - commandPayload.idTag; - this.chargingStation.getConnectorStatus(transactionConnectorId).idTagLocalAuthorized = - true; + connectorStatus.localAuthorizeIdTag = commandPayload.idTag; + connectorStatus.idTagLocalAuthorized = true; authorized = true; } else if (this.chargingStation.getMayAuthorizeAtRemoteStart()) { - this.chargingStation.getConnectorStatus(transactionConnectorId).authorizeIdTag = - commandPayload.idTag; + connectorStatus.authorizeIdTag = commandPayload.idTag; const authorizeResponse: OCPP16AuthorizeResponse = - (await this.chargingStation.ocppRequestService.sendMessageHandler( - OCPP16RequestCommand.AUTHORIZE, - { - idTag: commandPayload.idTag, - } - )) as OCPP16AuthorizeResponse; + await this.chargingStation.ocppRequestService.requestHandler< + OCPP16AuthorizeRequest, + OCPP16AuthorizeResponse + >(OCPP16RequestCommand.AUTHORIZE, { + idTag: commandPayload.idTag, + }); if (authorizeResponse?.idTagInfo?.status === OCPP16AuthorizationStatus.ACCEPTED) { authorized = true; } @@ -585,18 +619,16 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer commandPayload.chargingProfile ) ) { - this.chargingStation.getConnectorStatus( - transactionConnectorId - ).transactionRemoteStarted = true; + connectorStatus.transactionRemoteStarted = true; if ( ( - (await this.chargingStation.ocppRequestService.sendMessageHandler( - OCPP16RequestCommand.START_TRANSACTION, - { - connectorId: transactionConnectorId, - idTag: commandPayload.idTag, - } - )) as OCPP16StartTransactionResponse + await this.chargingStation.ocppRequestService.requestHandler< + OCPP16StartTransactionRequest, + OCPP16StartTransactionResponse + >(OCPP16RequestCommand.START_TRANSACTION, { + connectorId: transactionConnectorId, + idTag: commandPayload.idTag, + }) ).idTagInfo.status === OCPP16AuthorizationStatus.ACCEPTED ) { logger.debug( @@ -632,17 +664,16 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer commandPayload.chargingProfile ) ) { - this.chargingStation.getConnectorStatus(transactionConnectorId).transactionRemoteStarted = - true; + connectorStatus.transactionRemoteStarted = true; if ( ( - (await this.chargingStation.ocppRequestService.sendMessageHandler( - OCPP16RequestCommand.START_TRANSACTION, - { - connectorId: transactionConnectorId, - idTag: commandPayload.idTag, - } - )) as OCPP16StartTransactionResponse + await this.chargingStation.ocppRequestService.requestHandler< + OCPP16StartTransactionRequest, + OCPP16StartTransactionResponse + >(OCPP16RequestCommand.START_TRANSACTION, { + connectorId: transactionConnectorId, + idTag: commandPayload.idTag, + }) ).idTagInfo.status === OCPP16AuthorizationStatus.ACCEPTED ) { logger.debug( @@ -682,14 +713,14 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer this.chargingStation.getConnectorStatus(connectorId).status !== OCPP16ChargePointStatus.AVAILABLE ) { - await this.chargingStation.ocppRequestService.sendMessageHandler( - OCPP16RequestCommand.STATUS_NOTIFICATION, - { - connectorId, - status: OCPP16ChargePointStatus.AVAILABLE, - errorCode: OCPP16ChargePointErrorCode.NO_ERROR, - } - ); + await this.chargingStation.ocppRequestService.requestHandler< + OCPP16StatusNotificationRequest, + OCPP16StatusNotificationResponse + >(OCPP16RequestCommand.STATUS_NOTIFICATION, { + connectorId, + status: OCPP16ChargePointStatus.AVAILABLE, + errorCode: OCPP16ChargePointErrorCode.NO_ERROR, + }); this.chargingStation.getConnectorStatus(connectorId).status = OCPP16ChargePointStatus.AVAILABLE; } @@ -714,7 +745,7 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer if (cp && cp.chargingProfilePurpose === ChargingProfilePurposeType.TX_PROFILE) { this.chargingStation.setChargingProfile(connectorId, cp); logger.debug( - `${this.chargingStation.logPrefix()} Charging profile(s) set at remote start transaction, dump their stack: %j`, + `${this.chargingStation.logPrefix()} Charging profile(s) set at remote start transaction on connector id ${connectorId}, dump their stack: %j`, this.chargingStation.getConnectorStatus(connectorId).chargingProfiles ); return true; @@ -739,14 +770,14 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer connectorId > 0 && this.chargingStation.getConnectorStatus(connectorId)?.transactionId === transactionId ) { - await this.chargingStation.ocppRequestService.sendMessageHandler( - OCPP16RequestCommand.STATUS_NOTIFICATION, - { - connectorId, - status: OCPP16ChargePointStatus.FINISHING, - errorCode: OCPP16ChargePointErrorCode.NO_ERROR, - } - ); + await this.chargingStation.ocppRequestService.requestHandler< + OCPP16StatusNotificationRequest, + OCPP16StatusNotificationResponse + >(OCPP16RequestCommand.STATUS_NOTIFICATION, { + connectorId, + status: OCPP16ChargePointStatus.FINISHING, + errorCode: OCPP16ChargePointErrorCode.NO_ERROR, + }); this.chargingStation.getConnectorStatus(connectorId).status = OCPP16ChargePointStatus.FINISHING; if ( @@ -760,21 +791,24 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer connectorId, this.chargingStation.getEnergyActiveImportRegisterByTransactionId(transactionId) ); - await this.chargingStation.ocppRequestService.sendTransactionEndMeterValues( + await this.chargingStation.ocppRequestService.requestHandler< + OCPP16MeterValuesRequest, + OCPP16MeterValuesResponse + >(OCPP16RequestCommand.METER_VALUES, { connectorId, transactionId, - transactionEndMeterValue - ); + meterValue: transactionEndMeterValue, + }); } - await this.chargingStation.ocppRequestService.sendMessageHandler( - OCPP16RequestCommand.STOP_TRANSACTION, - { - transactionId, - meterStop: - this.chargingStation.getEnergyActiveImportRegisterByTransactionId(transactionId), - idTag: this.chargingStation.getTransactionIdTag(transactionId), - } - ); + await this.chargingStation.ocppRequestService.requestHandler< + OCPP16StopTransactionRequest, + OCPP16StopTransactionResponse + >(OCPP16RequestCommand.STOP_TRANSACTION, { + transactionId, + meterStop: + this.chargingStation.getEnergyActiveImportRegisterByTransactionId(transactionId), + idTag: this.chargingStation.getTransactionIdTag(transactionId), + }); return Constants.OCPP_RESPONSE_ACCEPTED; } } @@ -789,6 +823,15 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer private async handleRequestGetDiagnostics( commandPayload: GetDiagnosticsRequest ): Promise { + if ( + !OCPP16ServiceUtils.checkFeatureProfile( + this.chargingStation, + OCPP16SupportedFeatureProfiles.FirmwareManagement, + OCPP16IncomingRequestCommand.GET_DIAGNOSTICS + ) + ) { + return Constants.OCPP_RESPONSE_EMPTY; + } logger.debug( this.chargingStation.logPrefix() + ' ' + @@ -823,18 +866,24 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer info.bytes / 1024 } bytes transferred from diagnostics archive ${info.name}` ); - await this.chargingStation.ocppRequestService.sendDiagnosticsStatusNotification( - OCPP16DiagnosticsStatus.Uploading - ); + await this.chargingStation.ocppRequestService.requestHandler< + DiagnosticsStatusNotificationRequest, + DiagnosticsStatusNotificationResponse + >(OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION, { + status: OCPP16DiagnosticsStatus.Uploading, + }); }); uploadResponse = await ftpClient.uploadFrom( path.join(path.resolve(__dirname, '../../../../'), diagnosticsArchive), uri.pathname + diagnosticsArchive ); if (uploadResponse.code === 226) { - await this.chargingStation.ocppRequestService.sendDiagnosticsStatusNotification( - OCPP16DiagnosticsStatus.Uploaded - ); + await this.chargingStation.ocppRequestService.requestHandler< + DiagnosticsStatusNotificationRequest, + DiagnosticsStatusNotificationResponse + >(OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION, { + status: OCPP16DiagnosticsStatus.Uploaded, + }); if (ftpClient) { ftpClient.close(); } @@ -856,9 +905,12 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer OCPP16IncomingRequestCommand.GET_DIAGNOSTICS ); } catch (error) { - await this.chargingStation.ocppRequestService.sendDiagnosticsStatusNotification( - OCPP16DiagnosticsStatus.UploadFailed - ); + await this.chargingStation.ocppRequestService.requestHandler< + DiagnosticsStatusNotificationRequest, + DiagnosticsStatusNotificationResponse + >(OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION, { + status: OCPP16DiagnosticsStatus.UploadFailed, + }); if (ftpClient) { ftpClient.close(); } @@ -874,9 +926,12 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer uri.protocol } to transfer the diagnostic logs archive` ); - await this.chargingStation.ocppRequestService.sendDiagnosticsStatusNotification( - OCPP16DiagnosticsStatus.UploadFailed - ); + await this.chargingStation.ocppRequestService.requestHandler< + DiagnosticsStatusNotificationRequest, + DiagnosticsStatusNotificationResponse + >(OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION, { + status: OCPP16DiagnosticsStatus.UploadFailed, + }); return Constants.OCPP_RESPONSE_EMPTY; } } @@ -884,12 +939,30 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer private handleRequestTriggerMessage( commandPayload: OCPP16TriggerMessageRequest ): OCPP16TriggerMessageResponse { + if ( + !OCPP16ServiceUtils.checkFeatureProfile( + this.chargingStation, + OCPP16SupportedFeatureProfiles.RemoteTrigger, + OCPP16IncomingRequestCommand.TRIGGER_MESSAGE + ) + ) { + return Constants.OCPP_TRIGGER_MESSAGE_RESPONSE_NOT_IMPLEMENTED; + } + // TODO: factor out the check on connector id + if (commandPayload?.connectorId < 0) { + logger.warn( + `${this.chargingStation.logPrefix()} ${ + OCPP16IncomingRequestCommand.TRIGGER_MESSAGE + } incoming request received with invalid connectorId ${commandPayload.connectorId}` + ); + return Constants.OCPP_TRIGGER_MESSAGE_RESPONSE_REJECTED; + } try { switch (commandPayload.requestedMessage) { case MessageTrigger.BootNotification: setTimeout(() => { this.chargingStation.ocppRequestService - .sendMessageHandler( + .requestHandler( OCPP16RequestCommand.BOOT_NOTIFICATION, { chargePointModel: @@ -910,6 +983,9 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer }, { skipBufferingOnError: true, triggerMessage: true } ) + .then((value) => { + this.chargingStation.bootNotificationResponse = value; + }) .catch(() => { /* This is intentional */ }); @@ -918,12 +994,61 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer case MessageTrigger.Heartbeat: setTimeout(() => { this.chargingStation.ocppRequestService - .sendMessageHandler(OCPP16RequestCommand.HEARTBEAT, null, { triggerMessage: true }) + .requestHandler( + OCPP16RequestCommand.HEARTBEAT, + null, + { + triggerMessage: true, + } + ) .catch(() => { /* This is intentional */ }); }, Constants.OCPP_TRIGGER_MESSAGE_DELAY); return Constants.OCPP_TRIGGER_MESSAGE_RESPONSE_ACCEPTED; + case MessageTrigger.StatusNotification: + setTimeout(() => { + if (commandPayload?.connectorId) { + this.chargingStation.ocppRequestService + .requestHandler( + OCPP16RequestCommand.STATUS_NOTIFICATION, + { + connectorId: commandPayload.connectorId, + errorCode: OCPP16ChargePointErrorCode.NO_ERROR, + status: this.chargingStation.getConnectorStatus(commandPayload.connectorId) + .status, + }, + { + triggerMessage: true, + } + ) + .catch(() => { + /* This is intentional */ + }); + } else { + for (const connectorId of this.chargingStation.connectors.keys()) { + this.chargingStation.ocppRequestService + .requestHandler< + OCPP16StatusNotificationRequest, + OCPP16StatusNotificationResponse + >( + OCPP16RequestCommand.STATUS_NOTIFICATION, + { + connectorId, + errorCode: OCPP16ChargePointErrorCode.NO_ERROR, + status: this.chargingStation.getConnectorStatus(connectorId).status, + }, + { + triggerMessage: true, + } + ) + .catch(() => { + /* This is intentional */ + }); + } + } + }, Constants.OCPP_TRIGGER_MESSAGE_DELAY); + return Constants.OCPP_TRIGGER_MESSAGE_RESPONSE_ACCEPTED; default: return Constants.OCPP_TRIGGER_MESSAGE_RESPONSE_NOT_IMPLEMENTED; }