// Send a message through wsConnection
return Utils.promiseWithTimeout(
new Promise((resolve, reject) => {
+ if (chargingStation.getEnableStatistics() === true) {
+ chargingStation.performanceStatistics.addRequestStatistic(commandName, messageType);
+ }
const messageToSend = this.buildMessageToSend(
chargingStation,
messageId,
responseCallback,
errorCallback
);
- if (chargingStation.getEnableStatistics() === true) {
- chargingStation.performanceStatistics.addRequestStatistic(commandName, messageType);
- }
let sendError = false;
// Check if wsConnection opened
- if (chargingStation.isWebSocketConnectionOpened() === true) {
- const beginId = PerformanceStatistics.beginMeasure(commandName as string);
+ const wsOpened = chargingStation.isWebSocketConnectionOpened() === true;
+ if (wsOpened) {
+ const beginId = PerformanceStatistics.beginMeasure(commandName);
try {
chargingStation.wsConnection.send(messageToSend);
logger.debug(
- `${chargingStation.logPrefix()} >> Command '${commandName}' sent ${this.getMessageTypeString(
+ `${chargingStation.logPrefix()} >> Command '${commandName}' sent ${OCPPServiceUtils.getMessageTypeString(
messageType
)} payload: ${messageToSend}`
);
} catch (error) {
logger.error(
- `${chargingStation.logPrefix()} >> Command '${commandName}' failed to send ${this.getMessageTypeString(
+ `${chargingStation.logPrefix()} >> Command '${commandName}' failed to send ${OCPPServiceUtils.getMessageTypeString(
messageType
)} payload: ${messageToSend}:`,
error
);
sendError = true;
}
- PerformanceStatistics.endMeasure(commandName as string, beginId);
+ PerformanceStatistics.endMeasure(commandName, beginId);
}
- const wsClosedOrErrored =
- chargingStation.isWebSocketConnectionOpened() === false || sendError === true;
+ const wsClosedOrErrored = !wsOpened || sendError === true;
if (wsClosedOrErrored && params.skipBufferingOnError === false) {
// Buffer
chargingStation.bufferMessage(messageToSend);
);
}
logger.error(
- `${chargingStation.logPrefix()} Error occurred at ${self.getMessageTypeString(
+ `${chargingStation.logPrefix()} Error occurred at ${OCPPServiceUtils.getMessageTypeString(
messageType
)} command ${commandName} with PDU %j:`,
messagePayload,
return messageToSend;
}
- private getMessageTypeString(messageType: MessageType): string {
- switch (messageType) {
- case MessageType.CALL_MESSAGE:
- return 'request';
- case MessageType.CALL_RESULT_MESSAGE:
- return 'response';
- case MessageType.CALL_ERROR_MESSAGE:
- return 'error';
- }
- }
-
private handleSendMessageError(
chargingStation: ChargingStation,
commandName: RequestCommand | IncomingRequestCommand,