-import CommandStatisticsData from '../types/CommandStatisticsData';
+import CommandStatistics, { CommandStatisticsData, PerfEntry } from '../types/CommandStatistics';
+import { IncomingRequestCommand, RequestCommand } from '../types/ocpp/1.6/Requests';
+
+import CircularArray from './CircularArray';
import Configuration from './Configuration';
-import Constants from './Constants';
+import { MessageType } from '../types/ocpp/MessageType';
import { PerformanceEntry } from 'perf_hooks';
import Utils from './Utils';
import logger from './Logger';
export default class Statistics {
private static instance: Statistics;
private _objName: string;
- private _commandsStatistics: {
- [command: string]: CommandStatisticsData
- };
+ private _commandsStatistics: CommandStatistics;
private constructor() {
- this._commandsStatistics = {};
+ this._commandsStatistics = {} as CommandStatistics;
}
set objName(objName: string) {
return Statistics.instance;
}
- addMessage(command: string, messageType: number): void {
+ addMessage(command: RequestCommand | IncomingRequestCommand, messageType: MessageType): void {
switch (messageType) {
- case Constants.OCPP_JSON_CALL_MESSAGE:
+ case MessageType.CALL_MESSAGE:
if (this._commandsStatistics[command] && this._commandsStatistics[command].countRequest) {
this._commandsStatistics[command].countRequest++;
} else {
this._commandsStatistics[command].countRequest = 1;
}
break;
- case Constants.OCPP_JSON_CALL_RESULT_MESSAGE:
+ case MessageType.CALL_RESULT_MESSAGE:
if (this._commandsStatistics[command]) {
if (this._commandsStatistics[command].countResponse) {
this._commandsStatistics[command].countResponse++;
this._commandsStatistics[command].countResponse = 1;
}
break;
- case Constants.OCPP_JSON_CALL_ERROR_MESSAGE:
+ case MessageType.CALL_ERROR_MESSAGE:
if (this._commandsStatistics[command]) {
if (this._commandsStatistics[command].countError) {
this._commandsStatistics[command].countError++;
}
}
- addPerformanceTimer(command: string, duration: number): void {
- // Map to proper command name
- const MAPCOMMAND = {
- sendMeterValues: 'MeterValues',
- startTransaction: 'StartTransaction',
- stopTransaction: 'StopTransaction',
- };
- if (MAPCOMMAND[command]) {
- command = MAPCOMMAND[command] as string;
- }
- // Initialize command statistics
- if (!this._commandsStatistics[command]) {
- this._commandsStatistics[command] = {} as CommandStatisticsData;
- }
- // Update current statistics timers
- this._commandsStatistics[command].countTime = this._commandsStatistics[command].countTime ? this._commandsStatistics[command].countTime + 1 : 1;
- this._commandsStatistics[command].minTime = this._commandsStatistics[command].minTime ? (this._commandsStatistics[command].minTime > duration ? duration : this._commandsStatistics[command].minTime) : duration;
- this._commandsStatistics[command].maxTime = this._commandsStatistics[command].maxTime ? (this._commandsStatistics[command].maxTime < duration ? duration : this._commandsStatistics[command].maxTime) : duration;
- this._commandsStatistics[command].totalTime = this._commandsStatistics[command].totalTime ? this._commandsStatistics[command].totalTime + duration : duration;
- this._commandsStatistics[command].avgTime = this._commandsStatistics[command].totalTime / this._commandsStatistics[command].countTime;
+ logPerformance(entry: PerformanceEntry, className: string): void {
+ this.addPerformanceTimer(entry.name as RequestCommand | IncomingRequestCommand, entry.duration);
+ const perfEntry: PerfEntry = {} as PerfEntry;
+ perfEntry.name = entry.name;
+ perfEntry.entryType = entry.entryType;
+ perfEntry.startTime = entry.startTime;
+ perfEntry.duration = entry.duration;
+ logger.info(`${this._logPrefix()} object ${className} method(s) performance entry: %j`, perfEntry);
}
- logPerformance(entry: PerformanceEntry, className: string): void {
- this.addPerformanceTimer(entry.name, entry.duration);
- logger.info(`${this._logPrefix()} class->${className}, method->${entry.name}, duration->${entry.duration}`);
+ start(): void {
+ this._displayInterval();
}
- _display(): void {
+ private _display(): void {
logger.info(this._logPrefix() + ' %j', this._commandsStatistics);
}
- _displayInterval(): void {
+ private _displayInterval(): void {
if (Configuration.getStatisticsDisplayInterval() > 0) {
setInterval(() => {
this._display();
}, Configuration.getStatisticsDisplayInterval() * 1000);
- logger.info(this._logPrefix() + ' displayed every ' + Configuration.getStatisticsDisplayInterval().toString() + 's');
+ logger.info(this._logPrefix() + ' displayed every ' + Utils.secondsToHHMMSS(Configuration.getStatisticsDisplayInterval()));
}
}
- start(): void {
- this._displayInterval();
+ private median(dataSet: number[]): number {
+ if (Array.isArray(dataSet) && dataSet.length === 1) {
+ return dataSet[0];
+ }
+ const sortedDataSet = dataSet.slice().sort();
+ const middleIndex = Math.floor(sortedDataSet.length / 2);
+ if (sortedDataSet.length % 2) {
+ return sortedDataSet[middleIndex / 2];
+ }
+ return (sortedDataSet[(middleIndex - 1)] + sortedDataSet[middleIndex]) / 2;
+ }
+
+ private addPerformanceTimer(command: RequestCommand | IncomingRequestCommand, duration: number): void {
+ // Map to proper command name
+ const MAPCOMMAND = {
+ sendMeterValues: 'MeterValues',
+ startTransaction: 'StartTransaction',
+ stopTransaction: 'StopTransaction',
+ };
+ if (MAPCOMMAND[command]) {
+ command = MAPCOMMAND[command] as RequestCommand | IncomingRequestCommand;
+ }
+ // Initialize command statistics
+ if (!this._commandsStatistics[command]) {
+ this._commandsStatistics[command] = {} as CommandStatisticsData;
+ }
+ // Update current statistics timers
+ this._commandsStatistics[command].countTimeMeasurement = this._commandsStatistics[command].countTimeMeasurement ? this._commandsStatistics[command].countTimeMeasurement + 1 : 1;
+ this._commandsStatistics[command].currentTimeMeasurement = duration;
+ this._commandsStatistics[command].minTimeMeasurement = this._commandsStatistics[command].minTimeMeasurement ? (this._commandsStatistics[command].minTimeMeasurement > duration ? duration : this._commandsStatistics[command].minTimeMeasurement) : duration;
+ this._commandsStatistics[command].maxTimeMeasurement = this._commandsStatistics[command].maxTimeMeasurement ? (this._commandsStatistics[command].maxTimeMeasurement < duration ? duration : this._commandsStatistics[command].maxTimeMeasurement) : duration;
+ this._commandsStatistics[command].totalTimeMeasurement = this._commandsStatistics[command].totalTimeMeasurement ? this._commandsStatistics[command].totalTimeMeasurement + duration : duration;
+ this._commandsStatistics[command].avgTimeMeasurement = this._commandsStatistics[command].totalTimeMeasurement / this._commandsStatistics[command].countTimeMeasurement;
+ Array.isArray(this._commandsStatistics[command].timeMeasurementSeries) ? this._commandsStatistics[command].timeMeasurementSeries.push(duration) : this._commandsStatistics[command].timeMeasurementSeries = [duration] as CircularArray<number>;
+ this._commandsStatistics[command].medTimeMeasurement = this.median(this._commandsStatistics[command].timeMeasurementSeries);
}
private _logPrefix(): string {