X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fperformance%2Fstorage%2FJsonFileStorage.ts;h=592504a77c73ae104035da36f6415f4bf2986ffb;hb=8d2a9e1c5a2b21932c77846bdf10cbe726797685;hp=fcb35a4df0507569d941edbcb1aac223561e6be4;hpb=59b6ed8d1db313ef3371efd8ab5e039cf3dedab0;p=e-mobility-charging-stations-simulator.git

diff --git a/src/performance/storage/JsonFileStorage.ts b/src/performance/storage/JsonFileStorage.ts
index fcb35a4d..592504a7 100644
--- a/src/performance/storage/JsonFileStorage.ts
+++ b/src/performance/storage/JsonFileStorage.ts
@@ -1,86 +1,82 @@
-// Copyright Jerome Benoit. 2021-2023. All Rights Reserved.
+// Copyright Jerome Benoit. 2021-2024. All Rights Reserved.
 
-import fs from 'node:fs';
+import { closeSync, existsSync, mkdirSync, openSync, writeSync } from 'node:fs'
+import { dirname } from 'node:path'
 
-import lockfile from 'proper-lockfile';
-
-import { FileType, type Statistics } from '../../types';
-import { Constants, FileUtils, Utils } from '../../utils';
-import { Storage } from '../internal';
+import { BaseError } from '../../exception/index.js'
+import { FileType, MapStringifyFormat, type Statistics } from '../../types/index.js'
+import { AsyncLock, AsyncLockType, handleFileException, JSONStringify } from '../../utils/index.js'
+import { Storage } from './Storage.js'
 
 export class JsonFileStorage extends Storage {
-  private fd: number | null = null;
+  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();
-    lockfile
-      .lock(this.dbName, { stale: 5000, retries: 3 })
-      .then(async (release) => {
-        try {
-          const fileData = fs.readFileSync(this.dbName, 'utf8');
-          const performanceRecords: Statistics[] = fileData
-            ? (JSON.parse(fileData) as Statistics[])
-            : [];
-          performanceRecords.push(performanceStatistics);
-          fs.writeFileSync(
-            this.dbName,
-            Utils.JSONStringifyWithMapSupport(performanceRecords, 2),
-            'utf8'
-          );
-        } catch (error) {
-          FileUtils.handleFileException(
-            this.dbName,
-            FileType.PerformanceRecords,
-            error as NodeJS.ErrnoException,
-            this.logPrefix
-          );
-        }
-        await release();
-      })
-      .catch(Constants.EMPTY_FUNCTION);
+  public storePerformanceStatistics (performanceStatistics: Statistics): void {
+    this.setPerformanceStatistics(performanceStatistics)
+    this.checkPerformanceRecordsFile()
+    AsyncLock.runExclusive(AsyncLockType.performance, () => {
+      writeSync(
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        this.fd!,
+        JSONStringify([...this.getPerformanceStatistics()], 2, MapStringifyFormat.object),
+        0,
+        'utf8'
+      )
+    }).catch(error => {
+      handleFileException(
+        this.dbName,
+        FileType.PerformanceRecords,
+        error as NodeJS.ErrnoException,
+        this.logPrefix
+      )
+    })
   }
 
-  public open(): void {
+  public open (): void {
     try {
-      if (Utils.isNullOrUndefined(this?.fd)) {
-        this.fd = fs.openSync(this.dbName, 'a+');
+      if (this.fd == null) {
+        if (!existsSync(dirname(this.dbName))) {
+          mkdirSync(dirname(this.dbName), { recursive: true })
+        }
+        this.fd = openSync(this.dbName, 'w')
       }
     } catch (error) {
-      FileUtils.handleFileException(
+      handleFileException(
         this.dbName,
         FileType.PerformanceRecords,
         error as NodeJS.ErrnoException,
         this.logPrefix
-      );
+      )
     }
   }
 
-  public close(): void {
+  public close (): void {
+    this.clearPerformanceStatistics()
     try {
-      if (this?.fd) {
-        fs.closeSync(this.fd);
-        this.fd = null;
+      if (this.fd != null) {
+        closeSync(this.fd)
+        delete this.fd
       }
     } catch (error) {
-      FileUtils.handleFileException(
+      handleFileException(
         this.dbName,
         FileType.PerformanceRecords,
         error as NodeJS.ErrnoException,
         this.logPrefix
-      );
+      )
     }
   }
 
-  private checkPerformanceRecordsFile(): void {
-    if (!this?.fd) {
-      throw new Error(
+  private checkPerformanceRecordsFile (): void {
+    if (this.fd == null) {
+      throw new BaseError(
         `${this.logPrefix} Performance records '${this.dbName}' file descriptor not found`
-      );
+      )
     }
   }
 }