X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Focpp%2F1.6%2FOCPP16IncomingRequestService.ts;h=b67090af8fc6a9e7a5794cda32f6ed152c9e0645;hb=cc6e8ab5f669ff49b1d476efffc509be8128bccc;hp=a86e995efb477d53675da0a458e7d9e37ca32b84;hpb=3a33b6a907a44aabd721d3c63e6c5984f4f60c28;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 a86e995e..b67090af 100644 --- a/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts +++ b/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts @@ -21,8 +21,12 @@ import { ChangeAvailabilityResponse, ChangeConfigurationResponse, ClearChargingProfileResponse, + DiagnosticsStatusNotificationResponse, GetConfigurationResponse, GetDiagnosticsResponse, + OCPP16BootNotificationResponse, + OCPP16HeartbeatResponse, + OCPP16StatusNotificationResponse, OCPP16TriggerMessageResponse, SetChargingProfileResponse, UnlockConnectorResponse, @@ -49,6 +53,7 @@ import { JsonType } from '../../../types/JsonType'; import { OCPP16ChargePointErrorCode } from '../../../types/ocpp/1.6/ChargePointErrorCode'; import { OCPP16ChargePointStatus } from '../../../types/ocpp/1.6/ChargePointStatus'; import { OCPP16DiagnosticsStatus } from '../../../types/ocpp/1.6/DiagnosticsStatus'; +import { OCPP16MeterValuesResponse } from '../../../types/ocpp/1.6/MeterValues'; import { OCPP16ServiceUtils } from './OCPP16ServiceUtils'; import { OCPP16StandardParametersKey } from '../../../types/ocpp/1.6/Configuration'; import { OCPPConfigurationKey } from '../../../types/ocpp/Configuration'; @@ -217,7 +222,7 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer connectorId, this.chargingStation.getEnergyActiveImportRegisterByTransactionId(transactionId) ); - await this.chargingStation.ocppRequestService.sendMessageHandler( + await this.chargingStation.ocppRequestService.sendMessageHandler( OCPP16RequestCommand.METER_VALUES, { connectorId, @@ -226,22 +231,23 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer } ); } - 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.sendMessageHandler( + 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( + await this.chargingStation.ocppRequestService.sendMessageHandler( OCPP16RequestCommand.STATUS_NOTIFICATION, { connectorId, @@ -259,7 +265,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; } @@ -324,12 +330,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; @@ -400,7 +407,8 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer private handleRequestClearChargingProfile( commandPayload: ClearChargingProfileRequest ): ClearChargingProfileResponse { - if (!this.chargingStation.getConnectorStatus(commandPayload.connectorId)) { + 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 @@ -408,16 +416,11 @@ 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 + connectorStatus.chargingProfiles ); return Constants.OCPP_CLEAR_CHARGING_PROFILE_RESPONSE_ACCEPTED; } @@ -453,13 +456,10 @@ 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 + connectorStatus.chargingProfiles ); clearedCP = true; } @@ -495,7 +495,7 @@ 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( + await this.chargingStation.ocppRequestService.sendMessageHandler( OCPP16RequestCommand.STATUS_NOTIFICATION, { connectorId: id, @@ -520,7 +520,7 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer return Constants.OCPP_AVAILABILITY_RESPONSE_SCHEDULED; } this.chargingStation.getConnectorStatus(connectorId).availability = commandPayload.type; - await this.chargingStation.ocppRequestService.sendMessageHandler( + await this.chargingStation.ocppRequestService.sendMessageHandler( OCPP16RequestCommand.STATUS_NOTIFICATION, { connectorId, status: chargePointStatus, errorCode: OCPP16ChargePointErrorCode.NO_ERROR } ); @@ -533,9 +533,10 @@ 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( + await this.chargingStation.ocppRequestService.sendMessageHandler( OCPP16RequestCommand.STATUS_NOTIFICATION, { connectorId: transactionConnectorId, @@ -543,12 +544,8 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer errorCode: OCPP16ChargePointErrorCode.NO_ERROR, } ); - this.chargingStation.getConnectorStatus(transactionConnectorId).status = - OCPP16ChargePointStatus.PREPARING; - if ( - this.chargingStation.isChargingStationAvailable() && - this.chargingStation.isConnectorAvailable(transactionConnectorId) - ) { + connectorStatus.status = OCPP16ChargePointStatus.PREPARING; + if (this.chargingStation.isChargingStationAvailable() && connectorStatus) { // Check if authorized if (this.chargingStation.getAuthorizeRemoteTxRequests()) { let authorized = false; @@ -557,21 +554,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( + await this.chargingStation.ocppRequestService.sendMessageHandler( OCPP16RequestCommand.AUTHORIZE, { idTag: commandPayload.idTag, } - )) as OCPP16AuthorizeResponse; + ); if (authorizeResponse?.idTagInfo?.status === OCPP16AuthorizationStatus.ACCEPTED) { authorized = true; } @@ -588,18 +582,16 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer commandPayload.chargingProfile ) ) { - this.chargingStation.getConnectorStatus( - transactionConnectorId - ).transactionRemoteStarted = true; + connectorStatus.transactionRemoteStarted = true; if ( ( - (await this.chargingStation.ocppRequestService.sendMessageHandler( + await this.chargingStation.ocppRequestService.sendMessageHandler( OCPP16RequestCommand.START_TRANSACTION, { connectorId: transactionConnectorId, idTag: commandPayload.idTag, } - )) as OCPP16StartTransactionResponse + ) ).idTagInfo.status === OCPP16AuthorizationStatus.ACCEPTED ) { logger.debug( @@ -635,17 +627,16 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer commandPayload.chargingProfile ) ) { - this.chargingStation.getConnectorStatus(transactionConnectorId).transactionRemoteStarted = - true; + connectorStatus.transactionRemoteStarted = true; if ( ( - (await this.chargingStation.ocppRequestService.sendMessageHandler( + await this.chargingStation.ocppRequestService.sendMessageHandler( OCPP16RequestCommand.START_TRANSACTION, { connectorId: transactionConnectorId, idTag: commandPayload.idTag, } - )) as OCPP16StartTransactionResponse + ) ).idTagInfo.status === OCPP16AuthorizationStatus.ACCEPTED ) { logger.debug( @@ -685,7 +676,7 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer this.chargingStation.getConnectorStatus(connectorId).status !== OCPP16ChargePointStatus.AVAILABLE ) { - await this.chargingStation.ocppRequestService.sendMessageHandler( + await this.chargingStation.ocppRequestService.sendMessageHandler( OCPP16RequestCommand.STATUS_NOTIFICATION, { connectorId, @@ -742,7 +733,7 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer connectorId > 0 && this.chargingStation.getConnectorStatus(connectorId)?.transactionId === transactionId ) { - await this.chargingStation.ocppRequestService.sendMessageHandler( + await this.chargingStation.ocppRequestService.sendMessageHandler( OCPP16RequestCommand.STATUS_NOTIFICATION, { connectorId, @@ -763,7 +754,7 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer connectorId, this.chargingStation.getEnergyActiveImportRegisterByTransactionId(transactionId) ); - await this.chargingStation.ocppRequestService.sendMessageHandler( + await this.chargingStation.ocppRequestService.sendMessageHandler( OCPP16RequestCommand.METER_VALUES, { connectorId, @@ -772,7 +763,7 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer } ); } - await this.chargingStation.ocppRequestService.sendMessageHandler( + await this.chargingStation.ocppRequestService.sendMessageHandler( OCPP16RequestCommand.STOP_TRANSACTION, { transactionId, @@ -829,8 +820,11 @@ 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.sendMessageHandler( + OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION, + { + status: OCPP16DiagnosticsStatus.Uploading, + } ); }); uploadResponse = await ftpClient.uploadFrom( @@ -838,8 +832,11 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer uri.pathname + diagnosticsArchive ); if (uploadResponse.code === 226) { - await this.chargingStation.ocppRequestService.sendDiagnosticsStatusNotification( - OCPP16DiagnosticsStatus.Uploaded + await this.chargingStation.ocppRequestService.sendMessageHandler( + OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION, + { + status: OCPP16DiagnosticsStatus.Uploaded, + } ); if (ftpClient) { ftpClient.close(); @@ -862,8 +859,11 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer OCPP16IncomingRequestCommand.GET_DIAGNOSTICS ); } catch (error) { - await this.chargingStation.ocppRequestService.sendDiagnosticsStatusNotification( - OCPP16DiagnosticsStatus.UploadFailed + await this.chargingStation.ocppRequestService.sendMessageHandler( + OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION, + { + status: OCPP16DiagnosticsStatus.UploadFailed, + } ); if (ftpClient) { ftpClient.close(); @@ -880,8 +880,11 @@ 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.sendMessageHandler( + OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION, + { + status: OCPP16DiagnosticsStatus.UploadFailed, + } ); return Constants.OCPP_RESPONSE_EMPTY; } @@ -895,7 +898,7 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer case MessageTrigger.BootNotification: setTimeout(() => { this.chargingStation.ocppRequestService - .sendMessageHandler( + .sendMessageHandler( OCPP16RequestCommand.BOOT_NOTIFICATION, { chargePointModel: @@ -916,6 +919,9 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer }, { skipBufferingOnError: true, triggerMessage: true } ) + .then((value) => { + this.chargingStation.bootNotificationResponse = value; + }) .catch(() => { /* This is intentional */ }); @@ -924,7 +930,9 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer case MessageTrigger.Heartbeat: setTimeout(() => { this.chargingStation.ocppRequestService - .sendMessageHandler(OCPP16RequestCommand.HEARTBEAT, null, { triggerMessage: true }) + .sendMessageHandler(OCPP16RequestCommand.HEARTBEAT, null, { + triggerMessage: true, + }) .catch(() => { /* This is intentional */ });