X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Focpp%2FOCPPRequestService.ts;h=816826992eb3fa0f7f31770e1b9e01b19daad91a;hb=dcd06cc1ba5bd15b67478926cfe82b190b44120b;hp=8924882286e404de0d14bab0070ffb6424f0e0e5;hpb=efa43e52e5a9b466c32ab0040bc4877c0f2fc621;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/ocpp/OCPPRequestService.ts b/src/charging-station/ocpp/OCPPRequestService.ts index 89248822..81682699 100644 --- a/src/charging-station/ocpp/OCPPRequestService.ts +++ b/src/charging-station/ocpp/OCPPRequestService.ts @@ -1,5 +1,5 @@ import { AuthorizeResponse, StartTransactionResponse, StopTransactionReason, StopTransactionResponse } from '../../types/ocpp/Transaction'; -import { IncomingRequestCommand, Request, RequestCommand } from '../../types/ocpp/Requests'; +import { DiagnosticsStatus, IncomingRequestCommand, RequestCommand } from '../../types/ocpp/Requests'; import { BootNotificationResponse } from '../../types/ocpp/Responses'; import { ChargePointErrorCode } from '../../types/ocpp/ChargePointErrorCode'; @@ -8,6 +8,7 @@ import ChargingStation from '../ChargingStation'; import Constants from '../../utils/Constants'; import { ErrorType } from '../../types/ocpp/ErrorType'; import { MessageType } from '../../types/ocpp/MessageType'; +import { MeterValue } from '../../types/ocpp/MeterValues'; import OCPPError from '../OcppError'; import OCPPResponseService from './OCPPResponseService'; import logger from '../../utils/Logger'; @@ -21,10 +22,9 @@ export default abstract class OCPPRequestService { this.ocppResponseService = ocppResponseService; } - public async sendMessage(messageId: string, commandParams: any, messageType: MessageType = MessageType.CALL_RESULT_MESSAGE, commandName: RequestCommand | IncomingRequestCommand): Promise { + public async sendMessage(messageId: string, commandParams: any, messageType: MessageType, commandName: RequestCommand | IncomingRequestCommand): Promise { // eslint-disable-next-line @typescript-eslint/no-this-alias const self = this; - const chargingStation = this.chargingStation; // Send a message through wsConnection return new Promise((resolve: (value?: any | PromiseLike) => void, reject: (reason?: any) => void) => { let messageToSend: string; @@ -33,7 +33,7 @@ export default abstract class OCPPRequestService { // Request case MessageType.CALL_MESSAGE: // Build request - this.chargingStation.requests[messageId] = [responseCallback, rejectCallback, commandParams] as Request; + this.chargingStation.requests[messageId] = [responseCallback, rejectCallback, commandParams as Record]; messageToSend = JSON.stringify([messageType, messageId, commandName, commandParams]); break; // Response @@ -50,24 +50,13 @@ export default abstract class OCPPRequestService { // Check if wsConnection opened and charging station registered if (this.chargingStation.isWebSocketOpen() && (this.chargingStation.isRegistered() || commandName === RequestCommand.BOOT_NOTIFICATION)) { if (this.chargingStation.getEnableStatistics()) { - this.chargingStation.statistics.addMessage(commandName, messageType); + this.chargingStation.performanceStatistics.addMessage(commandName, messageType); } // Yes: Send Message this.chargingStation.wsConnection.send(messageToSend); } else if (commandName !== RequestCommand.BOOT_NOTIFICATION) { - let dups = false; - // Handle dups in buffer - for (const message of this.chargingStation.messageQueue) { - // Same message - if (messageToSend === message) { - dups = true; - break; - } - } - if (!dups) { - // Buffer message - this.chargingStation.messageQueue.push(messageToSend); - } + // Buffer it + this.chargingStation.addToMessageQueue(messageToSend); // Reject it return rejectCallback(new OCPPError(commandParams.code ? commandParams.code : ErrorType.GENERIC_ERROR, commandParams.message ? commandParams.message : `WebSocket closed for message id '${messageId}' with content '${messageToSend}', message buffered`, commandParams.details ? commandParams.details : {})); } @@ -80,25 +69,34 @@ export default abstract class OCPPRequestService { setTimeout(() => rejectCallback(new OCPPError(commandParams.code ? commandParams.code : ErrorType.GENERIC_ERROR, commandParams.message ? commandParams.message : `Timeout for message id '${messageId}' with content '${messageToSend}'`, commandParams.details ? commandParams.details : {})), Constants.OCPP_ERROR_TIMEOUT); } - // Function that will receive the request's response + /** + * Function that will receive the request's response + * + * @param {Record | string} payload + * @param {Record} requestPayload + */ async function responseCallback(payload: Record | string, requestPayload: Record): Promise { - if (chargingStation.getEnableStatistics()) { - chargingStation.statistics.addMessage(commandName, messageType); + if (self.chargingStation.getEnableStatistics()) { + self.chargingStation.performanceStatistics.addMessage(commandName, MessageType.CALL_RESULT_MESSAGE); } // Send the response await self.ocppResponseService.handleResponse(commandName as RequestCommand, payload, requestPayload); resolve(payload); } - // Function that will receive the request's rejection + /** + * Function that will receive the request's rejection + * + * @param {OCPPError} error + */ function rejectCallback(error: OCPPError): void { - if (chargingStation.getEnableStatistics()) { - chargingStation.statistics.addMessage(commandName, messageType); + if (self.chargingStation.getEnableStatistics()) { + self.chargingStation.performanceStatistics.addMessage(commandName, MessageType.CALL_ERROR_MESSAGE); } - logger.debug(`${chargingStation.logPrefix()} Error: %j occurred when calling command %s with parameters: %j`, error, commandName, commandParams); + logger.debug(`${self.chargingStation.logPrefix()} Error: %j occurred when calling command %s with parameters: %j`, error, commandName, commandParams); // Build Exception // eslint-disable-next-line no-empty-function - chargingStation.requests[messageId] = [() => { }, () => { }, {}]; // Properly format the request + self.chargingStation.requests[messageId] = [() => { }, () => { }, {}]; // Send error reject(error); } @@ -106,16 +104,19 @@ export default abstract class OCPPRequestService { } public handleRequestError(commandName: RequestCommand, error: Error): void { - logger.error(this.chargingStation.logPrefix() + ' Send ' + commandName + ' error: %j', error); + logger.error(this.chargingStation.logPrefix() + ' Request command ' + commandName + ' error: %j', error); throw error; } public abstract sendHeartbeat(): Promise; public abstract sendBootNotification(chargePointModel: string, chargePointVendor: string, chargeBoxSerialNumber?: string, firmwareVersion?: string, chargePointSerialNumber?: string, iccid?: string, imsi?: string, meterSerialNumber?: string, meterType?: string): Promise; public abstract sendStatusNotification(connectorId: number, status: ChargePointStatus, errorCode?: ChargePointErrorCode): Promise; - public abstract sendAuthorize(idTag?: string): Promise; + public abstract sendAuthorize(connectorId: number, idTag?: string): Promise; public abstract sendStartTransaction(connectorId: number, idTag?: string): Promise; public abstract sendStopTransaction(transactionId: number, meterStop: number, idTag?: string, reason?: StopTransactionReason): Promise; public abstract sendMeterValues(connectorId: number, transactionId: number, interval: number, self: OCPPRequestService): Promise; + public abstract sendTransactionBeginMeterValues(connectorId: number, transactionId: number, beginMeterValue: MeterValue): Promise; + public abstract sendTransactionEndMeterValues(connectorId: number, transactionId: number, endMeterValue: MeterValue): Promise; + public abstract sendDiagnosticsStatusNotification(diagnosticsStatus: DiagnosticsStatus): Promise; public abstract sendError(messageId: string, error: OCPPError, commandName: RequestCommand | IncomingRequestCommand): Promise; }