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/RequestResponses';
+import { BootNotificationResponse } from '../../types/ocpp/Responses';
import { ChargePointErrorCode } from '../../types/ocpp/ChargePointErrorCode';
import { ChargePointStatus } from '../../types/ocpp/ChargePointStatus';
import ChargingStation from '../ChargingStation';
import Constants from '../../utils/Constants';
import { ErrorType } from '../../types/ocpp/ErrorType';
import { MessageType } from '../../types/ocpp/MessageType';
-import OCPPError from '../OcppError';
+import { MeterValue } from '../../types/ocpp/MeterValues';
+import OCPPError from '../OCPPError';
import OCPPResponseService from './OCPPResponseService';
+import PerformanceStatistics from '../../utils/PerformanceStatistics';
import logger from '../../utils/Logger';
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<any> {
+ public async sendMessage(messageId: string, commandParams: any, messageType: MessageType, commandName: RequestCommand | IncomingRequestCommand): Promise<any> {
// 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<any>) => void, reject: (reason?: any) => void) => {
let messageToSend: string;
// 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<string, unknown>];
messageToSend = JSON.stringify([messageType, messageId, commandName, commandParams]);
break;
// Response
break;
}
// Check if wsConnection opened and charging station registered
- if (this.chargingStation.isWebSocketOpen() && (this.chargingStation.isRegistered() || commandName === RequestCommand.BOOT_NOTIFICATION)) {
+ if (this.chargingStation.isWebSocketConnectionOpened() && (this.chargingStation.isRegistered() || commandName === RequestCommand.BOOT_NOTIFICATION)) {
if (this.chargingStation.getEnableStatistics()) {
- this.chargingStation.statistics.addMessage(commandName, messageType);
+ this.chargingStation.performanceStatistics.addRequestStatistic(commandName, messageType);
}
// Yes: Send Message
+ const beginId = PerformanceStatistics.beginMeasure(commandName);
this.chargingStation.wsConnection.send(messageToSend);
+ PerformanceStatistics.endMeasure(commandName, beginId);
} 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 : {}));
}
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 payload
+ * @param requestPayload
+ */
async function responseCallback(payload: Record<string, unknown> | string, requestPayload: Record<string, unknown>): Promise<void> {
- if (chargingStation.getEnableStatistics()) {
- chargingStation.statistics.addMessage(commandName, messageType);
+ if (self.chargingStation.getEnableStatistics()) {
+ self.chargingStation.performanceStatistics.addRequestStatistic(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 error
+ */
function rejectCallback(error: OCPPError): void {
- if (chargingStation.getEnableStatistics()) {
- chargingStation.statistics.addMessage(commandName, messageType);
+ if (self.chargingStation.getEnableStatistics()) {
+ self.chargingStation.performanceStatistics.addRequestStatistic(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);
}
});
}
- public handleRequestError(commandName: RequestCommand, error: Error): void {
- logger.error(this.chargingStation.logPrefix() + ' Send ' + commandName + ' error: %j', error);
+ protected handleRequestError(commandName: RequestCommand, error: Error): void {
+ logger.error(this.chargingStation.logPrefix() + ' Request command ' + commandName + ' error: %j', error);
throw error;
}
public abstract sendHeartbeat(): Promise<void>;
public abstract sendBootNotification(chargePointModel: string, chargePointVendor: string, chargeBoxSerialNumber?: string, firmwareVersion?: string, chargePointSerialNumber?: string, iccid?: string, imsi?: string, meterSerialNumber?: string, meterType?: string): Promise<BootNotificationResponse>;
public abstract sendStatusNotification(connectorId: number, status: ChargePointStatus, errorCode?: ChargePointErrorCode): Promise<void>;
- public abstract sendAuthorize(idTag?: string): Promise<AuthorizeResponse>;
+ public abstract sendAuthorize(
connectorId: number, idTag?: string): Promise<AuthorizeResponse>;
public abstract sendStartTransaction(connectorId: number, idTag?: string): Promise<StartTransactionResponse>;
public abstract sendStopTransaction(transactionId: number, meterStop: number, idTag?: string, reason?: StopTransactionReason): Promise<StopTransactionResponse>;
- public abstract sendMeterValues(connectorId: number, transactionId: number, interval: number, self: OCPPRequestService): Promise<void>;
+ public abstract sendMeterValues(connectorId: number, transactionId: number, interval: number): Promise<void>;
+ public abstract sendTransactionBeginMeterValues(connectorId: number, transactionId: number, beginMeterValue: MeterValue): Promise<void>;
+ public abstract sendTransactionEndMeterValues(connectorId: number, transactionId: number, endMeterValue: MeterValue): Promise<void>;
+ public abstract sendDiagnosticsStatusNotification(diagnosticsStatus: DiagnosticsStatus): Promise<void>;
public abstract sendError(messageId: string, error: OCPPError, commandName: RequestCommand | IncomingRequestCommand): Promise<unknown>;
-
}
repositories / e-mobility-charging-stations-simulator.git / blobdiff