X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fperformance%2Fstorage%2FJsonFileStorage.ts;h=e94d79b97d337826bcc4c7bc74d698d5211b1e04;hb=c1565026eb14b8bf6aa494c89ccbfcea1ff1dc67;hp=44340cc4e425a9b1faf5f520a9f69e344f8fab77;hpb=4c5e87ae4e007b3cb0a8636515da8c3fe2bccff3;p=e-mobility-charging-stations-simulator.git

diff --git a/src/performance/storage/JsonFileStorage.ts b/src/performance/storage/JsonFileStorage.ts
index 44340cc4..e94d79b9 100644
--- a/src/performance/storage/JsonFileStorage.ts
+++ b/src/performance/storage/JsonFileStorage.ts
@@ -1,12 +1,11 @@
 // Copyright Jerome Benoit. 2021-2023. All Rights Reserved.
 
 import fs from 'node:fs';
+import path from 'node:path';
 
-import lockfile from 'proper-lockfile';
-
+import { Storage } from './Storage';
 import { FileType, type Statistics } from '../../types';
-import { FileUtils, Utils } from '../../utils';
-import { Storage } from '../internal';
+import { AsyncLock, AsyncLockType, Constants, FileUtils, Utils } from '../../utils';
 
 export class JsonFileStorage extends Storage {
   private fd: number | null = null;
@@ -18,38 +17,38 @@ export class JsonFileStorage extends Storage {
 
   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();
+    AsyncLock.acquire(AsyncLockType.performance)
+      .then(() => {
+        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(() => {
-        /* This is intentional */
+      .catch((error) => {
+        FileUtils.handleFileException(
+          this.dbName,
+          FileType.PerformanceRecords,
+          error as NodeJS.ErrnoException,
+          this.logPrefix
+        );
+      })
+      .finally(() => {
+        AsyncLock.release(AsyncLockType.performance).catch(Constants.EMPTY_FUNCTION);
       });
   }
 
   public open(): void {
     try {
       if (Utils.isNullOrUndefined(this?.fd)) {
+        if (!fs.existsSync(path.dirname(this.dbName))) {
+          fs.mkdirSync(path.dirname(this.dbName), { recursive: true });
+        }
         this.fd = fs.openSync(this.dbName, 'a+');
       }
     } catch (error) {