X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Futils%2FUtils.ts;h=fb8aebfe0dae72f3415c3ab9f7c9d3cb08e68471;hb=f902e1c441c6751f885e39bc5aa23721a102f424;hp=e09eeebd3be31773495eb794f11610448f02fe62;hpb=d7d1db72537ac2b012ca901a768d6442f3cf39fe;p=e-mobility-charging-stations-simulator.git

diff --git a/src/utils/Utils.ts b/src/utils/Utils.ts
index e09eeebd..fb8aebfe 100644
--- a/src/utils/Utils.ts
+++ b/src/utils/Utils.ts
@@ -14,17 +14,17 @@ export default class Utils {
   }
 
   public static async sleep(milliSeconds: number): Promise<NodeJS.Timeout> {
-    return new Promise((resolve) => setTimeout(resolve, milliSeconds));
+    return new Promise((resolve) => setTimeout(resolve as () => void, milliSeconds));
   }
 
   public static formatDurationMilliSeconds(duration: number): string {
     duration = Utils.convertToInt(duration);
     const hours = Math.floor(duration / (3600 * 1000));
-    const minutes = Math.floor((duration - (hours * (3600 * 1000))) / (60 * 1000));
-    const seconds = (duration - (hours * 3600 * 1000) - (minutes * 60 * 1000)) / 1000;
-    let hoursStr: string = hours.toString();
-    let minutesStr: string = minutes.toString();
-    let secondsStr: string = seconds.toString();
+    const minutes = Math.floor((duration / 1000 - (hours * 3600)) / 60);
+    const seconds = duration / 1000 - (hours * 3600) - (minutes * 60);
+    let hoursStr = hours.toString();
+    let minutesStr = minutes.toString();
+    let secondsStr = seconds.toString();
 
     if (hours < 10) {
       hoursStr = '0' + hours.toString();
@@ -35,29 +35,13 @@ export default class Utils {
     if (seconds < 10) {
       secondsStr = '0' + seconds.toString();
     }
-    return hoursStr + ':' + minutesStr + ':' + secondsStr;
+    return hoursStr + ':' + minutesStr + ':' + secondsStr.substring(0, 6);
   }
 
   public static formatDurationSeconds(duration: number): string {
     return Utils.formatDurationMilliSeconds(duration * 1000);
   }
 
-  public static removeExtraEmptyLines(tab: string[]): void {
-    // Start from the end
-    for (let i = tab.length - 1; i > 0; i--) {
-      // Two consecutive empty lines?
-      if (tab[i].length === 0 && tab[i - 1].length === 0) {
-        // Remove the last one
-        tab.splice(i, 1);
-      }
-      // Check last line
-      if (i === 1 && tab[i - 1].length === 0) {
-        // Remove the first one
-        tab.splice(i - 1, 1);
-      }
-    }
-  }
-
   public static convertToDate(value: unknown): Date {
     // Check
     if (!value) {
@@ -116,14 +100,23 @@ export default class Utils {
   }
 
   public static getRandomFloat(max: number, min = 0, negative = false): number {
+    if (max < min || min < 0 || max < 0) {
+      throw new RangeError('Invalid interval');
+    }
     const randomPositiveFloat = crypto.randomBytes(4).readUInt32LE() / 0xffffffff;
-    const sign = (negative && randomPositiveFloat < 0.5) ? 1 : -1;
+    const sign = (negative && randomPositiveFloat < 0.5) ? -1 : 1;
     return sign * (randomPositiveFloat * (max - min) + min);
   }
 
-  public static getRandomInt(max: number, min = 0): number {
+  public static getRandomInteger(max: number, min = 0): number {
+    if (max < 0) {
+      throw new RangeError('Invalid interval');
+    }
     max = Math.floor(max);
     if (min) {
+      if (max < min || min < 0) {
+        throw new RangeError('Invalid interval');
+      }
       min = Math.ceil(min);
       return Math.floor(Utils.secureRandom() * (max - min + 1)) + min;
     }
@@ -166,19 +159,6 @@ export default class Utils {
     return false;
   }
 
-  public static isEmptyJSon(document: unknown): boolean {
-    // Empty?
-    if (!document) {
-      return true;
-    }
-    // Check type
-    if (typeof document !== 'object') {
-      return true;
-    }
-    // Check
-    return Object.keys(document).length === 0;
-  }
-
   public static isString(value: unknown): boolean {
     return typeof value === 'string';
   }
@@ -255,6 +235,24 @@ export default class Utils {
     return Configuration.getWorkerProcess() === WorkerProcessType.DYNAMIC_POOL;
   }
 
+  public static async promiseWithTimeout<T>(
+      promise: Promise<T>,
+      timeoutMs: number,
+      timeoutError: Error,
+      timeoutCallback: () => void = () => { /* This is intentional */ }
+  ): Promise<T> {
+    // Create a timeout promise that rejects in timeout milliseconds
+    const timeoutPromise = new Promise<never>((_, reject) => {
+      setTimeout(() => {
+        timeoutCallback();
+        reject(timeoutError);
+      }, timeoutMs);
+    });
+
+    // Returns a race between timeout promise and the passed promise
+    return Promise.race<T>([promise, timeoutPromise]);
+  }
+
   /**
    * Generate a cryptographically secure random number in the [0,1[ range
    *