X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Focpp%2F2.0%2FOCPP20RequestService.ts;h=92d70aedcb2c63a569a5d35adf409de1a34424a8;hb=617cad0c86c3fea53b56a738bb0d6ddc3da05237;hp=3e54ca50326c4bde179674662b50bfbe5ed6d6bb;hpb=81533a206ec56709897f27edf1298e7c86d74c31;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 3e54ca50..92d70aed 100644 --- a/src/charging-station/ocpp/2.0/OCPP20RequestService.ts +++ b/src/charging-station/ocpp/2.0/OCPP20RequestService.ts @@ -1,30 +1,31 @@ // 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 OCPPError from '../../../exception/OCPPError'; -import type { JsonObject, JsonType } from '../../../types/JsonType'; +import type { ChargingStation } from '../../../charging-station'; +import { OCPPError } from '../../../exception'; import { + ErrorType, + type JsonObject, + type JsonType, type OCPP20BootNotificationRequest, type OCPP20HeartbeatRequest, OCPP20RequestCommand, -} 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 Utils from '../../../utils/Utils'; -import type ChargingStation from '../../ChargingStation'; -import OCPPRequestService from '../OCPPRequestService'; -import type OCPPResponseService from '../OCPPResponseService'; -import { OCPP20ServiceUtils } from './OCPP20ServiceUtils'; + type OCPP20StatusNotificationRequest, + OCPPVersion, + type RequestParams, +} from '../../../types'; +import { Utils } from '../../../utils'; +import { + OCPP20ServiceUtils, + OCPPConstants, + OCPPRequestService, + type OCPPResponseService, +} from '../internal'; const moduleName = 'OCPP20RequestService'; -export default class OCPP20RequestService extends OCPPRequestService { +export class OCPP20RequestService extends OCPPRequestService { protected jsonSchemas: Map>; public constructor(ocppResponseService: OCPPResponseService) { @@ -35,27 +36,27 @@ 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', + moduleName, + 'constructor' + ), ], [ OCPP20RequestCommand.HEARTBEAT, - JSON.parse( - fs.readFileSync( - path.resolve( - path.dirname(fileURLToPath(import.meta.url)), - '../../../assets/json-schemas/ocpp/2.0/HeartbeatRequest.json' - ), - 'utf8' - ) - ) as JSONSchemaType, + OCPP20ServiceUtils.parseJsonSchemaFile( + '../../../assets/json-schemas/ocpp/2.0/HeartbeatRequest.json', + moduleName, + 'constructor' + ), + ], + [ + OCPP20RequestCommand.STATUS_NOTIFICATION, + OCPP20ServiceUtils.parseJsonSchemaFile( + '../../../assets/json-schemas/ocpp/2.0/StatusNotificationRequest.json', + moduleName, + 'constructor' + ), ], ]); this.buildRequestPayload.bind(this); @@ -68,18 +69,13 @@ export default class OCPP20RequestService extends OCPPRequestService { params?: RequestParams ): Promise { if (OCPP20ServiceUtils.isRequestCommandSupported(chargingStation, commandName) === true) { - const requestPayload = this.buildRequestPayload( - chargingStation, - commandName, - commandParams - ); return (await this.sendMessage( chargingStation, Utils.generateUUID(), - requestPayload, + this.buildRequestPayload(chargingStation, commandName, commandParams), commandName, params - )) as unknown as ResponseType; + )) as ResponseType; } // OCPPError usage here is debatable: it's an error in the OCPP stack but not targeted to sendError(). throw new OCPPError( @@ -98,33 +94,14 @@ export default class OCPP20RequestService extends OCPPRequestService { commandParams = commandParams as JsonObject; switch (commandName) { case OCPP20RequestCommand.BOOT_NOTIFICATION: - commandParams.chargingStation = commandParams.chargingStation as JsonObject; - commandParams.chargingStation.modem = commandParams.chargingStation.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?.chargingStation?.model, - vendorName: commandParams?.chargingStation?.vendorName, - ...(!Utils.isUndefined(commandParams?.chargingStation?.firmwareVersion) && { - firmwareVersion: commandParams.chargingStation?.firmwareVersion, - }), - ...(!Utils.isUndefined(commandParams?.chargingStation?.serialNumber) && { - serialNumber: commandParams.chargingStation?.serialNumber, - }), - ...(!Utils.isUndefined(commandParams?.chargingStation?.modem) && { - modem: { - ...(!Utils.isUndefined(commandParams?.chargingStation?.modem?.iccid) && { - iccid: commandParams.chargingStation.modem.iccid, - }), - ...(!Utils.isUndefined(commandParams?.chargingStation?.modem?.imsi) && { - imsi: commandParams.chargingStation.modem.imsi, - }), - }, - }), - }, + timestamp: new Date(), + ...commandParams, } as unknown as Request; - case OCPP20RequestCommand.HEARTBEAT: - return {} as unknown as Request; default: // OCPPError usage here is debatable: it's an error in the OCPP stack but not targeted to sendError(). throw new OCPPError(