X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fperformance%2Fstorage%2FJsonFileStorage.ts;h=8bbbd42cea06563d91d7e6d360bf38cc06f92563;hb=b3d7d65476a4ab586b3ccd188f0bfbe8452aba0e;hp=bc28a6cb43c15b39a0925c10c9b8cf555a85b68d;hpb=8114d10e3893e96bb725ce2fca9744429ee4b75b;p=e-mobility-charging-stations-simulator.git

diff --git a/src/performance/storage/JsonFileStorage.ts b/src/performance/storage/JsonFileStorage.ts
index bc28a6cb..8bbbd42c 100644
--- a/src/performance/storage/JsonFileStorage.ts
+++ b/src/performance/storage/JsonFileStorage.ts
@@ -1,13 +1,19 @@
-// Copyright Jerome Benoit. 2021. All Rights Reserved.
+// Copyright Jerome Benoit. 2021-2023. All Rights Reserved.
 
-import fs from 'fs';
+import { closeSync, existsSync, mkdirSync, openSync, readFileSync, writeFileSync } from 'node:fs';
+import { dirname } from 'node:path';
 
-import lockfile from 'proper-lockfile';
-
-import { FileType } from '../../types/FileType';
-import Statistics from '../../types/Statistics';
-import FileUtils from '../../utils/FileUtils';
 import { Storage } from './Storage';
+import { BaseError } from '../../exception';
+import { FileType, type Statistics } from '../../types';
+import {
+  AsyncLock,
+  AsyncLockType,
+  Constants,
+  JSONStringifyWithMapSupport,
+  handleFileException,
+  isNullOrUndefined,
+} from '../../utils';
 
 export class JsonFileStorage extends Storage {
   private fd: number | null = null;
@@ -19,58 +25,42 @@ 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,
-            JSON.stringify(
-              performanceRecords,
-              (key, value) => {
-                if (value instanceof Map) {
-                  return {
-                    dataType: 'Map',
-                    value: [...value],
-                  };
-                }
-                return value as Statistics;
-              },
-              2
-            ),
-            'utf8'
-          );
-        } catch (error) {
-          FileUtils.handleFileException(
-            this.logPrefix,
-            FileType.PerformanceRecords,
-            this.dbName,
-            error as NodeJS.ErrnoException
-          );
-        }
-        await release();
+    AsyncLock.acquire(AsyncLockType.performance)
+      .then(() => {
+        const fileData = readFileSync(this.dbName, 'utf8');
+        const performanceRecords: Statistics[] = fileData
+          ? (JSON.parse(fileData) as Statistics[])
+          : [];
+        performanceRecords.push(performanceStatistics);
+        writeFileSync(this.dbName, JSONStringifyWithMapSupport(performanceRecords, 2), 'utf8');
+      })
+      .catch((error) => {
+        handleFileException(
+          this.dbName,
+          FileType.PerformanceRecords,
+          error as NodeJS.ErrnoException,
+          this.logPrefix,
+        );
       })
-      .catch(() => {
-        /* This is intentional */
+      .finally(() => {
+        AsyncLock.release(AsyncLockType.performance).catch(Constants.EMPTY_FUNCTION);
       });
   }
 
   public open(): void {
     try {
-      if (!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(
-        this.logPrefix,
-        FileType.PerformanceRecords,
+      handleFileException(
         this.dbName,
-        error as NodeJS.ErrnoException
+        FileType.PerformanceRecords,
+        error as NodeJS.ErrnoException,
+        this.logPrefix,
       );
     }
   }
@@ -78,23 +68,23 @@ 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(
-        this.logPrefix,
-        FileType.PerformanceRecords,
+      handleFileException(
         this.dbName,
-        error as NodeJS.ErrnoException
+        FileType.PerformanceRecords,
+        error as NodeJS.ErrnoException,
+        this.logPrefix,
       );
     }
   }
 
   private checkPerformanceRecordsFile(): void {
     if (!this?.fd) {
-      throw new Error(
-        `${this.logPrefix} Performance records '${this.dbName}' file descriptor not found`
+      throw new BaseError(
+        `${this.logPrefix} Performance records '${this.dbName}' file descriptor not found`,
       );
     }
   }