X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Focpp%2FOCPPServiceUtils.ts;h=cf2aa07eb9d9c280295a74f10e84bdb5bf273b9a;hb=1431af786f4d2728bad4132d505758144798516b;hp=3c41525140774d82d9f459208ea15ee7941cf988;hpb=028878919a937f9307634c0316e27c677a87d305;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/ocpp/OCPPServiceUtils.ts b/src/charging-station/ocpp/OCPPServiceUtils.ts index 3c415251..cf2aa07e 100644 --- a/src/charging-station/ocpp/OCPPServiceUtils.ts +++ b/src/charging-station/ocpp/OCPPServiceUtils.ts @@ -3,10 +3,21 @@ import type { DefinedError, ErrorObject } from 'ajv'; import BaseError from '../../exception/BaseError'; import type { JsonObject, JsonType } from '../../types/JsonType'; import type { SampledValueTemplate } from '../../types/MeasurandPerPhaseSampledValueTemplates'; +import type { OCPP16StatusNotificationRequest } from '../../types/ocpp/1.6/Requests'; +import type { OCPP20StatusNotificationRequest } from '../../types/ocpp/2.0/Requests'; +import { ChargePointErrorCode } from '../../types/ocpp/ChargePointErrorCode'; import { StandardParametersKey } from '../../types/ocpp/Configuration'; +import type { ConnectorStatusEnum } from '../../types/ocpp/ConnectorStatusEnum'; import { ErrorType } from '../../types/ocpp/ErrorType'; +import { MessageType } from '../../types/ocpp/MessageType'; import { MeterValueMeasurand, type MeterValuePhase } from '../../types/ocpp/MeterValues'; -import { IncomingRequestCommand, MessageTrigger, RequestCommand } from '../../types/ocpp/Requests'; +import { OCPPVersion } from '../../types/ocpp/OCPPVersion'; +import { + IncomingRequestCommand, + MessageTrigger, + RequestCommand, + type StatusNotificationRequest, +} from '../../types/ocpp/Requests'; import Constants from '../../utils/Constants'; import logger from '../../utils/Logger'; import Utils from '../../utils/Utils'; @@ -34,6 +45,17 @@ export class OCPPServiceUtils { return ErrorType.FORMAT_VIOLATION; } + public static getMessageTypeString(messageType: MessageType): string { + switch (messageType) { + case MessageType.CALL_MESSAGE: + return 'request'; + case MessageType.CALL_RESULT_MESSAGE: + return 'response'; + case MessageType.CALL_ERROR_MESSAGE: + return 'error'; + } + } + public static isRequestCommandSupported( chargingStation: ChargingStation, command: RequestCommand @@ -115,6 +137,31 @@ export class OCPPServiceUtils { } } + public static buildStatusNotificationRequest( + chargingStation: ChargingStation, + connectorId: number, + status: ConnectorStatusEnum + ): StatusNotificationRequest { + switch (chargingStation.stationInfo.ocppVersion ?? OCPPVersion.VERSION_16) { + case OCPPVersion.VERSION_16: + return { + connectorId, + status, + errorCode: ChargePointErrorCode.NO_ERROR, + } as OCPP16StatusNotificationRequest; + case OCPPVersion.VERSION_20: + case OCPPVersion.VERSION_201: + return { + timestamp: new Date(), + connectorStatus: status, + connectorId, + evseId: connectorId, + } as OCPP20StatusNotificationRequest; + default: + throw new BaseError('Cannot build status notification payload: OCPP version not supported'); + } + } + protected static getSampledValueTemplate( chargingStation: ChargingStation, connectorId: number,