X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fperformance%2FPerformanceStatistics.ts;h=e90595225278d3a926059a2ca3ab7821b800d644;hb=c317ae3edbd335e6dc52616df7d702c0d8419fd4;hp=f61d095874f9dafbde0df907b7ad60e58f504098;hpb=1fb214826a367053852c7d56e91775cdb92c9588;p=e-mobility-charging-stations-simulator.git

diff --git a/src/performance/PerformanceStatistics.ts b/src/performance/PerformanceStatistics.ts
index f61d0958..e9059522 100644
--- a/src/performance/PerformanceStatistics.ts
+++ b/src/performance/PerformanceStatistics.ts
@@ -1,4 +1,4 @@
-// Partial Copyright Jerome Benoit. 2021-2023. All Rights Reserved.
+// Partial Copyright Jerome Benoit. 2021-2024. All Rights Reserved.
 
 import { type PerformanceEntry, PerformanceObserver, performance } from 'node:perf_hooks'
 import type { URL } from 'node:url'
@@ -6,6 +6,7 @@ import { parentPort } from 'node:worker_threads'
 
 import { secondsToMilliseconds } from 'date-fns'
 
+import { BaseError } from '../exception/index.js'
 import {
   ConfigurationSection,
   type IncomingRequestCommand,
@@ -13,6 +14,7 @@ import {
   MessageType,
   type RequestCommand,
   type Statistics,
+  type StatisticsData,
   type StorageConfiguration,
   type TimestampedData
 } from '../types/index.js'
@@ -41,8 +43,8 @@ export class PerformanceStatistics {
   PerformanceStatistics
   >()
 
-  private readonly objId: string
-  private readonly objName: string
+  private readonly objId: string | undefined
+  private readonly objName: string | undefined
   private performanceObserver!: PerformanceObserver
   private readonly statistics: Statistics
   private displayInterval?: NodeJS.Timeout
@@ -52,8 +54,8 @@ export class PerformanceStatistics {
     this.objName = objName
     this.initializePerformanceObserver()
     this.statistics = {
-      id: this.objId ?? 'Object id not specified',
-      name: this.objName ?? 'Object name not specified',
+      id: this.objId,
+      name: this.objName,
       uri: uri.toString(),
       createdAt: new Date(),
       statisticsData: new Map()
@@ -61,16 +63,40 @@ export class PerformanceStatistics {
   }
 
   public static getInstance (
-    objId: string,
-    objName: string,
-    uri: URL
+    objId: string | undefined,
+    objName: string | undefined,
+    uri: URL | undefined
   ): PerformanceStatistics | undefined {
+    if (objId == null) {
+      const errMsg = 'Cannot get performance statistics instance without specifying object id'
+      logger.error(`${PerformanceStatistics.logPrefix()} ${errMsg}`)
+      throw new BaseError(errMsg)
+    }
+    if (objName == null) {
+      const errMsg = 'Cannot get performance statistics instance without specifying object name'
+      logger.error(`${PerformanceStatistics.logPrefix()} ${errMsg}`)
+      throw new BaseError(errMsg)
+    }
+    if (uri == null) {
+      const errMsg = 'Cannot get performance statistics instance without specifying object uri'
+      logger.error(`${PerformanceStatistics.logPrefix()} ${errMsg}`)
+      throw new BaseError(errMsg)
+    }
     if (!PerformanceStatistics.instances.has(objId)) {
       PerformanceStatistics.instances.set(objId, new PerformanceStatistics(objId, objName, uri))
     }
     return PerformanceStatistics.instances.get(objId)
   }
 
+  public static deleteInstance (objId: string | undefined): boolean {
+    if (objId == null) {
+      const errMsg = 'Cannot delete performance statistics instance without specifying object id'
+      logger.error(`${PerformanceStatistics.logPrefix()} ${errMsg}`)
+      throw new BaseError(errMsg)
+    }
+    return PerformanceStatistics.instances.delete(objId)
+  }
+
   public static beginMeasure (id: string): string {
     const markId = `${id.charAt(0).toUpperCase()}${id.slice(1)}~${generateUUID()}`
     performance.mark(markId)
@@ -164,7 +190,7 @@ export class PerformanceStatistics {
     this.stopLogStatisticsInterval()
     performance.clearMarks()
     performance.clearMeasures()
-    this.performanceObserver?.disconnect()
+    this.performanceObserver.disconnect()
   }
 
   public restart (): void {
@@ -173,7 +199,7 @@ export class PerformanceStatistics {
   }
 
   private initializePerformanceObserver (): void {
-    this.performanceObserver = new PerformanceObserver((performanceObserverList) => {
+    this.performanceObserver = new PerformanceObserver(performanceObserverList => {
       const lastPerformanceEntry = performanceObserverList.getEntries()[0]
       // logger.debug(
       //   `${this.logPrefix()} '${lastPerformanceEntry.name}' performance entry: %j`,
@@ -185,9 +211,11 @@ export class PerformanceStatistics {
   }
 
   private logStatistics (): void {
-    logger.info(`${this.logPrefix()}`, {
+    logger.info(this.logPrefix(), {
       ...this.statistics,
-      statisticsData: JSONStringifyWithMapSupport(this.statistics.statisticsData)
+      statisticsData: JSON.parse(
+        JSONStringifyWithMapSupport(this.statistics.statisticsData)
+      ) as Map<string | RequestCommand | IncomingRequestCommand, StatisticsData>
     })
   }
 
@@ -288,6 +316,10 @@ export class PerformanceStatistics {
     }
   }
 
+  private static readonly logPrefix = (): string => {
+    return logPrefix(' Performance statistics')
+  }
+
   private readonly logPrefix = (): string => {
     return logPrefix(` ${this.objName} | Performance statistics`)
   }