X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fperformance%2Fstorage%2FJsonFileStorage.ts;h=c4a9f7483e30060047607bdbad5a97e15fb7c91c;hb=3e8d029bbd0a072ae80c45e9a50770de3218cbc1;hp=5effae906dc6965d3d60893c801d5e6b465e8d4d;hpb=1227a6f190a8020afd953a26bdede86e5f04eb0c;p=e-mobility-charging-stations-simulator.git

diff --git a/src/performance/storage/JsonFileStorage.ts b/src/performance/storage/JsonFileStorage.ts
index 5effae90..c4a9f748 100644
--- a/src/performance/storage/JsonFileStorage.ts
+++ b/src/performance/storage/JsonFileStorage.ts
@@ -1,10 +1,19 @@
 // Copyright Jerome Benoit. 2021-2023. All Rights Reserved.
 
-import fs from 'node:fs';
+import { closeSync, existsSync, mkdirSync, openSync, readFileSync, writeFileSync } from 'node:fs';
+import { dirname } from 'node:path';
 
+import { Storage } from './Storage';
+import { BaseError } from '../../exception';
 import { FileType, type Statistics } from '../../types';
-import { AsyncLock, AsyncLockType, Constants, FileUtils, Utils } from '../../utils';
-import { Storage } from '../internal';
+import {
+  AsyncLock,
+  AsyncLockType,
+  Constants,
+  JSONStringifyWithMapSupport,
+  handleFileException,
+  isNullOrUndefined,
+} from '../../utils';
 
 export class JsonFileStorage extends Storage {
   private fd: number | null = null;
@@ -16,23 +25,17 @@ export class JsonFileStorage extends Storage {
 
   public storePerformanceStatistics(performanceStatistics: Statistics): void {
     this.checkPerformanceRecordsFile();
-    const asyncLock = AsyncLock.getInstance(AsyncLockType.performance);
-    asyncLock
-      .acquire()
+    AsyncLock.acquire(AsyncLockType.performance)
       .then(() => {
-        const fileData = fs.readFileSync(this.dbName, 'utf8');
+        const fileData = 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'
-        );
+        writeFileSync(this.dbName, JSONStringifyWithMapSupport(performanceRecords, 2), 'utf8');
       })
       .catch((error) => {
-        FileUtils.handleFileException(
+        handleFileException(
           this.dbName,
           FileType.PerformanceRecords,
           error as NodeJS.ErrnoException,
@@ -40,17 +43,20 @@ export class JsonFileStorage extends Storage {
         );
       })
       .finally(() => {
-        asyncLock.release().catch(Constants.EMPTY_FUNCTION);
+        AsyncLock.release(AsyncLockType.performance).catch(Constants.EMPTY_FUNCTION);
       });
   }
 
   public open(): void {
     try {
-      if (Utils.isNullOrUndefined(this?.fd)) {
-        this.fd = fs.openSync(this.dbName, 'a+');
+      if (isNullOrUndefined(this?.fd)) {
+        if (!existsSync(dirname(this.dbName))) {
+          mkdirSync(dirname(this.dbName), { recursive: true });
+        }
+        this.fd = openSync(this.dbName, 'a+');
       }
     } catch (error) {
-      FileUtils.handleFileException(
+      handleFileException(
         this.dbName,
         FileType.PerformanceRecords,
         error as NodeJS.ErrnoException,
@@ -62,11 +68,11 @@ export class JsonFileStorage extends Storage {
   public close(): void {
     try {
       if (this?.fd) {
-        fs.closeSync(this.fd);
+        closeSync(this.fd);
         this.fd = null;
       }
     } catch (error) {
-      FileUtils.handleFileException(
+      handleFileException(
         this.dbName,
         FileType.PerformanceRecords,
         error as NodeJS.ErrnoException,
@@ -77,7 +83,7 @@ export class JsonFileStorage extends Storage {
 
   private checkPerformanceRecordsFile(): void {
     if (!this?.fd) {
-      throw new Error(
+      throw new BaseError(
         `${this.logPrefix} Performance records '${this.dbName}' file descriptor not found`
       );
     }