X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcharging-station%2Focpp%2F2.0%2FOCPP20RequestService.ts;h=902aa094306cd07f8cfe07580314af910b13e8ad;hb=7164966d863b4539243b473c5e2e9d22fb9b5fd1;hp=e23b1e76fcc3e1fbf9b64f2e61f3d44f0fdb98d2;hpb=96a52d088b4927e7bc51ea9282f502c2a6b67707;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/ocpp/2.0/OCPP20RequestService.ts b/src/charging-station/ocpp/2.0/OCPP20RequestService.ts index e23b1e76..902aa094 100644 --- a/src/charging-station/ocpp/2.0/OCPP20RequestService.ts +++ b/src/charging-station/ocpp/2.0/OCPP20RequestService.ts @@ -1,31 +1,29 @@ // Partial Copyright Jerome Benoit. 2021-2023. All Rights Reserved. -import fs from 'fs'; -import path from 'path'; -import { fileURLToPath } from 'url'; - import type { JSONSchemaType } from 'ajv'; +import { OCPP20ServiceUtils } from './OCPP20ServiceUtils'; import OCPPError from '../../../exception/OCPPError'; import type { JsonObject, JsonType } from '../../../types/JsonType'; import { type OCPP20BootNotificationRequest, + type OCPP20HeartbeatRequest, OCPP20RequestCommand, + type OCPP20StatusNotificationRequest, } from '../../../types/ocpp/2.0/Requests'; import { ErrorType } from '../../../types/ocpp/ErrorType'; import { OCPPVersion } from '../../../types/ocpp/OCPPVersion'; import type { RequestParams } from '../../../types/ocpp/Requests'; -import logger from '../../../utils/Logger'; import Utils from '../../../utils/Utils'; import type ChargingStation from '../../ChargingStation'; +import OCPPConstants from '../OCPPConstants'; import OCPPRequestService from '../OCPPRequestService'; import type OCPPResponseService from '../OCPPResponseService'; -import { OCPP20ServiceUtils } from './OCPP20ServiceUtils'; const moduleName = 'OCPP20RequestService'; export default class OCPP20RequestService extends OCPPRequestService { - private jsonSchemas: Map>; + protected jsonSchemas: Map>; public constructor(ocppResponseService: OCPPResponseService) { if (new.target?.name === moduleName) { @@ -35,19 +33,24 @@ export default class OCPP20RequestService extends OCPPRequestService { this.jsonSchemas = new Map>([ [ OCPP20RequestCommand.BOOT_NOTIFICATION, - JSON.parse( - fs.readFileSync( - path.resolve( - path.dirname(fileURLToPath(import.meta.url)), - '../../../assets/json-schemas/ocpp/2.0/BootNotificationRequest.json' - ), - 'utf8' - ) - ) as JSONSchemaType, + OCPP20ServiceUtils.parseJsonSchemaFile( + '../../../assets/json-schemas/ocpp/2.0/BootNotificationRequest.json' + ), + ], + [ + OCPP20RequestCommand.HEARTBEAT, + OCPP20ServiceUtils.parseJsonSchemaFile( + '../../../assets/json-schemas/ocpp/2.0/HeartbeatRequest.json' + ), + ], + [ + OCPP20RequestCommand.STATUS_NOTIFICATION, + OCPP20ServiceUtils.parseJsonSchemaFile( + '../../../assets/json-schemas/ocpp/2.0/StatusNotificationRequest.json' + ), ], ]); this.buildRequestPayload.bind(this); - this.validatePayload.bind(this); } public async requestHandler( @@ -57,16 +60,10 @@ export default class OCPP20RequestService extends OCPPRequestService { params?: RequestParams ): Promise { if (OCPP20ServiceUtils.isRequestCommandSupported(chargingStation, commandName) === true) { - const requestPayload = this.buildRequestPayload( - chargingStation, - commandName, - commandParams - ); - this.validatePayload(chargingStation, commandName, requestPayload); return (await this.sendMessage( chargingStation, Utils.generateUUID(), - requestPayload, + this.buildRequestPayload(chargingStation, commandName, commandParams), commandName, params )) as unknown as ResponseType; @@ -88,27 +85,13 @@ export default class OCPP20RequestService extends OCPPRequestService { commandParams = commandParams as JsonObject; switch (commandName) { case OCPP20RequestCommand.BOOT_NOTIFICATION: - commandParams.modem = commandParams.modem as JsonObject; + return commandParams as unknown as Request; + case OCPP20RequestCommand.HEARTBEAT: + return OCPPConstants.OCPP_RESPONSE_EMPTY as unknown as Request; + case OCPP20RequestCommand.STATUS_NOTIFICATION: return { - reason: commandParams?.reason, - chargingStation: { - model: commandParams?.model, - vendorName: commandParams?.vendorName, - ...(!Utils.isUndefined(commandParams?.firmwareVersion) && { - firmwareVersion: commandParams.firmwareVersion, - }), - ...(!Utils.isUndefined(commandParams?.serialNumber) && { - serialNumber: commandParams.serialNumber, - }), - modem: { - ...(!Utils.isUndefined(commandParams?.modem?.iccid) && { - iccid: commandParams.modem.iccid, - }), - ...(!Utils.isUndefined(commandParams?.modem?.imsi) && { - imsi: commandParams.modem.imsi, - }), - }, - }, + timestamp: new Date(), + ...commandParams, } as unknown as Request; default: // OCPPError usage here is debatable: it's an error in the OCPP stack but not targeted to sendError(). @@ -121,23 +104,4 @@ export default class OCPP20RequestService extends OCPPRequestService { ); } } - - private validatePayload( - chargingStation: ChargingStation, - commandName: OCPP20RequestCommand, - requestPayload: Request - ): boolean { - if (this.jsonSchemas.has(commandName)) { - return this.validateRequestPayload( - chargingStation, - commandName, - this.jsonSchemas.get(commandName), - requestPayload - ); - } - logger.warn( - `${chargingStation.logPrefix()} ${moduleName}.validatePayload: No JSON schema found for command ${commandName} PDU validation` - ); - return false; - } }