X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=inline;f=src%2Fcharging-station%2Focpp%2FOCPPRequestService.ts;h=d03e64ec067759a7ed0fefe8f0ce7fc40bdb48eb;hb=9d7484a4667898757b7c23be3dec7458c337cb84;hp=704838e960c0638eeef967f3480a303bca78f9c3;hpb=b3ec7bc1553759e915e590df6a91f0849f03514d;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/ocpp/OCPPRequestService.ts b/src/charging-station/ocpp/OCPPRequestService.ts index 704838e9..d03e64ec 100644 --- a/src/charging-station/ocpp/OCPPRequestService.ts +++ b/src/charging-station/ocpp/OCPPRequestService.ts @@ -6,13 +6,13 @@ import { RequestParams, ResponseType, } from '../../types/ocpp/Requests'; +import { JsonObject, JsonType } from '../../types/JsonType'; import type ChargingStation from '../ChargingStation'; import Constants from '../../utils/Constants'; import { EmptyObject } from '../../types/EmptyObject'; import { ErrorType } from '../../types/ocpp/ErrorType'; import { HandleErrorParams } from '../../types/Error'; -import { JsonType } from '../../types/JsonType'; import { MessageType } from '../../types/ocpp/MessageType'; import OCPPError from '../../exception/OCPPError'; import type OCPPResponseService from './OCPPResponseService'; @@ -21,58 +21,49 @@ import Utils from '../../utils/Utils'; import logger from '../../utils/Logger'; export default abstract class OCPPRequestService { - private static readonly instances: Map = new Map< - string, - OCPPRequestService - >(); + private static instance: OCPPRequestService | null = null; - protected readonly chargingStation: ChargingStation; private readonly ocppResponseService: OCPPResponseService; - protected constructor( - chargingStation: ChargingStation, - ocppResponseService: OCPPResponseService - ) { - this.chargingStation = chargingStation; + protected constructor(ocppResponseService: OCPPResponseService) { this.ocppResponseService = ocppResponseService; this.requestHandler.bind(this); - this.sendResult.bind(this); + this.sendResponse.bind(this); this.sendError.bind(this); } public static getInstance( - this: new (chargingStation: ChargingStation, ocppResponseService: OCPPResponseService) => T, - chargingStation: ChargingStation, + this: new (ocppResponseService: OCPPResponseService) => T, ocppResponseService: OCPPResponseService ): T { - if (!OCPPRequestService.instances.has(chargingStation.hashId)) { - OCPPRequestService.instances.set( - chargingStation.hashId, - new this(chargingStation, ocppResponseService) - ); + if (!OCPPRequestService.instance) { + OCPPRequestService.instance = new this(ocppResponseService); } - return OCPPRequestService.instances.get(chargingStation.hashId) as T; + return OCPPRequestService.instance as T; } - public async sendResult( + public async sendResponse( + chargingStation: ChargingStation, messageId: string, messagePayload: JsonType, commandName: IncomingRequestCommand ): Promise { try { - // Send result message + // Send response message return await this.internalSendMessage( + chargingStation, messageId, messagePayload, MessageType.CALL_RESULT_MESSAGE, commandName ); } catch (error) { - this.handleRequestError(commandName, error as Error); + this.handleRequestError(chargingStation, commandName, error as Error); } } public async sendError( + chargingStation: ChargingStation, messageId: string, ocppError: OCPPError, commandName: RequestCommand | IncomingRequestCommand @@ -80,17 +71,19 @@ export default abstract class OCPPRequestService { try { // Send error message return await this.internalSendMessage( + chargingStation, messageId, ocppError, MessageType.CALL_ERROR_MESSAGE, commandName ); } catch (error) { - this.handleRequestError(commandName, error as Error); + this.handleRequestError(chargingStation, commandName, error as Error); } } protected async sendMessage( + chargingStation: ChargingStation, messageId: string, messagePayload: JsonType, commandName: RequestCommand, @@ -101,6 +94,7 @@ export default abstract class OCPPRequestService { ): Promise { try { return await this.internalSendMessage( + chargingStation, messageId, messagePayload, MessageType.CALL_MESSAGE, @@ -108,11 +102,12 @@ export default abstract class OCPPRequestService { params ); } catch (error) { - this.handleRequestError(commandName, error as Error, { throwError: false }); + this.handleRequestError(chargingStation, commandName, error as Error, { throwError: false }); } } private async internalSendMessage( + chargingStation: ChargingStation, messageId: string, messagePayload: JsonType | OCPPError, messageType: MessageType, @@ -123,12 +118,10 @@ export default abstract class OCPPRequestService { } ): Promise { if ( - (this.chargingStation.isInUnknownState() && - commandName === RequestCommand.BOOT_NOTIFICATION) || - (!this.chargingStation.getOcppStrictCompliance() && - this.chargingStation.isInUnknownState()) || - this.chargingStation.isInAcceptedState() || - (this.chargingStation.isInPendingState() && + (chargingStation.isInUnknownState() && commandName === RequestCommand.BOOT_NOTIFICATION) || + (!chargingStation.getOcppStrictCompliance() && chargingStation.isInUnknownState()) || + chargingStation.isInAcceptedState() || + (chargingStation.isInPendingState() && (params.triggerMessage || messageType === MessageType.CALL_RESULT_MESSAGE)) ) { // eslint-disable-next-line @typescript-eslint/no-this-alias @@ -137,53 +130,51 @@ export default abstract class OCPPRequestService { return Utils.promiseWithTimeout( new Promise((resolve, reject) => { const messageToSend = this.buildMessageToSend( + chargingStation, messageId, messagePayload, messageType, commandName, responseCallback, - rejectCallback + errorCallback ); - if (this.chargingStation.getEnableStatistics()) { - this.chargingStation.performanceStatistics.addRequestStatistic( - commandName, - messageType - ); + if (chargingStation.getEnableStatistics()) { + chargingStation.performanceStatistics.addRequestStatistic(commandName, messageType); } // Check if wsConnection opened - if (this.chargingStation.isWebSocketConnectionOpened()) { + if (chargingStation.isWebSocketConnectionOpened()) { // Yes: Send Message const beginId = PerformanceStatistics.beginMeasure(commandName); // FIXME: Handle sending error - this.chargingStation.wsConnection.send(messageToSend); + chargingStation.wsConnection.send(messageToSend); PerformanceStatistics.endMeasure(commandName, beginId); logger.debug( - `${this.chargingStation.logPrefix()} >> Command '${commandName}' sent ${this.getMessageTypeString( + `${chargingStation.logPrefix()} >> Command '${commandName}' sent ${this.getMessageTypeString( messageType )} payload: ${messageToSend}` ); } else if (!params.skipBufferingOnError) { // Buffer it - this.chargingStation.bufferMessage(messageToSend); + chargingStation.bufferMessage(messageToSend); const ocppError = new OCPPError( ErrorType.GENERIC_ERROR, `WebSocket closed for buffered message id '${messageId}' with content '${messageToSend}'`, commandName, - (messagePayload?.details as JsonType) ?? {} + (messagePayload as JsonObject)?.details ?? {} ); if (messageType === MessageType.CALL_MESSAGE) { // Reject it but keep the request in the cache return reject(ocppError); } - return rejectCallback(ocppError, false); + return errorCallback(ocppError, false); } else { // Reject it - return rejectCallback( + return errorCallback( new OCPPError( ErrorType.GENERIC_ERROR, `WebSocket closed for non buffered message id '${messageId}' with content '${messageToSend}'`, commandName, - (messagePayload?.details as JsonType) ?? {} + (messagePayload as JsonObject)?.details ?? {} ), false ); @@ -204,8 +195,8 @@ export default abstract class OCPPRequestService { payload: JsonType, requestPayload: JsonType ): Promise { - if (self.chargingStation.getEnableStatistics()) { - self.chargingStation.performanceStatistics.addRequestStatistic( + if (chargingStation.getEnableStatistics()) { + chargingStation.performanceStatistics.addRequestStatistic( commandName, MessageType.CALL_RESULT_MESSAGE ); @@ -213,6 +204,7 @@ export default abstract class OCPPRequestService { // Handle the request's response try { await self.ocppResponseService.responseHandler( + chargingStation, commandName as RequestCommand, payload, requestPayload @@ -221,7 +213,7 @@ export default abstract class OCPPRequestService { } catch (error) { reject(error); } finally { - self.chargingStation.requests.delete(messageId); + chargingStation.requests.delete(messageId); } } @@ -231,20 +223,20 @@ export default abstract class OCPPRequestService { * @param error * @param requestStatistic */ - function rejectCallback(error: OCPPError, requestStatistic = true): void { - if (requestStatistic && self.chargingStation.getEnableStatistics()) { - self.chargingStation.performanceStatistics.addRequestStatistic( + function errorCallback(error: OCPPError, requestStatistic = true): void { + if (requestStatistic && chargingStation.getEnableStatistics()) { + chargingStation.performanceStatistics.addRequestStatistic( commandName, MessageType.CALL_ERROR_MESSAGE ); } logger.error( - `${self.chargingStation.logPrefix()} Error %j occurred when calling command %s with message data %j`, + `${chargingStation.logPrefix()} Error %j occurred when calling command %s with message data %j`, error, commandName, messagePayload ); - self.chargingStation.requests.delete(messageId); + chargingStation.requests.delete(messageId); reject(error); } }), @@ -253,28 +245,28 @@ export default abstract class OCPPRequestService { ErrorType.GENERIC_ERROR, `Timeout for message id '${messageId}'`, commandName, - (messagePayload?.details as JsonType) ?? {} + (messagePayload as JsonObject)?.details ?? {} ), () => { - messageType === MessageType.CALL_MESSAGE && - this.chargingStation.requests.delete(messageId); + messageType === MessageType.CALL_MESSAGE && chargingStation.requests.delete(messageId); } ); } throw new OCPPError( ErrorType.SECURITY_ERROR, - `Cannot send command ${commandName} payload when the charging station is in ${this.chargingStation.getRegistrationStatus()} state on the central server`, + `Cannot send command ${commandName} payload when the charging station is in ${chargingStation.getRegistrationStatus()} state on the central server`, commandName ); } private buildMessageToSend( + chargingStation: ChargingStation, messageId: string, messagePayload: JsonType | OCPPError, messageType: MessageType, commandName?: RequestCommand | IncomingRequestCommand, responseCallback?: (payload: JsonType, requestPayload: JsonType) => Promise, - rejectCallback?: (error: OCPPError, requestStatistic?: boolean) => void + errorCallback?: (error: OCPPError, requestStatistic?: boolean) => void ): string { let messageToSend: string; // Type of message @@ -282,9 +274,9 @@ export default abstract class OCPPRequestService { // Request case MessageType.CALL_MESSAGE: // Build request - this.chargingStation.requests.set(messageId, [ + chargingStation.requests.set(messageId, [ responseCallback, - rejectCallback, + errorCallback, commandName, messagePayload as JsonType, ]); @@ -327,15 +319,12 @@ export default abstract class OCPPRequestService { } private handleRequestError( + chargingStation: ChargingStation, commandName: RequestCommand | IncomingRequestCommand, error: Error, params: HandleErrorParams = { throwError: true } ): void { - logger.error( - this.chargingStation.logPrefix() + ' Request command %s error: %j', - commandName, - error - ); + logger.error(chargingStation.logPrefix() + ' Request command %s error: %j', commandName, error); if (params?.throwError) { throw error; } @@ -343,6 +332,7 @@ export default abstract class OCPPRequestService { // eslint-disable-next-line @typescript-eslint/no-unused-vars public abstract requestHandler( + chargingStation: ChargingStation, commandName: RequestCommand, commandParams?: JsonType, params?: RequestParams