X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Focpp%2F1.6%2FOCPP16IncomingRequestService.ts;h=d24a2d4cd36e2716ab35b375af7b433017e4a9f3;hb=da332e702310d2a717d759040727e4e2a3f3fe87;hp=a838377f2c736339b83609cbee2766c5c5d2072e;hpb=9c6983d1f7acf05a0a4b69ddb233c8331063a79c;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 a838377f..d24a2d4c 100644 --- a/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts +++ b/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts @@ -1,29 +1,44 @@ // Partial Copyright Jerome Benoit. 2021-2023. All Rights Reserved. -import fs from 'node:fs'; -import path from 'node:path'; +import { createWriteStream, readdirSync } from 'node:fs'; +import { dirname, join, resolve } from 'node:path'; import { URL, fileURLToPath } from 'node:url'; import type { JSONSchemaType } from 'ajv'; import { Client, type FTPResponse } from 'basic-ftp'; -import tar from 'tar'; +import { + addSeconds, + differenceInSeconds, + isAfter, + isBefore, + isDate, + isWithinInterval, + max, + maxTime, + min, + minTime, + secondsToMilliseconds, +} from 'date-fns'; +import { create } from 'tar'; import { OCPP16Constants } from './OCPP16Constants'; import { OCPP16ServiceUtils } from './OCPP16ServiceUtils'; import { type ChargingStation, - ChargingStationConfigurationUtils, - ChargingStationUtils, + canProceedChargingProfile, + checkChargingStation, + getConfigurationKey, + getConnectorChargingProfiles, + prepareChargingProfileKind, + removeExpiredReservations, + setConfigurationKeyValue, } from '../../../charging-station'; import { OCPPError } from '../../../exception'; import { - type ChangeAvailabilityRequest, - type ChangeAvailabilityResponse, type ChangeConfigurationRequest, type ChangeConfigurationResponse, type ClearChargingProfileRequest, type ClearChargingProfileResponse, - type ConnectorStatus, ErrorType, type GenericResponse, GenericStatus, @@ -39,11 +54,15 @@ import { type OCPP16BootNotificationRequest, type OCPP16BootNotificationResponse, type OCPP16CancelReservationRequest, + type OCPP16ChangeAvailabilityRequest, + type OCPP16ChangeAvailabilityResponse, OCPP16ChargePointErrorCode, OCPP16ChargePointStatus, type OCPP16ChargingProfile, OCPP16ChargingProfilePurposeType, + OCPP16ChargingRateUnitType, type OCPP16ChargingSchedule, + type OCPP16ChargingSchedulePeriod, type OCPP16ClearCacheRequest, type OCPP16DataTransferRequest, type OCPP16DataTransferResponse, @@ -78,16 +97,28 @@ import { OCPPVersion, type RemoteStartTransactionRequest, type RemoteStopTransactionRequest, - ReservationFilterKey, ReservationTerminationReason, type ResetRequest, type SetChargingProfileRequest, type SetChargingProfileResponse, - type StartTransactionRequest, type UnlockConnectorRequest, type UnlockConnectorResponse, } from '../../../types'; -import { Constants, Utils, logger } from '../../../utils'; +import { + Constants, + convertToDate, + convertToInt, + formatDurationMilliSeconds, + getRandomInteger, + isEmptyArray, + isNotEmptyArray, + isNotEmptyString, + isNullOrUndefined, + isUndefined, + isValidTime, + logger, + sleep, +} from '../../../utils'; import { OCPPIncomingRequestService } from '../OCPPIncomingRequestService'; const moduleName = 'OCPP16IncomingRequestService'; @@ -102,49 +133,73 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { // } super(OCPPVersion.VERSION_16); this.incomingRequestHandlers = new Map([ - [OCPP16IncomingRequestCommand.RESET, this.handleRequestReset.bind(this)], - [OCPP16IncomingRequestCommand.CLEAR_CACHE, this.handleRequestClearCache.bind(this)], - [OCPP16IncomingRequestCommand.UNLOCK_CONNECTOR, this.handleRequestUnlockConnector.bind(this)], + [ + OCPP16IncomingRequestCommand.RESET, + this.handleRequestReset.bind(this) as unknown as IncomingRequestHandler, + ], + [ + OCPP16IncomingRequestCommand.CLEAR_CACHE, + this.handleRequestClearCache.bind(this) as IncomingRequestHandler, + ], + [ + OCPP16IncomingRequestCommand.UNLOCK_CONNECTOR, + this.handleRequestUnlockConnector.bind(this) as unknown as IncomingRequestHandler, + ], [ OCPP16IncomingRequestCommand.GET_CONFIGURATION, - this.handleRequestGetConfiguration.bind(this), + this.handleRequestGetConfiguration.bind(this) as IncomingRequestHandler, ], [ OCPP16IncomingRequestCommand.CHANGE_CONFIGURATION, - this.handleRequestChangeConfiguration.bind(this), + this.handleRequestChangeConfiguration.bind(this) as unknown as IncomingRequestHandler, ], [ OCPP16IncomingRequestCommand.GET_COMPOSITE_SCHEDULE, - this.handleRequestGetCompositeSchedule.bind(this), + this.handleRequestGetCompositeSchedule.bind(this) as unknown as IncomingRequestHandler, ], [ OCPP16IncomingRequestCommand.SET_CHARGING_PROFILE, - this.handleRequestSetChargingProfile.bind(this), + this.handleRequestSetChargingProfile.bind(this) as unknown as IncomingRequestHandler, ], [ OCPP16IncomingRequestCommand.CLEAR_CHARGING_PROFILE, - this.handleRequestClearChargingProfile.bind(this), + this.handleRequestClearChargingProfile.bind(this) as IncomingRequestHandler, ], [ OCPP16IncomingRequestCommand.CHANGE_AVAILABILITY, - this.handleRequestChangeAvailability.bind(this), + this.handleRequestChangeAvailability.bind(this) as unknown as IncomingRequestHandler, ], [ OCPP16IncomingRequestCommand.REMOTE_START_TRANSACTION, - this.handleRequestRemoteStartTransaction.bind(this), + this.handleRequestRemoteStartTransaction.bind(this) as unknown as IncomingRequestHandler, ], [ OCPP16IncomingRequestCommand.REMOTE_STOP_TRANSACTION, - this.handleRequestRemoteStopTransaction.bind(this), + this.handleRequestRemoteStopTransaction.bind(this) as unknown as IncomingRequestHandler, + ], + [ + OCPP16IncomingRequestCommand.GET_DIAGNOSTICS, + this.handleRequestGetDiagnostics.bind(this) as IncomingRequestHandler, + ], + [ + OCPP16IncomingRequestCommand.TRIGGER_MESSAGE, + this.handleRequestTriggerMessage.bind(this) as unknown as IncomingRequestHandler, + ], + [ + OCPP16IncomingRequestCommand.DATA_TRANSFER, + this.handleRequestDataTransfer.bind(this) as unknown as IncomingRequestHandler, + ], + [ + OCPP16IncomingRequestCommand.UPDATE_FIRMWARE, + this.handleRequestUpdateFirmware.bind(this) as unknown as IncomingRequestHandler, + ], + [ + OCPP16IncomingRequestCommand.RESERVE_NOW, + this.handleRequestReserveNow.bind(this) as unknown as IncomingRequestHandler, ], - [OCPP16IncomingRequestCommand.GET_DIAGNOSTICS, this.handleRequestGetDiagnostics.bind(this)], - [OCPP16IncomingRequestCommand.TRIGGER_MESSAGE, this.handleRequestTriggerMessage.bind(this)], - [OCPP16IncomingRequestCommand.DATA_TRANSFER, this.handleRequestDataTransfer.bind(this)], - [OCPP16IncomingRequestCommand.UPDATE_FIRMWARE, this.handleRequestUpdateFirmware.bind(this)], - [OCPP16IncomingRequestCommand.RESERVE_NOW, this.handleRequestReserveNow.bind(this)], [ OCPP16IncomingRequestCommand.CANCEL_RESERVATION, - this.handleRequestCancelReservation.bind(this), + this.handleRequestCancelReservation.bind(this) as unknown as IncomingRequestHandler, ], ]); this.jsonSchemas = new Map>([ @@ -153,7 +208,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { OCPP16ServiceUtils.parseJsonSchemaFile( 'assets/json-schemas/ocpp/1.6/Reset.json', moduleName, - 'constructor' + 'constructor', ), ], [ @@ -161,7 +216,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { OCPP16ServiceUtils.parseJsonSchemaFile( 'assets/json-schemas/ocpp/1.6/ClearCache.json', moduleName, - 'constructor' + 'constructor', ), ], [ @@ -169,7 +224,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { OCPP16ServiceUtils.parseJsonSchemaFile( 'assets/json-schemas/ocpp/1.6/UnlockConnector.json', moduleName, - 'constructor' + 'constructor', ), ], [ @@ -177,7 +232,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { OCPP16ServiceUtils.parseJsonSchemaFile( 'assets/json-schemas/ocpp/1.6/GetConfiguration.json', moduleName, - 'constructor' + 'constructor', ), ], [ @@ -185,7 +240,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { OCPP16ServiceUtils.parseJsonSchemaFile( 'assets/json-schemas/ocpp/1.6/ChangeConfiguration.json', moduleName, - 'constructor' + 'constructor', ), ], [ @@ -193,7 +248,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { OCPP16ServiceUtils.parseJsonSchemaFile( 'assets/json-schemas/ocpp/1.6/GetDiagnostics.json', moduleName, - 'constructor' + 'constructor', ), ], [ @@ -201,7 +256,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { OCPP16ServiceUtils.parseJsonSchemaFile( 'assets/json-schemas/ocpp/1.6/GetCompositeSchedule.json', moduleName, - 'constructor' + 'constructor', ), ], [ @@ -209,7 +264,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { OCPP16ServiceUtils.parseJsonSchemaFile( 'assets/json-schemas/ocpp/1.6/SetChargingProfile.json', moduleName, - 'constructor' + 'constructor', ), ], [ @@ -217,15 +272,15 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { OCPP16ServiceUtils.parseJsonSchemaFile( 'assets/json-schemas/ocpp/1.6/ClearChargingProfile.json', moduleName, - 'constructor' + 'constructor', ), ], [ OCPP16IncomingRequestCommand.CHANGE_AVAILABILITY, - OCPP16ServiceUtils.parseJsonSchemaFile( + OCPP16ServiceUtils.parseJsonSchemaFile( 'assets/json-schemas/ocpp/1.6/ChangeAvailability.json', moduleName, - 'constructor' + 'constructor', ), ], [ @@ -233,7 +288,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { OCPP16ServiceUtils.parseJsonSchemaFile( 'assets/json-schemas/ocpp/1.6/RemoteStartTransaction.json', moduleName, - 'constructor' + 'constructor', ), ], [ @@ -241,7 +296,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { OCPP16ServiceUtils.parseJsonSchemaFile( 'assets/json-schemas/ocpp/1.6/RemoteStopTransaction.json', moduleName, - 'constructor' + 'constructor', ), ], [ @@ -249,7 +304,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { OCPP16ServiceUtils.parseJsonSchemaFile( 'assets/json-schemas/ocpp/1.6/TriggerMessage.json', moduleName, - 'constructor' + 'constructor', ), ], [ @@ -257,7 +312,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { OCPP16ServiceUtils.parseJsonSchemaFile( 'assets/json-schemas/ocpp/1.6/DataTransfer.json', moduleName, - 'constructor' + 'constructor', ), ], [ @@ -265,7 +320,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { OCPP16ServiceUtils.parseJsonSchemaFile( 'assets/json-schemas/ocpp/1.6/UpdateFirmware.json', moduleName, - 'constructor' + 'constructor', ), ], [ @@ -273,7 +328,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { OCPP16ServiceUtils.parseJsonSchemaFile( 'assets/json-schemas/ocpp/1.6/ReserveNow.json', moduleName, - 'constructor' + 'constructor', ), ], [ @@ -281,24 +336,24 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { OCPP16ServiceUtils.parseJsonSchemaFile( 'assets/json-schemas/ocpp/1.6/CancelReservation.json', moduleName, - 'constructor' + 'constructor', ), ], ]); this.validatePayload = this.validatePayload.bind(this) as ( chargingStation: ChargingStation, commandName: OCPP16IncomingRequestCommand, - commandPayload: JsonType + commandPayload: JsonType, ) => boolean; } - public async incomingRequestHandler( + public async incomingRequestHandler( chargingStation: ChargingStation, messageId: string, commandName: OCPP16IncomingRequestCommand, - commandPayload: JsonType + commandPayload: ReqType, ): Promise { - let response: JsonType; + let response: ResType; if ( chargingStation.getOcppStrictCompliance() === true && chargingStation.inPendingState() === true && @@ -310,10 +365,10 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { `${commandName} cannot be issued to handle request PDU ${JSON.stringify( commandPayload, null, - 2 + 2, )} while the charging station is in pending state on the central server`, commandName, - commandPayload + commandPayload, ); } if ( @@ -328,16 +383,16 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { try { this.validatePayload(chargingStation, commandName, commandPayload); // Call the method to build the response - response = await this.incomingRequestHandlers.get(commandName)( + response = (await this.incomingRequestHandlers.get(commandName)!( chargingStation, - commandPayload - ); + commandPayload, + )) as ResType; } catch (error) { // Log logger.error( `${chargingStation.logPrefix()} ${moduleName}.incomingRequestHandler: Handle incoming request error:`, - error + error, ); throw error; } @@ -348,10 +403,10 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { `${commandName} is not implemented to handle request PDU ${JSON.stringify( commandPayload, null, - 2 + 2, )}`, commandName, - commandPayload + commandPayload, ); } } else { @@ -360,10 +415,10 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { `${commandName} cannot be issued to handle request PDU ${JSON.stringify( commandPayload, null, - 2 + 2, )} while the charging station is not registered on the central server.`, commandName, - commandPayload + commandPayload, ); } // Send the built response @@ -371,26 +426,26 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { chargingStation, messageId, response, - commandName + commandName, ); } private validatePayload( chargingStation: ChargingStation, commandName: OCPP16IncomingRequestCommand, - commandPayload: JsonType + commandPayload: JsonType, ): boolean { if (this.jsonSchemas.has(commandName) === true) { return this.validateIncomingRequestPayload( chargingStation, commandName, - this.jsonSchemas.get(commandName), - commandPayload + this.jsonSchemas.get(commandName)!, + commandPayload, ); } logger.warn( `${chargingStation.logPrefix()} ${moduleName}.validatePayload: No JSON schema found - for command '${commandName}' PDU validation` + for command '${commandName}' PDU validation`, ); return false; } @@ -398,47 +453,46 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { // Simulate charging station restart private handleRequestReset( chargingStation: ChargingStation, - commandPayload: ResetRequest + commandPayload: ResetRequest, ): GenericResponse { + const { type } = commandPayload; this.runInAsyncScope( chargingStation.reset.bind(chargingStation) as ( this: ChargingStation, - ...args: any[] + ...args: unknown[] ) => Promise, chargingStation, - `${commandPayload.type}Reset` as OCPP16StopTransactionReason + `${type}Reset` as OCPP16StopTransactionReason, ).catch(Constants.EMPTY_FUNCTION); logger.info( - `${chargingStation.logPrefix()} ${ - commandPayload.type - } reset command received, simulating it. The station will be - back online in ${Utils.formatDurationMilliSeconds(chargingStation.stationInfo.resetTime)}` + `${chargingStation.logPrefix()} ${type} reset command received, simulating it. The station will be + back online in ${formatDurationMilliSeconds(chargingStation.stationInfo.resetTime!)}`, ); return OCPP16Constants.OCPP_RESPONSE_ACCEPTED; } private async handleRequestUnlockConnector( chargingStation: ChargingStation, - commandPayload: UnlockConnectorRequest + commandPayload: UnlockConnectorRequest, ): Promise { - const connectorId = commandPayload.connectorId; + const { connectorId } = commandPayload; if (chargingStation.hasConnector(connectorId) === false) { logger.error( `${chargingStation.logPrefix()} Trying to unlock a non existing - connector id ${connectorId.toString()}` + connector id ${connectorId.toString()}`, ); return OCPP16Constants.OCPP_RESPONSE_UNLOCK_NOT_SUPPORTED; } if (connectorId === 0) { logger.error( - `${chargingStation.logPrefix()} Trying to unlock connector id ${connectorId.toString()}` + `${chargingStation.logPrefix()} Trying to unlock connector id ${connectorId.toString()}`, ); return OCPP16Constants.OCPP_RESPONSE_UNLOCK_NOT_SUPPORTED; } if (chargingStation.getConnectorStatus(connectorId)?.transactionStarted === true) { const stopResponse = await chargingStation.stopTransactionOnConnector( connectorId, - OCPP16StopTransactionReason.UNLOCK_COMMAND + OCPP16StopTransactionReason.UNLOCK_COMMAND, ); if (stopResponse.idTagInfo?.status === OCPP16AuthorizationStatus.ACCEPTED) { return OCPP16Constants.OCPP_RESPONSE_UNLOCKED; @@ -448,20 +502,21 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { await OCPP16ServiceUtils.sendAndSetConnectorStatus( chargingStation, connectorId, - OCPP16ChargePointStatus.Available + OCPP16ChargePointStatus.Available, ); return OCPP16Constants.OCPP_RESPONSE_UNLOCKED; } private handleRequestGetConfiguration( chargingStation: ChargingStation, - commandPayload: GetConfigurationRequest + commandPayload: GetConfigurationRequest, ): GetConfigurationResponse { + const { key } = commandPayload; const configurationKey: OCPPConfigurationKey[] = []; const unknownKey: string[] = []; - if (Utils.isUndefined(commandPayload.key) === true) { - for (const configuration of chargingStation.ocppConfiguration.configurationKey) { - if (Utils.isUndefined(configuration.visible) === true) { + if (isUndefined(key) === true) { + for (const configuration of chargingStation.ocppConfiguration!.configurationKey!) { + if (isUndefined(configuration.visible) === true) { configuration.visible = true; } if (configuration.visible === false) { @@ -473,15 +528,11 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { value: configuration.value, }); } - } else if (Utils.isNotEmptyArray(commandPayload.key) === true) { - for (const key of commandPayload.key) { - const keyFound = ChargingStationConfigurationUtils.getConfigurationKey( - chargingStation, - key, - true - ); + } else if (isNotEmptyArray(key) === true) { + for (const k of key!) { + const keyFound = getConfigurationKey(chargingStation, k, true); if (keyFound) { - if (Utils.isUndefined(keyFound.visible) === true) { + if (isUndefined(keyFound.visible) === true) { keyFound.visible = true; } if (keyFound.visible === false) { @@ -493,7 +544,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { value: keyFound.value, }); } else { - unknownKey.push(key); + unknownKey.push(k); } } } @@ -505,49 +556,51 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { private handleRequestChangeConfiguration( chargingStation: ChargingStation, - commandPayload: ChangeConfigurationRequest + commandPayload: ChangeConfigurationRequest, ): ChangeConfigurationResponse { - const keyToChange = ChargingStationConfigurationUtils.getConfigurationKey( - chargingStation, - commandPayload.key, - true - ); - if (!keyToChange) { - return OCPP16Constants.OCPP_CONFIGURATION_RESPONSE_NOT_SUPPORTED; - } else if (keyToChange?.readonly === true) { + const { key, value } = commandPayload; + const keyToChange = getConfigurationKey(chargingStation, key, true); + if (keyToChange?.readonly === true) { return OCPP16Constants.OCPP_CONFIGURATION_RESPONSE_REJECTED; } else if (keyToChange?.readonly === false) { let valueChanged = false; - if (keyToChange.value !== commandPayload.value) { - ChargingStationConfigurationUtils.setConfigurationKeyValue( - chargingStation, - commandPayload.key, - commandPayload.value, - true - ); + if (keyToChange.value !== value) { + setConfigurationKeyValue(chargingStation, key, value, true); valueChanged = true; } let triggerHeartbeatRestart = false; - if (keyToChange.key === OCPP16StandardParametersKey.HeartBeatInterval && valueChanged) { - ChargingStationConfigurationUtils.setConfigurationKeyValue( + if ( + (keyToChange.key as OCPP16StandardParametersKey) === + OCPP16StandardParametersKey.HeartBeatInterval && + valueChanged + ) { + setConfigurationKeyValue( chargingStation, OCPP16StandardParametersKey.HeartbeatInterval, - commandPayload.value + value, ); triggerHeartbeatRestart = true; } - if (keyToChange.key === OCPP16StandardParametersKey.HeartbeatInterval && valueChanged) { - ChargingStationConfigurationUtils.setConfigurationKeyValue( + if ( + (keyToChange.key as OCPP16StandardParametersKey) === + OCPP16StandardParametersKey.HeartbeatInterval && + valueChanged + ) { + setConfigurationKeyValue( chargingStation, OCPP16StandardParametersKey.HeartBeatInterval, - commandPayload.value + value, ); triggerHeartbeatRestart = true; } if (triggerHeartbeatRestart) { chargingStation.restartHeartbeat(); } - if (keyToChange.key === OCPP16StandardParametersKey.WebSocketPingInterval && valueChanged) { + if ( + (keyToChange.key as OCPP16StandardParametersKey) === + OCPP16StandardParametersKey.WebSocketPingInterval && + valueChanged + ) { chargingStation.restartWebSocketPing(); } if (keyToChange.reboot) { @@ -555,194 +608,403 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { } return OCPP16Constants.OCPP_CONFIGURATION_RESPONSE_ACCEPTED; } + return OCPP16Constants.OCPP_CONFIGURATION_RESPONSE_NOT_SUPPORTED; } private handleRequestSetChargingProfile( chargingStation: ChargingStation, - commandPayload: SetChargingProfileRequest + commandPayload: SetChargingProfileRequest, ): SetChargingProfileResponse { if ( OCPP16ServiceUtils.checkFeatureProfile( chargingStation, OCPP16SupportedFeatureProfiles.SmartCharging, - OCPP16IncomingRequestCommand.SET_CHARGING_PROFILE + OCPP16IncomingRequestCommand.SET_CHARGING_PROFILE, ) === false ) { return OCPP16Constants.OCPP_SET_CHARGING_PROFILE_RESPONSE_NOT_SUPPORTED; } - if (chargingStation.hasConnector(commandPayload.connectorId) === false) { + const { connectorId, csChargingProfiles } = commandPayload; + if (chargingStation.hasConnector(connectorId) === false) { logger.error( `${chargingStation.logPrefix()} Trying to set charging profile(s) to a - non existing connector id ${commandPayload.connectorId}` + non existing connector id ${connectorId}`, ); return OCPP16Constants.OCPP_SET_CHARGING_PROFILE_RESPONSE_REJECTED; } if ( - commandPayload.csChargingProfiles.chargingProfilePurpose === + csChargingProfiles.chargingProfilePurpose === OCPP16ChargingProfilePurposeType.CHARGE_POINT_MAX_PROFILE && - commandPayload.connectorId !== 0 + connectorId !== 0 ) { return OCPP16Constants.OCPP_SET_CHARGING_PROFILE_RESPONSE_REJECTED; } if ( - commandPayload.csChargingProfiles.chargingProfilePurpose === - OCPP16ChargingProfilePurposeType.TX_PROFILE && - (commandPayload.connectorId === 0 || - chargingStation.getConnectorStatus(commandPayload.connectorId)?.transactionStarted === - false) + csChargingProfiles.chargingProfilePurpose === OCPP16ChargingProfilePurposeType.TX_PROFILE && + (connectorId === 0 || + chargingStation.getConnectorStatus(connectorId)?.transactionStarted === false) ) { logger.error( `${chargingStation.logPrefix()} Trying to set transaction charging profile(s) - on connector ${commandPayload.connectorId} without a started transaction` + on connector ${connectorId} without a started transaction`, ); return OCPP16Constants.OCPP_SET_CHARGING_PROFILE_RESPONSE_REJECTED; } - OCPP16ServiceUtils.setChargingProfile( - chargingStation, - commandPayload.connectorId, - commandPayload.csChargingProfiles - ); + OCPP16ServiceUtils.setChargingProfile(chargingStation, connectorId, csChargingProfiles); logger.debug( - `${chargingStation.logPrefix()} Charging profile(s) set on connector id ${ - commandPayload.connectorId - }: %j`, - commandPayload.csChargingProfiles + `${chargingStation.logPrefix()} Charging profile(s) set on connector id ${connectorId}: %j`, + csChargingProfiles, ); return OCPP16Constants.OCPP_SET_CHARGING_PROFILE_RESPONSE_ACCEPTED; } private handleRequestGetCompositeSchedule( chargingStation: ChargingStation, - commandPayload: OCPP16GetCompositeScheduleRequest + commandPayload: OCPP16GetCompositeScheduleRequest, ): OCPP16GetCompositeScheduleResponse { if ( OCPP16ServiceUtils.checkFeatureProfile( chargingStation, OCPP16SupportedFeatureProfiles.SmartCharging, - OCPP16IncomingRequestCommand.CLEAR_CHARGING_PROFILE + OCPP16IncomingRequestCommand.GET_COMPOSITE_SCHEDULE, ) === false ) { return OCPP16Constants.OCPP_RESPONSE_REJECTED; } - if (chargingStation.hasConnector(commandPayload.connectorId) === false) { + const { connectorId, duration, chargingRateUnit } = commandPayload; + if (chargingStation.hasConnector(connectorId) === false) { logger.error( `${chargingStation.logPrefix()} Trying to get composite schedule to a - non existing connector id ${commandPayload.connectorId}` + non existing connector id ${connectorId}`, ); return OCPP16Constants.OCPP_RESPONSE_REJECTED; } + if (connectorId === 0) { + logger.error( + `${chargingStation.logPrefix()} Get composite schedule on connector id ${connectorId} is not yet supported`, + ); + return OCPP16Constants.OCPP_RESPONSE_REJECTED; + } + if (chargingRateUnit) { + logger.warn( + `${chargingStation.logPrefix()} Get composite schedule with a specified rate unit is not yet supported, no conversion will be done`, + ); + } + const connectorStatus = chargingStation.getConnectorStatus(connectorId)!; if ( - Utils.isEmptyArray( - chargingStation.getConnectorStatus(commandPayload.connectorId)?.chargingProfiles + isEmptyArray( + connectorStatus?.chargingProfiles && + isEmptyArray(chargingStation.getConnectorStatus(0)?.chargingProfiles), ) ) { return OCPP16Constants.OCPP_RESPONSE_REJECTED; } - const startDate = new Date(); - const endDate = new Date(startDate.getTime() + commandPayload.duration * 1000); - let compositeSchedule: OCPP16ChargingSchedule; - for (const chargingProfile of chargingStation.getConnectorStatus(commandPayload.connectorId) - .chargingProfiles) { - // FIXME: build the composite schedule including the local power limit, the stack level, the charging rate unit, etc. + const currentDate = new Date(); + const interval: Interval = { + start: currentDate, + end: addSeconds(currentDate, duration), + }; + // Get charging profiles sorted by connector id then stack level + const storedChargingProfiles: OCPP16ChargingProfile[] = getConnectorChargingProfiles( + chargingStation, + connectorId, + ); + const chargingProfiles: OCPP16ChargingProfile[] = []; + for (const storedChargingProfile of storedChargingProfiles) { + if ( + isNullOrUndefined(storedChargingProfile.chargingSchedule?.startSchedule) && + connectorStatus?.transactionStarted + ) { + logger.debug( + `${chargingStation.logPrefix()} ${moduleName}.handleRequestGetCompositeSchedule: Charging profile id ${ + storedChargingProfile.chargingProfileId + } has no startSchedule defined. Trying to set it to the connector current transaction start date`, + ); + // OCPP specifies that if startSchedule is not defined, it should be relative to start of the connector transaction + storedChargingProfile.chargingSchedule.startSchedule = connectorStatus?.transactionStart; + } + if ( + !isNullOrUndefined(storedChargingProfile.chargingSchedule?.startSchedule) && + isNullOrUndefined(storedChargingProfile.chargingSchedule?.duration) + ) { + logger.debug( + `${chargingStation.logPrefix()} ${moduleName}.getLimitFromChargingProfiles: Charging profile id ${ + storedChargingProfile.chargingProfileId + } has no duration defined and will be set to the maximum time allowed`, + ); + // OCPP specifies that if duration is not defined, it should be infinite + storedChargingProfile.chargingSchedule.duration = differenceInSeconds( + maxTime, + storedChargingProfile.chargingSchedule.startSchedule!, + ); + } + if (!isDate(storedChargingProfile.chargingSchedule?.startSchedule)) { + logger.warn( + `${chargingStation.logPrefix()} ${moduleName}.handleRequestGetCompositeSchedule: Charging profile id ${ + storedChargingProfile.chargingProfileId + } startSchedule property is not a Date object. Trying to convert it to a Date object`, + ); + storedChargingProfile.chargingSchedule.startSchedule = convertToDate( + storedChargingProfile.chargingSchedule?.startSchedule, + )!; + } if ( - chargingProfile.chargingSchedule?.startSchedule >= startDate && - chargingProfile.chargingSchedule?.startSchedule <= endDate + !prepareChargingProfileKind( + connectorStatus, + storedChargingProfile, + interval.start as Date, + chargingStation.logPrefix(), + ) ) { - compositeSchedule = chargingProfile.chargingSchedule; - break; + continue; + } + if ( + !canProceedChargingProfile( + storedChargingProfile, + interval.start as Date, + chargingStation.logPrefix(), + ) + ) { + continue; + } + // Add active charging profiles into chargingProfiles array + if ( + isValidTime(storedChargingProfile.chargingSchedule?.startSchedule) && + isWithinInterval(storedChargingProfile.chargingSchedule.startSchedule!, interval) + ) { + if (isEmptyArray(chargingProfiles)) { + if ( + isAfter( + addSeconds( + storedChargingProfile.chargingSchedule.startSchedule!, + storedChargingProfile.chargingSchedule.duration!, + ), + interval.end, + ) + ) { + storedChargingProfile.chargingSchedule.chargingSchedulePeriod = + storedChargingProfile.chargingSchedule.chargingSchedulePeriod.filter( + (schedulePeriod) => + isWithinInterval( + addSeconds( + storedChargingProfile.chargingSchedule.startSchedule!, + schedulePeriod.startPeriod, + )!, + interval, + ), + ); + storedChargingProfile.chargingSchedule.duration = differenceInSeconds( + interval.end, + storedChargingProfile.chargingSchedule.startSchedule!, + ); + } + chargingProfiles.push(storedChargingProfile); + } else if (isNotEmptyArray(chargingProfiles)) { + const chargingProfilesInterval: Interval = { + start: min( + chargingProfiles.map( + (chargingProfile) => chargingProfile.chargingSchedule.startSchedule ?? maxTime, + ), + ), + end: max( + chargingProfiles.map( + (chargingProfile) => + addSeconds( + chargingProfile.chargingSchedule.startSchedule!, + chargingProfile.chargingSchedule.duration!, + ) ?? minTime, + ), + ), + }; + let addChargingProfile = false; + if ( + isBefore(interval.start, chargingProfilesInterval.start) && + isBefore( + storedChargingProfile.chargingSchedule.startSchedule!, + chargingProfilesInterval.start, + ) + ) { + // Remove charging schedule periods that are after the start of the active profiles interval + storedChargingProfile.chargingSchedule.chargingSchedulePeriod = + storedChargingProfile.chargingSchedule.chargingSchedulePeriod.filter( + (schedulePeriod) => + isWithinInterval( + addSeconds( + storedChargingProfile.chargingSchedule.startSchedule!, + schedulePeriod.startPeriod, + ), + { + start: interval.start, + end: chargingProfilesInterval.start, + }, + ), + ); + addChargingProfile = true; + } + if ( + isBefore(chargingProfilesInterval.end, interval.end) && + isAfter( + addSeconds( + storedChargingProfile.chargingSchedule.startSchedule!, + storedChargingProfile.chargingSchedule.duration!, + ), + chargingProfilesInterval.end, + ) + ) { + // Remove charging schedule periods that are before the end of the active profiles interval + storedChargingProfile.chargingSchedule.chargingSchedulePeriod = + storedChargingProfile.chargingSchedule.chargingSchedulePeriod.filter( + (schedulePeriod, index) => { + if ( + isWithinInterval( + addSeconds( + storedChargingProfile.chargingSchedule.startSchedule!, + schedulePeriod.startPeriod, + ), + { + start: chargingProfilesInterval.end, + end: interval.end, + }, + ) + ) { + return true; + } + if ( + !isWithinInterval( + addSeconds( + storedChargingProfile.chargingSchedule.startSchedule!, + schedulePeriod.startPeriod, + ), + { + start: chargingProfilesInterval.end, + end: interval.end, + }, + ) && + index < + storedChargingProfile.chargingSchedule.chargingSchedulePeriod.length - 1 && + isWithinInterval( + addSeconds( + storedChargingProfile.chargingSchedule.startSchedule!, + storedChargingProfile.chargingSchedule.chargingSchedulePeriod[index + 1] + .startPeriod, + ), + { + start: chargingProfilesInterval.end, + end: interval.end, + }, + ) + ) { + return true; + } + return false; + }, + ); + addChargingProfile = true; + } + addChargingProfile && chargingProfiles.push(storedChargingProfile); + } } } + const compositeScheduleStart: Date = min( + chargingProfiles.map( + (chargingProfile) => chargingProfile.chargingSchedule.startSchedule ?? maxTime, + ), + ); + const compositeScheduleDuration: number = Math.max( + ...chargingProfiles.map((chargingProfile) => + isNaN(chargingProfile.chargingSchedule.duration!) + ? -Infinity + : chargingProfile.chargingSchedule.duration!, + ), + ); + const compositeSchedulePeriods: OCPP16ChargingSchedulePeriod[] = chargingProfiles + .map((chargingProfile) => chargingProfile.chargingSchedule.chargingSchedulePeriod) + .reduce( + (accumulator, value) => + accumulator.concat(value).sort((a, b) => a.startPeriod - b.startPeriod), + [], + ); + const compositeSchedule: OCPP16ChargingSchedule = { + startSchedule: compositeScheduleStart, + duration: compositeScheduleDuration, + chargingRateUnit: chargingProfiles.every( + (chargingProfile) => + chargingProfile.chargingSchedule.chargingRateUnit === OCPP16ChargingRateUnitType.AMPERE, + ) + ? OCPP16ChargingRateUnitType.AMPERE + : chargingProfiles.every( + (chargingProfile) => + chargingProfile.chargingSchedule.chargingRateUnit === OCPP16ChargingRateUnitType.WATT, + ) + ? OCPP16ChargingRateUnitType.WATT + : OCPP16ChargingRateUnitType.AMPERE, + chargingSchedulePeriod: compositeSchedulePeriods, + minChargeRate: Math.min( + ...chargingProfiles.map((chargingProfile) => + isNaN(chargingProfile.chargingSchedule.minChargeRate!) + ? Infinity + : chargingProfile.chargingSchedule.minChargeRate!, + ), + ), + }; return { status: GenericStatus.Accepted, - scheduleStart: compositeSchedule?.startSchedule, - connectorId: commandPayload.connectorId, + scheduleStart: compositeSchedule.startSchedule!, + connectorId, chargingSchedule: compositeSchedule, }; } private handleRequestClearChargingProfile( chargingStation: ChargingStation, - commandPayload: ClearChargingProfileRequest + commandPayload: ClearChargingProfileRequest, ): ClearChargingProfileResponse { if ( OCPP16ServiceUtils.checkFeatureProfile( chargingStation, OCPP16SupportedFeatureProfiles.SmartCharging, - OCPP16IncomingRequestCommand.CLEAR_CHARGING_PROFILE + OCPP16IncomingRequestCommand.CLEAR_CHARGING_PROFILE, ) === false ) { return OCPP16Constants.OCPP_CLEAR_CHARGING_PROFILE_RESPONSE_UNKNOWN; } - if (chargingStation.hasConnector(commandPayload.connectorId) === false) { + const { connectorId } = commandPayload; + if (chargingStation.hasConnector(connectorId!) === false) { logger.error( `${chargingStation.logPrefix()} Trying to clear a charging profile(s) to - a non existing connector id ${commandPayload.connectorId}` + a non existing connector id ${connectorId}`, ); return OCPP16Constants.OCPP_CLEAR_CHARGING_PROFILE_RESPONSE_UNKNOWN; } if ( - !Utils.isNullOrUndefined(commandPayload.connectorId) && - Utils.isNotEmptyArray( - chargingStation.getConnectorStatus(commandPayload.connectorId)?.chargingProfiles - ) + !isNullOrUndefined(connectorId) && + isNotEmptyArray(chargingStation.getConnectorStatus(connectorId!)?.chargingProfiles) ) { - chargingStation.getConnectorStatus(commandPayload.connectorId).chargingProfiles = []; + chargingStation.getConnectorStatus(connectorId!)!.chargingProfiles = []; logger.debug( - `${chargingStation.logPrefix()} Charging profile(s) cleared on connector id ${ - commandPayload.connectorId - }` + `${chargingStation.logPrefix()} Charging profile(s) cleared on connector id ${connectorId}`, ); return OCPP16Constants.OCPP_CLEAR_CHARGING_PROFILE_RESPONSE_ACCEPTED; } - if (Utils.isNullOrUndefined(commandPayload.connectorId)) { + if (isNullOrUndefined(connectorId)) { let clearedCP = false; - const clearChargingProfiles = (connectorStatus: ConnectorStatus) => { - if (Utils.isNotEmptyArray(connectorStatus?.chargingProfiles)) { - connectorStatus?.chargingProfiles?.forEach( - (chargingProfile: OCPP16ChargingProfile, index: number) => { - let clearCurrentCP = false; - if (chargingProfile.chargingProfileId === commandPayload.id) { - clearCurrentCP = true; - } - if ( - !commandPayload.chargingProfilePurpose && - chargingProfile.stackLevel === commandPayload.stackLevel - ) { - clearCurrentCP = true; - } - if ( - !chargingProfile.stackLevel && - chargingProfile.chargingProfilePurpose === commandPayload.chargingProfilePurpose - ) { - clearCurrentCP = true; - } - if ( - chargingProfile.stackLevel === commandPayload.stackLevel && - chargingProfile.chargingProfilePurpose === commandPayload.chargingProfilePurpose - ) { - clearCurrentCP = true; - } - if (clearCurrentCP) { - connectorStatus?.chargingProfiles?.splice(index, 1); - logger.debug( - `${chargingStation.logPrefix()} Matching charging profile(s) cleared: %j`, - chargingProfile - ); - clearedCP = true; - } - } - ); - } - }; if (chargingStation.hasEvses) { for (const evseStatus of chargingStation.evses.values()) { for (const connectorStatus of evseStatus.connectors.values()) { - clearChargingProfiles(connectorStatus); + clearedCP = OCPP16ServiceUtils.clearChargingProfiles( + chargingStation, + commandPayload, + connectorStatus.chargingProfiles, + ); } } } else { - for (const connectorId of chargingStation.connectors.keys()) { - clearChargingProfiles(chargingStation.getConnectorStatus(connectorId)); + for (const id of chargingStation.connectors.keys()) { + clearedCP = OCPP16ServiceUtils.clearChargingProfiles( + chargingStation, + commandPayload, + chargingStation.getConnectorStatus(id)?.chargingProfiles, + ); } } if (clearedCP) { @@ -754,63 +1016,55 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { private async handleRequestChangeAvailability( chargingStation: ChargingStation, - commandPayload: ChangeAvailabilityRequest - ): Promise { - const connectorId: number = commandPayload.connectorId; + commandPayload: OCPP16ChangeAvailabilityRequest, + ): Promise { + const { connectorId, type } = commandPayload; if (chargingStation.hasConnector(connectorId) === false) { logger.error( `${chargingStation.logPrefix()} Trying to change the availability of a - non existing connector id ${connectorId.toString()}` + non existing connector id ${connectorId.toString()}`, ); return OCPP16Constants.OCPP_AVAILABILITY_RESPONSE_REJECTED; } const chargePointStatus: OCPP16ChargePointStatus = - commandPayload.type === OCPP16AvailabilityType.Operative + type === OCPP16AvailabilityType.Operative ? OCPP16ChargePointStatus.Available : OCPP16ChargePointStatus.Unavailable; if (connectorId === 0) { - let response: ChangeAvailabilityResponse = - OCPP16Constants.OCPP_AVAILABILITY_RESPONSE_ACCEPTED; - const changeAvailability = async (id: number, connectorStatus: ConnectorStatus) => { - if (connectorStatus?.transactionStarted === true) { - response = OCPP16Constants.OCPP_AVAILABILITY_RESPONSE_SCHEDULED; - } - connectorStatus.availability = commandPayload.type; - if (response === OCPP16Constants.OCPP_AVAILABILITY_RESPONSE_ACCEPTED) { - await OCPP16ServiceUtils.sendAndSetConnectorStatus( - chargingStation, - id, - chargePointStatus - ); - } - }; + let response: OCPP16ChangeAvailabilityResponse; if (chargingStation.hasEvses) { for (const evseStatus of chargingStation.evses.values()) { - for (const [id, connectorStatus] of evseStatus.connectors) { - await changeAvailability(id, connectorStatus); - } + response = await OCPP16ServiceUtils.changeAvailability( + chargingStation, + [...evseStatus.connectors.keys()], + chargePointStatus, + type, + ); } } else { - for (const id of chargingStation.connectors.keys()) { - await changeAvailability(id, chargingStation.getConnectorStatus(id)); - } + response = await OCPP16ServiceUtils.changeAvailability( + chargingStation, + [...chargingStation.connectors.keys()], + chargePointStatus, + type, + ); } - return response; + return response!; } else if ( connectorId > 0 && (chargingStation.isChargingStationAvailable() === true || (chargingStation.isChargingStationAvailable() === false && - commandPayload.type === OCPP16AvailabilityType.Inoperative)) + type === OCPP16AvailabilityType.Inoperative)) ) { if (chargingStation.getConnectorStatus(connectorId)?.transactionStarted === true) { - chargingStation.getConnectorStatus(connectorId).availability = commandPayload.type; + chargingStation.getConnectorStatus(connectorId)!.availability = type; return OCPP16Constants.OCPP_AVAILABILITY_RESPONSE_SCHEDULED; } - chargingStation.getConnectorStatus(connectorId).availability = commandPayload.type; + chargingStation.getConnectorStatus(connectorId)!.availability = type; await OCPP16ServiceUtils.sendAndSetConnectorStatus( chargingStation, connectorId, - chargePointStatus + chargePointStatus, ); return OCPP16Constants.OCPP_AVAILABILITY_RESPONSE_ACCEPTED; } @@ -819,26 +1073,14 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { private async handleRequestRemoteStartTransaction( chargingStation: ChargingStation, - commandPayload: RemoteStartTransactionRequest + commandPayload: RemoteStartTransactionRequest, ): Promise { const { connectorId: transactionConnectorId, idTag, chargingProfile } = commandPayload; - const reserved = - chargingStation.getConnectorStatus(transactionConnectorId).status === - OCPP16ChargePointStatus.Reserved; - const reservedOnConnectorZero = - chargingStation.getConnectorStatus(0).status === OCPP16ChargePointStatus.Reserved; - if ( - (reserved && - !chargingStation.validateIncomingRequestWithReservation(transactionConnectorId, idTag)) || - (reservedOnConnectorZero && !chargingStation.validateIncomingRequestWithReservation(0, idTag)) - ) { - return OCPP16Constants.OCPP_RESPONSE_REJECTED; - } if (chargingStation.hasConnector(transactionConnectorId) === false) { return this.notifyRemoteStartTransactionRejected( chargingStation, transactionConnectorId, - idTag + idTag, ); } if ( @@ -848,22 +1090,22 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { return this.notifyRemoteStartTransactionRejected( chargingStation, transactionConnectorId, - idTag + idTag, ); } const remoteStartTransactionLogMsg = ` ${chargingStation.logPrefix()} Transaction remotely STARTED on ${ - chargingStation.stationInfo.chargingStationId - }#${transactionConnectorId.toString()} for idTag '${idTag}'`; + chargingStation.stationInfo.chargingStationId + }#${transactionConnectorId.toString()} for idTag '${idTag}'`; await OCPP16ServiceUtils.sendAndSetConnectorStatus( chargingStation, transactionConnectorId, - OCPP16ChargePointStatus.Preparing + OCPP16ChargePointStatus.Preparing, ); - const connectorStatus = chargingStation.getConnectorStatus(transactionConnectorId); - // Check if authorized + const connectorStatus = chargingStation.getConnectorStatus(transactionConnectorId)!; + // Authorization check required if ( - chargingStation.getAuthorizeRemoteTxRequests() && + chargingStation.getAuthorizeRemoteTxRequests() === true && (await OCPP16ServiceUtils.isIdTagAuthorized(chargingStation, transactionConnectorId, idTag)) ) { // Authorization successful, start transaction @@ -871,31 +1113,19 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { this.setRemoteStartTransactionChargingProfile( chargingStation, transactionConnectorId, - chargingProfile + chargingProfile!, ) === true ) { connectorStatus.transactionRemoteStarted = true; - const startTransactionPayload: Partial = { - connectorId: transactionConnectorId, - idTag, - }; - if (reserved || reservedOnConnectorZero) { - const reservation = chargingStation.getReservationBy( - ReservationFilterKey.CONNECTOR_ID, - reservedOnConnectorZero ? 0 : transactionConnectorId - ); - startTransactionPayload.reservationId = reservation.id; - await chargingStation.removeReservation( - reservation, - ReservationTerminationReason.TRANSACTION_STARTED - ); - } if ( ( await chargingStation.ocppRequestService.requestHandler< OCPP16StartTransactionRequest, OCPP16StartTransactionResponse - >(chargingStation, OCPP16RequestCommand.START_TRANSACTION, startTransactionPayload) + >(chargingStation, OCPP16RequestCommand.START_TRANSACTION, { + connectorId: transactionConnectorId, + idTag, + }) ).idTagInfo.status === OCPP16AuthorizationStatus.ACCEPTED ) { logger.debug(remoteStartTransactionLogMsg); @@ -904,13 +1134,13 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { return this.notifyRemoteStartTransactionRejected( chargingStation, transactionConnectorId, - idTag + idTag, ); } return this.notifyRemoteStartTransactionRejected( chargingStation, transactionConnectorId, - idTag + idTag, ); } // No authorization check required, start transaction @@ -918,7 +1148,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { this.setRemoteStartTransactionChargingProfile( chargingStation, transactionConnectorId, - chargingProfile + chargingProfile!, ) === true ) { connectorStatus.transactionRemoteStarted = true; @@ -939,20 +1169,20 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { return this.notifyRemoteStartTransactionRejected( chargingStation, transactionConnectorId, - idTag + idTag, ); } return this.notifyRemoteStartTransactionRejected( chargingStation, transactionConnectorId, - idTag + idTag, ); } private async notifyRemoteStartTransactionRejected( chargingStation: ChargingStation, connectorId: number, - idTag: string + idTag: string, ): Promise { if ( chargingStation.getConnectorStatus(connectorId)?.status !== OCPP16ChargePointStatus.Available @@ -960,14 +1190,14 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { await OCPP16ServiceUtils.sendAndSetConnectorStatus( chargingStation, connectorId, - OCPP16ChargePointStatus.Available + OCPP16ChargePointStatus.Available, ); } logger.warn( `${chargingStation.logPrefix()} Remote starting transaction REJECTED on connector id - ${connectorId.toString()}, idTag '${idTag}', availability '${ - chargingStation.getConnectorStatus(connectorId)?.availability - }', status '${chargingStation.getConnectorStatus(connectorId)?.status}'` + ${connectorId.toString()}, idTag '${idTag}', availability '${chargingStation.getConnectorStatus( + connectorId, + )?.availability}', status '${chargingStation.getConnectorStatus(connectorId)?.status}'`, ); return OCPP16Constants.OCPP_RESPONSE_REJECTED; } @@ -975,54 +1205,44 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { private setRemoteStartTransactionChargingProfile( chargingStation: ChargingStation, connectorId: number, - cp: OCPP16ChargingProfile + chargingProfile: OCPP16ChargingProfile, ): boolean { - if (cp && cp.chargingProfilePurpose === OCPP16ChargingProfilePurposeType.TX_PROFILE) { - OCPP16ServiceUtils.setChargingProfile(chargingStation, connectorId, cp); + if ( + chargingProfile && + chargingProfile.chargingProfilePurpose === OCPP16ChargingProfilePurposeType.TX_PROFILE + ) { + OCPP16ServiceUtils.setChargingProfile(chargingStation, connectorId, chargingProfile); logger.debug( `${chargingStation.logPrefix()} Charging profile(s) set at remote start transaction on connector id ${connectorId}: %j`, - cp + chargingProfile, ); return true; - } else if (cp && cp.chargingProfilePurpose !== OCPP16ChargingProfilePurposeType.TX_PROFILE) { + } else if ( + chargingProfile && + chargingProfile.chargingProfilePurpose !== OCPP16ChargingProfilePurposeType.TX_PROFILE + ) { logger.warn( `${chargingStation.logPrefix()} Not allowed to set ${ - cp.chargingProfilePurpose - } charging profile(s) at remote start transaction` + chargingProfile.chargingProfilePurpose + } charging profile(s) at remote start transaction`, ); return false; - } else if (!cp) { - return true; } + return true; } private async handleRequestRemoteStopTransaction( chargingStation: ChargingStation, - commandPayload: RemoteStopTransactionRequest + commandPayload: RemoteStopTransactionRequest, ): Promise { - const transactionId = commandPayload.transactionId; - const remoteStopTransaction = async (connectorId: number): Promise => { - await OCPP16ServiceUtils.sendAndSetConnectorStatus( - chargingStation, - connectorId, - OCPP16ChargePointStatus.Finishing - ); - const stopResponse = await chargingStation.stopTransactionOnConnector( - connectorId, - OCPP16StopTransactionReason.REMOTE - ); - if (stopResponse.idTagInfo?.status === OCPP16AuthorizationStatus.ACCEPTED) { - return OCPP16Constants.OCPP_RESPONSE_ACCEPTED; - } - return OCPP16Constants.OCPP_RESPONSE_REJECTED; - }; + const { transactionId } = commandPayload; if (chargingStation.hasEvses) { for (const [evseId, evseStatus] of chargingStation.evses) { if (evseId > 0) { for (const [connectorId, connectorStatus] of evseStatus.connectors) { if (connectorStatus.transactionId === transactionId) { - return remoteStopTransaction(connectorId); + return OCPP16ServiceUtils.remoteStopTransaction(chargingStation, connectorId); } } } @@ -1033,66 +1253,70 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { connectorId > 0 && chargingStation.getConnectorStatus(connectorId)?.transactionId === transactionId ) { - return remoteStopTransaction(connectorId); + return OCPP16ServiceUtils.remoteStopTransaction(chargingStation, connectorId); } } } logger.warn( - `${chargingStation.logPrefix()} Trying to remote stop a non existing transaction with id: - ${transactionId.toString()}` + `${chargingStation.logPrefix()} Trying to remote stop a non existing transaction with id + ${transactionId.toString()}`, ); return OCPP16Constants.OCPP_RESPONSE_REJECTED; } private handleRequestUpdateFirmware( chargingStation: ChargingStation, - commandPayload: OCPP16UpdateFirmwareRequest + commandPayload: OCPP16UpdateFirmwareRequest, ): OCPP16UpdateFirmwareResponse { if ( OCPP16ServiceUtils.checkFeatureProfile( chargingStation, OCPP16SupportedFeatureProfiles.FirmwareManagement, - OCPP16IncomingRequestCommand.UPDATE_FIRMWARE + OCPP16IncomingRequestCommand.UPDATE_FIRMWARE, ) === false ) { logger.warn( `${chargingStation.logPrefix()} ${moduleName}.handleRequestUpdateFirmware: - Cannot simulate firmware update: feature profile not supported` + Cannot simulate firmware update: feature profile not supported`, ); return OCPP16Constants.OCPP_RESPONSE_EMPTY; } + let { retrieveDate } = commandPayload; if ( - !Utils.isNullOrUndefined(chargingStation.stationInfo.firmwareStatus) && + !isNullOrUndefined(chargingStation.stationInfo.firmwareStatus) && chargingStation.stationInfo.firmwareStatus !== OCPP16FirmwareStatus.Installed ) { logger.warn( `${chargingStation.logPrefix()} ${moduleName}.handleRequestUpdateFirmware: - Cannot simulate firmware update: firmware update is already in progress` + Cannot simulate firmware update: firmware update is already in progress`, ); return OCPP16Constants.OCPP_RESPONSE_EMPTY; } - const retrieveDate = Utils.convertToDate(commandPayload.retrieveDate); + retrieveDate = convertToDate(retrieveDate)!; const now = Date.now(); if (retrieveDate?.getTime() <= now) { this.runInAsyncScope( this.updateFirmwareSimulation.bind(this) as ( this: OCPP16IncomingRequestService, - ...args: any[] + ...args: unknown[] ) => Promise, this, - chargingStation + chargingStation, ).catch(Constants.EMPTY_FUNCTION); } else { - setTimeout(() => { - this.runInAsyncScope( - this.updateFirmwareSimulation.bind(this) as ( - this: OCPP16IncomingRequestService, - ...args: any[] - ) => Promise, - this, - chargingStation - ).catch(Constants.EMPTY_FUNCTION); - }, retrieveDate?.getTime() - now); + setTimeout( + () => { + this.runInAsyncScope( + this.updateFirmwareSimulation.bind(this) as ( + this: OCPP16IncomingRequestService, + ...args: unknown[] + ) => Promise, + this, + chargingStation, + ).catch(Constants.EMPTY_FUNCTION); + }, + retrieveDate?.getTime() - now, + ); } return OCPP16Constants.OCPP_RESPONSE_EMPTY; } @@ -1100,12 +1324,9 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { private async updateFirmwareSimulation( chargingStation: ChargingStation, maxDelay = 30, - minDelay = 15 + minDelay = 15, ): Promise { - if ( - ChargingStationUtils.checkChargingStation(chargingStation, chargingStation.logPrefix()) === - false - ) { + if (checkChargingStation(chargingStation, chargingStation.logPrefix()) === false) { return; } if (chargingStation.hasEvses) { @@ -1116,7 +1337,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { await OCPP16ServiceUtils.sendAndSetConnectorStatus( chargingStation, connectorId, - OCPP16ChargePointStatus.Unavailable + OCPP16ChargePointStatus.Unavailable, ); } } @@ -1131,7 +1352,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { await OCPP16ServiceUtils.sendAndSetConnectorStatus( chargingStation, connectorId, - OCPP16ChargePointStatus.Unavailable + OCPP16ChargePointStatus.Unavailable, ); } } @@ -1147,7 +1368,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { chargingStation.stationInfo?.firmwareUpgrade?.failureStatus === OCPP16FirmwareStatus.DownloadFailed ) { - await Utils.sleep(Utils.getRandomInteger(maxDelay, minDelay) * 1000); + await sleep(secondsToMilliseconds(getRandomInteger(maxDelay, minDelay))); await chargingStation.ocppRequestService.requestHandler< OCPP16FirmwareStatusNotificationRequest, OCPP16FirmwareStatusNotificationResponse @@ -1158,7 +1379,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { chargingStation.stationInfo?.firmwareUpgrade?.failureStatus; return; } - await Utils.sleep(Utils.getRandomInteger(maxDelay, minDelay) * 1000); + await sleep(secondsToMilliseconds(getRandomInteger(maxDelay, minDelay))); await chargingStation.ocppRequestService.requestHandler< OCPP16FirmwareStatusNotificationRequest, OCPP16FirmwareStatusNotificationResponse @@ -1171,14 +1392,14 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { do { const runningTransactions = chargingStation.getNumberOfRunningTransactions(); if (runningTransactions > 0) { - const waitTime = 15 * 1000; + const waitTime = secondsToMilliseconds(15); logger.debug( `${chargingStation.logPrefix()} ${moduleName}.updateFirmwareSimulation: - ${runningTransactions} transaction(s) in progress, waiting ${ - waitTime / 1000 - } seconds before continuing firmware update simulation` + ${runningTransactions} transaction(s) in progress, waiting ${formatDurationMilliSeconds( + waitTime, + )} before continuing firmware update simulation`, ); - await Utils.sleep(waitTime); + await sleep(waitTime); transactionsStarted = true; wasTransactionsStarted = true; } else { @@ -1190,7 +1411,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { await OCPP16ServiceUtils.sendAndSetConnectorStatus( chargingStation, connectorId, - OCPP16ChargePointStatus.Unavailable + OCPP16ChargePointStatus.Unavailable, ); } } @@ -1206,7 +1427,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { await OCPP16ServiceUtils.sendAndSetConnectorStatus( chargingStation, connectorId, - OCPP16ChargePointStatus.Unavailable + OCPP16ChargePointStatus.Unavailable, ); } } @@ -1215,11 +1436,8 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { } } while (transactionsStarted); !wasTransactionsStarted && - (await Utils.sleep(Utils.getRandomInteger(maxDelay, minDelay) * 1000)); - if ( - ChargingStationUtils.checkChargingStation(chargingStation, chargingStation.logPrefix()) === - false - ) { + (await sleep(secondsToMilliseconds(getRandomInteger(maxDelay, minDelay)))); + if (checkChargingStation(chargingStation, chargingStation.logPrefix()) === false) { return; } await chargingStation.ocppRequestService.requestHandler< @@ -1233,7 +1451,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { chargingStation.stationInfo?.firmwareUpgrade?.failureStatus === OCPP16FirmwareStatus.InstallationFailed ) { - await Utils.sleep(Utils.getRandomInteger(maxDelay, minDelay) * 1000); + await sleep(secondsToMilliseconds(getRandomInteger(maxDelay, minDelay))); await chargingStation.ocppRequestService.requestHandler< OCPP16FirmwareStatusNotificationRequest, OCPP16FirmwareStatusNotificationResponse @@ -1245,52 +1463,52 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { return; } if (chargingStation.stationInfo?.firmwareUpgrade?.reset === true) { - await Utils.sleep(Utils.getRandomInteger(maxDelay, minDelay) * 1000); + await sleep(secondsToMilliseconds(getRandomInteger(maxDelay, minDelay))); await chargingStation.reset(OCPP16StopTransactionReason.REBOOT); } } private async handleRequestGetDiagnostics( chargingStation: ChargingStation, - commandPayload: GetDiagnosticsRequest + commandPayload: GetDiagnosticsRequest, ): Promise { if ( OCPP16ServiceUtils.checkFeatureProfile( chargingStation, OCPP16SupportedFeatureProfiles.FirmwareManagement, - OCPP16IncomingRequestCommand.GET_DIAGNOSTICS + OCPP16IncomingRequestCommand.GET_DIAGNOSTICS, ) === false ) { logger.warn( `${chargingStation.logPrefix()} ${moduleName}.handleRequestGetDiagnostics: - Cannot get diagnostics: feature profile not supported` + Cannot get diagnostics: feature profile not supported`, ); return OCPP16Constants.OCPP_RESPONSE_EMPTY; } - const uri = new URL(commandPayload.location); + const { location } = commandPayload; + const uri = new URL(location); if (uri.protocol.startsWith('ftp:')) { - let ftpClient: Client; + let ftpClient: Client | undefined; try { - const logFiles = fs - .readdirSync(path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../')) + const logFiles = readdirSync(resolve(dirname(fileURLToPath(import.meta.url)), '../')) .filter((file) => file.endsWith('.log')) - .map((file) => path.join('./', file)); + .map((file) => join('./', file)); const diagnosticsArchive = `${chargingStation.stationInfo.chargingStationId}_logs.tar.gz`; - tar.create({ gzip: true }, logFiles).pipe(fs.createWriteStream(diagnosticsArchive)); + create({ gzip: true }, logFiles).pipe(createWriteStream(diagnosticsArchive)); ftpClient = new Client(); const accessResponse = await ftpClient.access({ host: uri.host, - ...(Utils.isNotEmptyString(uri.port) && { port: Utils.convertToInt(uri.port) }), - ...(Utils.isNotEmptyString(uri.username) && { user: uri.username }), - ...(Utils.isNotEmptyString(uri.password) && { password: uri.password }), + ...(isNotEmptyString(uri.port) && { port: convertToInt(uri.port) }), + ...(isNotEmptyString(uri.username) && { user: uri.username }), + ...(isNotEmptyString(uri.password) && { password: uri.password }), }); - let uploadResponse: FTPResponse; + let uploadResponse: FTPResponse | undefined; if (accessResponse.code === 220) { ftpClient.trackProgress((info) => { logger.info( - `${chargingStation.logPrefix()} ${ + `${chargingStation.logPrefix()} ${moduleName}.handleRequestGetDiagnostics: ${ info.bytes / 1024 - } bytes transferred from diagnostics archive ${info.name}` + } bytes transferred from diagnostics archive ${info.name}`, ); chargingStation.ocppRequestService .requestHandler< @@ -1303,16 +1521,13 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { logger.error( `${chargingStation.logPrefix()} ${moduleName}.handleRequestGetDiagnostics: Error while sending '${OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION}'`, - error + error, ); }); }); uploadResponse = await ftpClient.uploadFrom( - path.join( - path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../'), - diagnosticsArchive - ), - `${uri.pathname}${diagnosticsArchive}` + join(resolve(dirname(fileURLToPath(import.meta.url)), '../'), diagnosticsArchive), + `${uri.pathname}${diagnosticsArchive}`, ); if (uploadResponse.code === 226) { await chargingStation.ocppRequestService.requestHandler< @@ -1331,7 +1546,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { `Diagnostics transfer failed with error code ${accessResponse.code.toString()}${ uploadResponse?.code && `|${uploadResponse?.code.toString()}` }`, - OCPP16IncomingRequestCommand.GET_DIAGNOSTICS + OCPP16IncomingRequestCommand.GET_DIAGNOSTICS, ); } throw new OCPPError( @@ -1339,7 +1554,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { `Diagnostics transfer failed with error code ${accessResponse.code.toString()}${ uploadResponse?.code && `|${uploadResponse?.code.toString()}` }`, - OCPP16IncomingRequestCommand.GET_DIAGNOSTICS + OCPP16IncomingRequestCommand.GET_DIAGNOSTICS, ); } catch (error) { await chargingStation.ocppRequestService.requestHandler< @@ -1351,18 +1566,18 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { if (ftpClient) { ftpClient.close(); } - return this.handleIncomingRequestError( + return this.handleIncomingRequestError( chargingStation, OCPP16IncomingRequestCommand.GET_DIAGNOSTICS, error as Error, - { errorResponse: OCPP16Constants.OCPP_RESPONSE_EMPTY } - ); + { errorResponse: OCPP16Constants.OCPP_RESPONSE_EMPTY }, + )!; } } else { logger.error( `${chargingStation.logPrefix()} Unsupported protocol ${ uri.protocol - } to transfer the diagnostic logs archive` + } to transfer the diagnostic logs archive`, ); await chargingStation.ocppRequestService.requestHandler< OCPP16DiagnosticsStatusNotificationRequest, @@ -1376,18 +1591,16 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { private handleRequestTriggerMessage( chargingStation: ChargingStation, - commandPayload: OCPP16TriggerMessageRequest + commandPayload: OCPP16TriggerMessageRequest, ): OCPP16TriggerMessageResponse { + const { requestedMessage, connectorId } = commandPayload; if ( !OCPP16ServiceUtils.checkFeatureProfile( chargingStation, OCPP16SupportedFeatureProfiles.RemoteTrigger, - OCPP16IncomingRequestCommand.TRIGGER_MESSAGE + OCPP16IncomingRequestCommand.TRIGGER_MESSAGE, ) || - !OCPP16ServiceUtils.isMessageTriggerSupported( - chargingStation, - commandPayload.requestedMessage - ) + !OCPP16ServiceUtils.isMessageTriggerSupported(chargingStation, requestedMessage) ) { return OCPP16Constants.OCPP_TRIGGER_MESSAGE_RESPONSE_NOT_IMPLEMENTED; } @@ -1395,13 +1608,13 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { !OCPP16ServiceUtils.isConnectorIdValid( chargingStation, OCPP16IncomingRequestCommand.TRIGGER_MESSAGE, - commandPayload.connectorId + connectorId!, ) ) { return OCPP16Constants.OCPP_TRIGGER_MESSAGE_RESPONSE_REJECTED; } try { - switch (commandPayload.requestedMessage) { + switch (requestedMessage) { case OCPP16MessageTrigger.BootNotification: setTimeout(() => { chargingStation.ocppRequestService @@ -1409,7 +1622,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { chargingStation, OCPP16RequestCommand.BOOT_NOTIFICATION, chargingStation.bootNotificationRequest, - { skipBufferingOnError: true, triggerMessage: true } + { skipBufferingOnError: true, triggerMessage: true }, ) .then((response) => { chargingStation.bootNotificationResponse = response; @@ -1426,33 +1639,33 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { null, { triggerMessage: true, - } + }, ) .catch(Constants.EMPTY_FUNCTION); }, OCPP16Constants.OCPP_TRIGGER_MESSAGE_DELAY); return OCPP16Constants.OCPP_TRIGGER_MESSAGE_RESPONSE_ACCEPTED; case OCPP16MessageTrigger.StatusNotification: setTimeout(() => { - if (!Utils.isNullOrUndefined(commandPayload?.connectorId)) { + if (!isNullOrUndefined(connectorId)) { chargingStation.ocppRequestService .requestHandler( chargingStation, OCPP16RequestCommand.STATUS_NOTIFICATION, { - connectorId: commandPayload.connectorId, + connectorId, errorCode: OCPP16ChargePointErrorCode.NO_ERROR, - status: chargingStation.getConnectorStatus(commandPayload.connectorId)?.status, + status: chargingStation.getConnectorStatus(connectorId!)?.status, }, { triggerMessage: true, - } + }, ) .catch(Constants.EMPTY_FUNCTION); } else { // eslint-disable-next-line no-lonely-if if (chargingStation.hasEvses) { for (const evseStatus of chargingStation.evses.values()) { - for (const [connectorId, connectorStatus] of evseStatus.connectors) { + for (const [id, connectorStatus] of evseStatus.connectors) { chargingStation.ocppRequestService .requestHandler< OCPP16StatusNotificationRequest, @@ -1461,19 +1674,19 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { chargingStation, OCPP16RequestCommand.STATUS_NOTIFICATION, { - connectorId, + connectorId: id, errorCode: OCPP16ChargePointErrorCode.NO_ERROR, status: connectorStatus.status, }, { triggerMessage: true, - } + }, ) .catch(Constants.EMPTY_FUNCTION); } } } else { - for (const connectorId of chargingStation.connectors.keys()) { + for (const id of chargingStation.connectors.keys()) { chargingStation.ocppRequestService .requestHandler< OCPP16StatusNotificationRequest, @@ -1482,13 +1695,13 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { chargingStation, OCPP16RequestCommand.STATUS_NOTIFICATION, { - connectorId, + connectorId: id, errorCode: OCPP16ChargePointErrorCode.NO_ERROR, - status: chargingStation.getConnectorStatus(connectorId)?.status, + status: chargingStation.getConnectorStatus(id)?.status, }, { triggerMessage: true, - } + }, ) .catch(Constants.EMPTY_FUNCTION); } @@ -1500,43 +1713,44 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { return OCPP16Constants.OCPP_TRIGGER_MESSAGE_RESPONSE_NOT_IMPLEMENTED; } } catch (error) { - return this.handleIncomingRequestError( + return this.handleIncomingRequestError( chargingStation, OCPP16IncomingRequestCommand.TRIGGER_MESSAGE, error as Error, - { errorResponse: OCPP16Constants.OCPP_TRIGGER_MESSAGE_RESPONSE_REJECTED } - ); + { errorResponse: OCPP16Constants.OCPP_TRIGGER_MESSAGE_RESPONSE_REJECTED }, + )!; } } private handleRequestDataTransfer( chargingStation: ChargingStation, - commandPayload: OCPP16DataTransferRequest + commandPayload: OCPP16DataTransferRequest, ): OCPP16DataTransferResponse { + const { vendorId } = commandPayload; try { - if (Object.values(OCPP16DataTransferVendorId).includes(commandPayload.vendorId)) { + if (Object.values(OCPP16DataTransferVendorId).includes(vendorId)) { return OCPP16Constants.OCPP_DATA_TRANSFER_RESPONSE_ACCEPTED; } return OCPP16Constants.OCPP_DATA_TRANSFER_RESPONSE_UNKNOWN_VENDOR_ID; } catch (error) { - return this.handleIncomingRequestError( + return this.handleIncomingRequestError( chargingStation, OCPP16IncomingRequestCommand.DATA_TRANSFER, error as Error, - { errorResponse: OCPP16Constants.OCPP_DATA_TRANSFER_RESPONSE_REJECTED } - ); + { errorResponse: OCPP16Constants.OCPP_DATA_TRANSFER_RESPONSE_REJECTED }, + )!; } } private async handleRequestReserveNow( chargingStation: ChargingStation, - commandPayload: OCPP16ReserveNowRequest + commandPayload: OCPP16ReserveNowRequest, ): Promise { if ( !OCPP16ServiceUtils.checkFeatureProfile( chargingStation, OCPP16SupportedFeatureProfiles.Reservation, - OCPP16IncomingRequestCommand.RESERVE_NOW + OCPP16IncomingRequestCommand.RESERVE_NOW, ) ) { return OCPP16Constants.OCPP_RESERVATION_RESPONSE_REJECTED; @@ -1544,16 +1758,17 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { const { reservationId, idTag, connectorId } = commandPayload; let response: OCPP16ReserveNowResponse; try { - if (!chargingStation.isConnectorAvailable(connectorId) && connectorId > 0) { + if (connectorId > 0 && !chargingStation.isConnectorAvailable(connectorId)) { return OCPP16Constants.OCPP_RESERVATION_RESPONSE_REJECTED; } - if (connectorId === 0 && !chargingStation.getReservationOnConnectorId0Enabled()) { + if (connectorId === 0 && !chargingStation.getReserveConnectorZeroSupported()) { return OCPP16Constants.OCPP_RESERVATION_RESPONSE_REJECTED; } if (!(await OCPP16ServiceUtils.isIdTagAuthorized(chargingStation, connectorId, idTag))) { return OCPP16Constants.OCPP_RESERVATION_RESPONSE_REJECTED; } - switch (chargingStation.getConnectorStatus(connectorId).status) { + await removeExpiredReservations(chargingStation); + switch (chargingStation.getConnectorStatus(connectorId)!.status) { case OCPP16ChargePointStatus.Faulted: response = OCPP16Constants.OCPP_RESERVATION_RESPONSE_FAULTED; break; @@ -1587,51 +1802,51 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { } return response; } catch (error) { - chargingStation.getConnectorStatus(connectorId).status = OCPP16ChargePointStatus.Available; - return this.handleIncomingRequestError( + chargingStation.getConnectorStatus(connectorId)!.status = OCPP16ChargePointStatus.Available; + return this.handleIncomingRequestError( chargingStation, OCPP16IncomingRequestCommand.RESERVE_NOW, error as Error, - { errorResponse: OCPP16Constants.OCPP_RESERVATION_RESPONSE_FAULTED } - ); + { errorResponse: OCPP16Constants.OCPP_RESERVATION_RESPONSE_FAULTED }, + )!; } } private async handleRequestCancelReservation( chargingStation: ChargingStation, - commandPayload: OCPP16CancelReservationRequest + commandPayload: OCPP16CancelReservationRequest, ): Promise { if ( !OCPP16ServiceUtils.checkFeatureProfile( chargingStation, OCPP16SupportedFeatureProfiles.Reservation, - OCPP16IncomingRequestCommand.CANCEL_RESERVATION + OCPP16IncomingRequestCommand.CANCEL_RESERVATION, ) ) { return OCPP16Constants.OCPP_CANCEL_RESERVATION_RESPONSE_REJECTED; } try { const { reservationId } = commandPayload; - const [exists, reservation] = chargingStation.doesReservationExists({ id: reservationId }); - if (!exists) { - logger.error( - `${chargingStation.logPrefix()} Reservation with ID ${reservationId} - does not exist on charging station` + const reservation = chargingStation.getReservationBy('reservationId', reservationId); + if (isUndefined(reservation)) { + logger.debug( + `${chargingStation.logPrefix()} Reservation with id ${reservationId} + does not exist on charging station`, ); return OCPP16Constants.OCPP_CANCEL_RESERVATION_RESPONSE_REJECTED; } await chargingStation.removeReservation( - reservation, - ReservationTerminationReason.RESERVATION_CANCELED + reservation!, + ReservationTerminationReason.RESERVATION_CANCELED, ); return OCPP16Constants.OCPP_CANCEL_RESERVATION_RESPONSE_ACCEPTED; } catch (error) { - return this.handleIncomingRequestError( + return this.handleIncomingRequestError( chargingStation, OCPP16IncomingRequestCommand.CANCEL_RESERVATION, error as Error, - { errorResponse: OCPP16Constants.OCPP_CANCEL_RESERVATION_RESPONSE_REJECTED } - ); + { errorResponse: OCPP16Constants.OCPP_CANCEL_RESERVATION_RESPONSE_REJECTED }, + )!; } } }