X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fperformance%2Fstorage%2FJsonFileStorage.ts;h=31d18537f783067bebd396d40cf19fad34d69b0f;hb=a8599ae9ed113db82ee4857c7a660faca5ec7fb8;hp=2f6e498749f5751f2364cc62716b3cfa8904872f;hpb=f1c729e06d48e7821b732276343990946fad9f35;p=e-mobility-charging-stations-simulator.git

diff --git a/src/performance/storage/JsonFileStorage.ts b/src/performance/storage/JsonFileStorage.ts
index 2f6e4987..31d18537 100644
--- a/src/performance/storage/JsonFileStorage.ts
+++ b/src/performance/storage/JsonFileStorage.ts
@@ -1,97 +1,90 @@
-// Copyright Jerome Benoit. 2021-2023. All Rights Reserved.
+// Copyright Jerome Benoit. 2021-2024. All Rights Reserved.
 
-import { closeSync, existsSync, mkdirSync, openSync, writeSync } from 'node:fs';
-import { dirname } from 'node:path';
+import { closeSync, existsSync, mkdirSync, openSync, writeSync } from 'node:fs'
+import { dirname } from 'node:path'
 
-import { Storage } from './Storage';
-import { BaseError } from '../../exception';
-import { FileType, type Statistics } from '../../types';
+import { Storage } from './Storage.js'
+import { BaseError } from '../../exception/index.js'
+import { FileType, type Statistics } from '../../types/index.js'
 import {
   AsyncLock,
   AsyncLockType,
-  Constants,
   JSONStringifyWithMapSupport,
-  handleFileException,
-  isNullOrUndefined,
-} from '../../utils';
+  handleFileException
+} from '../../utils/index.js'
 
 export class JsonFileStorage extends Storage {
-  private static readonly performanceRecords: Map<string, Statistics> = new Map<
-    string,
-    Statistics
-  >();
+  private static performanceRecords: Map<string, Statistics>
 
-  private fd?: number;
+  private fd?: number
 
-  constructor(storageUri: string, logPrefix: string) {
-    super(storageUri, logPrefix);
-    this.dbName = this.storageUri.pathname;
+  constructor (storageUri: string, logPrefix: string) {
+    super(storageUri, logPrefix)
+    this.dbName = this.storageUri.pathname
   }
 
-  public storePerformanceStatistics(performanceStatistics: Statistics): void {
-    this.checkPerformanceRecordsFile();
-    AsyncLock.acquire(AsyncLockType.performance)
-      .then(() => {
-        JsonFileStorage.performanceRecords.set(performanceStatistics.id, performanceStatistics);
-        writeSync(
-          this.fd!,
-          JSONStringifyWithMapSupport([...JsonFileStorage.performanceRecords.values()], 2),
-          0,
-          'utf8',
-        );
-      })
-      .catch((error) => {
-        handleFileException(
-          this.dbName,
-          FileType.PerformanceRecords,
-          error as NodeJS.ErrnoException,
-          this.logPrefix,
-        );
-      })
-      .finally(() => {
-        AsyncLock.release(AsyncLockType.performance).catch(Constants.EMPTY_FUNCTION);
-      });
+  public storePerformanceStatistics (performanceStatistics: Statistics): void {
+    this.checkPerformanceRecordsFile()
+    JsonFileStorage.performanceRecords.set(performanceStatistics.id, performanceStatistics)
+    AsyncLock.runExclusive(AsyncLockType.performance, () => {
+      writeSync(
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        this.fd!,
+        JSONStringifyWithMapSupport([...JsonFileStorage.performanceRecords.values()], 2),
+        0,
+        'utf8'
+      )
+    }).catch(error => {
+      handleFileException(
+        this.dbName,
+        FileType.PerformanceRecords,
+        error as NodeJS.ErrnoException,
+        this.logPrefix
+      )
+    })
   }
 
-  public open(): void {
+  public open (): void {
+    JsonFileStorage.performanceRecords = new Map<string, Statistics>()
     try {
-      if (isNullOrUndefined(this?.fd)) {
+      if (this.fd == null) {
         if (!existsSync(dirname(this.dbName))) {
-          mkdirSync(dirname(this.dbName), { recursive: true });
+          mkdirSync(dirname(this.dbName), { recursive: true })
         }
-        this.fd = openSync(this.dbName, 'w+');
+        this.fd = openSync(this.dbName, 'w')
       }
     } catch (error) {
       handleFileException(
         this.dbName,
         FileType.PerformanceRecords,
         error as NodeJS.ErrnoException,
-        this.logPrefix,
-      );
+        this.logPrefix
+      )
     }
   }
 
-  public close(): void {
+  public close (): void {
+    JsonFileStorage.performanceRecords.clear()
     try {
-      if (this?.fd) {
-        closeSync(this.fd);
-        delete this?.fd;
+      if (this.fd != null) {
+        closeSync(this.fd)
+        delete this.fd
       }
     } catch (error) {
       handleFileException(
         this.dbName,
         FileType.PerformanceRecords,
         error as NodeJS.ErrnoException,
-        this.logPrefix,
-      );
+        this.logPrefix
+      )
     }
   }
 
-  private checkPerformanceRecordsFile(): void {
-    if (!this?.fd) {
+  private checkPerformanceRecordsFile (): void {
+    if (this.fd == null) {
       throw new BaseError(
-        `${this.logPrefix} Performance records '${this.dbName}' file descriptor not found`,
-      );
+        `${this.logPrefix} Performance records '${this.dbName}' file descriptor not found`
+      )
     }
   }
 }